From c4245ec41832feb87740d2344098b1aee42882a7 Mon Sep 17 00:00:00 2001 From: Fabrice Bellingard Date: Wed, 20 Jun 2012 15:14:15 +0200 Subject: [PATCH] SONAR-3552 Typos on admin pages --- .../WEB-INF/app/views/account/index.html.erb | 6 +++--- .../WEB-INF/app/views/backup/index.html.erb | 2 ++ .../WEB-INF/app/views/filters/manage.html.erb | 15 ++++++++------- .../WEB-INF/app/views/groups/index.html.erb | 2 +- .../WEB-INF/app/views/manual_rules/index.html.erb | 1 + .../WEB-INF/app/views/metrics/index.html.erb | 1 + .../WEB-INF/app/views/profiles/index.html.erb | 8 ++++++-- .../WEB-INF/app/views/roles/global.html.erb | 2 +- .../WEB-INF/app/views/settings/_settings.html.erb | 1 + .../WEB-INF/app/views/system/index.html.erb | 13 ++++++++----- .../WEB-INF/app/views/updatecenter/index.html.erb | 2 ++ 11 files changed, 34 insertions(+), 19 deletions(-) diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/account/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/account/index.html.erb index 175e42c31b3..52ee54f7a63 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/account/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/account/index.html.erb @@ -1,4 +1,4 @@ -

<%= message('my_profile.page') -%>

+

<%= message('my_profile.page') -%>

@@ -21,7 +21,7 @@ <% if User.editable_password? %> -

<%= message('my_profile.password.title') -%>

+

<%= message('my_profile.password.title') -%>

<% form_tag( {:action => 'change_password' }, :id => 'pass_form_tag', :name => 'pass_form_tag') do -%>
@@ -52,7 +52,7 @@ <% end -%> -

<%= message('my_profile.notifications.title') -%>

+

<%= message('my_profile.notifications.title') -%>

<% form_tag({:action => 'update_notifications'}, {:method => 'post'}) do %>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/backup/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/backup/index.html.erb index 3d666f78a65..159b416a128 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/backup/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/backup/index.html.erb @@ -1,3 +1,5 @@ +

Configuration Backup & Restore

+

Backup configuration

This will backup configuration in a portable XML format. Click on "backup" to download this file.

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/filters/manage.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/filters/manage.html.erb index bfba7e12ce9..001c37a0af6 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/filters/manage.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/filters/manage.html.erb @@ -1,12 +1,13 @@ +
<% if logged_in? %> -
- -
+ <% end %> +

<%= message('default_filters.page') -%>

+
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb index bb7a04e1cfc..b281d3fd66e 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb @@ -25,7 +25,7 @@ { :method => :get, :id => "edit-#{u group.name}", :class => 'link-action'} %> | <%= link_to "Delete", { :action => 'destroy', :id => group.id}, - {:confirm => "Are you sure to delete this group ? Members will not be deleted.", :class => 'link-action', :method => 'get', :id => "delete-#{u group.name}"} %> + {:confirm => "Are you sure that you want to delete this group? Members will not be deleted.", :class => 'link-action', :method => 'get', :id => "delete-#{u group.name}"} %> <% end %> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb index 21bfa98df6c..ce284dad24e 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/manual_rules/index.html.erb @@ -1,6 +1,7 @@
+

<%= message('manual_rules.page') -%>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb index 0484469e3b2..e2957f65070 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb @@ -1,6 +1,7 @@
+

<%= message('manual_metrics.page') -%>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb index 656729ca54c..c73879dcbe1 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb @@ -1,6 +1,6 @@ -<% if administrator? %>
-
+ +<% if administrator? %>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb index 08c25d5b4cb..7a97d24d756 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb @@ -1,4 +1,4 @@ -

Global roles

+

Global Roles

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_settings.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_settings.html.erb index cbd85572a12..9c2c2bb346f 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_settings.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_settings.html.erb @@ -32,6 +32,7 @@ }
+

<%= message('settings.page') -%>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/system/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/system/index.html.erb index f946a8d84a6..dbf12c3cf3d 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/system/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/system/index.html.erb @@ -1,8 +1,11 @@ - +
+ +

<%= message('system_info.page') -%>

+
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/index.html.erb index 50e4ad7029f..710b6071d8a 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/index.html.erb @@ -1,3 +1,5 @@ +

<%= message('update_center.page') -%>

+ <%= render :partial => 'updatecenter/tabs', :locals => {:tab => 'index'} -%>
-- 2.39.5