4 files changed, 13 insertions, 29 deletions
diff --git a/modules/gallery/views/admin_maintenance_show_log.html.php b/modules/gallery/views/admin_maintenance_show_log.html.php
index e6ed97b3..ff7ac50e 100644
--- a/modules/gallery/views/admin_maintenance_show_log.html.php
+++ b/modules/gallery/views/admin_maintenance_show_log.html.php
@@ -11,7 +11,7 @@ appendTo('body').submit().remove();
 </script>
 <div id="g-task-log-dialog">
   <h1> <?= $task->name ?> </h1>
-  <div class="g-task-log">
+  <div class="g-task-log g-txt-small">
     <pre><?= html::purify($task->get_log()) ?></pre>
   </div>
   <button id="g-close" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Close") ?></button>
diff --git a/modules/gallery/views/login.html.php b/modules/gallery/views/login.html.php
deleted file mode 100644
index 4c13ef4b..00000000
--- a/modules/gallery/views/login.html.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<ul id="g-login-menu" class="g-inline ui-helper-clearfix">
-  <? if ($user->guest): ?>
-  <li class="g-first">
-    <a href="<?= url::site("login/ajax") ?>"
-       title="<?= t("Login to Gallery")->for_html_attr() ?>"
-       id="g-login-link" class="g-dialog-link"><?= t("Login") ?></a>
-  </li>
-  <? else: ?>
-  <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>
-    <a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(url::current(true))) ?>"
-       id="g-logout-link"><?= t("Logout") ?></a>
-  </li>
-  <? endif ?>
-</ul>
diff --git a/modules/gallery/views/login_current_user.html.php b/modules/gallery/views/login_current_user.html.php
new file mode 100644
index 00000000..e3b3688f
--- /dev/null
+++ b/modules/gallery/views/login_current_user.html.php
@@ -0,0 +1,11 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<li>
+  <? $name = $menu->label->for_html() ?>
+  <? if (identity::is_writable()): ?>
+  <?= t("Logged in as %name", array("name" => html::mark_clean(
+        "<a href='$menu->url' title='" . t("Edit your profile")->for_html_attr() .
+        "' id='$menu->id' class='g-dialog-link'>{$name}</a>"))) ?>
+  <? else: ?>
+  <?= t("Logged in as %name", array("name" => $name)) ?>
+  <? endif ?>
+</li>
diff --git a/modules/gallery/views/menu.html.php b/modules/gallery/views/menu.html.php
index b4b38c93..cb49bcdf 100644
--- a/modules/gallery/views/menu.html.php
+++ b/modules/gallery/views/menu.html.php
@@ -1,8 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? if ($menu->elements): // Don't show the menu if it has no choices ?>
 <? if ($menu->is_root): ?>
-
-<ul class="<?= $menu->css_class ?>">
+<ul <?= isset($menu->css_id) ? "id='$menu->css_id'" : "" ?> class="<?= $menu->css_class ?>">
   <? foreach ($menu->elements as $element): ?>
   <?= $element->render() ?>
   <? endforeach ?>