From 549e52a2f43f6d7f56594dd1217cad5909b4c63b Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>
Date: Wed, 9 Oct 2013 12:09:53 +0200
Subject: SONAR-4746 Convert server ID page to new layout

---
 .../views/server_id_configuration/index.html.erb   | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

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 bc6d28d6873..e953a41fe6f 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,8 +1,8 @@
 <form method="post" action="<%= ApplicationController.root_context -%>/server_id_configuration/generate">
-  <table class="data marginbottom10">
+  <table class="marginbottom10">
     <thead>
     <tr>
-      <td style="padding: 10px">
+      <td style="padding: 10px" colspan="2">
         <p><%= message('server_id_configuration.information') -%></p>
 
         <% if @server_id %>
@@ -18,27 +18,29 @@
     </tr>
     </thead>
     <tbody>
-    <tr class="even">
-      <td style="padding: 10px">
+    <tr class="property">
+      <th>
         <h3><%= message('server_id_configuration.organisation.title') -%></h3>
-
-        <p class="marginbottom10"><%= message('server_id_configuration.organisation.desc') -%></p>
+      </th>
+      <td>
         <input type="text" name="organisation" value="<%= @organisation -%>" size="50"/>
         <br/>
+        <p class="marginbottom10"><%= message('server_id_configuration.organisation.desc') -%></p>
         <span class="note"><%= message('server_id_configuration.organisation.pattern') -%></span>
       </td>
     </tr>
-    <tr class="odd">
-      <td style="padding: 10px">
+    <tr class="property">
+      <th>
         <h3><%= message('server_id_configuration.ip.title') -%></h3>
-
+      </th>
+      <td>
+        <input type="text" name="address" value="<%= @address -%>"/>
         <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>
-- 
cgit v1.2.3