From 711cdde5b9755140981000adc6dd7897d836ccc5 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 12 Sep 2009 20:46:54 -0700 Subject: Only tack ?show= on for the last parent, because that's the only parent for which the id is relevant. In a perfect world each parent's link would have a ?show= for the next child's id. But that would require some confusing code and I don't want to put that into the default/example theme yet. --- themes/default/views/page.html.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'themes') diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php index 733534ea..19d8cc00 100644 --- a/themes/default/views/page.html.php +++ b/themes/default/views/page.html.php @@ -95,7 +95,12 @@
  • - item()->id}") ?>"> + + item()->id}" : null) ?>"> title) ?>
    • -- cgit v1.2.3 From 645cf6347cda049dc09664e60626c7a4f5609f89 Mon Sep 17 00:00:00 2001 From: Kevin Nehls Date: Sun, 13 Sep 2009 09:14:25 -0700 Subject: Fix "Back to the gallery" link in upper-right corner in Admin Dashboard. --- themes/admin_default/views/admin.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'themes') diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php index f77881bb..995e95ef 100644 --- a/themes/admin_default/views/admin.html.php +++ b/themes/admin_default/views/admin.html.php @@ -43,7 +43,7 @@
    admin_header_top() ?>
      -
    • url(), "← ".t("Back to the Gallery")) ?>
      • +
    +
    diff --git a/themes/default/views/block.html.php b/themes/default/views/block.html.php index 37504861..e8cff833 100644 --- a/themes/default/views/block.html.php +++ b/themes/default/views/block.html.php @@ -1,5 +1,7 @@ + +

    -- cgit v1.2.3 From ffccfb9e634de527261dca8e46ac4053806ec87b Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Tue, 15 Sep 2009 20:23:32 -0700 Subject: Move the code that adds the .gShortForm CSS class out of gallery.short_forms.js and into the theme, since this is really a theme decision. --- lib/gallery.form.js | 13 ------------- themes/default/js/ui.init.js | 7 +++++-- 2 files changed, 5 insertions(+), 15 deletions(-) (limited to 'themes') diff --git a/lib/gallery.form.js b/lib/gallery.form.js index 67245e60..77ce3b7d 100644 --- a/lib/gallery.form.js +++ b/lib/gallery.form.js @@ -1,14 +1,3 @@ -/** - * Handle initialization of all short forms - * - * @param shortForms array Array of short form IDs - */ -function handle_short_form_event(short_forms) { - for (var i in short_forms) { - short_form_init(short_forms[i]); - } -} - /** * Initialize a short form. Short forms may contain only one text input. * @@ -16,8 +5,6 @@ function handle_short_form_event(short_forms) { */ function short_form_init(form_id) { var form = $(form_id); - form.addClass("gShortForm"); - var label = form.find("label:first"); var input = form.find("input[type=text]:first"); var button = form.find("input[type=submit]"); diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js index 949933e9..93dfb275 100644 --- a/themes/default/js/ui.init.js +++ b/themes/default/js/ui.init.js @@ -2,7 +2,7 @@ * Initialize jQuery UI and Gallery Plugin elements */ -var shortForms = new Array( +var short_forms = new Array( "#gQuickSearchForm", "#gAddTagForm", "#gSearchForm" @@ -36,7 +36,10 @@ $(document).ready(function() { } // Initialize short forms - handleShortFormEvent(shortForms); + for (var i in short_forms) { + short_form_init(short_forms[i]); + $(short_forms[i]).addClass("gShortForm"); + } $(".gShortForm input[type=text]").addClass("ui-corner-left"); $(".gShortForm input[type=submit]").addClass("ui-state-default ui-corner-right"); -- cgit v1.2.3 From 4e1e24ba1a976cd0bb7ca7dd03c6001f906a25dd Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Wed, 16 Sep 2009 20:34:42 -0700 Subject: Add a movie_menu() theme callback, and have the default theme call it in the sidebar on movie page types. --- modules/gallery/libraries/Theme_View.php | 6 ++++++ themes/default/views/sidebar.html.php | 2 ++ 2 files changed, 8 insertions(+) (limited to 'themes') diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php index 541bce88..130e2dce 100644 --- a/modules/gallery/libraries/Theme_View.php +++ b/modules/gallery/libraries/Theme_View.php @@ -111,6 +111,12 @@ class Theme_View_Core extends Gallery_View { return $menu->compact(); } + public function movie_menu() { + $menu = Menu::factory("root"); + module::event("movie_menu", $menu, $this); + return $menu->compact(); + } + public function context_menu($item, $thumbnail_css_selector) { $menu = Menu::factory("root") ->append(Menu::factory("submenu") diff --git a/themes/default/views/sidebar.html.php b/themes/default/views/sidebar.html.php index 928ecb93..04379eb6 100644 --- a/themes/default/views/sidebar.html.php +++ b/themes/default/views/sidebar.html.php @@ -6,6 +6,8 @@ album_menu() ?> photo_menu() ?> + + movie_menu() ?> tag_menu() ?> -- cgit v1.2.3 From 48326ad01708fcfa020283e2ad8b2cae4ede1600 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Thu, 17 Sep 2009 12:11:00 -0700 Subject: Cleanup issues with the original fix for #779 --- modules/tag/controllers/admin_tags.php | 4 ++-- modules/tag/js/tag.js | 2 +- themes/admin_default/css/screen.css | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'themes') diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php index 3301566b..ced73d65 100644 --- a/modules/tag/controllers/admin_tags.php +++ b/modules/tag/controllers/admin_tags.php @@ -81,7 +81,7 @@ class Admin_Tags_Controller extends Admin_Controller { kohana::show_404(); } - //Don't use a form as the form is dynamically created in the js + // Don't use a form as the form is dynamically created in the js $post = new Validation($_POST); $post->add_rules("name", "required", "length[1,64]"); $valid = $post->validate(); @@ -89,7 +89,7 @@ class Admin_Tags_Controller extends Admin_Controller { $new_name = $this->input->post("name"); $new_tag = ORM::factory("tag")->where("name", $new_name)->find(); if ($new_tag->loaded) { - $error_msg = "There is already a tag with that name"; + $error_msg = t("There is already a tag with that name")->__toString(); $valid = false; } } else { diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js index d656da36..52c695c6 100644 --- a/modules/tag/js/tag.js +++ b/modules/tag/js/tag.js @@ -69,7 +69,7 @@ function editInPlace(element) { window.location.reload(); } else if (data.result == "error") { $("#gRenameTagForm #name") - .css("border", "2px solid red") + .addClass("gError") .focus(); $("#gTagAdmin").before("

    " + data.message + "

    "); } diff --git a/themes/admin_default/css/screen.css b/themes/admin_default/css/screen.css index 33cc6733..de6d436e 100644 --- a/themes/admin_default/css/screen.css +++ b/themes/admin_default/css/screen.css @@ -1034,6 +1034,11 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser { float: right; } +#gRenameTagForm input[type="text"].gError { + border: 2px solid red; + background: none; +} + #gRenameTagForm input[type="submit"] { height: 25px; } -- cgit v1.2.3 From 62863f5fead46480cf1a3f5a96eb52ce439d0f0e Mon Sep 17 00:00:00 2001 From: Chad Kieffer Date: Sat, 19 Sep 2009 18:55:49 -0600 Subject: Address IE8 hover effect issues. Closes #666. --- themes/default/js/ui.init.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'themes') diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js index 93dfb275..e645eb71 100644 --- a/themes/default/js/ui.init.js +++ b/themes/default/js/ui.init.js @@ -91,12 +91,19 @@ $(document).ready(function() { }, function() { // Reset item height, position, and z-index - var sib_height = $(this).next().height(); + if ($(this).next().height()) { + var sib_height = $(this).next().height(); + } else { + var sib_height = $(this).prev().height(); + } + if ($.browser.msie && $.browser.version >= 8) { + sib_height = sib_height + 1; + } $(this).css("height", sib_height); $(this).css("position", "relative"); $(this).css("top", null); $(this).css("left", null); - $(this).css("z-index", null); + $(this).css("z-index", 1); // Remove the placeholder and hover class from the item $("#gPlaceHolder").remove(); $(this).removeClass("gHoverItem"); -- cgit v1.2.3