Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Cleanup issues with the original fix for #779

  • Loading branch information...
commit 48326ad01708fcfa020283e2ad8b2cae4ede1600 1 parent 6469763
Tim Almdal authored
4  modules/tag/controllers/admin_tags.php
@@ -81,7 +81,7 @@ public function rename($id) {
81 81
       kohana::show_404();
82 82
     }
83 83
 
84  
-    //Don't use a form as the form is dynamically created in the js
  84
+    // Don't use a form as the form is dynamically created in the js
85 85
     $post = new Validation($_POST);
86 86
     $post->add_rules("name", "required", "length[1,64]");
87 87
     $valid = $post->validate();
@@ -89,7 +89,7 @@ public function rename($id) {
89 89
       $new_name = $this->input->post("name");
90 90
       $new_tag = ORM::factory("tag")->where("name", $new_name)->find();
91 91
       if ($new_tag->loaded) {
92  
-        $error_msg = "There is already a tag with that name";
  92
+        $error_msg = t("There is already a tag with that name")->__toString();
93 93
         $valid = false;
94 94
       }
95 95
     } else {
2  modules/tag/js/tag.js
@@ -69,7 +69,7 @@ function editInPlace(element) {
69 69
           window.location.reload();
70 70
         } else if (data.result == "error") {
71 71
           $("#gRenameTagForm #name")
72  
-            .css("border", "2px solid red")
  72
+            .addClass("gError")
73 73
             .focus();
74 74
           $("#gTagAdmin").before("<p id=\"gEditErrorMessage\" class=\"gError\">" + data.message + "</p>");
75 75
         }
5  themes/admin_default/css/screen.css
@@ -1034,6 +1034,11 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
1034 1034
   float: right;
1035 1035
 }
1036 1036
 
  1037
+#gRenameTagForm input[type="text"].gError {
  1038
+  border: 2px solid red;
  1039
+  background: none;
  1040
+}
  1041
+
1037 1042
 #gRenameTagForm input[type="submit"] {
1038 1043
   height: 25px;
1039 1044
 }

0 notes on commit 48326ad

Please sign in to comment.
Something went wrong with that request. Please try again.