jro_apps/redmine Commit - r15344:1d9caa46b1f1

Changes required by functional tests updates....

Jean-Philippe Lang -

r15344:1d9caa46b1f1

parent child

Context file:

r15344:1d9caa46b1f1

Collapse all files

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

             <div class="contextual">
             <%= link_to l(:button_log_time),
                         _new_time_entry_path(@project, @issue),
                         :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project, :global => true) %>
             </div>
             <h2><%= @query.new_record? ? l(:label_spent_time) : @query.name %></h2>
             <%= form_tag(_report_time_entries_path(@project, nil), :method => :get, :id => 'query_form') do %>
               <% @report.criteria.each do |criterion| %>
                 <%= hidden_field_tag 'criteria[]', criterion, :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']], @report.columns),
                                                                     :onchange => "this.form.submit();" %>
               <label for='criterias'><%= l(:button_add) %></label>: <%= select_tag('criteria[]', options_for_select([[]] + (@report.available_criteria.keys - @report.criteria).collect{|k| [l_or_humanize(@report.available_criteria[k][:label]), k]}),
                                                                       :onchange => "this.form.submit();",
                                                                       :style => 'width: 200px',
                                                                       :disabled => (@report.criteria.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 => @report.columns}, :class => 'icon icon-reload' %></p>
             <% end %>
             <% unless @report.criteria.empty? %>
-            <% unless @report.hours.empty? %>
+            <% if @report.hours.empty? %>
+            <p class="nodata"><%= l(:label_no_data) %></p>
+            <% else %>
             <div class="autoscroll">
             <table class="list" id="time-report">
             <thead>
             <tr>
             <% @report.criteria.each do |criteria| %>
               <th><%= l_or_humanize(@report.available_criteria[criteria][:label]) %></th>
             <% end %>
             <% columns_width = (40 / (@report.periods.length+1)).to_i %>
             <% @report.periods.each do |period| %>
               <th class="period" style="width:<%= columns_width %>%;"><%= period %></th>
             <% end %>
               <th class="total" style="width:<%= columns_width %>%;"><%= l(:label_total_time) %></th>
             </tr>
             </thead>
             <tbody>
             <%= render :partial => 'report_criteria', :locals => {:criterias => @report.criteria, :hours => @report.hours, :level => 0} %>
               <tr class="total">
               <td><%= l(:label_total_time) %></td>
               <%= ('<td></td>' * (@report.criteria.size - 1)).html_safe %>
               <% total = 0 -%>
               <% @report.periods.each do |period| -%>
                 <% sum = sum_hours(select_hours(@report.hours, @report.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 %>
             <% content_for :sidebar do %>
               <%= render_sidebar_queries(TimeEntryQuery, @project) %>
             <% end %>
             <% html_title(@query.new_record? ? l(:label_spent_time) : @query.name, l(:label_report)) %>

app/views/users/index.html.erb +1 -1

             <div class="contextual">
             <%= link_to l(:label_user_new), new_user_path, :class => 'icon icon-add' %>
             </div>
             <h2><%=l(:label_user_plural)%></h2>
             <%= form_tag(users_path, :method => :get) do %>
             <fieldset><legend><%= l(:label_filter_plural) %></legend>
             <label for='status'><%= l(:field_status) %>:</label>
             <%= select_tag 'status', users_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
             <% if @groups.present? %>
             <label for='group_id'><%= l(:label_group) %>:</label>
             <%= select_tag 'group_id', content_tag('option') + options_from_collection_for_select(@groups, :id, :name, params[:group_id].to_i), :onchange => "this.form.submit(); return false;"  %>
             <% end %>
             <label for='name'><%= l(:label_user) %>:</label>
             <%= text_field_tag 'name', params[:name], :size => 30 %>
             <%= submit_tag l(:button_apply), :class => "small", :name => nil %>
             <%= link_to l(:button_clear), users_path, :class => 'icon icon-reload' %>
             </fieldset>
             <% end %>
             &nbsp;
             <div class="autoscroll">
-            <table class="list">
+            <table class="list users">
               <thead><tr>
               <%= sort_header_tag('login', :caption => l(:field_login)) %>
               <%= sort_header_tag('firstname', :caption => l(:field_firstname)) %>
               <%= sort_header_tag('lastname', :caption => l(:field_lastname)) %>
               <th><%= l(:field_mail) %></th>
               <%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %>
               <%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
               <%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %>
                 <th></th>
               </tr></thead>
               <tbody>
             <% for user in @users -%>
               <tr class="<%= user.css_classes %> <%= cycle("odd", "even") %>">
               <td class="username"><%= avatar(user, :size => "14") %><%= link_to user.login, edit_user_path(user) %></td>
               <td class="firstname"><%= user.firstname %></td>
               <td class="lastname"><%= user.lastname %></td>
               <td class="email"><%= mail_to(user.mail) %></td>
               <td class="tick"><%= checked_image user.admin? %></td>
               <td class="created_on"><%= format_time(user.created_on) %></td>
               <td class="last_login_on"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
                 <td class="buttons">
                   <%= change_status_link(user) %>
                   <%= delete_link user_path(user, :back_url => request.original_fullpath) unless User.current == user %>
                 </td>
               </tr>
             <% end -%>
               </tbody>
             </table>
             </div>
             <span class="pagination"><%= pagination_links_full @user_pages, @user_count %></span>
             <% html_title(l(:label_user_plural)) -%>

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