Merge branch 'master' into talmdal_dev

Conflicts:
	lib/gallery.common.css

1 files changed, 2 insertions, 4 deletions

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>");
         }
       }
     });