jro_apps/redmine Commit - r3632:51d3f511599d

Added missing labels to the Issue Calendar....

Eric Davis -

r3632:51d3f511599d

parent child

Context file:

r3632:51d3f511599d

Collapse all files

app/views/calendars/show.html.erb +2 0

             <h2><%= l(:label_calendar) %></h2>
             <% form_tag({}, :id => 'query_form') do %>
             <fieldset id="filters" class="collapsible">
               <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
               <div>
                 <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
               </div>
             </fieldset>
             <p style="float:right;">
             <%= link_to_remote ('&#171; ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")),
                                     {:update => "content", :url => { :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) }},
                                     {:href => url_for(:action => 'show', :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1))}
                                     %> |
             <%= link_to_remote ((@month==12 ? "#{month_name(1)} #{@year+1}" : "#{month_name(@month+1)}") + ' &#187;'),
                                     {:update => "content", :url => { :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1) }},
                                     {:href => url_for(:action => 'show', :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1))}
                                     %>
             </p>
             <p class="buttons">
+            <%= label_tag('month', l(:label_month)) %>
             <%= select_month(@month, :prefix => "month", :discard_type => true) %>
+            <%= label_tag('year', l(:label_year)) %>
             <%= select_year(@year, :prefix => "year", :discard_type => true) %>
             <%= link_to_remote l(:button_apply),
                                { :url => { :set_filter => (@query.new_record? ? 1 : nil) },
                                  :update => "content",
                                  :with => "Form.serialize('query_form')"
                                }, :class => 'icon icon-checked' %>
             <%= link_to_remote l(:button_clear),
                                { :url => { :set_filter => (@query.new_record? ? 1 : nil) },
                                  :update => "content",
                                }, :class => 'icon icon-reload' if @query.new_record? %>
             </p>
             <% end %>
             <%= error_messages_for 'query' %>
             <% if @query.valid? %>
             <%= render :partial => 'common/calendar', :locals => {:calendar => @calendar} %>
             <p class="legend cal">
             	<span class="starting"><%= l(:text_tip_task_begin_day) %></span>
             	<span class="ending"><%= l(:text_tip_task_end_day) %></span>
             	<span class="starting ending"><%= l(:text_tip_task_begin_end_day) %></span>
             </p>
             <% end %>
             <% content_for :sidebar do %>
                 <%= render :partial => 'issues/sidebar' %>
             <% end %>
             <% html_title(l(:label_calendar)) -%>

app/views/queries/_filters.rhtml +1 -1

             <script type="text/javascript">
             //<![CDATA[
             function add_filter() {
                 select = $('add_filter_select');
                 field = select.value
                 Element.show('tr_' +  field);
                 check_box = $('cb_' + field);
                 check_box.checked = true;
                 toggle_filter(field);
                 select.selectedIndex = 0;
                 for (i=0; i<select.options.length; i++) {
                     if (select.options[i].value == field) {
                         select.options[i].disabled = true;
                     }
                 }
             }
             function toggle_filter(field) {
                 check_box = $('cb_' + field);
                 if (check_box.checked) {
                     Element.show("operators_" + field);
                     toggle_operator(field);
                 } else {
                     Element.hide("operators_" + field);
                     Element.hide("div_values_" + field);
               }
             }
             function toggle_operator(field) {
               operator = $("operators_" + field);
               switch (operator.value) {
                 case "!*":
                 case "*":
                 case "t":
                 case "w":
                 case "o":
                 case "c":
                   Element.hide("div_values_" + field);
                   break;
                 default:
                   Element.show("div_values_" + field);
                   break;
               }
             }
             function toggle_multi_select(field) {
                 select = $('values_' + field);
                 if (select.multiple == true) {
                     select.multiple = false;
                 } else {
                     select.multiple = true;
                 }
             }
             //]]>
             </script>
             <table width="100%">
             <tr>
             <td>
             <table>
             <% query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.each do |filter| %>
                 <% field = filter[0]
                    options = filter[1] %>
                 <tr <%= 'style="display:none;"' unless query.has_filter?(field) %> id="tr_<%= field %>" class="filter">
                 <td style="width:200px;">
                     <%= check_box_tag 'fields[]', field, query.has_filter?(field), :onclick => "toggle_filter('#{field}');", :id => "cb_#{field}" %>
                     <label for="cb_<%= field %>"><%= filter[1][:name] || l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) %></label>
                 </td>
                 <td style="width:150px;">
                     <%= select_tag "operators[#{field}]", options_for_select(operators_for_select(options[:type]), query.operator_for(field)), :id => "operators_#{field}", :onchange => "toggle_operator('#{field}');", :class => "select-small", :style => "vertical-align: top;" %>
                 </td>
                 <td>
                 <div id="div_values_<%= field %>" style="display:none;">
                 <% case options[:type]
                 when :list, :list_optional, :list_status, :list_subprojects %>
                     <select <%= "multiple=true" if query.values_for(field) and query.values_for(field).length > 1 %> name="values[<%= field %>][]" id="values_<%= field %>" class="select-small" style="vertical-align: top;">
                     <%= options_for_select options[:values], query.values_for(field) %>
                     </select>
                     <%= link_to_function image_tag('bullet_toggle_plus.png'), "toggle_multi_select('#{field}');", :style => "vertical-align: bottom;" %>
                 <% when :date, :date_past %>
                     <%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3, :class => "select-small" %> <%= l(:label_day_plural) %>
                 <% when :string, :text %>
                     <%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 30, :class => "select-small" %>
                 <% when :integer %>
                     <%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3, :class => "select-small" %>
                 <% end %>
                 </div>
                 <script type="text/javascript">toggle_filter('<%= field %>');</script>
                 </td>
                 </tr>
             <% end %>
             </table>
             </td>
             <td class="add-filter">
-            <%= l(:label_filter_add) %>:
+            <%= label_tag('add_filter_select', l(:label_filter_add)) %>:
             <%= select_tag 'add_filter_select', options_for_select([["",""]] + query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.collect{|field| [ field[1][:name] || l(("field_"+field[0].to_s.gsub(/_id$/, "")).to_sym), field[0]] unless query.has_filter?(field[0])}.compact),
             																		:onchange => "add_filter();",
             																		:class => "select-small",
             																		:name => nil %>
             </td>
             </tr>
             </table>

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