diff options
| author | simonbrandhof <simon.brandhof@gmail.com> | 2010-12-21 23:46:33 +0000 |
|---|---|---|
| committer | simonbrandhof <simon.brandhof@gmail.com> | 2010-12-21 23:46:33 +0000 |
| commit | 6acf2ea1ab7d59c60cc6e960d870ff2933b420c8 (patch) | |
| tree | d07c792f5a23bb44701666450d193c948fdefd32 | |
| parent | ffe7e443d23ccb8807168d0d1ae7df0633abe388 (diff) | |
| download | sonarqube-6acf2ea1ab7d59c60cc6e960d870ff2933b420c8.tar.gz sonarqube-6acf2ea1ab7d59c60cc6e960d870ff2933b420c8.zip | |
rename the period select box + add a small icon of RSS feed
5 files changed, 6 insertions, 6 deletions
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 916064adc1e..184f74aa749 100644 --- 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 9a0c9fb913e..9ba8ca4c1bf 100644 --- 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 958fb837c7b..dad5d8ed91a 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 @@ -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 fd245d00529..ebef2d5c6c4 100644 --- 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? %> - <a href="<%= url_for :controller => :feeds, :action => 'projects', :id => EventCategory::KEY_ALERT -%>" class="nolink"><%= image_tag 'feed-icon-14x14.png' %></a> + <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 Binary files differnew file mode 100644 index 00000000000..cd56b37cea1 --- /dev/null +++ b/sonar-server/src/main/webapp/images/rss-12x12.png |
