Merged r22675 and r22676 from trunk to 5.1-stable (#40166).

git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@22677 e93f8b46-1217-0410-a6f0-8f06a7374b81

7 files changed, 13 insertions, 12 deletions

diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index 2dd09d692..74b6c94f8 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -10,7 +10,7 @@
     <tr>
       <th class="checkbox hide-when-print">
         <%= check_box_tag 'check_all', '', false, :class => 'toggle-selection',
-              :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
+              :title => "#{l(:button_check_all)} / #{l(:button_uncheck_all)}" %>
       </th>
       <% query.inline_columns.each do |column| %>
         <%= column_header(query, column, query_options) %>
diff --git a/app/views/projects/_list.html.erb b/app/views/projects/_list.html.erb
index 1bc8d4687..03c5ce059 100644
--- a/app/views/projects/_list.html.erb
+++ b/app/views/projects/_list.html.erb
@@ -8,7 +8,8 @@
   <tr>
     <% if @admin_list %>
       <th class="checkbox hide-when-print">
-        <input type="checkbox" name="check_all" id="check_all" value="" class="toggle-selection" title="Check all/Uncheck all">
+        <%= check_box_tag 'check_all', '', false, :class => 'toggle-selection',
+          :title => "#{l(:button_check_all)} / #{l(:button_uncheck_all)}" %>
       </th>
     <% end %>
     <% @query.inline_columns.each do |column| %>
diff --git a/app/views/roles/permissions.html.erb b/app/views/roles/permissions.html.erb
index b70e2109b..301624509 100644
--- a/app/views/roles/permissions.html.erb
+++ b/app/views/roles/permissions.html.erb
@@ -36,7 +36,7 @@
     <th>
         <%= link_to_function('',
                              "toggleCheckboxesBySelector('input.role-#{role.id}')",
-                             :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
+                             :title => "#{l(:button_check_all)} / #{l(:button_uncheck_all)}",
                              :class => 'icon-only icon-checked') %>
         <%= content_tag(role.builtin? ? 'em' : 'span', role.name) %>
     </th>
@@ -63,7 +63,7 @@
         <td class="name">
             <%= link_to_function('',
                                  "toggleCheckboxesBySelector('.permission-#{permission.name} input')",
-                                 :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
+                                 :title => "#{l(:button_check_all)} / #{l(:button_uncheck_all)}",
                                  :class => 'icon-only icon-checked') %>
             <%= humanized_perm_name %>
         </td>
diff --git a/app/views/timelog/_list.html.erb b/app/views/timelog/_list.html.erb
index 62e221f59..af8dd1fa5 100644
--- a/app/views/timelog/_list.html.erb
+++ b/app/views/timelog/_list.html.erb
@@ -6,7 +6,7 @@
   <tr>
     <th class="checkbox hide-when-print">
       <%= check_box_tag 'check_all', '', false, :class => 'toggle-selection',
-        :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
+        :title => "#{l(:button_check_all)} / #{l(:button_uncheck_all)}" %>
     </th>
     <% @query.inline_columns.each do |column| %>
       <%= column_header(@query, column) %>
diff --git a/app/views/trackers/fields.html.erb b/app/views/trackers/fields.html.erb
index a9fe49351..bc6208d07 100644
--- a/app/views/trackers/fields.html.erb
+++ b/app/views/trackers/fields.html.erb
@@ -10,7 +10,7 @@
         <% @trackers.each do |tracker| %>
         <th>
           <%= link_to_function('', "toggleCheckboxesBySelector('input.tracker-#{tracker.id}')",
-                               :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
+                               :title => "#{l(:button_check_all)} / #{l(:button_uncheck_all)}",
                                :class => 'icon-only icon-checked') %>
           <%= tracker.name %>
         </th>
@@ -29,7 +29,7 @@
         <% field_name = l("field_#{field}".sub(/_id$/, '')) %>
         <td class="name">
           <%= link_to_function('', "toggleCheckboxesBySelector('input.core-field-#{field}')",
-                               :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
+                               :title => "#{l(:button_check_all)} / #{l(:button_uncheck_all)}",
                                :class => 'icon-only icon-checked') %>
           <%= field_name %>
         </td>
@@ -52,7 +52,7 @@
         <tr>
           <td class="name">
             <%= link_to_function('', "toggleCheckboxesBySelector('input.custom-field-#{field.id}')",
-                                 :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
+                                 :title => "#{l(:button_check_all)} / #{l(:button_uncheck_all)}",
                                  :class => 'icon-only icon-checked') %>
             <%= field.name %>
           </td>
diff --git a/app/views/users/_list.html.erb b/app/views/users/_list.html.erb
index 59c26da50..d2b9fa0ee 100644
--- a/app/views/users/_list.html.erb
+++ b/app/views/users/_list.html.erb
@@ -6,7 +6,7 @@
   <tr>
     <th class="checkbox hide-when-print">
       <%= check_box_tag 'check_all', '', false, :class => 'toggle-selection',
-        :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
+        :title => "#{l(:button_check_all)} / #{l(:button_uncheck_all)}" %>
     </th>
     <% @query.inline_columns.each do |column| %>
       <%= column_header(@query, column) %>
diff --git a/app/views/workflows/_form.html.erb b/app/views/workflows/_form.html.erb
index d565a02a2..f0863850f 100644
--- a/app/views/workflows/_form.html.erb
+++ b/app/views/workflows/_form.html.erb
@@ -3,7 +3,7 @@
   <tr>
     <th>
       <%= link_to_function('', "toggleCheckboxesBySelector('table.transitions-#{name} input[type=checkbox]:not(:disabled)')",
-                           :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
+                           :title => "#{l(:button_check_all)} / #{l(:button_uncheck_all)}",
                            :class => 'no-tooltip icon-only icon-checked') %>
       <%=l(:label_current_status)%>
     </th>
@@ -14,7 +14,7 @@
     <% for new_status in @statuses %>
     <td style="width:<%= 75 / @statuses.size %>%;">
       <%= link_to_function('', "toggleCheckboxesBySelector('table.transitions-#{name} input[type=checkbox]:not(:disabled).new-status-#{new_status.id}')",
-                           :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
+                           :title => "#{l(:button_check_all)} / #{l(:button_uncheck_all)}",
                            :class => 'no-tooltip icon-only icon-checked') %>
       <%= new_status.name %>
     </td>
@@ -28,7 +28,7 @@
   <tr>
     <td class="name">
       <%= link_to_function('', "toggleCheckboxesBySelector('table.transitions-#{name} input[type=checkbox]:not(:disabled).old-status-#{old_status.try(:id) || 0}')",
-                           :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
+                           :title => "#{l(:button_check_all)} / #{l(:button_uncheck_all)}",
                            :class => 'no-tooltip icon-only icon-checked') %>
       <% if old_status %>
         <% old_status_name = old_status.name %>