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(-)

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 51c995b26aeeaceee7f510de5b26ee69e209e20b Mon Sep 17 00:00:00 2001
From: Kevin Nehls <kevin@kevinnehls.com>
Date: Sun, 13 Sep 2009 09:26:30 -0700
Subject: Remove raw HTML that's wrapped around the name of the file to create
 if not logged in as admin

---
 modules/gallery/views/upgrader.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gallery/views/upgrader.html.php b/modules/gallery/views/upgrader.html.php
index 5f93c2d5..8a01cd29 100644
--- a/modules/gallery/views/upgrader.html.php
+++ b/modules/gallery/views/upgrader.html.php
@@ -81,7 +81,7 @@
         <? else: // can_upgrade ?>
         <h1> <?= t("Who are you?") ?> </h1>
         <p>
-          <?= t("You're not logged in as an administrator, so we have to verify you to make sure it's ok for you to do an upgrade.  To prove you can run an upgrade, create a file called %name in your <b>gallery3/var/tmp</b> directory.", array("name" => "<br/><b>$upgrade_token</b>")) ?>
+          <?= t("You're not logged in as an administrator, so we have to verify you to make sure it's ok for you to do an upgrade.  To prove you can run an upgrade, create a file called <br/><b>%name</b> in your <b>gallery3/var/tmp</b> directory.", array("name" => "$upgrade_token")) ?>
         </p>
         <a href="<?= url::site("upgrader?") ?>"><?= t("Ok, I've done that") ?></a>
         <? endif // can_upgrade ?>
-- 
cgit v1.2.3