From abdeb21ccbb25aee564335dbbfca4a8afaf49384 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 23 Jan 2010 13:29:49 -0800
Subject: Add a user_menu method to the Admin_View and then use this method to
 get the user menu.  Since the information displayed is identical in both
 admin and theme views, it makes sense to combine the generation to it is done
 in a common location.

---
 themes/admin_wind/css/screen.css       |  5 +++++
 themes/admin_wind/views/admin.html.php | 15 +--------------
 2 files changed, 6 insertions(+), 14 deletions(-)

(limited to 'themes')

diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 73ec8ac5..ac47a3db 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -229,6 +229,7 @@ th {
 
 #g-header #g-login-menu {
   margin-top: 1em;
+  float: right;
 }
 
 /* View container ~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -473,6 +474,10 @@ th {
   right: 150px;
 }
 
+.rtl #g-header #g-login-menu {
+  float: left;
+}
+
 .rtl #g-header #g-login-menu li {
   margin-left: 0;
   padding-left: 0;
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index 25ba1c97..fa79119a 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -43,23 +43,10 @@
       <?= $theme->site_status() ?>
       <div id="g-header" class="ui-helper-clearfix">
         <?= $theme->admin_header_top() ?>
-        <ul id="g-login-menu" class="g-inline g-right">
-          <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" class="g-left" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>">
           &larr; <?= t("back to the ...") ?>
         </a>
+        <?= $theme->user_menu() ?>
         <div id="g-site-admin-menu" class="ui-helper-clearfix">
           <?= $theme->admin_menu() ?>
         </div>
-- 
cgit v1.2.3