diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-01-23 16:29:10 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-01-23 16:29:10 -0800 |
| commit | fecac4a8596a69088270e48a90868e845fc8f4ca (patch) | |
| tree | a4683906d481d1091e218c9b6662a1997cb11086 /themes/admin_wind/views | |
| parent | 8849594aa17768f564e45370a62f01e440570dcf (diff) | |
| parent | 3b16d0662b8a4b06f4be72165c858a1231e9bd67 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Conflicts:
modules/gallery/tests/xss_data.txt
Diffstat (limited to 'themes/admin_wind/views')
| -rw-r--r-- | themes/admin_wind/views/admin.html.php | 15 |
1 files changed, 1 insertions, 14 deletions
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&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() ?>"> ← <?= t("back to the ...") ?> </a> + <?= $theme->user_menu() ?> <div id="g-site-admin-menu" class="ui-helper-clearfix"> <?= $theme->admin_menu() ?> </div> |