Merged r20717 from trunk to 4.1-stable (#34247).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@20720 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/workflows/_form.html.erb b/app/views/workflows/_form.html.erb
index 32639753c71591077d062aaebd8c71106adeb760..429ccb4e6257a8f95b435b2834f12d9b00d78458 100644 (file)
--- a/app/views/workflows/_form.html.erb
+++ b/app/views/workflows/_form.html.erb
@@ -40,7 +40,7 @@
     </td>
     <% for new_status in @statuses -%>
     <% checked = (old_status == new_status) || (transition_counts[[old_status, new_status]] > 0) %>
-    <td class="<%= checked ? 'enabled' : '' %>" title="<%= old_status_name %> &#187; <%= new_status.name %>">
+    <td class="no-tooltip <%= checked ? 'enabled' : '' %>" title="<%= old_status_name %> &#187; <%= new_status.name %>">
       <%= transition_tag transition_counts[[old_status, new_status]], old_status, new_status, name %>
     </td>
     <% end -%>

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index e4e902d9cab65848bdb94e0f2d06f3d25f85b18e..f1262d5e0fc8d196825f4f7ba441e9cf64842f52 100644 (file)
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -997,15 +997,15 @@ function setupAttachmentDetail() {
 
 
 $(function () {
-    $('[title]').tooltip({
-        show: {
-          delay: 400
-        },
-        position: {
-          my: "center bottom-5",
-          at: "center top"
-        }
-    });
+  $("[title]:not(.no-tooltip)").tooltip({
+    show: {
+      delay: 400
+    },
+    position: {
+      my: "center bottom-5",
+      at: "center top"
+    }
+  });
 });
 
 function inlineAutoComplete(element) {