Create a user_menu for the top of the page. Change the login, edit profile and logout portions of the banner to be rendered by the Theme_View::user_menu callback. This fires the user_menu event. Fixes Ticket #871.

2 files changed, 8 insertions, 4 deletions

diff --git a/themes/night_wind/views/page.html.php b/themes/night_wind/views/page.html.php
index a14a3278..f41dcd27 100644
--- a/themes/night_wind/views/page.html.php
+++ b/themes/night_wind/views/page.html.php
@@ -77,14 +77,15 @@
       <?= $theme->site_status() ?>
       <div id="g-header" class="ui-helper-clearfix">
         <div id="g-banner">
-          <?= $theme->header_top() ?>
           <? if ($header_text = module::get_var("gallery", "header_text")): ?>
           <?= $header_text ?>
           <? else: ?>
-          <a id="g-logo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>">
+          <a id="g-logo" class="g-left" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>">
             <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site")->for_html_attr() ?>" src="<?= url::file("lib/images/logo.png") ?>" />
           </a>
           <? endif ?>
+          <?= $theme->user_menu() ?>
+          <?= $theme->header_top() ?>
           <div id="g-site-menu">
           <?= $theme->site_menu() ?>
           </div>
@@ -93,8 +94,9 @@
 
         <? if (!empty($parents)): ?>
         <ul class="g-breadcrumbs">
+          <? $i = 0 ?>
           <? foreach ($parents as $parent): ?>
-          <li>
+          <li<? if ($i == 0) print " class=\"g-first\"" ?>>
             <!-- Adding ?show=<id> causes Gallery3 to display the page
                  containing that photo.  For now, we just do it for
                  the immediate parent so that when you go back up a
@@ -104,8 +106,9 @@
               <?= html::purify($parent->title) ?>
             </a>
           </li>
+          <? $i++ ?>
           <? endforeach ?>
-          <li class="active"><?= html::purify($theme->item()->title) ?></li>
+          <li class="g-active"><?= html::purify($theme->item()->title) ?></li>
         </ul>
         <? endif ?>
       </div>
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index a2b2fdd7..f41dcd27 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -84,6 +84,7 @@
             <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site")->for_html_attr() ?>" src="<?= url::file("lib/images/logo.png") ?>" />
           </a>
           <? endif ?>
+          <?= $theme->user_menu() ?>
           <?= $theme->header_top() ?>
           <div id="g-site-menu">
           <?= $theme->site_menu() ?>