Merge branch 'master' into talmdal_dev

2 files changed, 28 insertions, 8 deletions

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index e3cb6a9b..43920815 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -97,6 +97,34 @@ class gallery_event_Core {
     $data[] = $item->title;
   }
 
+  static function user_menu($menu, $theme) {
+    if ($theme->page_type != "login") {
+      Kohana::log("alert", "in gallery::user_menu");
+      $user = identity::active_user();
+      if ($user->guest) {
+        $menu->append(Menu::factory("dialog")
+                      ->id("user_menu_login")
+                      ->css_id("g-login-link")
+                      ->url(url::site("login/ajax"))
+                      ->label(t("Login")));
+      } else {
+        $csrf = access::csrf_token();
+        $menu->append(Menu::factory("dialog")
+                      ->id("user_menu_edit_profile")
+                      ->css_id("g-user-profile-link")
+                      ->view("login_current_user.html")
+                      ->url(url::site("form/edit/users/{$user->id}"))
+                      ->label($user->display_name()));
+        $menu->append(Menu::factory("link")
+                    ->id("user_menu_logout")
+                    ->css_id("g-logout-link")
+                    ->url(url::site("logout?csrf=$csrf&continue=" .
+                                    urlencode(url::current(true))))
+                    ->label(t("Logout")));
+      }
+    }
+  }
+
   static function site_menu($menu, $theme) {
     if ($theme->page_type != "login") {
       $menu->append(Menu::factory("link")
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index 0682d4ae..ab3e7eb5 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -52,14 +52,6 @@ class gallery_theme_Core {
     return $buf;
   }
 
-  static function header_top($theme) {
-    if ($theme->page_type != "login") {
-      $view = new View("login.html");
-      $view->user = identity::active_user();
-      return $view->render();
-    }
-  }
-
   static function admin_head($theme) {
     $theme->css("gallery.css");
     $theme->script("gallery.panel.js");