From 4d851aee64ef78a7dcbaeec6f580280a7930abde Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Tue, 10 Sep 2013 18:11:13 +0200
Subject: [PATCH] SONAR-4653 Provide new CSS styles for tables and titles in
 rule descriptions

---
 .../resources/org/sonar/l10n/core.properties  |  6 +-
 .../WEB-INF/app/views/issue/_issue.html.erb   |  2 +-
 .../app/views/rules/_show_modal.html.erb      |  4 +-
 .../WEB-INF/app/views/rules/show.html.erb     |  2 +-
 .../views/rules_configuration/_rule.html.erb  |  4 +-
 .../rules_configuration/_rule_note.html.erb   |  2 +-
 .../views/rules_configuration/index.html.erb  |  4 +-
 .../src/main/webapp/stylesheets/style.css     | 69 +++++++++++++++----
 8 files changed, 66 insertions(+), 27 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 ee093b5df8c..74b4b87c244 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
@@ -1476,9 +1476,9 @@ rules_configuration.rule_deleted=Rule deleted
 rules_configuration.unknown_rule=Unknown rule
 rules_configuration.x_rules_have_been_activated={0} rules have been activated.
 rules_configuration.x_rules_have_been_deactivated={0} rules have been deactivated.
-rules_configuration.extend_description=Extend description
-rules_configuration.edit_note=Edit note
-rules_configuration.add_note=Add note
+rules_configuration.extend_description=Extend Description
+rules_configuration.edit_note=Edit Note
+rules_configuration.add_note=Add Note
 rules_configuration.confirm_delete_note=Do you really want to delete this note?
 rules_configuration.rule_inherited_from_profile_x=Rule inherited from profile "{0}"
 rules_configuration.rule_overriding_from_profile_x=Rule overrides parent definition from profile "{0}"
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb
index 6e1cb2eeeed..67097e935b4 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issue/_issue.html.erb
@@ -37,7 +37,7 @@
     <% end %>
   </div>
 
-  <div class="issue-rule rule_detail" style="display: none"></div>
+  <div class="issue-rule rule-desc" style="display: none"></div>
   <div class="issue-changelog" id="issue-changelog" style="display: none"></div>
 
   <% unless issue.message.blank? %>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules/_show_modal.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules/_show_modal.html.erb
index 71dcc6c944a..ea19f410b4e 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules/_show_modal.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules/_show_modal.html.erb
@@ -17,7 +17,7 @@
   </ul>
 </div>
 
-<div class="modal-body rule_detail">
+<div class="modal-body rule-desc">
   <% if @rule.description.strip.start_with?('<p>') %>
     <%= Internal.text.interpretMacros(@rule.description) %>
   <% else %>
@@ -42,6 +42,6 @@
 <script type="text/javascript">
   $j(document).ready(function () {
     // As links in rule description will be loaded after open-modal has been processed by jquery, we have to process manually rule-modal classes
-    $j('.rule_detail .rule-modal').modal();
+    $j('.rule-desc .rule-modal').modal();
   });
 </script>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules/show.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules/show.html.erb
index 2258fdd293e..d437ae0a9ef 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules/show.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules/show.html.erb
@@ -15,7 +15,7 @@
 <%= h @rule.plugin_name -%> : <%= h @rule.plugin_rule_key -%>
 </div>
 
-<div class="rule_detail">
+<div class="rule-desc">
   <% if @rule.description.strip.start_with?('<p>') %>
     <%= Internal.text.interpretMacros(@rule.description) %>
   <% else %>
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 a00f4f1f5b1..7f005ead014 100644
--- 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
@@ -42,10 +42,10 @@
   end
   %></div>
 
-  <div id="desc_<%= rule.id -%>" class="rule_detail" style="<%= 'display:none' -%>">
+  <div id="desc_<%= rule.id -%>" class="rule-desc" style="<%= 'display:none' -%>">
     <a name="rule<%= rule.id -%>"></a>
 
-    <div class="spacer-top spacer-bottom" id="rule_note_<%= rule.id -%>">
+    <div id="rule_note_<%= rule.id -%>" class="marginbottom10">
       <%= render :partial => 'rule_note', :locals => {:rule => rule} %>
     </div>
 
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule_note.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule_note.html.erb
index 1b2a7f5646e..16d0d6f2166 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule_note.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule_note.html.erb
@@ -8,7 +8,7 @@
 %>
 
 <div id="<%= note_detail_div_id -%>">
-  <div>
+  <div class="marginbottom10">
   <% if rule.description.strip.start_with?('<p>') %>
     <%= Internal.text.interpretMacros(rule.description) %>
   <% else %>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/index.html.erb
index ba9dc323455..2682494364c 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/index.html.erb
@@ -24,11 +24,11 @@
   }
 
   function expand_rules(){
-     $j('.rule_detail').show();
+     $j('.rule-desc').show();
   }
 
   function collapse_rules(){
-    $j('.rule_detail').hide();
+    $j('.rule-desc').hide();
   }
 
   function submitSearch() {
diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index 6750544429e..047aafcd87c 100644
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -1821,33 +1821,72 @@ ul.bullet li {
   color: #777;
 }
 
-.rule_detail ul li {
-  list-style: disc outside;
-  padding: 2px;
+
+/* API for Rule Descriptions */
+.rule-desc h2 {
+  margin-top: 16px;
+  font-size: 16px;
+  line-height: 1.5;
+  color: #2B547D;
 }
 
-.rule_detail ul, .rule_detail ol {
-  list-style: none outside;
-  padding-left: 30px;
+.rule-desc h3 {
+  margin-top: 16px;
+  font-size: 12px;
+  line-height: 1.5;
+  color: #2B547D;
+  font-weight: bold;
 }
 
-.rule_detail ol li {
-  list-style: decimal outside;
-  padding: 2px;
+.rule-desc p {
+  margin-top: 10px;
 }
 
-.rule_detail pre, .code .rule_detail pre {
+.rule-desc pre {
   margin: 10px 0;
-  padding: 7px;
-  font-family: "Courier New", Courier, monospace;;
+  padding: 10px;
   border: 1px dashed #aaa;
-  font-size: 93%;
+  font-size: 12px;
+  font-family: monospace;;
 }
 
-.rule_detail p {
-  margin: 8px 0;
+.rule-desc blockquote {
+  margin-top: 10px;
+  padding: 10px;
+}
+
+.rule-desc ul {
+  list-style-type: disc;
+  list-style-position: inside;
+  margin: 10px;
+}
+
+.rule-desc ol {
+  list-style-type: decimal;
+  list-style-position: inside;
+  margin: 10px;
 }
 
+.rule-table {
+  margin-top: 10px;
+  overflow-x: auto;
+  border-collapse: collapse;
+}
+.rule-table th {
+  background: none no-repeat scroll right center #EFEFEF;
+  border: 1px solid #DDD;
+  padding: 5px 10px;
+  font-weight: bold;
+}
+.rule-table td {
+  background: none no-repeat scroll right center transparent;
+  border: 1px solid #DDD;
+  padding: 5px 10px;
+}
+/* End of API for Rule Descriptions */
+
+
+
 .tip:hover {
   background: #FFF;
   position: relative;
-- 
2.39.5