From 57d687a7e162e0238b5a1c48c863402778dacb9e Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Mon, 19 Mar 2012 19:09:52 +0000
Subject: [PATCH] give images priority 10

---
 contrib/blocks/main.php        | 2 +-
 contrib/blocks/theme.php       | 3 +++
 contrib/handle_flash/theme.php | 2 +-
 contrib/handle_ico/theme.php   | 2 +-
 contrib/handle_mp3/theme.php   | 2 +-
 contrib/handle_svg/theme.php   | 2 +-
 ext/handle_pixel/theme.php     | 2 +-
 ext/view/theme.php             | 2 +-
 8 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/contrib/blocks/main.php b/contrib/blocks/main.php
index 27d5a124..6cb7d0d1 100644
--- a/contrib/blocks/main.php
+++ b/contrib/blocks/main.php
@@ -74,7 +74,7 @@ class Blocks extends Extension {
 				}
 			}
 			else if($event->get_arg(0) == "list") {
-				$this->theme->display_blocks($database->get_all("SELECT * FROM blocks"));
+				$this->theme->display_blocks($database->get_all("SELECT * FROM blocks ORDER BY area, priority"));
 			}
 		}
 	}
diff --git a/contrib/blocks/theme.php b/contrib/blocks/theme.php
index 7022afed..57763255 100644
--- a/contrib/blocks/theme.php
+++ b/contrib/blocks/theme.php
@@ -18,6 +18,9 @@ class BlocksTheme extends Themelet {
 			$html .= "<tr>";
 			$html .= "<td colspan='11'><textarea rows='5' name='content'>".html_escape($block['content'])."</textarea></td>";
 			$html .= "</tr>\n";
+			$html .= "<tr>";
+			$html .= "<td colspan='11'>&nbsp;</td>";
+			$html .= "</tr>\n";
 			$html .= "</form>\n";
 		}
 		$html .= make_form(make_link("blocks/add"));
diff --git a/contrib/handle_flash/theme.php b/contrib/handle_flash/theme.php
index aec6bb9f..6b956a75 100644
--- a/contrib/handle_flash/theme.php
+++ b/contrib/handle_flash/theme.php
@@ -20,7 +20,7 @@ class FlashFileHandlerTheme extends Themelet {
 					wmode='opaque'
 					type='application/x-shockwave-flash'></embed>
 			</object>";
-		$page->add_block(new Block("Flash Animation", $html, "main", 0));
+		$page->add_block(new Block("Flash Animation", $html, "main", 10));
 	}
 }
 ?>
diff --git a/contrib/handle_ico/theme.php b/contrib/handle_ico/theme.php
index 47b91121..27b1ae74 100644
--- a/contrib/handle_ico/theme.php
+++ b/contrib/handle_ico/theme.php
@@ -6,7 +6,7 @@ class IcoFileHandlerTheme extends Themelet {
 		$html = "
 			<img id='main_image' src='$ilink'>
 		";
-		$page->add_block(new Block("Image", $html, "main", 0));
+		$page->add_block(new Block("Image", $html, "main", 10));
 	}
 }
 ?>
diff --git a/contrib/handle_mp3/theme.php b/contrib/handle_mp3/theme.php
index 953f9a19..59ecefac 100644
--- a/contrib/handle_mp3/theme.php
+++ b/contrib/handle_mp3/theme.php
@@ -17,7 +17,7 @@ class MP3FileHandlerTheme extends Themelet {
 					type='application/x-shockwave-flash'></embed>
 			</object>
 			<p><a href='$ilink'>Download</a>";
-		$page->add_block(new Block("Music", $html, "main", 0));
+		$page->add_block(new Block("Music", $html, "main", 10));
 	}
 }
 ?>
diff --git a/contrib/handle_svg/theme.php b/contrib/handle_svg/theme.php
index ed4697d3..304baf79 100644
--- a/contrib/handle_svg/theme.php
+++ b/contrib/handle_svg/theme.php
@@ -9,7 +9,7 @@ class SVGFileHandlerTheme extends Themelet {
 			    <embed src='$ilink' type='image/svg+xml' width='{$image->width}' height='{$image->height}' />
 			</object>
 		";
-		$page->add_block(new Block("Image", $html, "main", 0));
+		$page->add_block(new Block("Image", $html, "main", 10));
 	}
 }
 ?>
diff --git a/ext/handle_pixel/theme.php b/ext/handle_pixel/theme.php
index a3604831..88c14d63 100644
--- a/ext/handle_pixel/theme.php
+++ b/ext/handle_pixel/theme.php
@@ -56,7 +56,7 @@ class PixelFileHandlerTheme extends Themelet {
 					}
 				</script>";
 		
-		$page->add_block(new Block("Image", $html.$zoom, "main", 0));
+		$page->add_block(new Block("Image", $html.$zoom, "main", 10));
 	}
 }
 ?>
diff --git a/ext/view/theme.php b/ext/view/theme.php
index dc39ddaa..c043ff83 100644
--- a/ext/view/theme.php
+++ b/ext/view/theme.php
@@ -17,7 +17,7 @@ class ViewImageTheme extends Themelet {
 		$page->add_html_header("<meta property=\"og:url\" content=\"".make_http(make_link("post/view/{$image->id}"))."\">");
 		$page->set_heading(html_escape($image->get_tag_list()));
 		$page->add_block(new Block("Navigation", $this->build_navigation($image), "left", 0));
-		$page->add_block(new Block(null, $this->build_info($image, $editor_parts), "main", 10));
+		$page->add_block(new Block(null, $this->build_info($image, $editor_parts), "main", 20));
 		//$page->add_block(new Block(null, $this->build_pin($image), "main", 11));
 	}