SONAR-3552 Typos on admin pages

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 175e42c31b3445c93bd98467fd27dce3e44a1b5a..52ee54f7a63a885c935ec5920ebe3f91ba2b61f0 100644 (file)
--- 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 @@
-<h1><%= message('my_profile.page') -%></h1>
+<h1 class="marginbottom10"><%= message('my_profile.page') -%></h1>
 <div class="admin marginbottom10">
 <table class="form">
   <tr>
@@ -21,7 +21,7 @@
 </div>
 
 <% if User.editable_password? %>
-<h1><%= message('my_profile.password.title') -%></h1>
+<h2><%= message('my_profile.password.title') -%></h2>
 <div class="admin marginbottom10">
   <% form_tag( {:action => 'change_password' }, :id => 'pass_form_tag', :name => 'pass_form_tag') do -%>
   <table class="form">
@@ -52,7 +52,7 @@
 </div>
 <% end -%>
 
-<h1><%= message('my_profile.notifications.title') -%></h1>
+<h2><%= message('my_profile.notifications.title') -%></h2>
 <div class="admin marginbottom10">
 <% form_tag({:action => 'update_notifications'}, {:method => 'post'}) do %>
   <table class="form">

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 3d666f78a65cdabec706e7e71732253ab0a0468a..159b416a12802c3a0cccc3071c5f962d5136bc1d 100644 (file)
--- 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 @@
+<h1 class="marginbottom10">Configuration Backup & Restore</h1>
+
 <h2>Backup configuration</h2>
 <div class="box">
     <p>This will backup configuration in a portable XML format. Click on "backup" to download this file.</p>

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 bfba7e12ce98fb97a66128f99fe863b042a70baf..001c37a0af6d3d8a4f074988c7961d813a10ee80 100644 (file)
--- 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 @@
+<div class="line-block">
 <% if logged_in? %>
-  <div id="page-operations">
-    <ul class="operations">
-      <li>
-        <a href="<%= url_for :action => 'new' -%>"><%= message('filters.add_filter') -%></a>
-      </li>
-    </ul>
-  </div>
+  <ul style="float: right" class="operations">
+    <li>
+      <a href="<%= url_for :action => 'new' -%>"><%= message('filters.add_filter') -%></a>
+    </li>
+  </ul>
 <% end %>
+  <h1 class="marginbottom10"><%= message('default_filters.page') -%></h1>
+</div>
 
 <div class="admin_page">
   <table class="data" id="actives">

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 bb7a04e1cfc4515b30be7155a0d4fe787a542600..b281d3fd66eb3b4b598f524606fc65dc41e4c602 100644 (file)
--- 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}"} %>
             </td>
           </tr>
         <% 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 21bfa98df6c6b311b1b37bd2e72f1fcb9dff4a0c..ce284dad24eec9c6ea5acda3f61ca514dd8acb42 100644 (file)
--- 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 @@
 <table width="100%">
   <tr>
     <td valign="top">
+      <h1 class="marginbottom10"><%= message('manual_rules.page') -%></h1>
       <table class="data width100" id="manual-rules">
         <thead>
         <tr>

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 0484469e3b2f2f5f7f7fe68c1895404dc808aaf6..e2957f6507016307dcface89cee7b6cf6cabf084 100644 (file)
--- 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 @@
 <table width="100%">
   <tr>
     <td valign="top">
+      <h1 class="marginbottom10"><%= message('manual_metrics.page') -%></h1>
       <table class="sortable data width100" id="metrics">
         <thead>
           <tr>

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 656729ca54c66973f20f75bc88c7aba611109c10..c73879dcbe1d3a85935da451cf4296d44c2b4dd5 100644 (file)
--- 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? %>
 <div class="line-block marginbottom10">
-  <ul class="operations">
+<% if administrator? %>
+  <ul style="float: right" class="operations">
     <li>
       <%= image_tag 'compare.png' -%>
       <a href="<%= ApplicationController.root_context-%>/profiles/compare" id="compare-link"><%= message('quality_profiles.compare_profiles') -%></a>
@@ -10,7 +10,11 @@
       <a href="#" onclick="$('restore-form').show();return false;" id="restore-link"><%= message('quality_profiles.restore_profile') -%></a>
     </li>
   </ul>
+<% end %>
+  <h1 class="marginbottom10"><%= message('quality_profiles.quality_profiles') -%></h1>
 </div>
+
+<% if administrator? %>
 <form class="admin marginbottom10" id="restore-form" action="<%= url_for :action => 'restore' -%>" enctype="multipart/form-data" style="display: none" method="post">
     <table class="spaced width100">
       <tr>

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 08c25d5b4cbffb6caf687c7ea364d49975edb68f..7a97d24d756e59879d9f31b042a51835a235a9af 100644 (file)
--- 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 @@
-<h1 class="marginbottom10">Global roles</h1>
+<h1 class="marginbottom10">Global Roles</h1>
 
 <table class="data width100" id="global-roles">
   <thead>

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 cbd85572a12e950b208aea064825b1571dbeb193..9c2c2bb346fd7918b2ab3de6a893c8331e9908e3 100644 (file)
--- 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 @@
   }
 </script>
 <div id="plugins">
+  <h1 class="marginbottom10"><%= message('settings.page') -%></h1>
   <table width="100%">
     <tr>
       <td width="1%" nowrap class="column first">

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 f946a8d84a625243c49f5752b4eaba2f36959c65..dbf12c3cf3d20fb89065dd4c82e7ce366918347f 100644 (file)
--- 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 @@
-<ul style="float: right" class="horizontal">
-  <li class="csv marginleft10">
-    <a href="<%= ApplicationController.root_context -%>/system/index?format=csv" id="download-link" class="action">Download</a>
-  </li>
-</ul>
+<div class="line-block">
+  <ul style="float: right" class="horizontal">
+    <li class="csv marginleft10">
+      <a href="<%= ApplicationController.root_context -%>/system/index?format=csv" id="download-link" class="action">Download</a>
+    </li>
+  </ul>
+  <h1 class="marginbottom10"><%= message('system_info.page') -%></h1>
+</div>
 
 <table class="data width100" id="sonar">
 <thead>

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 50e4ad7029fb4548434f3256f23874985f0420c0..710b6071d8a46a6419e0c2ba44be6ad78dbcdafb 100644 (file)
--- 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 @@
+ <h1 class="marginbottom10"><%= message('update_center.page') -%></h1>
+
  <%= render :partial => 'updatecenter/tabs', :locals => {:tab => 'index'} -%>
 
  <div class="tabs-panel">