From e232c39fe516a9782ec15f4e2a9b4e68f1863a7d Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Wed, 18 Nov 2009 18:51:18 -0700 Subject: Rename g-pager to g-paginator after the recent pagination update. --- lib/gallery.common.css | 12 ++++++------ modules/comment/views/admin_comments.html.php | 2 +- themes/admin_wind/views/pager.html.php | 2 +- themes/wind/css/fix-ie.css | 4 ++-- themes/wind/views/paginator.html.php | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/gallery.common.css b/lib/gallery.common.css index 860529cd..1ada929f 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -542,17 +542,17 @@ div#g-action-status { /* Pagination ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -.g-pager { +.g-paginator { padding: .2em 0; width: 100%; } -.g-pager li { +.g-paginator li { float: left; width: 30%; } -.g-pager .g-info { +.g-paginator .g-info { background: none; padding: .2em 0; text-align: center; @@ -680,7 +680,7 @@ div#g-action-status { .rtl #g-content #g-album-grid .g-item, .rtl .sf-menu li, .rtl .g-breadcrumbs li, -.rtl .g-pager li, +.rtl .g-paginator li, .rtl .g-buttonset li, .rtl .ui-icon-left .ui-icon, .rtl .g-short-form li, @@ -717,11 +717,11 @@ div#g-action-status { padding-right: 0; } -.rtl .g-pager .g-info { +.rtl .g-paginator .g-info { width: 35%; } -.rtl .g-pager .g-text-right { +.rtl .g-paginator .g-text-right { margin-left: 0; } diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php index 20236a7a..f58267bd 100644 --- a/modules/comment/views/admin_comments.html.php +++ b/modules/comment/views/admin_comments.html.php @@ -193,7 +193,7 @@ -
+
diff --git a/themes/admin_wind/views/pager.html.php b/themes/admin_wind/views/pager.html.php index 7870ef3f..5fff5845 100644 --- a/themes/admin_wind/views/pager.html.php +++ b/themes/admin_wind/views/pager.html.php @@ -1,6 +1,6 @@ -
-- cgit v1.2.3 From 51f2b547672ab69a7a04d37b723c6afbeb584a59 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Thu, 19 Nov 2009 08:48:23 -0800 Subject: Make sure that calls to the theme::get_var() have sane defaults in the event that the theme does not supply them. --- modules/g2_import/controllers/admin_g2_import.php | 4 ++-- modules/g2_import/helpers/g2_import.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/g2_import/controllers/admin_g2_import.php b/modules/g2_import/controllers/admin_g2_import.php index 6ed92c37..99d28fd7 100644 --- a/modules/g2_import/controllers/admin_g2_import.php +++ b/modules/g2_import/controllers/admin_g2_import.php @@ -35,8 +35,8 @@ class Admin_g2_import_Controller extends Admin_Controller { if (g2_import::is_initialized()) { $view->content->g2_stats = $g2_stats; $view->content->g2_sizes = $g2_sizes; - $view->content->thumb_size = theme::get_var("thumb_size"); - $view->content->resize_size = theme::get_var("resize_size"); + $view->content->thumb_size = theme::get_var("thumb_size", 200); + $view->content->resize_size = theme::get_var("resize_size", 640); } print $view; } diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php index 61a7ef85..519da40f 100644 --- a/modules/g2_import/helpers/g2_import.php +++ b/modules/g2_import/helpers/g2_import.php @@ -671,8 +671,8 @@ class g2_import_Core { $g2_item_id = self::$current_g2_item->getId(); $derivatives = g2(GalleryCoreApi::fetchDerivativesByItemIds(array($g2_item_id))); - $target_thumb_size = theme::get_var("thumb_size"); - $target_resize_size = theme::get_var("resize_size"); + $target_thumb_size = theme::get_var("thumb_size", 200); + $target_resize_size = theme::get_var("resize_size", 640); if (!empty($derivatives[$g2_item_id])) { foreach ($derivatives[$g2_item_id] as $derivative) { if ($derivative->getPostFilterOperations()) { -- cgit v1.2.3 From 75cc4962a2c945e3e3ad37fda3b5de32d512b929 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Thu, 19 Nov 2009 10:03:39 -0800 Subject: Use call_user_func instead of call_user_func_array as we don't need to pass the parameters by reference. --- modules/gallery/controllers/admin_theme_options.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/gallery/controllers/admin_theme_options.php b/modules/gallery/controllers/admin_theme_options.php index dc421ee1..c75aebaa 100644 --- a/modules/gallery/controllers/admin_theme_options.php +++ b/modules/gallery/controllers/admin_theme_options.php @@ -28,8 +28,8 @@ class Admin_Theme_Options_Controller extends Admin_Controller { // Don't use the Kohana cascading file system because we don't want to mess up the admin theme $theme_helper = THEMEPATH . "$theme_name/helpers/{$theme_name}.php"; @require_once($theme_helper); - $view->content->form = call_user_func_array(array(theme::$site, "get_admin_form"), - array("admin/theme_options/save/")); + $view->content->form = + call_user_func("{$theme_name}::get_admin_form", "admin/theme_options/save/"); $view->content->title = t("%name options", array("name" => $info->name)); @@ -46,12 +46,9 @@ class Admin_Theme_Options_Controller extends Admin_Controller { $info = theme::get_info($theme_name); - $form = call_user_func_array(array(theme::$site, "get_admin_form"), - array("admin/theme_options/save/")); + $form = call_user_func("{$theme_name}::get_admin_form", "admin/theme_options/save/"); if ($form->validate()) { - - $view->content->form = call_user_func_array(array(theme::$site, "update_options"), - array($form)); + call_user_func("{$theme_name}::update_options", $form); message::success(t("Updated %name options", array("name" => $info->name))); url::redirect("admin/theme_options"); -- cgit v1.2.3