Replace accordion-body and header by accordion-item-body and header

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_extension.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_extension.html.erb
index a51fe0c16fdff049de38acba6e594281ca22121a..772ba48e57edfd3ca3c528d3269d02c23d02d7a2 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_extension.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_extension.html.erb
@@ -1,8 +1,8 @@
 <div class="accordion-item">
-  <div class="accordion-header">
+  <div class="accordion-item-header">
     <%= render :partial => 'tabs' -%>
   </div>
-  <div class="accordion-body">
+  <div class="accordion-item-body">
     <% if @extension.isGwt() %>
       <div id="gwtpage"> </div>
       <script>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_index.html.erb
index 2340b6d7a869ee9b3e6533466a3062001efd5317..de83de7d7dca89d5a877a55c9a748b819c2884bd 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_index.html.erb
@@ -1,8 +1,8 @@
 <div class="accordion-item">
-  <div class="accordion-header">
+  <div class="accordion-item-header">
     <%= render :partial => 'tabs' -%>
   </div>
-  <div class="accordion-body">
+  <div class="accordion-item-body">
     <%= render :partial => "resource/header_#{@extension.getId()}" -%>
 
     <% if @display_violations && @global_violations && @global_violations.size>0 -%>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/test/_testable_working_view.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/test/_testable_working_view.erb
index b9997f4140c1702a1c4d59448842d283c4bf7538..9ee32ad6dc6f954684b5c8318061c068499568b9 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/test/_testable_working_view.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/test/_testable_working_view.erb
@@ -1,9 +1,9 @@
 <div class="accordion-item">
-  <div class="accordion-header">
+  <div class="accordion-item-header">
     <h3>Tests covering <%= @testable.component.longName %> on line <%= @line %></h3>
   </div>
   <br/>
-  <div class="accordion-body">
+  <div class="accordion-item-body">
     <% @test_case_by_test_plan.sort_by{|test_plan, test_cases| test_plan.component.longName}.each do |test_plan, test_cases| %>
       <% resource_key = test_plan.component.key %>
       <table class="data">

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/test/_testcase_working_view.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/test/_testcase_working_view.erb
index 030a5e3ecc5bc7b62f1e50a5fb7460a794d50c05..895305f591185f91644be8537e1e810dc09c5baf 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/test/_testcase_working_view.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/test/_testcase_working_view.erb
@@ -1,9 +1,9 @@
 <div class="accordion-item">
-  <div class="accordion-header">
+  <div class="accordion-item-header">
     <h3>Files covered by <%= @test %> (<%= @test_plan.component.longName %>)</h3>
   </div>
   <br/>
-  <div class="accordion-body">
+  <div class="accordion-item-body">
     <table class="data">
       <thead>
       <tr>

diff --git a/sonar-server/src/main/webapp/javascripts/application.js b/sonar-server/src/main/webapp/javascripts/application.js
index 0c4ef77c2018f0c6aa71cef4bf967b4ede98206d..71a843b380b23bf7783c68c81c60dfbca477439a 100644 (file)
--- a/sonar-server/src/main/webapp/javascripts/application.js
+++ b/sonar-server/src/main/webapp/javascripts/application.js
@@ -355,9 +355,9 @@ function openAccordionItem(url, elt, updateCurrentElement) {
   // Get content from url
   $j.get(url,function (html) {
     if (currentElement.length) {
-      var body = currentElement.find('.accordion-body');
-      if (!updateCurrentElement && !body.hasClass('accordion-item-medium')) {
-        body.addClass("accordion-item-medium");
+      var body = currentElement.find('.accordion-item-body');
+      if (!updateCurrentElement && !body.hasClass('accordion-item-body-medium')) {
+        body.addClass("accordion-item-body-medium");
         elt.scrollIntoView(false);
       }
     } else {
@@ -385,7 +385,7 @@ function openAccordionItem(url, elt, updateCurrentElement) {
 
 function expandAccordionItem(elt) {
   var currentElement = $j(elt).closest('.accordion-item');
-  currentElement.find('.accordion-body').removeClass("accordion-item-medium");
+  currentElement.find('.accordion-item-body').removeClass("accordion-item-body-medium");
 }
 
 //******************* HANDLING OF WORKING VIEWS [END] ******************* //

diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index 57a78228244487195bff72dfa50ffde8638975e7..f82a77c01df554c4cdda15ca786932bf16269c70 100644 (file)
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -2422,7 +2422,7 @@ textarea.width100 {
   overflow: hidden;
 }
 
-.accordion-item-medium {
+.accordion-item-body-medium {
   height: 200px;
   overflow: auto;
   border-bottom: 1px solid #DDD;