From d49fe62131978366d80b9b8e3031f6285edb4c54 Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@gmail.com>
Date: Tue, 19 Mar 2013 16:19:46 +0100
Subject: [PATCH] SONAR-4184 Use dropdown_tag component on violations drilldown
 period select box

---
 .../WEB-INF/app/helpers/dashboard_helper.rb   |  4 +-
 .../app/views/dashboard/_header.html.erb      |  1 -
 .../app/views/drilldown/violations.html.erb   | 37 +++++++++----------
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb
index 023af084208..0dc3f1ebb02 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb
@@ -43,8 +43,8 @@ module DashboardHelper
   end
 
   def period_select_option_tags(snapshot, html_class = '')
-    options = ""
-    options = '<option selected="selected" value=""/>' unless params[:period]
+    selected=(!params[:period] || params[:period] == '0' ? 'selected' : '')
+    options = "<option #{selected} value='0' class='#{html_class}'/>#{message('time_changes')}...</option>"
     (1..5).each { |index|
       option = period_select_options(snapshot, index, html_class)
       if option
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb
index ac410e4ba6b..949a7af315e 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb
@@ -22,7 +22,6 @@
             <input type="hidden" name="did" value="<%= @dashboard.id -%>"/>
             <%= dropdown_tag "period", period_select_option_tags(@snapshot, 'small'), {
                 :width => '200px',
-                :placeholder => message('time_changes') + '...'
             }, {:id => 'select-comparison', :onchange => 'submit()'} -%>
           </form>
         <% end %>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/violations.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/violations.html.erb
index b908a8f18ba..636d3d73fca 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/violations.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/drilldown/violations.html.erb
@@ -1,25 +1,22 @@
 <%= render :partial => 'header' -%>
 
-<div id="snapshot_title" class="page_title">
-  <h4>
-    <%
-       profile_measure=@snapshot.measure(Metric::PROFILE)
-    %>
-    <% if profile_measure %>Profile <%= link_to profile_measure.data, :controller => '/rules_configuration', :action => 'index', :id => profile_measure.value.to_i %> -
-    <% end %>
-    <% if @snapshot.project_snapshot.periods? %>
-      <form method="GET" action="<%= url_for :only_path=>true, :overwrite_params => {:period => nil} -%>" style="display: inline">
-        <select id="select-comparison" name="period" onchange="submit()" class="small">
-          <option value=""><%= message('time_changes') -%>...</option>
-          <%= violation_period_select_options(@snapshot, 1) -%>
-          <%= violation_period_select_options(@snapshot, 2) -%>
-          <%= violation_period_select_options(@snapshot, 3) -%>
-          <%= violation_period_select_options(@snapshot, 4) -%>
-          <%= violation_period_select_options(@snapshot, 5) -%>
-        </select>
-      </form>
-    <% end %>
-  </h4>
+<div class="line-block">
+  <div id="snapshot_title" class="page_title">
+    <h4>
+      <%
+         profile_measure=@snapshot.measure(Metric::PROFILE)
+      %>
+      <% if profile_measure %>Profile <%= link_to profile_measure.data, :controller => '/rules_configuration', :action => 'index', :id => profile_measure.value.to_i %>
+      <% end %>
+      <% if @snapshot.project_snapshot.periods? %>
+        <form method="GET" action="<%= url_for :only_path=>true, :overwrite_params => {:period => nil} -%>" style="display: inline" class="spacer-left">
+          <%= dropdown_tag "period", period_select_option_tags(@snapshot, 'small'), {
+              :width => '200px',
+          }, {:id => 'select-comparison', :onchange => 'submit()'} -%>
+        </form>
+      <% end %>
+    </h4>
+  </div>
 </div>
 
 <table class="width100 spacer-bottom" cellpadding="0" cellspacing="0" id="columns">
-- 
2.39.5