diff options
Diffstat (limited to 'modules/gallery')
| -rw-r--r-- | modules/gallery/helpers/gallery_event.php | 2 | ||||
| -rw-r--r-- | modules/gallery/helpers/theme.php | 11 | ||||
| -rw-r--r-- | modules/gallery/views/admin_languages.html.php | 6 |
3 files changed, 11 insertions, 8 deletions
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); 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> |