diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2012-12-14 18:27:50 +0100 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2012-12-14 18:27:50 +0100 |
| commit | 8a244d39061694cc2117788f222d2e4827da2be5 (patch) | |
| tree | fcc6f0be04f43c814b769a548014f54206c16932 /sonar-server | |
| parent | af07212b764549c16cd252a9311bb68c642e8179 (diff) | |
| parent | 2227d1a0e2f1f0975b0960502be86cc91e4c4580 (diff) | |
| download | sonarqube-8a244d39061694cc2117788f222d2e4827da2be5.tar.gz sonarqube-8a244d39061694cc2117788f222d2e4827da2be5.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'sonar-server')
5 files changed, 18 insertions, 4 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/alerts_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/alerts_helper.rb index fa338a0617b..8f43923b641 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/alerts_helper.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/alerts_helper.rb @@ -109,4 +109,13 @@ module AlertsHelper end end + def period_label(alert) + index = alert.period + if index + "Δ #{Api::Utils.period_label(index)}" + else + "#{message('value')}" + end + end + end
\ No newline at end of file diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_show.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_show.html.erb index ed533127abc..5e4a58b2750 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_show.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/_show.html.erb @@ -4,6 +4,9 @@ <%= h alert.name %> </td> <td width="10%"> + <%= period_label(alert) -%> + </td> + <td width="10%"> <%= message("alerts.operator.#{alert.operator}") -%> </td> <td width="20%"> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/index.html.erb index c50067f0e02..c672968789d 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/index.html.erb @@ -20,7 +20,9 @@ <tr class="<%= cycle('even','odd') -%>"> <td id="row_alert_<%= alert.id -%>"> <% if is_admin? %> - <%= render :partial => 'edit', :locals => {:alert => alert} %> + <%= render :partial => 'edit', :locals => {:alert => alert} %> + <% else %> + <%= render :partial => 'show', :locals => {:alert => alert} %> <% end %> </td> </tr> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/all_projects/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/all_projects/index.html.erb index 1193aac805d..4a65fb9a4d1 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/all_projects/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/all_projects/index.html.erb @@ -5,7 +5,7 @@ <div id="all-projects"> <% if @filter.security_exclusions %> - <p class="notes"><%= message('rows_not_display_due_to_security') -%></p> + <p class="notes"><%= message('all-projects.results_not_display_due_to_security') -%></p> <% end %> <% diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_projects.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_projects.html.erb index ec8a68e1f8d..01545026f4b 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_projects.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_menu_projects.html.erb @@ -9,7 +9,7 @@ <div id="projects-menu" class="dropdown-menu" style="max-width: none; display: none;"> <div id="recent-history" style="border-bottom: 1px solid #ccc; padding-bottom: 10px;"> - <h2><%= message('layout.recent_activity') -%></h2> + <h2><%= message('layout.recent_projects') -%></h2> <ul id="recent-history-list"> </ul> </div> @@ -32,7 +32,7 @@ <% if @resource - # we keep only root resources in the "Recent activity" + # we keep only root resources in the "Recent Projects" root_resource = @resource.root_project %> else { |