##// END OF EJS Templates
Typos/fixes in views (#2654)....
Jean-Philippe Lang -
r2356:c9ca635fa7f8
parent child
Show More
@@ -1,57 +1,58
1 1 <h2><%= l(:label_bulk_edit_selected_issues) %></h2>
2 2
3 3 <ul><%= @issues.collect {|i| content_tag('li', link_to(h("#{i.tracker} ##{i.id}"), { :action => 'show', :id => i }) + h(": #{i.subject}")) }.join("\n") %></ul>
4 4
5 5 <% form_tag() do %>
6 6 <%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join %>
7 7 <div class="box">
8 8 <fieldset>
9 9 <legend><%= l(:label_change_properties) %></legend>
10 10 <p>
11 11 <% if @available_statuses.any? %>
12 12 <label><%= l(:field_status) %>:
13 13 <%= select_tag('status_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@available_statuses, :id, :name)) %></label>
14 14 <% end %>
15 15 <label><%= l(:field_priority) %>:
16 16 <%= select_tag('priority_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(Enumeration.get_values('IPRI'), :id, :name)) %></label>
17 17 <label><%= l(:field_category) %>:
18 18 <%= select_tag('category_id', content_tag('option', l(:label_no_change_option), :value => '') +
19 19 content_tag('option', l(:label_none), :value => 'none') +
20 20 options_from_collection_for_select(@project.issue_categories, :id, :name)) %></label>
21 21 </p>
22 22 <p>
23 23 <label><%= l(:field_assigned_to) %>:
24 24 <%= select_tag('assigned_to_id', content_tag('option', l(:label_no_change_option), :value => '') +
25 25 content_tag('option', l(:label_nobody), :value => 'none') +
26 26 options_from_collection_for_select(@project.assignable_users, :id, :name)) %></label>
27 27 <label><%= l(:field_fixed_version) %>:
28 28 <%= select_tag('fixed_version_id', content_tag('option', l(:label_no_change_option), :value => '') +
29 29 content_tag('option', l(:label_none), :value => 'none') +
30 30 options_from_collection_for_select(@project.versions.sort, :id, :name)) %></label>
31 31 </p>
32 32
33 33 <p>
34 34 <label><%= l(:field_start_date) %>:
35 35 <%= text_field_tag 'start_date', '', :size => 10 %><%= calendar_for('start_date') %></label>
36 36 <label><%= l(:field_due_date) %>:
37 37 <%= text_field_tag 'due_date', '', :size => 10 %><%= calendar_for('due_date') %></label>
38 38 <label><%= l(:field_done_ratio) %>:
39 39 <%= select_tag 'done_ratio', options_for_select([[l(:label_no_change_option), '']] + (0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></label>
40 40 </p>
41 41
42 42 <% @custom_fields.each do |custom_field| %>
43 43 <p><label><%= h(custom_field.name) %></label>
44 44 <%= select_tag "custom_field_values[#{custom_field.id}]", options_for_select([[l(:label_no_change_option), '']] + custom_field.possible_values) %></label>
45 45 </p>
46 46 <% end %>
47 47
48 48 <%= call_hook(:view_issues_bulk_edit_details_bottom, { :issues => @issues }) %>
49 49 </fieldset>
50 50
51 51 <fieldset><legend><%= l(:field_notes) %></legend>
52 52 <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %>
53 53 <%= wikitoolbar_for 'notes' %>
54 </fieldset>
54 55 </div>
55 56
56 57 <p><%= submit_tag l(:button_submit) %>
57 58 <% end %>
@@ -1,52 +1,52
1 1 <h3><%=l(:label_spent_time)%> (<%= l(:label_last_n_days, 7) %>)</h3>
2 2 <%
3 3 entries = TimeEntry.find(:all,
4 4 :conditions => ["#{TimeEntry.table_name}.user_id = ? AND #{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", @user.id, Date.today - 6, Date.today],
5 5 :include => [:activity, :project, {:issue => [:tracker, :status]}],
6 6 :order => "#{TimeEntry.table_name}.spent_on DESC, #{Project.table_name}.name ASC, #{Tracker.table_name}.position ASC, #{Issue.table_name}.id ASC")
7 7 entries_by_day = entries.group_by(&:spent_on)
8 8 %>
9 9
10 10 <div class="total-hours">
11 11 <p><%= l(:label_total) %>: <%= html_hours("%.2f" % entries.sum(&:hours).to_f) %></p>
12 12 </div>
13 13
14 14 <% if entries.any? %>
15 15 <table class="list time-entries">
16 16 <thead>
17 17 <th><%= l(:label_activity) %></th>
18 18 <th><%= l(:label_project) %></th>
19 19 <th><%= l(:field_comments) %></th>
20 20 <th><%= l(:field_hours) %></th>
21 21 <th></th>
22 22 </thead>
23 23 <tbody>
24 24 <% entries_by_day.keys.sort.reverse.each do |day| %>
25 25 <tr class="odd">
26 26 <td><strong><%= day == Date.today ? l(:label_today).titleize : format_date(day) %></strong></td>
27 27 <td colspan="2"></td>
28 28 <td class="hours"><em><%= html_hours("%.2f" % entries_by_day[day].sum(&:hours).to_f) %></em></td>
29 29 <td></td>
30 30 </tr>
31 31 <% entries_by_day[day].each do |entry| -%>
32 32 <tr class="time-entry" style="border-bottom: 1px solid #f5f5f5;">
33 33 <td class="activity"><%=h entry.activity %></td>
34 34 <td class="subject"><%=h entry.project %> <%= ' - ' + link_to_issue(entry.issue, :title => h("#{entry.issue.subject} (#{entry.issue.status})")) if entry.issue %></td>
35 35 <td class="comments"><%=h entry.comments %></td>
36 36 <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
37 37 <td align="center">
38 38 <% if entry.editable_by?(@user) -%>
39 39 <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry},
40 40 :title => l(:button_edit) %>
41 41 <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry},
42 42 :confirm => l(:text_are_you_sure),
43 43 :method => :post,
44 44 :title => l(:button_delete) %>
45 45 <% end -%>
46 46 </td>
47 47 </tr>
48 48 <% end -%>
49 49 <% end -%>
50 </tbdoy>
50 </tbody>
51 51 </table>
52 52 <% end %>
@@ -1,29 +1,28
1 1 <% if @project.versions.any? %>
2 2 <table class="list">
3 3 <thead>
4 4 <th><%= l(:label_version) %></th>
5 5 <th><%= l(:field_effective_date) %></th>
6 6 <th><%= l(:field_description) %></th>
7 7 <th><%= l(:label_wiki_page) unless @project.wiki.nil? %></th>
8 8 <th style="width:15%"></th>
9 9 <th style="width:15%"></th>
10 10 </thead>
11 11 <tbody>
12 12 <% for version in @project.versions.sort %>
13 13 <tr class="<%= cycle 'odd', 'even' %>">
14 14 <td><%= link_to h(version.name), :controller => 'versions', :action => 'show', :id => version %></td>
15 15 <td align="center"><%= format_date(version.effective_date) %></td>
16 16 <td><%=h version.description %></td>
17 17 <td><%= link_to(version.wiki_page_title, :controller => 'wiki', :page => Wiki.titleize(version.wiki_page_title)) unless version.wiki_page_title.blank? || @project.wiki.nil? %></td>
18 18 <td align="center"><%= link_to_if_authorized l(:button_edit), { :controller => 'versions', :action => 'edit', :id => version }, :class => 'icon icon-edit' %></td>
19 19 <td align="center"><%= link_to_if_authorized l(:button_delete), {:controller => 'versions', :action => 'destroy', :id => version}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %></td>
20 </td>
21 20 </tr>
22 21 <% end; reset_cycle %>
23 22 </tbody>
24 23 </table>
25 24 <% else %>
26 25 <p class="nodata"><%= l(:label_no_data) %></p>
27 26 <% end %>
28 27
29 28 <p><%= link_to_if_authorized l(:label_version_new), :controller => 'projects', :action => 'add_version', :id => @project %></p>
@@ -1,18 +1,18
1 1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2 2 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
3 3 <head>
4 4 <title><%=h @page.pretty_title %></title>
5 5 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
6 6 <style>
7 7 body { font:80% Verdana,Tahoma,Arial,sans-serif; }
8 h1, h2, h3, h4 { font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
8 h1, h2, h3, h4 { font-family: "Trebuchet MS",Georgia,"Times New Roman",serif; }
9 9 ul.toc { padding: 4px; margin-left: 0; }
10 10 ul.toc li { list-style-type:none; }
11 11 ul.toc li.heading2 { margin-left: 1em; }
12 12 ul.toc li.heading3 { margin-left: 2em; }
13 13 </style>
14 14 </head>
15 15 <body>
16 16 <%= textilizable @content, :text, :wiki_links => :local %>
17 17 </body>
18 18 </html>
@@ -1,27 +1,27
1 1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
2 2 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
3 3 <head>
4 4 <title><%=h @wiki.project.name %></title>
5 5 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
6 6 <style>
7 7 body { font:80% Verdana,Tahoma,Arial,sans-serif; }
8 h1, h2, h3, h4 { font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
8 h1, h2, h3, h4 { font-family: "Trebuchet MS",Georgia,"Times New Roman",serif; }
9 9 </style>
10 10 </head>
11 11 <body>
12 12
13 13 <strong><%= l(:label_index_by_title) %></strong>
14 14 <ul>
15 15 <% @pages.each do |page| %>
16 16 <li><a href="#<%= page.title %>"><%= page.pretty_title %></a></li>
17 17 <% end %>
18 18 </ul>
19 19
20 20 <% @pages.each do |page| %>
21 21 <hr />
22 22 <a name="<%= page.title %>" />
23 23 <%= textilizable page.content ,:text, :wiki_links => :anchor %>
24 24 <% end %>
25 25
26 26 </body>
27 27 </html>
General Comments 0
You need to be logged in to leave comments. Login now