From 27571a1467e34a6774f250a22ce9ab16fddd909a Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Tue, 27 Oct 2009 23:18:45 -0600
Subject: We really only need one "back to the Gallery" link in the banner.
 Replace the one on the left with "you are logged in as". Added a bit of
 height to the admin banner to space out the admin menu from the login menu.
 Forced the removal of padding-left in g-inline list items.

---
 lib/gallery.common.css                 |  4 ++--
 themes/admin_wind/css/screen.css       |  2 +-
 themes/admin_wind/views/admin.html.php | 12 +++++++++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index b5692877..6709e4db 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -558,8 +558,8 @@ div#g-action-status {
 
 .g-inline li {
   float: left;
-  margin-left: 1.6em;
-  padding-left: 0;
+  margin-left: 1.8em;
+  padding-left: 0 !important;
 }
 
 .g-inline li.g-first {
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 4ae0c218..38fe50cf 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -246,7 +246,7 @@ th {
   background: transparent url('../../../lib/images/logo.png') no-repeat 0 .5em;
   color: #A5A5A5 !important;
   display: block;
-  height: 55px;
+  height: 65px;
   padding-top: 5px;
   width: 105px;
 }
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index d88cabf6..ef1aa1d2 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -44,7 +44,17 @@
       <div id="g-header">
         <?= $theme->admin_header_top() ?>
         <ul id="g-login-menu" class="g-inline g-right">
-          <li class="g-first"><?= html::anchor(item::root()->abs_url(), "&larr; ".t("Back to the Gallery")) ?></li>
+          <li class="g-first">
+            <? if (identity::is_writable()): ?>
+            <?= t('Logged in as %name', array('name' => html::mark_clean(
+              '<a href="' . url::site("form/edit/users/{$user->id}") .
+              '" title="' . t("Edit Your Profile")->for_html_attr() .
+              '" id="g-user-profile-link" class="g-dialog-link">' .
+              html::clean($user->display_name()) . '</a>'))) ?>
+            <? else: ?>
+            <?= t('Logged in as %name', array('name' => html::clean($user->display_name()))) ?>
+            <? endif ?>
+          </li>
           <li id="g-logout-link"><a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(item::root()->url())) ?>"><?= t("Logout") ?></a></li>
         </ul>
         <a id="g-logo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>">
-- 
cgit v1.2.3