SONAR-3754 Better look for special settings pages

5 files changed, 120 insertions, 85 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 f9088055607..1fa003ce918 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
@@ -322,7 +322,6 @@ my_profile.page=My Profile
 roles.page=Roles
 project_settings.page=Settings
 project_links.page=Links
-project_exclusions.page=Exclusions
 project_history.page=History
 quality_profiles.page=Quality Profiles
 reviews.page=Reviews
@@ -578,8 +577,8 @@ property.category.duplications=Duplications
 property.category.localization=Localization
 property.category.server_id=Server ID
 property.category.exclusions=Exclusions
-property.sonar.exclusions.name=Exclusions
-property.sonar.exclusions.description=Exclude sources from code analysis. Changes will be applied during next code analysis.
+property.sonar.exclusions.name=Exclude sources from code analysis
+property.sonar.exclusions.description=Changes will be applied during next code analysis.
 property.sonar.exclusions.help=<h2>Wildcards</h2>\
  <p>Following rules are applied:</p>\
  <table class="data">\
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/email_configuration/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/email_configuration/index.html.erb
index afd4ebe9269..dbbe4155ff0 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/email_configuration/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/email_configuration/index.html.erb
@@ -1,8 +1,9 @@
 <style>
   #body {
-    padding: 0;
+    padding: 0 1px 0 0;
   }
 </style>
+
 <% form_tag({:action => 'save'}) do -%>
   <table class="data form marginbottom10">
     <thead>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/generate_secret_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/generate_secret_form.html.erb
index b3236d737b6..bd38e1cd7c6 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/generate_secret_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/generate_secret_form.html.erb
@@ -1,11 +1,32 @@
-<h3 class="spacer-bottom">Encryption</h3>
-<p class="spacer-bottom">Secret key is required to be able to encrypt properties. <a href="http://docs.codehaus.org/display/SONAR/Settings+Encryption" class="external" target="sonar_doc">More information</a>.</p>
-<div id="secret_content">
-  <%=  button_to_remote 'Generate secret key',
-                          {:url => {:action => 'generate_secret'},
-                          :update => {:success => 'secret_content', :failure => 'secret_error'},
-                          :failure => "$('secret_error').show()",
-                          :method => 'POST'},
-                          {:id => 'submit_generate_secret'} -%>
-  <span id="secret_error" class="error" style="display:none"></span>
-</div>
\ No newline at end of file
+<style>
+  #body {
+    padding: 0 1px 0 0;
+  }
+</style>
+
+<table class="data marginbottom10">
+  <thead>
+  <tr>
+    <th>Encryption</th>
+  </tr>
+  </thead>
+  <tbody>
+  <tr class="even">
+    <td style="padding: 10px">
+      <p class="marginbottom10">Secret key is required to be able to encrypt properties.
+        <a href="http://docs.codehaus.org/display/SONAR/Settings+Encryption" class="external" target="sonar_doc">More
+          information</a>.</p>
+
+      <div id="secret_content">
+        <%= button_to_remote 'Generate secret key',
+                             {:url => {:action => 'generate_secret'},
+                              :update => {:success => 'secret_content', :failure => 'secret_error'},
+                              :failure => "$('secret_error').show()",
+                              :method => 'POST'},
+                             {:id => 'submit_generate_secret'} -%>
+        <span id="secret_error" class="error" style="display:none"></span>
+      </div>
+    </td>
+  </tr>
+  </tbody>
+</table>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/index.html.erb
index ff021a225ac..8c479ad480a 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/encryption_configuration/index.html.erb
@@ -1,20 +1,39 @@
-<h3 class="spacer-bottom">Encryption</h3>
-<p class="spacer-bottom">Secret key is registered. You can encrypt any property value with the following form :</p>
+<style>
+  #body {
+    padding: 0 1px 0 0;
+  }
+</style>
 
-<%= form_remote_tag :url => {:action => 'encrypt'},
-                    :update => {:success => 'encrypted_section', :failure => 'encryption_error'},
-                    :success => "$('encrypted_section').show();$('encryption_error').hide();",
-                    :failure => "$('encryption_error').show()",
-                    :html => {:class => 'spacer-bottom'} -%>
-<input type="text" name="text" id="clear_text"/>
-<input type="submit" value="Encrypt" id="submit_encrypt"/>
-</form>
+<table class="data marginbottom10">
+  <thead>
+  <tr>
+    <th>Encryption</th>
+  </tr>
+  </thead>
+  <tbody>
+  <tr class="even">
+    <td style="padding: 10px">
+      <p class="spacer-bottom">Secret key is registered. You can encrypt any property value with the following form :</p>
 
-<div id="encrypted_section" style="display:none"></div>
-<span id="encryption_error" class="error" style="display:none"></span>
+      <%= form_remote_tag :url => {:action => 'encrypt'},
+                          :update => {:success => 'encrypted_section', :failure => 'encryption_error'},
+                          :success => "$('encrypted_section').show();$('encryption_error').hide();",
+                          :failure => "$('encryption_error').show()",
+                          :html => {:class => 'spacer-bottom'} -%>
+      <input type="text" name="text" id="clear_text"/>
+      <input type="submit" value="Encrypt" id="submit_encrypt"/>
+      </form>
+
+      <div id="encrypted_section" style="display:none"></div>
+      <span id="encryption_error" class="error" style="display:none"></span>
+
+      <p>Note that the <%= link_to 'secret key can be changed', {:action => 'generate_secret_form'}, :class => 'link-action', :id => 'link-generate-key' %>
+        but all the encrypted properties will have to be updated. <a href="http://docs.codehaus.org/display/SONAR/Settings+Encryption" class="external" target="sonar_doc">More information</a>.</p>
+    </td>
+  </tr>
+  </tbody>
+</table>
 
-<p>Note that the <%= link_to 'secret key can be changed', {:action => 'generate_secret_form'}, :class => 'link-action', :id => 'link-generate-key' %>
-  but all the encrypted properties will have to be updated. <a href="http://docs.codehaus.org/display/SONAR/Settings+Encryption" class="external" target="sonar_doc">More information</a>.</p>
 <script>
-  $('clear_text').focus();
-</script>
\ No newline at end of file
+  $j('#clear_text').focus();
+</script>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/server_id_configuration/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/server_id_configuration/index.html.erb
index 7ffc9c9099e..8d1ed4cdb23 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/server_id_configuration/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/server_id_configuration/index.html.erb
@@ -1,60 +1,55 @@
-<h3 class="marginbottom10"><%= message('server_id_configuration.page') -%></h3>
+<style>
+  #body {
+    padding: 0 1px 0 0;
+  }
+</style>
 
-<% if @server_id %>
-  <p>
-    <big><b><span class="<%= @bad_id ? 'error' : 'notice' -%>" id="server_id"><%= @server_id -%></span></b></big>
-    <% if @bad_id %>
-      <span class="error"><%= message('server_id_configuration.bad_id') -%></span>
-    <% end %>
-  </p>
-  <br/>
-<% end %>
+<table class="data marginbottom10">
+  <thead>
+  <tr>
+    <th><%= message('server_id_configuration.page') -%></th>
+  </tr>
+  </thead>
+  <tbody>
+  <tr class="even">
+    <td style="padding: 10px">
+      <p class="marginbottom10"><%= message('server_id_configuration.information') -%></p>
 
-<p>
-  <%= message('server_id_configuration.information') -%>
-</p>
+      <% if @server_id %>
+        <big><b><span class="<%= @bad_id ? 'error' : 'notice' -%>" id="server_id"><%= @server_id -%></span></b></big>
+        <% if @bad_id %>
+          <span class="error"><%= message('server_id_configuration.bad_id') -%></span>
+        <% end %>
+        <br/>
+      <% end %>
+    </td>
+  </tr>
+  <tr class="odd">
+    <td style="padding: 10px">
+      <h3><%= message('server_id_configuration.organisation.title') -%></h3>
 
-<% form_tag :action => 'generate' do %>
-  <table class="data marginbottom10">
-    <thead>
-    <tr>
-      <th></th>
-    </tr>
-    </thead>
-    <tfoot>
-    <tr>
-      <td>
-        <%= submit_tag message('server_id_configuration.generate_button'), :disable_with => message('server_id_configuration.generating_button'), :id => 'generate-button' -%>
-      </td>
-    </tr>
-    </tfoot>
-    <tbody>
-    <tr class="even">
-      <td style="padding:  10px">
-        <h3><%= message('server_id_configuration.organisation.title') -%></h3>
+      <p class="marginbottom10"><%= message('server_id_configuration.organisation.desc') -%></p>
+      <input type="text" name="organisation" value="<%= @organisation -%>" size="50"/>
+    </td>
+  </tr>
+  <tr class="even">
+    <td style="padding: 10px">
+      <h3><%= message('server_id_configuration.ip.title') -%></h3>
+
+      <p class="marginbottom10"><%= message('server_id_configuration.ip.desc') -%></p>
+      <ul class="marginbottom10 bullet">
+        <% @valid_addresses.each_with_index do |ip_address, index| %>
+          <li><span id="address_<%= index -%>"><%= ip_address.getHostAddress() -%></span></li>
+        <% end %>
+      </ul>
+      <input type="text" name="address" value="<%= @address -%>"/>
+    </td>
+  </tr>
+  </tbody>
+</table>
 
-        <p class="marginbottom10"><%= message('server_id_configuration.organisation.desc') -%></p>
+<% form_tag :action => 'generate' do %>
+  <%= submit_tag message('server_id_configuration.generate_button'), :disable_with => message('server_id_configuration.generating_button'), :id => 'generate-button' -%>
+<% end %>
 
-        <p>
-          <input type="text" name="organisation" value="<%= @organisation -%>" size="50"/>
-        </p>
-      </td>
-    </tr>
-    <tr class="odd">
-      <td style="padding:  10px">
-        <h3><%= message('server_id_configuration.ip.title') -%></h3>
 
-        <p class="marginbottom10"><%= message('server_id_configuration.ip.desc') -%></p>
-        <ul class="marginbottom10 bullet">
-          <% @valid_addresses.each_with_index do |ip_address, index| %>
-            <li><span id="address_<%= index -%>"><%= ip_address.getHostAddress() -%></span></li>
-          <% end %>
-        </ul>
-        <p>
-          <input type="text" name="address" value="<%= @address -%>"/>
-        </p>
-      </td>
-    </tr>
-    </tbody>
-  </table>
-<% end %>
\ No newline at end of file