jro_apps/redmine Commit - r7862:cce80c690c0d

Adds an autoscroll div around time entry list and report (#8809)....

Jean-Philippe Lang -

r7862:cce80c690c0d

parent child

Context file:

r7862:cce80c690c0d

Collapse all files

app/views/time_entry_reports/report.html.erb +2 0

             <div class="contextual">
             <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'new', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time-add' %>
             </div>
             <%= render_timelog_breadcrumb %>
             <h2><%= l(:label_spent_time) %></h2>
             <% form_tag({:controller => 'time_entry_reports', :action => 'report', :project_id => @project, :issue_id => @issue}, :method => :get, :id => 'query_form') do %>
               <% @criterias.each do |criteria| %>
                 <%= hidden_field_tag 'criterias[]', criteria, :id => nil %>
               <% end %>
               <%= render :partial => 'timelog/date_range' %>
               <p><label for='columns'><%= l(:label_details) %></label>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'],
                                                                                         [l(:label_month), 'month'],
                                                                                         [l(:label_week), 'week'],
                                                                                         [l(:label_day_plural).titleize, 'day']], @columns),
                                                                     :onchange => "this.form.onsubmit();" %>
               <label for='criterias'><%= l(:button_add) %></label>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l_or_humanize(@available_criterias[k][:label]), k]}),
                                                                       :onchange => "this.form.submit();",
                                                                       :style => 'width: 200px',
                                                                       :id => nil,
                                                                       :disabled => (@criterias.length >= 3), :id => "criterias") %>
                  <%= link_to l(:button_clear), {:project_id => @project, :issue_id => @issue, :period_type => params[:period_type], :period => params[:period], :from => @from, :to => @to, :columns => @columns}, :class => 'icon icon-reload' %></p>
             <% end %>
             <% unless @criterias.empty? %>
             <div class="total-hours">
             <p><%= l(:label_total) %>: <%= html_hours(l_hours(@total_hours)) %></p>
             </div>
             <% unless @hours.empty? %>
+            <div class="autoscroll">
             <table class="list" id="time-report">
             <thead>
             <tr>
             <% @criterias.each do |criteria| %>
               <th><%= l_or_humanize(@available_criterias[criteria][:label]) %></th>
             <% end %>
             <% columns_width = (40 / (@periods.length+1)).to_i %>
             <% @periods.each do |period| %>
               <th class="period" width="<%= columns_width %>%"><%= period %></th>
             <% end %>
               <th class="total" width="<%= columns_width %>%"><%= l(:label_total) %></th>
             </tr>
             </thead>
             <tbody>
             <%= render :partial => 'report_criteria', :locals => {:criterias => @criterias, :hours => @hours, :level => 0} %>
               <tr class="total">
               <td><%= l(:label_total) %></td>
               <%= '<td></td>' * (@criterias.size - 1) %>
               <% total = 0 -%>
               <% @periods.each do |period| -%>
                 <% sum = sum_hours(select_hours(@hours, @columns, period.to_s)); total += sum -%>
                 <td class="hours"><%= html_hours("%.2f" % sum) if sum > 0 %></td>
               <% end -%>
               <td class="hours"><%= html_hours("%.2f" % total) if total > 0 %></td>
               </tr>
             </tbody>
             </table>
+            </div>
             <% other_formats_links do |f| %>
               <%= f.link_to 'CSV', :url => params %>
             <% end %>
             <% end %>
             <% end %>
             <% html_title l(:label_spent_time), l(:label_report) %>

app/views/timelog/_list.html.erb +2 0

             <% 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'),
                 {},
                 :onclick => 'toggleIssuesSelection(Element.up(this, "form")); return false;',
                 :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
             </th>
             <%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %>
             <%= sort_header_tag('user', :caption => l(:label_member)) %>
             <%= sort_header_tag('activity', :caption => l(:label_activity)) %>
             <%= sort_header_tag('project', :caption => l(:label_project)) %>
             <%= sort_header_tag('issue', :caption => l(:label_issue), :default_order => 'desc') %>
             <th><%= l(:field_comments) %></th>
             <%= sort_header_tag('hours', :caption => l(:field_hours)) %>
             <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>
             <td class="spent_on"><%= format_date(entry.spent_on) %></td>
             <td class="user"><%= link_to_user(entry.user) %></td>
             <td class="activity"><%=h entry.activity %></td>
             <td class="project"><%= link_to_project(entry.project) %></td>
             <td class="subject">
             <% if entry.issue -%>
             <%= entry.issue.visible? ? link_to_issue(entry.issue, :truncate => 50) : "##{entry.issue.id}" -%>
             <% end -%>
             </td>
             <td class="comments"><%=h entry.comments %></td>
             <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
             <td align="center">
             <% if entry.editable_by?(User.current) -%>
                 <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry, :project_id => nil},
                                                    :title => l(:button_edit) %>
                 <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry, :project_id => nil},
                                                      :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 %>

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