jro_apps/redmine Commit - r14347:c29727dd39fa

Replaces the link with a checkbox to select/unselect all items in the list....

Jean-Philippe Lang -

r14347:c29727dd39fa

parent child

Context file:

r14347:c29727dd39fa

Collapse all files

app/views/issues/_list.html.erb +1 -2

             <%= form_tag({}) do -%>
             <%= hidden_field_tag 'back_url', url_for(params), :id => nil %>
             <div class="autoscroll">
             <table class="list issues <%= sort_css_classes %>">
               <thead>
                 <tr>
                   <th class="checkbox hide-when-print">
-                    <%= link_to image_tag('toggle_check.png'), {},
+                    <%= check_box_tag 'check_all', '', false, :class => 'toggle-selection',
-                                          :onclick => 'toggleIssuesSelection(this); return false;',
                           :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
                   </th>
                   <% query.inline_columns.each do |column| %>
                     <%= column_header(column) %>
                   <% end %>
                 </tr>
               </thead>
               <tbody>
               <% grouped_issue_list(issues, @query, @issue_count_by_group) do |issue, level, group_name, group_count, group_totals| -%>
               <% if group_name %>
                 <% reset_cycle %>
                 <tr class="group open">
                   <td colspan="<%= query.inline_columns.size + 2 %>">
                     <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
                     <span class="name"><%= group_name %></span> <span class="count"><%= group_count %></span> <span class="totals"><%= group_totals %></span>
                     <%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}",
                                          "toggleAllRowGroups(this)", :class => 'toggle-all') %>
                   </td>
                 </tr>
               <% end %>
               <tr id="issue-<%= issue.id %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
                 <td class="checkbox hide-when-print"><%= check_box_tag("ids[]", issue.id, false, :id => nil) %></td>
                 <%= raw query.inline_columns.map {|column| "<td class=\"#{column.css_classes}\">#{column_content(column, issue)}</td>"}.join %>
               </tr>
               <% @query.block_columns.each do |column|
                    if (text = column_content(column, issue)) && text.present? -%>
               <tr class="<%= current_cycle %>">
                 <td colspan="<%= @query.inline_columns.size + 1 %>" class="<%= column.css_classes %>"><%= text %></td>
               </tr>
               <% end -%>
               <% end -%>
               <% end -%>
               </tbody>
             </table>
             </div>
             <% end -%>

app/views/timelog/_list.html.erb +1 -3

             <%= form_tag({}) do -%>
             <%= hidden_field_tag 'back_url', url_for(params) %>
             <div class="autoscroll">
             <table class="list time-entries">
             <thead>
               <tr>
                 <th class="checkbox hide-when-print">
-                  <%= link_to image_tag('toggle_check.png'),
+                  <%= check_box_tag 'check_all', '', false, :class => 'toggle-selection',
-                    {},
-                    :onclick => 'toggleIssuesSelection(this); return false;',
                     :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
                 </th>
                 <% @query.inline_columns.each do |column| %>
                   <%= column_header(column) %>
                 <% end %>
                 <th></th>
               </tr>
             </thead>
             <tbody>
             <% entries.each do |entry| -%>
               <tr class="time-entry <%= cycle("odd", "even") %> hascontextmenu">
                 <td class="checkbox hide-when-print"><%= check_box_tag("ids[]", entry.id, false, :id => nil) %></td>
                 <%= raw @query.inline_columns.map {|column| "<td class=\"#{column.css_classes}\">#{column_content(column, entry)}</td>"}.join %>
                 <td class="buttons">
                 <% if entry.editable_by?(User.current) -%>
                     <%= link_to image_tag('edit.png'), edit_time_entry_path(entry),
                                                        :title => l(:button_edit) %>
                     <%= link_to image_tag('delete.png'), time_entry_path(entry),
                                                          :data => {:confirm => l(:text_are_you_sure)},
                                                          :method => :delete,
                                                          :title => l(:button_delete) %>
                 <% end -%>
                 </td>
               </tr>
             <% end -%>
             </tbody>
             </table>
             </div>
             <% end -%>
             <%= context_menu time_entries_context_menu_path %>

public/javascripts/context_menu.js +10 -12

             /* Redmine - project management software
                Copyright (C) 2006-2015  Jean-Philippe Lang */
             var contextMenuObserving;
             var contextMenuUrl;
             function contextMenuRightClick(event) {
               var target = $(event.target);
               if (target.is('a')) {return;}
               var tr = target.parents('tr').first();
               if (!tr.hasClass('hascontextmenu')) {return;}
               event.preventDefault();
               if (!contextMenuIsSelected(tr)) {
                 contextMenuUnselectAll();
                 contextMenuAddSelection(tr);
                 contextMenuSetLastSelected(tr);
               }
               contextMenuShow(event);
             }
             function contextMenuClick(event) {
               var target = $(event.target);
               var lastSelected;
               if (target.is('a') && target.hasClass('submenu')) {
                 event.preventDefault();
                 return;
               }
               contextMenuHide();
               if (target.is('a') || target.is('img')) { return; }
               if (event.which == 1 || (navigator.appVersion.match(/\bMSIE\b/))) {
                 var tr = target.parents('tr').first();
                 if (tr.length && tr.hasClass('hascontextmenu')) {
                   // a row was clicked, check if the click was on checkbox
                   if (target.is('input')) {
                     // a checkbox may be clicked
                     if (target.prop('checked')) {
                       tr.addClass('context-menu-selection');
                     } else {
                       tr.removeClass('context-menu-selection');
                     }
                   } else {
                     if (event.ctrlKey || event.metaKey) {
                       contextMenuToggleSelection(tr);
                     } else if (event.shiftKey) {
                       lastSelected = contextMenuLastSelected();
                       if (lastSelected.length) {
                         var toggling = false;
                         $('.hascontextmenu').each(function(){
                           if (toggling || $(this).is(tr)) {
                             contextMenuAddSelection($(this));
                           }
                           if ($(this).is(tr) || $(this).is(lastSelected)) {
                             toggling = !toggling;
                           }
                         });
                       } else {
                         contextMenuAddSelection(tr);
                       }
                     } else {
                       contextMenuUnselectAll();
                       contextMenuAddSelection(tr);
                     }
                     contextMenuSetLastSelected(tr);
                   }
                 } else {
                   // click is outside the rows
                   if (target.is('a') && (target.hasClass('disabled') || target.hasClass('submenu'))) {
                     event.preventDefault();
+                  } else if (target.is('.toggle-selection')) {
+                    // nop
                   } else {
                     contextMenuUnselectAll();
                   }
                 }
               }
             }
             function contextMenuCreate() {
               if ($('#context-menu').length < 1) {
                 var menu = document.createElement("div");
                 menu.setAttribute("id", "context-menu");
                 menu.setAttribute("style", "display:none;");
                 document.getElementById("content").appendChild(menu);
               }
             }
             function contextMenuShow(event) {
               var mouse_x = event.pageX;
               var mouse_y = event.pageY;
               var render_x = mouse_x;
               var render_y = mouse_y;
               var dims;
               var menu_width;
               var menu_height;
               var window_width;
               var window_height;
               var max_width;
               var max_height;
               $('#context-menu').css('left', (render_x + 'px'));
               $('#context-menu').css('top', (render_y + 'px'));
               $('#context-menu').html('');
               $.ajax({
                 url: contextMenuUrl,
                 data: $(event.target).parents('form').first().serialize(),
                 success: function(data, textStatus, jqXHR) {
                   $('#context-menu').html(data);
                   menu_width = $('#context-menu').width();
                   menu_height = $('#context-menu').height();
                   max_width = mouse_x + 2*menu_width;
                   max_height = mouse_y + menu_height;
                   var ws = window_size();
                   window_width = ws.width;
                   window_height = ws.height;
                   /* display the menu above and/or to the left of the click if needed */
                   if (max_width > window_width) {
                    render_x -= menu_width;
                    $('#context-menu').addClass('reverse-x');
                   } else {
                    $('#context-menu').removeClass('reverse-x');
                   }
                   if (max_height > window_height) {
                    render_y -= menu_height;
                    $('#context-menu').addClass('reverse-y');
                   } else {
                    $('#context-menu').removeClass('reverse-y');
                   }
                   if (render_x <= 0) render_x = 1;
                   if (render_y <= 0) render_y = 1;
                   $('#context-menu').css('left', (render_x + 'px'));
                   $('#context-menu').css('top', (render_y + 'px'));
                   $('#context-menu').show();
                   //if (window.parseStylesheets) { window.parseStylesheets(); } // IE
                 }
               });
             }
             function contextMenuSetLastSelected(tr) {
               $('.cm-last').removeClass('cm-last');
               tr.addClass('cm-last');
             }
             function contextMenuLastSelected() {
               return $('.cm-last').first();
             }
             function contextMenuUnselectAll() {
+              $('input[type=checkbox].toggle-selection').prop('checked', false);
               $('.hascontextmenu').each(function(){
                 contextMenuRemoveSelection($(this));
               });
               $('.cm-last').removeClass('cm-last');
             }
             function contextMenuHide() {
               $('#context-menu').hide();
             }
             function contextMenuToggleSelection(tr) {
               if (contextMenuIsSelected(tr)) {
                 contextMenuRemoveSelection(tr);
               } else {
                 contextMenuAddSelection(tr);
               }
             }
             function contextMenuAddSelection(tr) {
               tr.addClass('context-menu-selection');
               contextMenuCheckSelectionBox(tr, true);
               contextMenuClearDocumentSelection();
             }
             function contextMenuRemoveSelection(tr) {
               tr.removeClass('context-menu-selection');
               contextMenuCheckSelectionBox(tr, false);
             }
             function contextMenuIsSelected(tr) {
               return tr.hasClass('context-menu-selection');
             }
             function contextMenuCheckSelectionBox(tr, checked) {
               tr.find('input[type=checkbox]').prop('checked', checked);
             }
             function contextMenuClearDocumentSelection() {
               // TODO
               if (document.selection) {
                 document.selection.empty(); // IE
               } else {
                 window.getSelection().removeAllRanges();
               }
             }
             function contextMenuInit(url) {
               contextMenuUrl = url;
               contextMenuCreate();
               contextMenuUnselectAll();
               if (!contextMenuObserving) {
                 $(document).click(contextMenuClick);
                 $(document).contextmenu(contextMenuRightClick);
                 contextMenuObserving = true;
               }
             }
             function toggleIssuesSelection(el) {
-              var boxes = $(el).parents('form').find('input[type=checkbox]');
+              var checked = $(this).prop('checked');
-              var all_checked = true;
+              var boxes = $(this).parents('table').find('input[name=ids\\[\\]]');
-              boxes.each(function(){ if (!$(this).prop('checked')) { all_checked = false; } });
+              boxes.prop('checked', checked).parents('tr').toggleClass('context-menu-selection', checked);
-              boxes.each(function(){
-                if (all_checked) {
-                  $(this).removeAttr('checked');
-                  $(this).parents('tr').removeClass('context-menu-selection');
-                } else if (!$(this).prop('checked')) {
-                  $(this).prop('checked', true);
-                  $(this).parents('tr').addClass('context-menu-selection');
-              });
             }
             function window_size() {
               var w;
               var h;
               if (window.innerWidth) {
                 w = window.innerWidth;
                 h = window.innerHeight;
               } else if (document.documentElement) {
                 w = document.documentElement.clientWidth;
                 h = document.documentElement.clientHeight;
               } else {
                 w = document.body.clientWidth;
                 h = document.body.clientHeight;
               }
               return {width: w, height: h};
             }
+            $(document).ready(function(){
+              $('input[type=checkbox].toggle-selection').on('change', toggleIssuesSelection);
+            });

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages