rename the period select box + add a small icon of RSS feed

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
index 916064adc1e1b4550782099bb78c7e3bea956ae8..184f74aa749822dd9a87147cd6ea91fafbf46d8a 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb
@@ -80,10 +80,10 @@ module ApplicationHelper
     mode=snapshot.project_snapshot.send "period#{period_index}_mode"
     mode_param=snapshot.project_snapshot.send "period#{period_index}_param"
 
-    label=''
+    label=nil
     if mode
       if mode=='days'
-        label = "%s previous days" % mode_param
+        label = "%s days ago" % mode_param
       elsif mode=='version'
         label = "Version %s" % mode_param
       elsif mode=='previous_analysis'

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/filters_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/filters_helper.rb
index 9a0c9fb913e5e784400b09585c1634838d8dae70..9ba8ca4c1bf9a7236e174b1d2781c4b83d893ef1 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/filters_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/filters_helper.rb
@@ -174,7 +174,7 @@ module FiltersHelper
       "Compare to previous analysis"
     elsif property =~ /^[\d]+(\.[\d]+){0,1}$/
       # is integer
-      "Compare to previous #{property} days"
+      "Compare to #{property} days ago"
     elsif property =~ /\d{4}-\d{2}-\d{2}/
       "Compare to #{property}"
     elsif !property.blank?

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 958fb837c7b964992492dde6959f8a60b951ede7..dad5d8ed91a0076a290cc2df70c73e4b231f967f 100644 (file)
--- 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
@@ -21,7 +21,7 @@
     -
     <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="">Display trends</option>
+      <option value="">Compare to...</option>
       <%= period_select_options(@snapshot, 1) -%>
       <%= period_select_options(@snapshot, 2) -%>
       <%= period_select_options(@snapshot, 3) -%>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/filters/_list.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/filters/_list.html.erb
index fd245d005293029721e2a964de202e7146f0d45f..ebef2d5c6c45c003df3a22d784ac68972449c51a 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/filters/_list.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/filters/_list.html.erb
@@ -4,7 +4,7 @@
     <div class="operations">
     <form action="<%= url_for :overwrite_params => {:period => nil} -%>" style="display: inline" method="get">
       <select name="period" onchange="submit()" class="small">
-          <option value="">Trends</option>
+          <option value="">Compare to...</option>
           <% period_names.each_with_index do |name, index| %>
              <option value="<%= index+1 -%>" <%= 'selected' if @filter_context.period_index==index+1 -%>><%= name -%></value>
           <% end %>
@@ -51,7 +51,7 @@
         <% end %>
 
         <% if @filter.projects_homepage? %>
-          &nbsp;&nbsp; <a href="<%= url_for :controller => :feeds, :action => 'projects', :id => EventCategory::KEY_ALERT -%>" class="nolink"><%= image_tag 'feed-icon-14x14.png' %></a>
+          &nbsp;&nbsp; <a href="<%= url_for :controller => :feeds, :action => 'projects', :id => EventCategory::KEY_ALERT -%>" class="nolink"><%= image_tag 'rss-12x12.png' %></a>
           <a href="<%= url_for :controller => :feeds, :action => 'projects', :id => EventCategory::KEY_ALERT -%>" class="action">Alerts feed</a>
         <% end %>
       </td>

diff --git a/sonar-server/src/main/webapp/images/rss-12x12.png b/sonar-server/src/main/webapp/images/rss-12x12.png
new file mode 100644 (file)
index 0000000..cd56b37
Binary files /dev/null and b/sonar-server/src/main/webapp/images/rss-12x12.png differ