3 files changed, 54 insertions, 37 deletions

diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php
index be5461a4..feaf40c5 100644
--- a/modules/tag/helpers/tag.php
+++ b/modules/tag/helpers/tag.php
@@ -73,12 +73,15 @@ class tag_Core {
     if ($tags) {
       $cloud = new View("tag_cloud.html");
       $cloud->max_count = $tags[0]->count;
-      usort($tags, array("tag_theme", "sort_by_name"));
+      usort($tags, array("tag", "sort_by_name"));
       $cloud->tags = $tags;
       return $cloud;
     }
   }
 
+  static function sort_by_name($tag1, $tag2) {
+    return strcasecmp($tag1->name, $tag2->name);
+  }
 
   /**
    * Return all the tags for a given item.
@@ -98,7 +101,7 @@ class tag_Core {
   }
 
   static function get_add_form($item) {
-    $form = new Forge("tags", "", "post", array("id" => "gAddTagForm"));
+    $form = new Forge("tags", "", "post", array("id" => "g-add-tag-form", "class" => "g-short-form"));
     $label = $item->is_album() ?
       t("Add tag to album") :
       ($item->is_photo() ? t("Add tag to photo") : t("Add tag to movie"));
@@ -110,17 +113,8 @@ class tag_Core {
     return $form;
   }
 
-  static function get_rename_form($tag) {
-    $form = new Forge("admin/tags/rename/$tag->id", "", "post", array("id" => "gRenameTagForm"));
-    $group = $form->group("rename_tag")->label(t("Rename Tag"));
-    $group->input("name")->label(t("Tag name"))->value($tag->name)->rules("required|length[1,64]");
-    $group->inputs["name"]->error_messages("in_use", t("There is already a tag with that name"));
-    $group->submit("")->value(t("Save"));
-    return $form;
-  }
-
   static function get_delete_form($tag) {
-    $form = new Forge("admin/tags/delete/$tag->id", "", "post", array("id" => "gDeleteTagForm"));
+    $form = new Forge("admin/tags/delete/$tag->id", "", "post", array("id" => "g-delete-tag-form"));
     $group = $form->group("delete_tag")
       ->label(t("Really delete tag %tag_name?", array("tag_name" => $tag->name)));
     $group->submit("")->value(t("Delete Tag"));
diff --git a/modules/tag/helpers/tag_block.php b/modules/tag/helpers/tag_block.php
new file mode 100644
index 00000000..20ef18fa
--- /dev/null
+++ b/modules/tag/helpers/tag_block.php
@@ -0,0 +1,45 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class tag_block_Core {
+  static function get_site_list() {
+    return array("tag" => t("Popular tags"));
+  }
+
+  static function get($block_id, $theme) {
+    $block = "";
+    switch ($block_id) {
+    case "tag":
+      $block = new Block();
+      $block->css_id = "g-tag";
+      $block->title = t("Popular tags");
+      $block->content = new View("tag_block.html");
+      $block->content->cloud = tag::cloud(30);
+
+      if ($theme->item() && $theme->page_type() != "tag" && access::can("edit", $theme->item())) {
+        $controller = new Tags_Controller();
+        $block->content->form = tag::get_add_form($theme->item());
+      } else {
+        $block->content->form = "";
+      }
+      break;
+    }
+    return $block;
+  }
+}
\ No newline at end of file
diff --git a/modules/tag/helpers/tag_theme.php b/modules/tag/helpers/tag_theme.php
index 1bce9bd8..e966821a 100644
--- a/modules/tag/helpers/tag_theme.php
+++ b/modules/tag/helpers/tag_theme.php
@@ -21,33 +21,11 @@ class tag_theme_Core {
   static function head($theme) {
     $theme->css("jquery.autocomplete.css");
     $theme->script("jquery.autocomplete.js");
-    $theme->script("tag.js");
+    $theme->css("tag.css");
   }
 
   static function admin_head($theme) {
-    $theme->script("tag.js");
-  }
-
-  static function sidebar_blocks($theme) {
-    // @todo this needs to be data driven
-
-    $block = new Block();
-    $block->css_id = "gTag";
-    $block->title = t("Popular Tags");
-    $block->content = new View("tag_block.html");
-    $block->content->cloud = tag::cloud(30);
-
-    if ($theme->item() && $theme->page_type() != "tag" && access::can("edit", $theme->item())) {
-      $controller = new Tags_Controller();
-      $block->content->form = tag::get_add_form($theme->item());
-    } else {
-      $block->content->form = "";
-    }
-
-    return $block;
-  }
-
-  static function sort_by_name($tag1, $tag2) {
-    return strcasecmp($tag1->name, $tag2->name);
+    $theme->css("tag.css");
+    $theme->script("gallery.in_place_edit.js");
   }
 }
\ No newline at end of file