diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/timelog/_list.rhtml | 4 | ||||
| -rw-r--r-- | app/views/timelog/details.rhtml | 2 | ||||
| -rw-r--r-- | app/views/timelog/report.rhtml | 13 |
3 files changed, 13 insertions, 6 deletions
diff --git a/app/views/timelog/_list.rhtml b/app/views/timelog/_list.rhtml index 67e3c67d5..189f4f5e8 100644 --- a/app/views/timelog/_list.rhtml +++ b/app/views/timelog/_list.rhtml @@ -1,5 +1,6 @@ <table class="list time-entries"> <thead> +<tr> <%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %> <%= sort_header_tag('user_id', :caption => l(:label_member)) %> <%= sort_header_tag('activity_id', :caption => l(:label_activity)) %> @@ -8,6 +9,7 @@ <th><%= l(:field_comments) %></th> <%= sort_header_tag('hours', :caption => l(:field_hours)) %> <th></th> +</tr> </thead> <tbody> <% entries.each do |entry| -%> @@ -35,5 +37,5 @@ </td> </tr> <% end -%> -</tbdoy> +</tbody> </table> diff --git a/app/views/timelog/details.rhtml b/app/views/timelog/details.rhtml index f1e80da1f..a0810fbde 100644 --- a/app/views/timelog/details.rhtml +++ b/app/views/timelog/details.rhtml @@ -28,3 +28,5 @@ <span><%= link_to 'CSV', params.merge(:format => 'csv'), :class => 'csv' %></span>
</p>
<% end %>
+
+<% html_title l(:label_spent_time), l(:label_details) %>
diff --git a/app/views/timelog/report.rhtml b/app/views/timelog/report.rhtml index 2e08e5883..92d0e8782 100644 --- a/app/views/timelog/report.rhtml +++ b/app/views/timelog/report.rhtml @@ -7,12 +7,11 @@ <% form_remote_tag(:url => {}, :update => 'content') do %> <% @criterias.each do |criteria| %> - <%= hidden_field_tag 'criterias[]', criteria %> + <%= hidden_field_tag 'criterias[]', criteria, :id => nil %> <% end %> <%= hidden_field_tag 'project_id', params[:project_id] %> <%= render :partial => 'date_range' %> - </p> - </fieldset> + <p><%= l(:label_details) %>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'], [l(:label_month), 'month'], [l(:label_week), 'week']], @columns), @@ -21,6 +20,7 @@ <%= l(:button_add) %>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l(@available_criterias[k][:label]), k]}), :onchange => "this.form.onsubmit();", :style => 'width: 200px', + :id => nil, :disabled => (@criterias.length >= 3)) %> <%= link_to_remote l(:button_clear), {:url => {:project_id => @project, :date_from => @date_from, :date_to => @date_to, :period => @columns}, :update => 'content'}, :class => 'icon icon-reload' %></p> @@ -36,10 +36,10 @@ <thead> <tr> <% @criterias.each do |criteria| %> - <th width="15%"><%= l(@available_criterias[criteria][:label]) %></th> + <th><%= l(@available_criterias[criteria][:label]) %></th> <% end %> <% @periods.each do |period| %> - <th width="<%= ((100 - @criterias.length * 15 - 15 ) / @periods.length).to_i %>%"><%= period %></th> + <th class="period" width="<%= (40 / @periods.length).to_i %>%"><%= period %></th> <% end %> </tr> </thead> @@ -57,3 +57,6 @@ </table> <% end %> <% end %> + +<% html_title l(:label_spent_time), l(:label_report) %> + |