diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-21 07:07:53 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-21 07:07:53 -0700 |
| commit | a2048ab3038b93925bff9a29cb22366e5670e067 (patch) | |
| tree | e38621f059fb907ed36a5f569448b8e4360c5b35 /modules/tag | |
| parent | 97928804ad5f7b69fefe6ff2b50115af1159dbbc (diff) | |
| parent | e025abea4179bc059b8fef195bafe0c3f60f1220 (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
lib/gallery.common.css
Diffstat (limited to 'modules/tag')
| -rw-r--r-- | modules/tag/css/tag.css | 8 | ||||
| -rw-r--r-- | modules/tag/js/tag.js | 6 | ||||
| -rw-r--r-- | modules/tag/views/admin_tags.html.php | 2 |
3 files changed, 5 insertions, 11 deletions
diff --git a/modules/tag/css/tag.css b/modules/tag/css/tag.css index ec16251d..03ed444b 100644 --- a/modules/tag/css/tag.css +++ b/modules/tag/css/tag.css @@ -80,6 +80,7 @@ #g-tag-admin td { border: 0; + vertical-align: top; } #g-tag-admin ul { @@ -92,9 +93,4 @@ #g-rename-tag-form ul { margin-bottom: 0; -} - -#g-rename-tag-form input[type="text"].g-error { - border: 2px solid red; - background: none; -} +}
\ No newline at end of file diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js index 02985d55..ed977480 100644 --- a/modules/tag/js/tag.js +++ b/modules/tag/js/tag.js @@ -19,7 +19,7 @@ function ajaxify_tag_form() { function closeEditInPlaceForms() { // closes currently open inplace edit forms if ($("#g-rename-tag-form").length) { - $("#g-edit-error-message").remove(); + $("#g-action-status").remove(); var li = $("#g-rename-tag-form").parent(); $("#g-rename-tag-form").parent().html($("#g-rename-tag-form").parent().data("revert")); li.height(""); @@ -64,17 +64,15 @@ function editInPlace(element) { $("#g-rename-tag-form").ajaxForm({ dataType: "json", success: function(data) { - console.log("success"); if (data.result == "success") { closeEditInPlaceForms(); // close form $(".g-tag[rel=" + data.tag_id + "]").text(data.new_tagname); // update tagname window.location.reload(); } else if (data.result == "error") { - console.log("error"); $("#g-rename-tag-form #name") .addClass("g-error") .focus(); - $("#g-tag-admin").before("<p id=\"g-edit-error-message\" class=\"g-error\">" + data.message + "</p>"); + $("#g-tag-admin").before("<p id=\"g-action-status\" class=\"g-message-block g-error\">" + data.message + "</p>"); } } }); diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php index 8647412d..3e333817 100644 --- a/modules/tag/views/admin_tags.html.php +++ b/modules/tag/views/admin_tags.html.php @@ -23,7 +23,7 @@ <div class="g-block-content"> <table id="g-tag-admin"> - <caption class="g-understate"> + <caption> <?= t2("There is one tag", "There are %count tags", $tags->count()) ?> </caption> <tr> |