From 96cbfe23a6031fc8fb87aadb37fec2e4e479bc0c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 3 Nov 2009 14:03:36 -0800
Subject: Respect the "theme" variable if we're an admin.  This requires us to
 change the order of operations in gallery_event::gallery_ready() so that we
 load users before themes.  Fixes ticket #836.

---
 modules/gallery/helpers/gallery_event.php |  2 +-
 modules/gallery/helpers/theme.php         | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 67a6f41f..e3cb6a9b 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -23,8 +23,8 @@ class gallery_event_Core {
    * Initialization.
    */
   static function gallery_ready() {
-    theme::load_themes();
     identity::load_user();
+    theme::load_themes();
     locales::set_request_locale();
   }
 
diff --git a/modules/gallery/helpers/theme.php b/modules/gallery/helpers/theme.php
index 64e919e3..da57a37e 100644
--- a/modules/gallery/helpers/theme.php
+++ b/modules/gallery/helpers/theme.php
@@ -30,13 +30,16 @@ class theme_Core {
    */
   static function load_themes() {
     $path = Input::instance()->server("PATH_INFO");
+    $input = Input::instance();
     if (empty($path)) {
-      $path = "/" . Input::instance()->get("kohana_uri");
+      $path = "/" . $input->get("kohana_uri");
     }
 
-    $theme_name = module::get_var(
-      "gallery",
-      !strncmp($path, "/admin", 6) ? "active_admin_theme" : "active_site_theme");
+    if (!(identity::active_user()->admin && $theme_name = $input->get("theme"))) {
+      $theme_name = module::get_var(
+        "gallery",
+        !strncmp($path, "/admin", 6) ? "active_admin_theme" : "active_site_theme");
+    }
     $modules = Kohana::config("core.modules");
     array_unshift($modules, THEMEPATH . $theme_name);
     Kohana::config_set("core.modules", $modules);
-- 
cgit v1.2.3


From 9a8e9bc7f5deb5108ccc10f27635d66d1ff2b14f Mon Sep 17 00:00:00 2001
From: jhilden <jakobhilden@gmail.com>
Date: Tue, 3 Nov 2009 17:40:39 -0500
Subject: Small CSS fix for language admin

---
 modules/gallery/views/admin_languages.html.php |  6 +++---
 themes/admin_wind/css/screen.css               | 10 +++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/views/admin_languages.html.php b/modules/gallery/views/admin_languages.html.php
index 94626b98..07134475 100644
--- a/modules/gallery/views/admin_languages.html.php
+++ b/modules/gallery/views/admin_languages.html.php
@@ -57,7 +57,7 @@
                 <th> <?= t("Default language") ?> </th>
               </tr>
             <? endif ?>
-            <tr class="<?= (isset($installed_locales[$code])) ? "g-installed" : "" ?><?= ($default_locale == $code) ? " g-default" : "" ?>">
+            <tr class="<?= (isset($installed_locales[$code])) ? "g-available" : "" ?><?= ($default_locale == $code) ? " g-selected" : "" ?>">
               <td> <?= form::checkbox("installed_locales[]", $code, isset($installed_locales[$code])) ?> </td>
               <td> <?= $display_name ?> </td>
               <td>
@@ -89,12 +89,12 @@
 
         <p><?= t("Follow these steps to begin translating Gallery.") ?></p>
 
-        <ul>
+        <ol>
           <li><?= t("Make sure the target language is installed and up to date (check above).") ?></li>
           <li><?= t("Make sure you have selected the right target language (currently %default_locale).",
                array("default_locale" => locales::display_name())) ?></li>
           <li><?= t("Start the translation mode and the translation interface will appear at the bottom of each Gallery page.") ?></li>
-        </ul>
+        </ol>
         <a href="<?= url::site("l10n_client/toggle_l10n_mode?csrf=".access::csrf_token()) ?>"
            class="g-button ui-state-default ui-corner-all ui-icon-left">
           <span class="ui-icon ui-icon-power"></span>
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 5ed42391..87879ecb 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -450,13 +450,17 @@ th {
 	clear: both;
 }
 
-#g-translations {
-	padding: 2em 0 0 0;
-	clear: both;
+#g-translations ol {
+	margin: 0 0 1em 2em;
+}
+#g-translations ol li {
+  list-style-type: decimal;
+	line-height: 150%;
 }
 
 #g-translations .g-button {
 	padding: .5em;
+	margin-bottom: 1em;
 }
 
 /** *******************************************************************
-- 
cgit v1.2.3