diff --git a/lib/gallery.common.css b/lib/gallery.common.css index b8d1eae9..fc12b401 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 */ /** ******************************************************************* @@ -73,7 +72,7 @@ form li.g-warning { padding: .3em .8em .3em 1em; } -.g-error, +.g-error, .g-denied, tr.g-error td.g-error { background: #f6cbca url('images/ico-error.png') no-repeat .4em 50%; @@ -89,7 +88,7 @@ tr.g-error td.g-error { background: #d9efc2 url('images/ico-success.png') no-repeat .4em 50%; } -.g-warning, +.g-warning, tr.g-warning td.g-warning { background: #fcf9ce url('images/ico-warning.png') no-repeat .4em 50%; } @@ -283,7 +282,9 @@ form .g-error { width: 40%; } -.g-list-horizontal { +.g-inline * { + float: left; + margin-right: .4em; } /* Dialogs ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ @@ -323,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/helpers/module.php b/modules/gallery/helpers/module.php index eab94500..fb298959 100644 --- a/modules/gallery/helpers/module.php +++ b/modules/gallery/helpers/module.php @@ -50,8 +50,20 @@ class module_Core { * @param string $module_name */ static function get($module_name) { - // @todo can't easily use model_cache here because it throw an exception on missing models. - return ORM::factory("module", array("name" => $module_name)); + if (empty(self::$modules[$module_name])) { + return ORM::factory("module", array("name" => $module_name)); + } + return self::$modules[$module_name]; + } + + /** + * Get the information about a module + * @returns ArrayObject containing the module information from the module.info file or false if + * not found + */ + static function info($module_name) { + $module_list = self::available(); + return isset($module_list->$module_name) ? $module_list->$module_name : false; } /** @@ -79,7 +91,8 @@ class module_Core { $modules = new ArrayObject(array(), ArrayObject::ARRAY_AS_PROPS); foreach (glob(MODPATH . "*/module.info") as $file) { $module_name = basename(dirname($file)); - $modules->$module_name = new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS); + $modules->$module_name = + new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS); $m =& $modules->$module_name; $m->installed = self::is_installed($module_name); $m->active = self::is_active($module_name); 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/tag/css/tag.css b/modules/tag/css/tag.css new file mode 100644 index 00000000..b718de05 --- /dev/null +++ b/modules/tag/css/tag.css @@ -0,0 +1,114 @@ +#g-tag-cloud ul { + font-size: 1.2em; + 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; +} + +/* Tag admin ~~~~~~~~~~~~~~ */ + +#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-edit-tag-form input { + padding: 0 .2em 0 .2em; + clear: none; + float: left; + margin: 0 .2em 0 0; +} + +#g-edit-tag-form input[type="text"].g-error { + border: 2px solid red; + background: none; +} + +#g-edit-tag-form input[type="submit"] { + height: 25px; +} + +#g-edit-tag-form a, #g-edit-tag-form span { + display: block; + float: left; + padding: .2em .2em 0 .1em; +} + +#g-edit-tag-form span { + float: right; +} 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/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php index 899e0b68..cee7c1eb 100644 --- a/modules/user/views/admin_users.html.php +++ b/modules/user/views/admin_users.html.php @@ -106,7 +106,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..99fc6241 100644 --- a/themes/admin_wind/css/fix-ie.css +++ b/themes/admin_wind/css/fix-ie.css @@ -2,12 +2,6 @@ * Fix display in IE 6 and 7 */ -.g-clearfix, -#g-group-admin, -#g-developer-tools { - zoom: 1; -} - .g-unavailable { filter: alpha(opacity=40); } diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css index 58a72baa..3d620f1c 100644 --- a/themes/admin_wind/css/screen.css +++ b/themes/admin_wind/css/screen.css @@ -583,8 +583,7 @@ li.g-group-disable h4, li.g-group-disable .g-user { * 5) Navigation and menus *********************************************************************/ -#g-site-admin-menu, -#g-tag-cloud ul { +#g-site-admin-menu { font-size: 1.2em; } @@ -791,27 +790,6 @@ li.g-group-disable h4, li.g-group-disable .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; } @@ -821,32 +799,6 @@ li.g-group-disable h4, li.g-group-disable .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; } @@ -965,9 +917,6 @@ li.g-group-disable h4, li.g-group-disable .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/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..cb51f349 100644 --- a/themes/night_wind/css/fix-ie.css +++ b/themes/night_wind/css/fix-ie.css @@ -2,10 +2,6 @@ * Fix display in IE 6, 7 */ -.g-clearfix { - zoom: 1; -} - #g-banner { z-index: 2; } 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)) ?>
    -