From c876ec1f500c605f58c7e70c4d0a3c6f8787df71 Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Fri, 16 Oct 2009 00:00:52 -0600 Subject: Apply g-short-form directly to short forms rather than via JS. Comment updates in ui.init.js. --- modules/tag/helpers/tag.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/tag/helpers') diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php index d4278802..a2104e9d 100644 --- a/modules/tag/helpers/tag.php +++ b/modules/tag/helpers/tag.php @@ -98,7 +98,7 @@ class tag_Core { } static function get_add_form($item) { - $form = new Forge("tags", "", "post", array("id" => "g-add-tag-form")); + $form = new Forge("tags", "", "post", array("id" => "g-add-tag-form", "class" => "g-short-form")); $label = $item->is_album() ? t("Add tag to album") : ($item->is_photo() ? t("Add tag to photo") : t("Add tag to movie")); -- 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 'modules/tag/helpers') 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