diff options
7 files changed, 21 insertions, 6 deletions
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties index 01429a561d7..e1acee2bc66 100644 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties +++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties @@ -306,7 +306,7 @@ layout.dashboards=Dashboards layout.reviews=Reviews layout.configuration=Configuration layout.projects=Projects -layout.recent_activity=Recent Activity +layout.recent_projects=Recent Projects layout.user_panel.my_profile=My profile sidebar.project_settings=Configuration @@ -518,6 +518,7 @@ reviews.filtered_by.to=To date #------------------------------------------------------------------------------ all-projects.cols.name=Name +all-projects.results_not_display_due_to_security=Due to security settings, some results are not being displayed. #------------------------------------------------------------------------------ @@ -69,7 +69,7 @@ </prerequisites> <properties> - <sonarJava.version>1.1-RC1</sonarJava.version> + <sonarJava.version>1.1-RC2</sonarJava.version> <sonarGwt.version>3.3.1</sonarGwt.version> <h2.version>1.3.167</h2.version> <jetty.version>6.1.25</jetty.version> 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 { |