Improve CSS of rule status (deprecated/beta)

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb
index eb0b3d9ad167793496ee19f31d70c49b96495d2c..907f215a332965b632a237dc86287d1e5b5e0c0d 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb
@@ -29,21 +29,21 @@
 </td>
 
 <td class="left" colspan="2">
+  <% unless rule.ready? %>
+    <div class="rule-status">
+      <% if rule.beta? %>
+        <span><%= message('rules_configuration.status.beta') %></span>
+      <% elsif rule.deprecated? %>
+        <span><%= message('rules_configuration.status.deprecated') %></span>
+      <% end %>
+    </div>
+  <% end %>
+
   <div class="h3 rule-title"><%= link_to_function("#{h rule.name}", nil, :class => "") do |page|
     page.toggle "desc_#{rule.id}"
   end
   %></div>
 
-  <% if !rule.ready? %>
-    <div class="rule-status">
-    <% if rule.beta? %>
-      <div class="status-beta"><%= message('rules_configuration.status.beta') %></div>
-    <% elsif rule.deprecated? %>
-      <div class="status-deprecated"><%= message('rules_configuration.status.deprecated') %></div>
-    <% end %>
-    </div>
-  <% end %>
-
   <div id="desc_<%= rule.id -%>" class="rule_detail" style="<%= 'display:none' -%>">
     <a name="rule<%= rule.id -%>"></a>
 
@@ -110,13 +110,13 @@
 
     <div style="height: 17px;line-height: 17px;font-size: 11px;">
       <div style="float: left">
-        <div style="color: #888" id="rule_repository_<%= rule.id -%>"><%= message('rules_configuration.repository')%> : <%= rule.repository_key %></div>
-        <div style="color: #888" id="rule_key_<%= rule.id -%>"><%= message('key')%> : <%= rule.plugin_rule_key %></div>
+        <div style="color: #888" id="rule_repository_<%= rule.id -%>"><%= message('rules_configuration.repository') %> : <%= rule.repository_key %></div>
+        <div style="color: #888" id="rule_key_<%= rule.id -%>"><%= message('key') %> : <%= rule.plugin_rule_key %></div>
         <% if !rule.removed? %>
-          <div style="color: #888" id="rule_available_since_<%= rule.id -%>"><%= message('rules_configuration.available_since')%> : <%= human_short_date(rule.created_at) %></div>
+          <div style="color: #888" id="rule_available_since_<%= rule.id -%>"><%= message('rules_configuration.available_since') %> : <%= human_short_date(rule.created_at) %></div>
         <% else %>
-          <div style="color: #888" id="rule_available_since_<%= rule.id -%>"><%= message('rules_configuration.removed_since')%> : <%= human_short_date(rule.updated_at) %></div>
-        <% end  %>
+          <div style="color: #888" id="rule_available_since_<%= rule.id -%>"><%= message('rules_configuration.removed_since') %> : <%= human_short_date(rule.updated_at) %></div>
+        <% end %>
       </div>
     </div>
   </div>

diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index b8cfd25e79caf959ad3dc8d24e34137b73e4d463..3037f4831c2068c23fff0e0fbc2909c52eeb6ec7 100644 (file)
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -2444,17 +2444,13 @@ textarea.width100 {
 }
 
 .rule-status {
-  display: inline-block;
   margin-left: 10px;
   float: right;
-  background-color: #e7e7e7;
-  padding: 3px;
-}
-
-.rule-status .status-beta {
-  color: #5e8790;
+  padding: 3px 5px 0 0;
 }
 
-.rule-status .status-deprecated {
-  color: #906947;
+.rule-status span {
+  text-transform: uppercase;
+  font-size: 85%;
+  color: #777;
 }
\ No newline at end of file