From aa2e4de024a985f16beb8c1ad90daf0e668d2e28 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Mon, 1 Feb 2010 22:55:47 -0800 Subject: Corrected copy paste errors in g2_import task. Fixes ticket #949. --- modules/g2_import/helpers/g2_import_task.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/g2_import/helpers/g2_import_task.php b/modules/g2_import/helpers/g2_import_task.php index 21ba4c3a..e0212b33 100644 --- a/modules/g2_import/helpers/g2_import_task.php +++ b/modules/g2_import/helpers/g2_import_task.php @@ -189,7 +189,7 @@ class g2_import_task_Core { } $task->status = t( "Album highlights (%count of %total)", - array("count" => $done["tags"] + 1, "total" => $stats["albums"])); + array("count" => $done["highlights"] + 1, "total" => $stats["highlights"])); break; -- cgit v1.2.3 From 370faf5f265e634b0828be9695cd6eb9676ff6f7 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Tue, 2 Feb 2010 10:55:22 -0800 Subject: Display the error message for the in place edit. Also improve the double click guard. Fixes ticket #1000. --- lib/gallery.in_place_edit.js | 44 ++++++++++++---------------- modules/gallery/views/in_place_edit.html.php | 6 ++++ 2 files changed, 24 insertions(+), 26 deletions(-) (limited to 'modules') diff --git a/lib/gallery.in_place_edit.js b/lib/gallery.in_place_edit.js index c10400e3..5a815dac 100644 --- a/lib/gallery.in_place_edit.js +++ b/lib/gallery.in_place_edit.js @@ -10,10 +10,10 @@ }, _show: function(target) { - if ($(this).data("gallery_in_place_edit") == true) { + if ($(target).data("gallery_in_place_edit") == true) { return; } - $(this).data("gallery_in_place_edit", true); + $(target).data("gallery_in_place_edit", true); var self = this; var tag_width = $(target).width(); $(self).data("tag_width", tag_width); @@ -27,26 +27,28 @@ var parent = $(target).parent(); parent.children().hide(); parent.append(data); - parent.find("form :text") - .width(tag_width) - .focus(); - $(".g-short-form").gallery_short_form(); - parent.find("form .g-cancel").click(function(event) { - self._cancel(); - event.preventDefault(); - return false; - }); - self._ajaxify_edit(); + self._setup_form(parent.find("form")); }); + }, + _setup_form: function(form) { + var self = this; + var width = $(self).data("tag_width"); + form.find(":text").width(width).focus(); + form.find(".g-cancel").click(function(event) { + self._cancel(); + event.preventDefault(); + return false; + }); + $(".g-short-form").gallery_short_form(); + this._ajaxify_edit(); }, _cancel: function() { var parent = $("#g-in-place-edit-form").parent(); - $(parent).find("form").remove(); + $("#g-in-place-edit-form").remove(); $(parent).children().show(); - $("#g-in-place-edit-message").remove(); - $(this).data("gallery_in_place_edit", false); + $(parent).find(".g-editable").data("gallery_in_place_edit", false); }, _ajaxify_edit: function() { @@ -60,17 +62,7 @@ } else { var parent = $(form).parent(); $(form).replaceWith(data.form); - var width = $(self).data("tag_width"); - $(parent).find("form :text") - .width(width) - .focus(); - $(".g-short-form").gallery_short_form(); - $(parent).find("form .g-cancel").click(function(event) { - self._cancel(); - event.preventDefault(); - return false; - }); - self._ajaxify_edit(); + self._setup_form(parent.find("form")); } } }); diff --git a/modules/gallery/views/in_place_edit.html.php b/modules/gallery/views/in_place_edit.html.php index 05a16ad4..2d6cbe90 100644 --- a/modules/gallery/views/in_place_edit.html.php +++ b/modules/gallery/views/in_place_edit.html.php @@ -9,7 +9,13 @@ "submit ui-state-default"), t("Save")) ?>
    • + +
  • +

    +
    • + + -- cgit v1.2.3 From fe11e34cea8ea31c048af5f38d63220850b0293d Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Tue, 2 Feb 2010 11:42:13 -0800 Subject: Change the view to display 'empty' when the variable value is a null string(""). Fixes ticket #987. --- modules/gallery/views/admin_advanced_settings.html.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules') diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php index 2d4b11a1..1f7d2f64 100644 --- a/modules/gallery/views/admin_advanced_settings.html.php +++ b/modules/gallery/views/admin_advanced_settings.html.php @@ -25,10 +25,10 @@ module_name/" . html::clean($var->name)) ?>" class="g-dialog-link" title=" $var->name, "module_name" => $var->module_name))->for_html_attr() ?>"> - value)): ?> - value) ?> - + value) || $var->value === ""): ?> + + value) ?> -- cgit v1.2.3 From 3c3671cff25f28e21a702b1f665a6baa282d045f Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Tue, 2 Feb 2010 12:30:23 -0800 Subject: Remove the test-transform:uppercase from the l10n css as it was causing problems with other text fields in IE and it violates our case standards. Fixes ticket #912 --- modules/gallery/css/l10n_client.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/gallery/css/l10n_client.css b/modules/gallery/css/l10n_client.css index 053b4432..90034d0c 100644 --- a/modules/gallery/css/l10n_client.css +++ b/modules/gallery/css/l10n_client.css @@ -45,7 +45,6 @@ display:block; position:absolute; right:0em; height:2em; line-height:2em; - text-transform:uppercase; text-align:center; background:#000; } #l10n-client-toggler a { @@ -62,7 +61,7 @@ height:1em; line-height:1em; padding: .5em; margin:0px; font-size:1em; - text-transform:uppercase;} +} #l10n-client .strings h2 { border:0px;} -- cgit v1.2.3