From 85880804d24ded84feda563a18bf3118b2c03d40 Mon Sep 17 00:00:00 2001
From: Daku <dakutree@codeanimu.net>
Date: Tue, 31 Dec 2013 08:22:58 +0000
Subject: [PATCH] have theme.php manage block creation so themes can
 move/remove if they wish

---
 ext/numeric_score/main.php  |  6 ++----
 ext/numeric_score/theme.php | 12 ++++++------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/ext/numeric_score/main.php b/ext/numeric_score/main.php
index ed7597ab..9cf21ab3 100644
--- a/ext/numeric_score/main.php
+++ b/ext/numeric_score/main.php
@@ -31,16 +31,14 @@ class NumericScore extends Extension {
 	public function onDisplayingImage(DisplayingImageEvent $event) {
 		global $user, $page;
 		if(!$user->is_anonymous()) {
-			$html = $this->theme->get_voter_html($event->image);
-			$page->add_block(new Block("Image Score", $html, "left", 20));
+			$this->theme->get_voter($event->image);
 		}
 	}
 
 	public function onUserPageBuilding(UserPageBuildingEvent $event) {
 		global $page, $user;
 		if($user->can("edit_other_vote")) {
-			$html = $this->theme->get_nuller_html($event->display_user);
-			$page->add_block(new Block("Votes", $html, "main", 60));
+			$this->theme->get_nuller($event->display_user);
 		}
 	}
 
diff --git a/ext/numeric_score/theme.php b/ext/numeric_score/theme.php
index baefad39..e60af00c 100644
--- a/ext/numeric_score/theme.php
+++ b/ext/numeric_score/theme.php
@@ -1,8 +1,8 @@
 <?php
 
 class NumericScoreTheme extends Themelet {
-	public function get_voter_html(Image $image) {
-		global $user;
+	public function get_voter(Image $image) {
+		global $user, $page;
 		$i_image_id = int_escape($image->id);
 		$i_score = int_escape($image->numeric_score);
 
@@ -46,11 +46,11 @@ class NumericScoreTheme extends Themelet {
 			</div>
 			";
 		}
-		return $html;
+		$page->add_block(new Block("Image Score", $html, "left", 20));
 	}
 
-	public function get_nuller_html(User $duser) {
-		global $user;
+	public function get_nuller(User $duser) {
+		global $user, $page;
 		$html = "
 			<form action='".make_link("numeric_score/remove_votes_by")."' method='POST'>
 			".$user->get_auth_html()."
@@ -58,7 +58,7 @@ class NumericScoreTheme extends Themelet {
 			<input type='submit' value='Delete all votes by this user'>
 			</form>
 		";
-		return $html;
+		$page->add_block(new Block("Votes", $html, "main", 60));
 	}
 
 	public function view_popular($images, $dte) {