From 595e03b556a8675844f868778c65f79e1b632d24 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Tue, 3 Nov 2009 13:27:56 -0800 Subject: Get rid of "skipping" messages because they're overly verbose if you resume an import. This fixes ticket #856. --- modules/g2_import/helpers/g2_import.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules') diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php index 248f8017..202a0e92 100644 --- a/modules/g2_import/helpers/g2_import.php +++ b/modules/g2_import/helpers/g2_import.php @@ -217,7 +217,7 @@ class g2_import_Core { static function import_group(&$queue) { $g2_group_id = array_shift($queue); if (self::map($g2_group_id)) { - return t("Group with id: %id already imported, skipping", array("id" => $g2_group_id)); + return; } try { @@ -330,7 +330,7 @@ class g2_import_Core { } if (self::map($g2_album_id)) { - return t("Album with id: %id already imported, skipping", array("id" => $g2_album_id)); + return; } try { @@ -424,7 +424,7 @@ class g2_import_Core { $g2_item_id = array_shift($queue); if (self::map($g2_item_id)) { - return t("Item with id: %id already imported, skipping", array("id" => $g2_item_id)); + return; } try { -- cgit v1.2.3 From f9b700e75c682df3c48efb0e69f893c61f06d3bd Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Tue, 3 Nov 2009 13:40:59 -0800 Subject: Delay initializing the recaptcha to allow the recaptcha JS to load and initialize. Fixes ticket #851. --- modules/recaptcha/views/form_recaptcha.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/recaptcha/views/form_recaptcha.html.php b/modules/recaptcha/views/form_recaptcha.html.php index f26ebdf6..20e7359e 100644 --- a/modules/recaptcha/views/form_recaptcha.html.php +++ b/modules/recaptcha/views/form_recaptcha.html.php @@ -12,6 +12,6 @@ callback: Recaptcha.focus_response_field } ); - }, 0); + }, 500); -- cgit v1.2.3 From 96cbfe23a6031fc8fb87aadb37fec2e4e479bc0c Mon Sep 17 00:00:00 2001 From: Bharat Mediratta 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') 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 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') 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 @@ - "> + "> @@ -89,12 +89,12 @@

-
    +
    2. locales::display_name())) ?>
      4. -
+ 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 From 9a33f96e31ba41d78ab24eb9420d74578c7fbbcf Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Tue, 3 Nov 2009 14:44:53 -0800 Subject: Add a register_add_form event handler to recaptcha to add the recaptcha to the bottom of the user registration form in the register module. --- modules/recaptcha/helpers/recaptcha_event.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'modules') diff --git a/modules/recaptcha/helpers/recaptcha_event.php b/modules/recaptcha/helpers/recaptcha_event.php index feedced4..e7ded3ab 100644 --- a/modules/recaptcha/helpers/recaptcha_event.php +++ b/modules/recaptcha/helpers/recaptcha_event.php @@ -24,6 +24,12 @@ class recaptcha_event_Core { } } + static function register_add_form($form) { + if (module::get_var("recaptcha", "public_key")) { + $form->register_user->recaptcha("recaptcha")->label("")->id("g-recaptcha"); + } + } + static function admin_menu($menu, $theme) { $menu->get("settings_menu") ->append(Menu::factory("link") -- cgit v1.2.3