From 645cf6347cda049dc09664e60626c7a4f5609f89 Mon Sep 17 00:00:00 2001
From: Kevin Nehls <kevin@kevinnehls.com>
Date: Sun, 13 Sep 2009 09:14:25 -0700
Subject: Fix "Back to the gallery" link in upper-right corner in Admin
 Dashboard.

---
 themes/admin_default/views/admin.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'themes/admin_default')

diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index f77881bb..995e95ef 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -43,7 +43,7 @@
       <div id="gHeader">
         <?= $theme->admin_header_top() ?>
         <ul id="gLoginMenu">
-          <li class="first"><?= html::anchor(item::root()->url(), "&larr; ".t("Back to the Gallery")) ?></li>
+          <li class="first"><?= html::anchor("", "&larr; ".t("Back to the Gallery")) ?></li>
           <li id="gLogoutLink"><a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(item::root()->url())) ?>"><?= t("Logout") ?></a></li>
         </ul>
         <a id="gLogo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>">
-- 
cgit v1.2.3


From 827c845abbfe0767cb5063fea372477c24713b1e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 13 Sep 2009 14:14:01 -0700
Subject: Use the absolute url format for the root item.  html::anchor() will
 not prepend the base url to that.

---
 themes/admin_default/views/admin.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'themes/admin_default')

diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index 995e95ef..ef15ed25 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -43,7 +43,7 @@
       <div id="gHeader">
         <?= $theme->admin_header_top() ?>
         <ul id="gLoginMenu">
-          <li class="first"><?= html::anchor("", "&larr; ".t("Back to the Gallery")) ?></li>
+          <li class="first"><?= html::anchor(item::root()->abs_url(), "&larr; ".t("Back to the Gallery")) ?></li>
           <li id="gLogoutLink"><a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(item::root()->url())) ?>"><?= t("Logout") ?></a></li>
         </ul>
         <a id="gLogo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>">
-- 
cgit v1.2.3


From 75c68084136321b108e379643065fd21167990f8 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 13 Sep 2009 14:25:56 -0700
Subject: Only show the block anchor if one exists.  Show block anchors for
 admin themes too.

---
 themes/admin_default/views/block.html.php | 3 +++
 themes/default/views/block.html.php       | 2 ++
 2 files changed, 5 insertions(+)

(limited to 'themes/admin_default')

diff --git a/themes/admin_default/views/block.html.php b/themes/admin_default/views/block.html.php
index 21512d02..6cbea76e 100644
--- a/themes/admin_default/views/block.html.php
+++ b/themes/admin_default/views/block.html.php
@@ -1,4 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
+<? if ($anchor): ?>
+<a name="<?= $anchor ?>"></a>
+<? endif ?>
 <div block_id="<?= $id ?>" id="<?= $css_id ?>" class="gBlock ui-widget">
   <div class="ui-dialog-titlebar ui-widget-header ui-helper-clearfix ui-icon-right">
     <? if ($css_id != "gBlockAdder"): ?>
diff --git a/themes/default/views/block.html.php b/themes/default/views/block.html.php
index 37504861..e8cff833 100644
--- a/themes/default/views/block.html.php
+++ b/themes/default/views/block.html.php
@@ -1,5 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
+<? if ($anchor): ?>
 <a name="<?= $anchor ?>"></a>
+<? endif ?>
 <div id="<?= $css_id ?>" class="gBlock">
   <h2><?= $title ?></h2>
   <div class="gBlockContent">
-- 
cgit v1.2.3


From 48326ad01708fcfa020283e2ad8b2cae4ede1600 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 17 Sep 2009 12:11:00 -0700
Subject: Cleanup issues with the original fix for #779

---
 modules/tag/controllers/admin_tags.php | 4 ++--
 modules/tag/js/tag.js                  | 2 +-
 themes/admin_default/css/screen.css    | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'themes/admin_default')

diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index 3301566b..ced73d65 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -81,7 +81,7 @@ class Admin_Tags_Controller extends Admin_Controller {
       kohana::show_404();
     }
 
-    //Don't use a form as the form is dynamically created in the js
+    // Don't use a form as the form is dynamically created in the js
     $post = new Validation($_POST);
     $post->add_rules("name", "required", "length[1,64]");
     $valid = $post->validate();
@@ -89,7 +89,7 @@ class Admin_Tags_Controller extends Admin_Controller {
       $new_name = $this->input->post("name");
       $new_tag = ORM::factory("tag")->where("name", $new_name)->find();
       if ($new_tag->loaded) {
-        $error_msg = "There is already a tag with that name";
+        $error_msg = t("There is already a tag with that name")->__toString();
         $valid = false;
       }
     } else {
diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js
index d656da36..52c695c6 100644
--- a/modules/tag/js/tag.js
+++ b/modules/tag/js/tag.js
@@ -69,7 +69,7 @@ function editInPlace(element) {
           window.location.reload();
         } else if (data.result == "error") {
           $("#gRenameTagForm #name")
-            .css("border", "2px solid red")
+            .addClass("gError")
             .focus();
           $("#gTagAdmin").before("<p id=\"gEditErrorMessage\" class=\"gError\">" + data.message + "</p>");
         }
diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css
index 33cc6733..de6d436e 100644
--- a/themes/admin_default/css/screen.css
+++ b/themes/admin_default/css/screen.css
@@ -1034,6 +1034,11 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   float: right;
 }
 
+#gRenameTagForm input[type="text"].gError {
+  border: 2px solid red;
+  background: none;
+}
+
 #gRenameTagForm input[type="submit"] {
   height: 25px;
 }
-- 
cgit v1.2.3