Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 27 insertions, 6 deletions

diff --git a/modules/user/helpers/user_theme.php b/modules/user/helpers/user_theme.php
index ad9d4c63..098d87fd 100644
--- a/modules/user/helpers/user_theme.php
+++ b/modules/user/helpers/user_theme.php
@@ -18,15 +18,36 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class user_theme_Core {
+  static function head($theme) {
+    if (count(locales::installed())) {
+      // Needed by the languages block
+      $theme->script("jquery.cookie.js");
+    }
+    return "";
+  }
+
   static function header_top($theme) {
-    $view = new View("login.html");
-    $view->user = user::active();
-    return $view->render();
+    if ($theme->page_type != "login") {
+      $view = new View("login.html");
+      $view->user = user::active();
+      return $view->render();
+    }
   }
 
-  static function admin_head($theme) {
-    if (strpos(Router::$current_uri, "admin/users") !== false) {
-      $theme->script("lib/gallery.panel.js");
+  static function sidebar_blocks($theme) {
+    $locales = locales::installed();
+    foreach ($locales as $locale => $display_name) {
+      $locales[$locale] = SafeString::of_safe_html($display_name);
+    }
+    if (count($locales) > 1) {
+      $block = new Block();
+      $block->css_id = "gUserLanguageBlock";
+      $block->title = t("Language Preference");
+      $block->content = new View("user_languages_block.html");
+      $block->content->installed_locales =
+        array_merge(array("" => t("« none »")), $locales);
+      $block->content->selected = (string) user::cookie_locale();
+      return $block;
     }
   }
 }