From 07268d5c5208ede6259da80680983dc9392a4428 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 8 Nov 2009 18:07:58 -0700 Subject: Key off of g-photo, rather than g-item, when fitting resized photos inside their parent. --- themes/wind/js/ui.init.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js index 0126c36b..be03b6a8 100644 --- a/themes/wind/js/ui.init.js +++ b/themes/wind/js/ui.init.js @@ -87,12 +87,12 @@ $(document).ready(function() { } // Photo/Item item view - if ($("#g-item").length) { + if ($("#g-photo").length) { // Ensure the resized image fits within its container - $("#g-item").gallery_fit_photo(); + $("#g-photo").gallery_fit_photo(); // Initialize context menus - var resize = $("#g-item").gallery_get_photo(); + var resize = $("#g-photo").gallery_get_photo(); $(resize).hover(function(){ $(this).gallery_context_menu(); }); -- cgit v1.2.3 From ed1bdd7b932d6d9b9bbeacc3a355e2f31c25ed15 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 8 Nov 2009 18:09:51 -0700 Subject: White-space cleanup. --- lib/gallery.common.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gallery.common.js b/lib/gallery.common.js index da69e476..9aaac1ce 100644 --- a/lib/gallery.common.js +++ b/lib/gallery.common.js @@ -125,7 +125,7 @@ // Initialize context menus $.fn.gallery_context_menu = function() { - if ($(".g-context-menu li").length) { + if ($(".g-context-menu li").length) { var hover_target = ".g-context-menu"; var in_progress = 0; $(hover_target + " *").removeAttr('title'); -- cgit v1.2.3 From 46fda847ad625c085b020f719da1c37660ab93b9 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 8 Nov 2009 18:13:26 -0700 Subject: Moved movie context-menu up to just under the movie. Fixed contextual menu font size on resize and movie pages. --- themes/wind/css/screen.css | 10 ++++------ themes/wind/views/movie.html.php | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index 1a7fc110..bd17e0e4 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -73,7 +73,9 @@ h3 { font-size: .8em; } -#g-content #g-album-grid .g-item { +#g-album-grid .g-item, +#g-item #g-photo, +#g-item #g-movie { font-size: .7em; } @@ -284,11 +286,7 @@ td { #g-item #g-photo, #g-item #g-movie { - padding: 1em 0; -} - -#g-item #g-photo, -#g-item #g-movie { + padding: 2.2em 0; position: relative; } diff --git a/themes/wind/views/movie.html.php b/themes/wind/views/movie.html.php index 116fd95e..d91ffbc5 100644 --- a/themes/wind/views/movie.html.php +++ b/themes/wind/views/movie.html.php @@ -26,6 +26,7 @@
movie_img(array("class" => "g-movie", "id" => "g-movie-id-{$item->id}")) ?> + context_menu($item, "#g-movie-id-{$item->id}") ?>
@@ -34,5 +35,4 @@
photo_bottom() ?> - context_menu($item, "#g-movie-id-{$item->id}") ?> -- cgit v1.2.3 From 176ca8cb33ffb07406ad46352d164f69f1201b6d Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 8 Nov 2009 19:21:06 -0700 Subject: Move g-panel styles into gallery.common and tighten up form layout a bit. --- lib/gallery.common.css | 32 +++++++++++++++++++++++++------- themes/admin_wind/css/screen.css | 14 -------------- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/lib/gallery.common.css b/lib/gallery.common.css index 5ca69908..c80dc90f 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -12,7 +12,6 @@ * 7) Right to left language styles * * @todo Update .g-message-block, don't force it to 100%, bad things happen is themes when you do. - * @todo Remove extra white space at the top of the add comment form, above the first field */ /** ******************************************************************* @@ -41,7 +40,7 @@ form { fieldset { border: 1px solid #ccc; - padding: .4em 1em .8em 1em; + padding: 0 1em .8em 1em; } #g-banner fieldset, @@ -52,7 +51,8 @@ fieldset { legend { font-weight: bold; - margin: 0 0 .4em .8em; + margin: 0; + padding: 0 .2em; } #g-banner legend, @@ -99,7 +99,11 @@ input[type=radio] { form li { margin: 0; - padding: .3em 0; + padding: 0 0 .2em 0; +} + +form ul { + margin-top: 0; } form ul ul { @@ -125,13 +129,22 @@ input[type="reset"] { float: left; } -/* Forms in dialogs ~~~~~~~~~~~~~~~~~~ */ +/* Forms in dialogs and panels ~~~~~~~~~ */ -#g-dialog form fieldset { +#g-dialog ul li { + padding-bottom: .8em; +} + +#g-dialog fieldset, +#g-panel fieldset { border: none; padding: 0; } +#g-panel legend { + display: none; +} + #g-dialog input.textbox, #g-dialog input[type=text], #g-dialog input[type=password], @@ -549,7 +562,7 @@ div#g-action-status { width: 40%; } -/* Dialogs ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ +/* Dialogs and panels ~~~~~~~~~~~~~~~~~~ */ #g-dialog { text-align: left; @@ -563,6 +576,11 @@ div#g-action-status { margin: .4em 1em; } +#g-panel { + display: none; + padding: 1em; +} + /* Inline layout ~~~~~~~~~~ */ .g-inline li { diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 97e0bfd0..9fe3a1fc 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -12,7 +12,6 @@ * 6) jQuery and jQuery UI * 7) Right-to-left language styles * - * @todo Consider moving g-panel to gallery.common * @todo Review g-actions along with g-buttonset-vertical */ @@ -428,19 +427,6 @@ th { /* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */ -#g-panel { - display: none; - padding: 1em; -} - -#g-panel legend { - display: none; -} - -#g-panel fieldset { - border: none; -} - #g-admin-dashboard .ui-state-highlight, #g-sidebar .ui-state-highlight { height: 2em; -- cgit v1.2.3 From 56c543dbe42ebb77fb3f5742480a186954796837 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 8 Nov 2009 21:41:11 -0700 Subject: Removed todo, it's done :) --- themes/wind/css/screen.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index bd17e0e4..e46ba8e6 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -11,8 +11,6 @@ * 5) Navigation and menus * 6) jQuery and jQuery UI * 7) Right-to-left language styles - * - * @todo Review g-buttonset and it's usage here and admin_wind */ /** ******************************************************************* -- cgit v1.2.3 From 2bd4fa4b43381da997219dbb9d2dd15a8d3af69f Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 8 Nov 2009 21:46:09 -0700 Subject: Remove g-actions, it doesn't serve any real purpose in styling or JavaScript. --- modules/user/views/admin_users.html.php | 2 +- themes/admin_wind/css/screen.css | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php index 661f1532..18ad9403 100644 --- a/modules/user/views/admin_users.html.php +++ b/modules/user/views/admin_users.html.php @@ -85,7 +85,7 @@ last_login == 0) ? "" : gallery::date($user->last_login) ?> - + id") ?>" open_text="" class="g-panel-link g-button ui-state-default ui-corner-all ui-icon-left"> diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 9fe3a1fc..83b258f5 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -12,7 +12,7 @@ * 6) jQuery and jQuery UI * 7) Right-to-left language styles * - * @todo Review g-actions along with g-buttonset-vertical + * @todo Review g-buttonset-vertical */ /** ******************************************************************* @@ -358,11 +358,6 @@ th { margin-right: 1em; } -.g-actions a, -.g-actions span { - margin-right: 3em; -} - /* Block admin ~~~~~~~~~~~~~~~~~~~~~~~~~ */ .g-admin-blocks-list { -- cgit v1.2.3 From e184b5b6b16eae73d2133819d151b465dbda0c53 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 8 Nov 2009 22:46:26 -0700 Subject: Apply borders and padding back to theme choices. --- themes/admin_wind/css/screen.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 83b258f5..cd15d1dc 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -156,6 +156,12 @@ th { padding: 0; } +#g-content .g-selected, +#g-content .g-available .g-block { + border: 1px solid #ccc; + padding: .8em; +} + .g-selected img, .g-available .g-block img { float: left; -- cgit v1.2.3 From 6ddbef3dcd3ee34e622bc7286ebf138b7ef1ffaa Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sun, 8 Nov 2009 23:13:02 -0700 Subject: Add a bit more space back inbetween admin form inputs on pages --- themes/admin_wind/css/screen.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index cd15d1dc..73ec8ac5 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -91,6 +91,10 @@ fieldset { margin-bottom: 1em; } +#g-content form ul li { + padding: .4em 0; +} + #g-dialog form { width: 270px; } -- cgit v1.2.3 From 64f5a98bd60410e54b6d0c59c713bb7e3eff0a83 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Mon, 9 Nov 2009 07:34:30 -0800 Subject: Since the activate_sidebar_blocks mentod is called from the module::install, we don't need to add the block in the image_block_installer::install method as well> Fixes ticket 874. --- modules/image_block/helpers/image_block_installer.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/image_block/helpers/image_block_installer.php b/modules/image_block/helpers/image_block_installer.php index 06668dc2..04a15619 100644 --- a/modules/image_block/helpers/image_block_installer.php +++ b/modules/image_block/helpers/image_block_installer.php @@ -19,13 +19,11 @@ */ class image_block_installer { static function install() { - block_manager::add("site.sidebar", "image_block", "random_image"); module::set_version("image_block", 2); } static function upgrade($version) { if ($version == 1) { - block_manager::add("site.sidebar", "image_block", "random_image"); module::set_version("image_block", 2); } } -- cgit v1.2.3