From b00bad39e6b97f5a09375763b4be8d3130f38084 Mon Sep 17 00:00:00 2001
From: Jakob Hilden <jhild@umich.edu>
Date: Wed, 11 Feb 2009 04:38:02 +0000
Subject: improvements on the tag admin

---
 modules/tag/views/admin_tags.html.php | 104 ++++++++++++----------------------
 themes/admin_default/js/ui.init.js    |  26 ++++++---
 2 files changed, 55 insertions(+), 75 deletions(-)

diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php
index 18ce150e..d92f422a 100644
--- a/modules/tag/views/admin_tags.html.php
+++ b/modules/tag/views/admin_tags.html.php
@@ -1,5 +1,8 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <style>
+  #gTagAdmin td {
+    border: 0;
+  }
   #gTagAdmin ul {
     padding-bottom: .3em;
   }
@@ -21,14 +24,15 @@
     padding: 0 .2em 0 .2em;
     clear: none;
     float: left;
+    margin: 0 .2em 0 0;
   }
   #gRenameTagForm input[type="submit"] {
     height: 25px;
   }
-  #gRenameTagForm a, #gEditTagForm span {
+  #gRenameTagForm a, #gRenameTagForm span {
     display: block;
     float: left;
-    padding: .2em 0 0 .3em;
+    padding: .2em .2em 0 .1em;
   }
 </style>
 <div class="gBlock">
@@ -37,79 +41,43 @@
   </h2>
 
   <? $tags_per_column = $tags->count()/5 ?>
-  <? $column_tag_number = 0 ?>
-
-  <div id="gTagAdmin" class="gBlockContent">
-    <div class="gColumn">
-      <? foreach ($tags as $i => $tag): ?>
-      <? $current_letter = strtoupper(substr($tag->name, 0, 1)) ?>
-
-      <? if ($i == 0): ?>
-      <strong><?= $current_letter ?></strong>
-      <ul>
-        <? elseif ($last_letter != $current_letter): ?>
-        <? if ($column_tag_number > $tags_per_column): ?>
-    </div>
-    <div class="gColumn">
-      <? $column_tag_number = 0 ?>
-      <? endif ?>
-    </ul>
-    <strong><?= $current_letter ?></strong>
-    <ul>
-      <? endif ?>
-
-      <li>
-        <span id="gTag-<?= $tag->id ?>" class="gEditable"
-              title="<?= t("Click to edit this tag") ?>"><?= $tag->name ?></span>
-        <span class="understate">(<?= $tag->count ?>)</span>
-        <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>" class="gDialogLink"
-          title="<?= t("Delete this tag") ?>">X</a>
-      </li>
-
-      <? $column_tag_number++ ?>
-      <? $last_letter = $current_letter ?>
-      <? endforeach ?>
-    </ul>
-
-    </div>
-  </div>
+  <? $column_tag_count = 0 ?>
 
-  <table>
+  <table id="gTagAdmin" class="gBlockContent">
+    <caption class="understate"><?= t("There are ".$tags->count()." tags") ?></caption>
     <tr>
-      <th> <?= t("Tag") ?> </th>
-      <th> <?= t("Photos") ?> </th>
-      <th> <?= t("Actions") ?> </th>
-    </tr>
-    <? foreach ($tags as $i => $tag): ?>
-    <tr class="<?= ($i % 2 == 0) ? "gEvenRow" : "gOddRow" ?>">
-      <td> <?= $tag->name ?> </td>
-      <td> <?= $tag->count ?> </td>
       <td>
-        <ul>
+        <? foreach ($tags as $i => $tag): ?>
+          <? $current_letter = strtoupper(substr($tag->name, 0, 1)) ?>
+
+          <? if ($i == 0): /* first letter */ ?>
+            <strong><?= $current_letter ?></strong>
+            <ul>
+          <? elseif ($last_letter != $current_letter): /* new letter */ ?>
+            <? if ($column_tag_count > $tags_per_column): /* new column */ ?>
+            	</td>
+              <td>
+              <? $column_tag_count = 0 ?>
+            <? endif ?>
+            
+            </ul>
+            <strong><?= $current_letter ?></strong>
+            <ul>
+          <? endif ?>
+    
           <li>
+            <span id="gTag-<?= $tag->id ?>" class="gEditable"
+                  title="<?= t("Click to edit this tag") ?>"><?= $tag->name ?></span>
+            <span class="understate">(<?= $tag->count ?>)</span>
             <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>" class="gDialogLink"
-              title="<?= t("Delete tag %tag_name", array("tag_name" => $tag->name)) ?>">
-              <?= t("delete") ?>
-            </a>
-          </li>
-          <li>
-            <a href="<?= url::site("admin/tags/form_rename/$tag->id") ?>" class="gDialogLink"
-              title="<?= t("Rename tag %tag_name", array("tag_name" => $tag->name)) ?>">
-              <?= t("rename") ?>
-            </a>
+              title="<?= t("Delete this tag") ?>">X</a>
           </li>
+    
+          <? $column_tag_count++ ?>
+          <? $last_letter = $current_letter ?>
+        <? endforeach /* $tags */ ?>
         </ul>
       </td>
     </tr>
-    <? endforeach ?>
   </table>
-
-  <div id="gTagSearch">
-    <form method="get" action="<?= url::site("admin/tags") ?>">
-      <fieldset>
-        <legend> <?= t("Search Tags") ?> </legend>
-        <input name="filter" value="<?= $filter ?>"/>
-        <input type="submit" value="<?= t("Search Tags") ?>"/>
-      </fieldset>
-    </form>
-  </div>
+</div>
\ No newline at end of file
diff --git a/themes/admin_default/js/ui.init.js b/themes/admin_default/js/ui.init.js
index a68a5238..d43a5f1d 100644
--- a/themes/admin_default/js/ui.init.js
+++ b/themes/admin_default/js/ui.init.js
@@ -49,26 +49,38 @@ $(document).ready(function(){
 
 });
 
-function editInplace(element){
-	// close already open inplace edit forms
+function closeEditInPlaceForms() {
+  // closes currently open inplace edit forms
 	if ($("#gRenameTagForm").length) {
 		var li = $("#gRenameTagForm").parent();
 		$("#gRenameTagForm").parent().html($("#gRenameTagForm").parent().data("revert"));
-		//li.$(".gEditable"); // TODO: would be good if below statements could only execute within li
-    $(".gEditable").bind("click", editInplace);
-    $(".dialogLink").bind("click", handleDialogEvent);
+    li.height("");
+    $(".gEditable", li).bind("click", editInplace);
+    $(".gDialogLink", li).bind("click", handleDialogEvent);
   }
+}
+
+function editInplace(element){
+	closeEditInPlaceForms();
 	
+  // creat edit form
 	var tag_id = $(this).attr('id').substr(5);
+  var tag_name = $(this).text();
+  var tag_width = $(this).width();
 	$(this).parent().data("revert", $(this).parent().html());
 	var form = '<form id="gRenameTagForm" method="post" action="/gallery3/index.php/admin/tags/rename/' + tag_id + '">';
 	form += '<input id="name" name="name" type="text" class="textbox" value="' + tag_name + '" />';
 	form += '<input type="submit" class="submit" value="Save" />';
 	form += '<span>or</span> <a href="#">cancel</a>';
 	form += '</form>';
-	
+  
+  // add edit form
 	$(this).parent().html(form);
-	$("#gRenameTagForm .textbox").focus();
+  $("#gRenameTagForm #name")
+    .width(tag_width+30)
+    .focus();
+  $("#gRenameTagForm").parent().height('1.6em');
+  $("#gRenameTagForm a").bind("click", closeEditInPlaceForms);
 }
 
 function handlePanelEvent(event) {
-- 
cgit v1.2.3