From 3b89a56caf594392c2d45b43932ecb070893588b Mon Sep 17 00:00:00 2001 From: mamouneyya Date: Fri, 18 Jun 2010 14:10:05 +0300 Subject: Flip some margin/padding values for RTL --- themes/admin_wind/css/screen.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'themes/admin_wind/css/screen.css') diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index ac47a3db..dbfb59e8 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -483,3 +483,8 @@ th { padding-left: 0; padding-right: 1.2em; } + +.rtl .g-selected img, +.rtl .g-available .g-block img { + margin: 0 0 1em 1em; +} \ No newline at end of file -- cgit v1.2.3 From b8800c69e1ddf5afd8d4c9ee3af74f37000515de Mon Sep 17 00:00:00 2001 From: mamouneyya Date: Wed, 23 Jun 2010 20:10:59 +0800 Subject: flip the padding direction for sidebar blocks contents in RTL --- themes/admin_wind/css/screen.css | 4 ++++ themes/wind/css/screen.css | 3 +++ 2 files changed, 7 insertions(+) (limited to 'themes/admin_wind/css/screen.css') diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index dbfb59e8..e2817b78 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -487,4 +487,8 @@ th { .rtl .g-selected img, .rtl .g-available .g-block img { margin: 0 0 1em 1em; +} + +.rtl #g-sidebar .g-block-content { + padding-right: 1em; } \ No newline at end of file diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index 1e55a967..f5cb6601 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -457,3 +457,6 @@ td { background-image: url('../images/ico-view-slideshow-rtl.png'); } +.rtl #g-sidebar .g-block-content { + padding-right: 1em; +} \ No newline at end of file -- cgit v1.2.3 From 5494751a33c93df1afe3db151a332c81cdbc00b4 Mon Sep 17 00:00:00 2001 From: mamouneyya Date: Wed, 23 Jun 2010 20:20:14 +0800 Subject: oops.. remove the padding in RTL for admin-wind, since it seems that it's zero (why the rule is duplicated with different values in the file in lines: 159, 301?) --- themes/admin_wind/css/screen.css | 4 ---- 1 file changed, 4 deletions(-) (limited to 'themes/admin_wind/css/screen.css') diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index e2817b78..dbfb59e8 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -487,8 +487,4 @@ th { .rtl .g-selected img, .rtl .g-available .g-block img { margin: 0 0 1em 1em; -} - -.rtl #g-sidebar .g-block-content { - padding-right: 1em; } \ No newline at end of file -- cgit v1.2.3 From d66c496fb1007bbd0b1640496808000c573d95fd Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Fri, 25 Jun 2010 06:45:09 -0700 Subject: Change the theme option page to display using tabs if the site theme has an admin page. --- modules/gallery/helpers/theme.php | 5 ++-- modules/gallery/views/admin_theme_options.html.php | 31 ++++++++++++++++++++++ themes/admin_wind/css/screen.css | 22 ++++++++++++++- 3 files changed, 55 insertions(+), 3 deletions(-) (limited to 'themes/admin_wind/css/screen.css') diff --git a/modules/gallery/helpers/theme.php b/modules/gallery/helpers/theme.php index 980ee11a..a390645f 100644 --- a/modules/gallery/helpers/theme.php +++ b/modules/gallery/helpers/theme.php @@ -70,7 +70,7 @@ class theme_Core { static function get_edit_form_admin() { $form = new Forge("admin/theme_options/save/", "", null, array("id" =>"g-theme-options-form")); - $group = $form->group("edit_theme"); + $group = $form->group("edit_theme")->label(t("Theme Layout")); $group->input("page_size")->label(t("Items per page"))->id("g-page-size") ->rules("required|valid_digit") ->error_messages("required", t("You must enter a number")) @@ -95,7 +95,8 @@ class theme_Core { module::event("theme_edit_form", $form); - $group = $form->group("buttons"); + $group = $form->group("buttons") + ->set_attr("style","border: none"); $group->submit("")->value(t("Save")); return $form; } diff --git a/modules/gallery/views/admin_theme_options.html.php b/modules/gallery/views/admin_theme_options.html.php index a4bf1c4e..2cf97713 100644 --- a/modules/gallery/views/admin_theme_options.html.php +++ b/modules/gallery/views/admin_theme_options.html.php @@ -1,4 +1,35 @@ + +

diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index dbfb59e8..937c4d15 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -399,6 +399,26 @@ th { background-color: #FFF; } +/* Theme options ~~~~~~~~~~~~~~~~~~~~~~~~ */ +#g-theme-options-form { + border: 1px solid #a6c9e2; +} +#g-theme-options-form-tabs { + border: none !important; +} +#g-theme-options-form fieldset { + border: none; +} + +.ui-tabs .ui-tabs-nav li a { + padding: 0 1em; +} + +.ui-tabs .ui-tabs-nav li a.g-error { + background: none no-repeat scroll 0 0 transparent; + color: #FF0000 !important; +} + /** ******************************************************************* * 5) Navigation and menus *********************************************************************/ @@ -487,4 +507,4 @@ th { .rtl .g-selected img, .rtl .g-available .g-block img { margin: 0 0 1em 1em; -} \ No newline at end of file +} -- cgit v1.2.3