From 324a4cb4fa60227589191d33fa1fb59416ad241b Mon Sep 17 00:00:00 2001
From: Florian Kraft <f.kraft@finn.de>
Date: Fri, 20 Feb 2015 16:30:34 +0100
Subject: [PATCH] aply new form builders to time entry reports

Signed-off-by: Florian Kraft <f.kraft@finn.de>
---
 app/views/time_entries/reports/show.html.erb | 20 ++++++----
 app/views/timelog/_date_range.html.erb       | 39 +++++++++-----------
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/app/views/time_entries/reports/show.html.erb b/app/views/time_entries/reports/show.html.erb
index ee97d53295..31d6bb53c1 100644
--- a/app/views/time_entries/reports/show.html.erb
+++ b/app/views/time_entries/reports/show.html.erb
@@ -40,24 +40,30 @@ See doc/COPYRIGHT.rdoc for more details.
 
 <%= render :partial => 'layouts/action_menu_specific' %>
 
-<%= form_tag(polymorphic_time_entries_report_path(@issue || @project), :method => :get, :id => 'query_form') do %>
+<%= styled_form_tag(polymorphic_time_entries_report_path(@issue || @project), :method => :get, :id => 'query_form') do %>
   <% @criterias.each do |criteria| %>
     <%= hidden_field_tag 'criterias[]', criteria, :id => nil %>
   <% end %>
   <%= render :partial => 'timelog/date_range' %>
   <%= render 'timelog/time_entry_tabs' %>
-
-  <p class="timelog-report-selection">
-    <label for='columns'><%= l(:label_details) %></label>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'],
+  <div class="form--field">
+    <%= styled_label_tag :columns, l(:label_details) %>
+    <%= styled_select_tag 'columns', options_for_select([[l(:label_year), 'year'],
                                                                             [l(:label_month), 'month'],
                                                                             [l(:label_week), 'week'],
                                                                             [l(:label_day_plural).titleize, 'day']], @columns) %>
-    <label for='criterias'><%= l(:button_add) %></label>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l_or_humanize(@available_criterias[k][:label]), k]}),
+  </div>
+
+  <div class="form--field">
+    <%= styled_label_tag :criterias, l(:label_details) %>
+    <%= styled_select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l_or_humanize(@available_criterias[k][:label]), k]}),
                                                           :style => 'width: 200px',
                                                           :id => nil,
                                                           :disabled => (@criterias.length >= 3), :id => "criterias") %>
-    <%= link_to_function l(:button_apply), '$("query_form").submit()', :class => 'icon icon-yes' %>
-    <%= link_to l(:button_clear), {:project_id => @project, :issue_id => @issue, :period_type => params[:period_type], :period => params[:period], :from => @from, :to => @to, :columns => @columns}, :class => 'icon icon-undo' %></p>
+  </div>
+  <hr class="form--separator">
+  <%= link_to_function l(:button_apply), '$("query_form").submit()', :class => 'button -highlight' %>
+  <%= link_to l(:button_clear), {:project_id => @project, :issue_id => @issue, :period_type => params[:period_type], :period => params[:period], :from => @from, :to => @to, :columns => @columns}, :class => 'button' %>
 <% end %>
 <% unless @criterias.empty? %>
   <div class="total-hours">
diff --git a/app/views/timelog/_date_range.html.erb b/app/views/timelog/_date_range.html.erb
index 3004491afd..f671f89cf3 100644
--- a/app/views/timelog/_date_range.html.erb
+++ b/app/views/timelog/_date_range.html.erb
@@ -28,37 +28,34 @@ See doc/COPYRIGHT.rdoc for more details.
 ++#%>
 <fieldset id="date-range" class="collapsible">
   <legend onclick="toggleFieldset(this);"><a href="javascript:"><%= l(:label_date_range) %></a></legend>
-  <div>
-    <p>
-      <%= label_tag "period_type_list", l(:description_date_range_list), :class => "hidden-for-sighted" %>
-      <%= radio_button_tag 'period_type', '1', !@free_period, :onclick => 'Form.Element.disable("from");Form.Element.disable("to");Form.Element.enable("period");', :id => "period_type_list"%>
-      <%= select_tag 'period', options_for_period_select(params[:period]),
-                         :onfocus => '$("period_type_1").checked = true;',
-                         :disabled => @free_period %>
-    </p>
-    <p>
-      <%= label_tag "period_type_interval", l(:description_date_range_interval), :class => "hidden-for-sighted" %>
-      <%= radio_button_tag 'period_type', '2', @free_period, :onclick => 'Form.Element.enable("from");Form.Element.enable("to");Form.Element.disable("period");', :id => "period_type_interval" %>
-      <span onclick="$('period_type_2').checked = true;">
+  <div class="form--field">
+    <%= styled_label_tag "period_type_list", l(:description_date_range_list), :class => "hidden-for-sighted" %>
+    <%= styled_radio_button_tag 'period_type', '1', !@free_period, :onclick => 'Form.Element.disable("from");Form.Element.disable("to");Form.Element.enable("period");', :id => "period_type_list"%>
+    <%= styled_select_tag 'period', options_for_period_select(params[:period]),
+                       :onfocus => '$("period_type_1").checked = true;',
+                       :disabled => @free_period %>
+  </div>
+  <div class="form--field">
+    <%= styled_label_tag "period_type_interval", l(:description_date_range_interval), :class => "hidden-for-sighted" %>
+    <%= styled_radio_button_tag 'period_type', '2', @free_period, :onclick => 'Form.Element.enable("from");Form.Element.enable("to");Form.Element.disable("period");', :id => "period_type_interval" %>
+    <span onclick="$('period_type_2').checked = true;">
         <%=
 raw l(:label_date_from_to,
   :start => raw(
-    label_tag("from", l(:description_date_from), :class => "hidden-for-sighted") +
-    text_field_tag('from', @from, :size => 10, :disabled => !@free_period) +
+    styled_label_tag("from", l(:description_date_from), :class => "hidden-for-sighted") +
+    styled_text_field_tag('from', @from, :size => 10, :disabled => !@free_period) +
     calendar_for('from')
   ),
   :end => raw(
-    label_tag("to", l(:description_date_to), :class => "hidden-for-sighted") +
-    text_field_tag('to', @to, :size => 10, :disabled => !@free_period) +
+    styled_label_tag("to", l(:description_date_to), :class => "hidden-for-sighted") +
+    styled_text_field_tag('to', @to, :size => 10, :disabled => !@free_period) +
     calendar_for('to')
   )
 )
 %>
       </span>
-    </p>
   </div>
 </fieldset>
-<p class="buttons">
-  <%= link_to_function l(:button_apply), '$("query_form").submit()', :class => 'icon icon-yes' %>
-  <%= link_to l(:button_clear), polymorphic_time_entries_path(@issue || @project), :class => 'icon icon-undo' %>
-</p>
+<hr class="form--separator">
+<%= link_to_function l(:button_apply), '$("query_form").submit()', :class => 'button -highlight' %>
+<%= link_to l(:button_clear), polymorphic_time_entries_path(@issue || @project), :class => 'button ' %>