From b4ef3affd2988a3dcfafcc04753501571db9fb9c Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Thu, 15 Oct 2009 21:20:30 -0600 Subject: Added missing hashes before g-languages-form selectors --- themes/admin_wind/css/screen.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'themes/admin_wind/css') diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 3c58a282..d79fd3c9 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -890,22 +890,22 @@ li.g-default-group h4, li.g-default-group .g-user { cursor: pointer; } -g-languages-form table { +#g-languages-form table { width: 400px; float: left; margin: 0 3em 1em 0; } -g-languages-form .installed { +#g-languages-form .installed { background-color: #EEEEEE; } -g-languages-form .default { +#g-languages-form .default { background-color: #C5DBEC; font-weight: bold; } -g-languages-form input { +#g-languages-form input { clear: both; } -- cgit v1.2.3 From 568017d8ccd230a5075a5b3e02654e129b4929d0 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Fri, 16 Oct 2009 00:54:20 -0600 Subject: Deal with IE flicker during Superfish menu init solely in ui.init.js with .hide() and .show(). Since the menus in the header are the only SF menus, use those selectors for initialization. --- themes/admin_wind/css/screen.css | 1 - themes/admin_wind/js/ui.init.js | 17 ++++++++++------- themes/wind/css/screen.css | 1 - themes/wind/js/ui.init.js | 16 ++++++++-------- 4 files changed, 18 insertions(+), 17 deletions(-) (limited to 'themes/admin_wind/css') diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index d79fd3c9..331f7f4c 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -600,7 +600,6 @@ li.g-default-group h4, li.g-default-group .g-user { #g-site-admin-menu { bottom: 0; - display: none; font-size: 1.2em; left: 140px; position: absolute; diff --git a/themes/admin_wind/js/ui.init.js b/themes/admin_wind/js/ui.init.js index 8d34241f..0954b63c 100644 --- a/themes/admin_wind/js/ui.init.js +++ b/themes/admin_wind/js/ui.init.js @@ -1,17 +1,20 @@ +/** + * Initialize jQuery UI and Gallery Plugins + */ + $(document).ready(function(){ + // Initialize Superfish menus - $("#g-site-admin-menu ul.g-menu").addClass("sf-menu"); - $("ul.g-menu").addClass("sf-menu"); - $("ul.sf-menu").superfish({ + $("#g-site-admin-menu .g-menu").hide().addClass("sf-menu"); + $("#g-site-admin-menu .g-menu").superfish({ delay: 500, animation: { opacity: "show", height: "show" }, - pathClass: "current", + pathClass: "g-selected", speed: "fast" - }); - $("#g-site-admin-menu").css("display", "block"); + }).show(); // Initialize status message effects $("#g-action-status li").gallery_show_message(); @@ -35,7 +38,7 @@ $(document).ready(function(){ // Round view menu buttons if ($("#g-admin-comments-menu").length) { - $("#g-admin-comments-menu ul").removeClass("g-menu").removeClass("sf-menu"); + $("#g-admin-comments-menu ul").removeClass("g-menu"); $("#g-admin-comments-menu").addClass("g-buttonset"); $("#g-admin-comments-menu a").addClass("g-button ui-state-default"); $("#g-admin-comments-menu ul li:first a").addClass("ui-corner-left"); diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index 5c65e344..ab3730c7 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -483,7 +483,6 @@ li.g-error select { #g-site-menu { bottom: 0; - display: none; left: 140px; position: absolute; } diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js index 357e6081..f45ba84a 100644 --- a/themes/wind/js/ui.init.js +++ b/themes/wind/js/ui.init.js @@ -1,20 +1,20 @@ /** - * Initialize jQuery UI and Gallery Plugin elements + * Initialize jQuery UI and Gallery Plugins */ $(document).ready(function() { - // Initialize Superfish menus - $("ul.g-menu").addClass("sf-menu"); - $('ul.sf-menu').superfish({ + // Initialize Superfish menus (hidden, then shown to address IE issue) + $("#g-site-menu .g-menu").hide().addClass("sf-menu"); + $("#g-site-menu .g-menu").superfish({ delay: 500, animation: { opacity:'show', height:'show' }, + pathClass: "g-selected", speed: 'fast' - }); - $("#g-site-menu").css("display", "block"); + }).show(); // Initialize status message effects $("#g-action-status li").gallery_show_message(); @@ -23,7 +23,7 @@ $(document).ready(function() { $("#g-login-link").addClass("g-dialog-link"); $(".g-dialog-link").gallery_dialog(); - // Apply jQuery UI button css to submit inputs + // Apply jQuery UI icon, hover, and rounded corner styles $(".g-short-form input[type=text]").addClass("ui-corner-left"); $(".g-short-form input[type=submit]").addClass("ui-state-default ui-corner-right"); $("input[type=submit]:not(.g-short-form input)").addClass("ui-state-default ui-corner-all"); @@ -32,7 +32,7 @@ $(document).ready(function() { $("#g-view-menu a").addClass("ui-icon"); } - // Apply styles and icon classes to g-context-menu + // Apply jQuery UI icon and hover styles to context menus if ($(".g-context-menu").length) { $(".g-context-menu li").addClass("ui-state-default"); $(".g-context-menu a").addClass("g-button ui-icon-left"); -- cgit v1.2.3 From f2b6ec6637c130044cc08ff186433f10ad2f3839 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sat, 17 Oct 2009 12:48:54 -0600 Subject: Move tag css from theme to the module. Introduced generic .g-inline class for inline elements, including lists and forms. --- lib/gallery.common.css | 4 +- modules/tag/helpers/tag.php | 2 +- modules/tag/helpers/tag_theme.php | 1 + modules/tag/js/tag.js | 22 +++++------ modules/tag/views/admin_tags.html.php | 8 ++-- themes/admin_wind/css/screen.css | 53 +------------------------- themes/wind/css/screen.css | 70 +---------------------------------- 7 files changed, 22 insertions(+), 138 deletions(-) (limited to 'themes/admin_wind/css') diff --git a/lib/gallery.common.css b/lib/gallery.common.css index b8d1eae9..23262087 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -283,7 +283,9 @@ form .g-error { width: 40%; } -.g-list-horizontal { +.g-inline * { + float: left; + margin-right: .4em; } /* Dialogs ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php index a2104e9d..b1d79458 100644 --- a/modules/tag/helpers/tag.php +++ b/modules/tag/helpers/tag.php @@ -111,7 +111,7 @@ class tag_Core { } static function get_rename_form($tag) { - $form = new Forge("admin/tags/rename/$tag->id", "", "post", array("id" => "g-rename-tag-form")); + $form = new Forge("admin/tags/rename/$tag->id", "", "post", array("id" => "g-edit-tag-form", "class" => "g-short-form")); $group = $form->group("rename_tag")->label(t("Rename Tag")); $group->input("name")->label(t("Tag name"))->value($tag->name)->rules("required|length[1,64]"); $group->inputs["name"]->error_messages("in_use", t("There is already a tag with that name")); diff --git a/modules/tag/helpers/tag_theme.php b/modules/tag/helpers/tag_theme.php index 4f22d2ac..e3743824 100644 --- a/modules/tag/helpers/tag_theme.php +++ b/modules/tag/helpers/tag_theme.php @@ -21,6 +21,7 @@ class tag_theme_Core { static function head($theme) { $theme->css("jquery.autocomplete.css"); $theme->script("jquery.autocomplete.js"); + $theme->css("tag.css"); $theme->script("tag.js"); } diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js index e2e6b782..17845272 100644 --- a/modules/tag/js/tag.js +++ b/modules/tag/js/tag.js @@ -8,8 +8,8 @@ function ajaxify_tag_form() { success: function(data) { if (data.result == "success") { $.get($("#g-tag-cloud").attr("title"), function(data, textStatus) { - $("#g-tag-cloud").html(data); - }); + $("#g-tag-cloud").html(data); + }); } $("#g-tag form").resetForm(); } @@ -18,10 +18,10 @@ function ajaxify_tag_form() { function closeEditInPlaceForms() { // closes currently open inplace edit forms - if ($("#g-rename-tag-form").length) { + if ($("#g-edit-tag-form").length) { $("#g-edit-error-message").remove(); - var li = $("#g-rename-tag-form").parent(); - $("#g-rename-tag-form").parent().html($("#g-rename-tag-form").parent().data("revert")); + var li = $("#g-edit-tag-form").parent(); + $("#g-edit-tag-form").parent().html($("#g-edit-tag-form").parent().data("revert")); li.height(""); $(".g-editable", li).bind("click", editInPlace); $(".g-dialog-link", li).gallery_dialog(); @@ -41,7 +41,7 @@ function editInPlace(element) { var tag_name = $(this).html(); var tag_width = $(this).width(); $(this).parent().data("revert", $(this).parent().html()); - var form = '
'; form += ''; form += '" + data.message + "

"); diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php index 27813a91..edc466bb 100644 --- a/modules/tag/views/admin_tags.html.php +++ b/modules/tag/views/admin_tags.html.php @@ -3,8 +3,8 @@ var TAG_RENAME_URL = ; $("document").ready(function() { // using JS for adding link titles to avoid running t() for each tag - $("#g-tag-admin .tag-name").attr("title", for_js() ?>); - $("#g-tag-admin .delete-link").attr("title", $(".delete-link:first span").html()); + $("#g-tag-admin .g-tag-name").attr("title", for_js() ?>); + $("#g-tag-admin .g-delete-link").attr("title", $(".g-delete-link:first span").html()); // In-place editing for tag admin $(".g-editable").bind("click", editInPlace); @@ -47,10 +47,10 @@
  • - name) ?> + name) ?> (count ?>) id") ?>" - class="g-dialog-link delete-link g-button"> + class="g-dialog-link g-delete-link g-button">
    • diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 331f7f4c..78358e84 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -582,8 +582,7 @@ li.g-default-group h4, li.g-default-group .g-user { * 5) Navigation and menus *********************************************************************/ -#g-site-admin-menu, -#g-tag-cloud ul { +#g-site-admin-menu { font-size: 1.2em; } @@ -790,27 +789,6 @@ li.g-default-group h4, li.g-default-group .g-user { list-style-type: disc; } -#g-tag-admin { - table-layout: fixed; -} - -#g-tag-admin td { - border: 0; -} - -#g-tag-admin ul { - padding-bottom: .3em; -} - -#g-tag-admin li { - padding: .1em 0 .2em .3em; -} - -#g-tag-admin .g-column { - float: left; - width: 200px; -} - .g-editable { padding: .1em .3em .2em .3em; } @@ -820,32 +798,6 @@ li.g-default-group h4, li.g-default-group .g-user { cursor: text; } -#g-rename-tag-form input { - padding: 0 .2em 0 .2em; - clear: none; - float: left; - margin: 0 .2em 0 0; -} - -#g-rename-tag-form input[type="text"].g-error { - border: 2px solid red; - background: none; -} - -#g-rename-tag-form input[type="submit"] { - height: 25px; -} - -#g-rename-tag-form a, #g-rename-tag-form span { - display: block; - float: left; - padding: .2em .2em 0 .1em; -} - -#g-rename-tag-form span { - float: right; -} - #g-task-log-dialog h1 { font-size: 1.1em; } @@ -964,9 +916,6 @@ li.g-default-group h4, li.g-default-group .g-user { .rtl .g-available .g-block img, .rtl #g-content #g-photo-stream .g-item, .rtl li.g-group, -.rtl #g-tag-admin .g-column, -.rtl #g-rename-tag-form input, -.rtl #g-rename-tag-form a, .rtl #g-server-add-admin, .rtl .ui-icon-left .ui-icon { float: right; diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css index cae472be..36231b0d 100644 --- a/themes/wind/css/screen.css +++ b/themes/wind/css/screen.css @@ -467,8 +467,7 @@ li.g-error select { * 5) Navigation and menus *********************************************************************/ -#g-site-menu, -#g-tag-cloud ul { +#g-site-menu { font-size: 1.2em; } @@ -566,73 +565,6 @@ li.g-error select { background-image: url('../images/ico-print.png'); } -/* Tags and cloud ~~~~~~~~~~~~~~~~~~~~~~~~ */ - -#g-tag-cloud ul { - text-align: justify; -} - -#g-tag-cloud ul li { - display: inline; - line-height: 1.5em; - text-align: justify; -} - -#g-tag-cloud ul li a { - text-decoration: none; -} - -#g-tag-cloud ul li span { - display: none; -} - -#g-tag-cloud ul li.size1 a { - color: #9cf; - font-size: 80%; - font-weight: 100; -} - -#g-tag-cloud ul li.size2 a { - color: #69f; - font-size: 90%; - font-weight: 300; -} - -#g-tag-cloud ul li.size3 a { - color: #69c; - font-size: 100%; - font-weight: 500; -} - -#g-tag-cloud ul li.size4 a { - color: #369; - font-size: 110%; - font-weight: 700; -} - -#g-tag-cloud ul li.size5 a { - color: #0e2b52; - font-size: 120%; - font-weight: 900; -} - -#g-tag-cloud ul li.size6 a { - color: #0e2b52; - font-size: 130%; - font-weight: 900; -} - -#g-tag-cloud ul li.size7 a { - color: #0e2b52; - font-size: 140%; - font-weight: 900; -} - -#g-tag-cloud ul li a:hover { - color: #f30; - text-decoration: underline; -} - #g-welcome-message p { padding-bottom: 1em; } -- cgit v1.2.3 From ad0497a8d2956a73d174445a30d9190b1f970caf Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sat, 17 Oct 2009 12:58:31 -0600 Subject: Drop our g-clearfix in favor of using jQuery UI's ui-helper-clearfix. --- lib/gallery.common.css | 13 ------------- modules/comment/views/admin_comments.html.php | 2 +- modules/gallery/views/admin_themes.html.php | 8 ++++---- modules/user/views/admin_users.html.php | 2 +- themes/admin_wind/css/fix-ie.css | 2 +- themes/admin_wind/views/admin.html.php | 2 +- themes/night_wind/css/fix-ie.css | 2 +- themes/night_wind/views/album.html.php | 2 +- themes/night_wind/views/page.html.php | 2 +- themes/night_wind/views/pager.html.php | 2 +- themes/night_wind/views/photo.html.php | 2 +- themes/night_wind/views/sidebar.html.php | 2 +- themes/wind/css/fix-ie.css | 2 +- themes/wind/views/album.html.php | 2 +- themes/wind/views/page.html.php | 2 +- themes/wind/views/pager.html.php | 2 +- themes/wind/views/photo.html.php | 2 +- themes/wind/views/sidebar.html.php | 2 +- 18 files changed, 20 insertions(+), 33 deletions(-) (limited to 'themes/admin_wind/css') diff --git a/lib/gallery.common.css b/lib/gallery.common.css index 23262087..74a9642f 100644 --- a/lib/gallery.common.css +++ b/lib/gallery.common.css @@ -7,7 +7,6 @@ * 3) States and interactions * 4) Positioning and order * 5) Containers/widgets - * 6) Browser hacks */ /** ******************************************************************* @@ -325,15 +324,3 @@ form .g-error { #g-dialog .g-cancel { margin: .4em 1em; } - -/** ******************************************************************* - * 6) Browser hacks - *********************************************************************/ - -.g-clearfix:after { - clear: both; - content: "."; - display: block; - height: 0; - visibility: hidden; -} diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php index e32a843f..8f719f05 100644 --- a/modules/comment/views/admin_comments.html.php +++ b/modules/comment/views/admin_comments.html.php @@ -38,7 +38,7 @@

    -
    +
    diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php index a75d9f04..f7e77a01 100644 --- a/modules/gallery/views/admin_themes.html.php +++ b/modules/gallery/views/admin_themes.html.php @@ -14,7 +14,7 @@

    -
    +
    " alt="name) ?>" />

    name ?>

    @@ -29,7 +29,7 @@ $info): ?> site) continue ?> -
    +
    " class="g-dialog-link" title=" $info->name))->for_html_attr() ?>"> " alt="name) ?>" /> @@ -52,7 +52,7 @@

    -
    +
    " alt="name) ?>" />

    name ?>

    @@ -67,7 +67,7 @@ $info): ?> admin) continue ?> -
    +
    " class="g-dialog-link" title=" $info->name))->for_html_attr() ?>"> " alt="name) ?>" /> diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php index a127bc15..2f8d8673 100644 --- a/modules/user/views/admin_users.html.php +++ b/modules/user/views/admin_users.html.php @@ -103,7 +103,7 @@
    -
    +
    " class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all" title="for_html_attr() ?>"> diff --git a/themes/admin_wind/css/fix-ie.css b/themes/admin_wind/css/fix-ie.css index 106fe4a1..fe6e32ab 100644 --- a/themes/admin_wind/css/fix-ie.css +++ b/themes/admin_wind/css/fix-ie.css @@ -2,7 +2,7 @@ * Fix display in IE 6 and 7 */ -.g-clearfix, +.ui-helper-clearfix, #g-group-admin, #g-developer-tools { zoom: 1; diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php index 4ee08d95..b788eb93 100644 --- a/themes/admin_wind/views/admin.html.php +++ b/themes/admin_wind/views/admin.html.php @@ -50,7 +50,7 @@ -
    +
    admin_menu() ?>
    admin_header_bottom() ?> diff --git a/themes/night_wind/css/fix-ie.css b/themes/night_wind/css/fix-ie.css index 60abc08d..c32d2cab 100644 --- a/themes/night_wind/css/fix-ie.css +++ b/themes/night_wind/css/fix-ie.css @@ -2,7 +2,7 @@ * Fix display in IE 6, 7 */ -.g-clearfix { +.ui-helper-clearfix { zoom: 1; } diff --git a/themes/night_wind/views/album.html.php b/themes/night_wind/views/album.html.php index 91646b1e..1163630d 100644 --- a/themes/night_wind/views/album.html.php +++ b/themes/night_wind/views/album.html.php @@ -6,7 +6,7 @@
    description)) ?>
    -