jro_apps/redmine Commit - r2356:c9ca635fa7f8

Typos/fixes in views (#2654)....

Jean-Philippe Lang -

r2356:c9ca635fa7f8

parent child

Context file:

r2356:c9ca635fa7f8

Collapse all files

app/views/issues/bulk_edit.rhtml +1 0

             <h2><%= l(:label_bulk_edit_selected_issues) %></h2>
             <ul><%= @issues.collect {|i| content_tag('li', link_to(h("#{i.tracker} ##{i.id}"), { :action => 'show', :id => i }) + h(": #{i.subject}")) }.join("\n") %></ul>
             <% form_tag() do %>
             <%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join %>
             <div class="box">
             <fieldset>
             <legend><%= l(:label_change_properties) %></legend>
             <p>
             <% if @available_statuses.any? %>
             <label><%= l(:field_status) %>:
             <%= select_tag('status_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@available_statuses, :id, :name)) %></label>
             <% end %>
             <label><%= l(:field_priority) %>:
             <%= select_tag('priority_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(Enumeration.get_values('IPRI'), :id, :name)) %></label>
             <label><%= l(:field_category) %>:
             <%= select_tag('category_id', content_tag('option', l(:label_no_change_option), :value => '') +
                                             content_tag('option', l(:label_none), :value => 'none') +
                                             options_from_collection_for_select(@project.issue_categories, :id, :name)) %></label>
             </p>
             <p>
             <label><%= l(:field_assigned_to) %>:
             <%= select_tag('assigned_to_id', content_tag('option', l(:label_no_change_option), :value => '') +
                                              content_tag('option', l(:label_nobody), :value => 'none') +
                                              options_from_collection_for_select(@project.assignable_users, :id, :name)) %></label>
             <label><%= l(:field_fixed_version) %>:
             <%= select_tag('fixed_version_id', content_tag('option', l(:label_no_change_option), :value => '') +
                                                content_tag('option', l(:label_none), :value => 'none') +
                                                options_from_collection_for_select(@project.versions.sort, :id, :name)) %></label>
             </p>
             <p>
             <label><%= l(:field_start_date) %>:
             <%= text_field_tag 'start_date', '', :size => 10 %><%= calendar_for('start_date') %></label>
             <label><%= l(:field_due_date) %>:
             <%= text_field_tag 'due_date', '', :size => 10 %><%= calendar_for('due_date') %></label>
             <label><%= l(:field_done_ratio) %>:
             <%= select_tag 'done_ratio', options_for_select([[l(:label_no_change_option), '']] + (0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></label>
             </p>
             <% @custom_fields.each do |custom_field| %>
             <p><label><%= h(custom_field.name) %></label>
             <%= select_tag "custom_field_values[#{custom_field.id}]", options_for_select([[l(:label_no_change_option), '']] + custom_field.possible_values) %></label>
             </p>
             <% end %>
             <%= call_hook(:view_issues_bulk_edit_details_bottom, { :issues => @issues }) %>
             </fieldset>
             <fieldset><legend><%= l(:field_notes) %></legend>
             <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %>
             <%= wikitoolbar_for 'notes' %>
+            </fieldset>
             </div>
             <p><%= submit_tag l(:button_submit) %>
             <% end %>

app/views/my/blocks/_timelog.rhtml +1 -1

             <h3><%=l(:label_spent_time)%> (<%= l(:label_last_n_days, 7) %>)</h3>
             <%
             entries = TimeEntry.find(:all,
             				:conditions => ["#{TimeEntry.table_name}.user_id = ? AND #{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", @user.id, Date.today - 6, Date.today],
             				:include => [:activity, :project, {:issue => [:tracker, :status]}],
             				:order => "#{TimeEntry.table_name}.spent_on DESC, #{Project.table_name}.name ASC, #{Tracker.table_name}.position ASC, #{Issue.table_name}.id ASC")
             entries_by_day = entries.group_by(&:spent_on)
             %>
             <div class="total-hours">
             <p><%= l(:label_total) %>: <%= html_hours("%.2f" % entries.sum(&:hours).to_f) %></p>
             </div>
             <% if entries.any? %>
             <table class="list time-entries">
             <thead>
             <th><%= l(:label_activity) %></th>
             <th><%= l(:label_project) %></th>
             <th><%= l(:field_comments) %></th>
             <th><%= l(:field_hours) %></th>
             <th></th>
             </thead>
             <tbody>
             <% entries_by_day.keys.sort.reverse.each do |day| %>
                 <tr class="odd">
                 <td><strong><%= day == Date.today ? l(:label_today).titleize : format_date(day) %></strong></td>
                 <td colspan="2"></td>
                 <td class="hours"><em><%= html_hours("%.2f" % entries_by_day[day].sum(&:hours).to_f) %></em></td>
                 <td></td>
                 </tr>
                 <% entries_by_day[day].each do |entry| -%>
                 <tr class="time-entry" style="border-bottom: 1px solid #f5f5f5;">
                 <td class="activity"><%=h entry.activity %></td>
                 <td class="subject"><%=h entry.project %> <%= ' - ' + link_to_issue(entry.issue, :title => h("#{entry.issue.subject} (#{entry.issue.status})")) if entry.issue %></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) -%>
                     <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry},
                                                        :title => l(:button_edit) %>
                     <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry},
                                                          :confirm => l(:text_are_you_sure),
                                                          :method => :post,
                                                          :title => l(:button_delete) %>
                 <% end -%>
                 </td>
                 </tr>
                 <% end -%>
             <% end -%>
-            </tbdoy>
+            </tbody>
             </table>
             <% end %>

app/views/projects/settings/_versions.rhtml 0 -1

             <% if @project.versions.any? %>
             <table class="list">
             	<thead>
                 <th><%= l(:label_version) %></th>
                 <th><%= l(:field_effective_date) %></th>
                 <th><%= l(:field_description) %></th>
                 <th><%= l(:label_wiki_page) unless @project.wiki.nil? %></th>
                 <th style="width:15%"></th>
                 <th style="width:15%"></th>
                 </thead>
             	<tbody>
             <% for version in @project.versions.sort %>
                 <tr class="<%= cycle 'odd', 'even' %>">
                 <td><%= link_to h(version.name), :controller => 'versions', :action => 'show', :id => version %></td>
                 <td align="center"><%= format_date(version.effective_date) %></td>
                 <td><%=h version.description %></td>
                 <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>
                 <td align="center"><%= link_to_if_authorized l(:button_edit), { :controller => 'versions', :action => 'edit', :id => version }, :class => 'icon icon-edit' %></td>
                 <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>
-                </td>
                 </tr>
             <% end; reset_cycle %>
                 </tbody>
             </table>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             <p><%= link_to_if_authorized l(:label_version_new), :controller => 'projects', :action => 'add_version', :id => @project %></p>

app/views/wiki/export.rhtml +1 -1

             <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
             <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
             <head>
             <title><%=h @page.pretty_title %></title>
             <meta http-equiv="content-type" content="text/html; charset=utf-8" />
             <style>
             body { font:80% Verdana,Tahoma,Arial,sans-serif; }
-            h1, h2, h3, h4 {  font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
+            h1, h2, h3, h4 {  font-family: "Trebuchet MS",Georgia,"Times New Roman",serif; }
             ul.toc { padding: 4px; margin-left: 0; }
             ul.toc li { list-style-type:none; }
             ul.toc li.heading2 { margin-left: 1em; }
             ul.toc li.heading3 { margin-left: 2em; }
             </style>
             </head>
             <body>
             <%= textilizable @content, :text, :wiki_links => :local %>
             </body>
             </html>

app/views/wiki/export_multiple.rhtml +1 -1

             <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
             <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
             <head>
             <title><%=h @wiki.project.name %></title>
             <meta http-equiv="content-type" content="text/html; charset=utf-8" />
             <style>
             body { font:80% Verdana,Tahoma,Arial,sans-serif; }
-            h1, h2, h3, h4 {  font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
+            h1, h2, h3, h4 {  font-family: "Trebuchet MS",Georgia,"Times New Roman",serif; }
             </style>
             </head>
             <body>
             <strong><%= l(:label_index_by_title) %></strong>
             <ul>
             <% @pages.each do |page| %>
                 <li><a href="#<%= page.title %>"><%= page.pretty_title %></a></li>
             <% end %>
             </ul>
             <% @pages.each do |page| %>
             <hr />
             <a name="<%= page.title %>" />
             <%= textilizable page.content ,:text, :wiki_links => :anchor %>
             <% end %>
             </body>
             </html>

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