SONAR-3786 Remove the collapse/expand link and add spaced above the exception message

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/web/tests_viewer.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/web/tests_viewer.html.erb
index 531c1d8e8e750cb2f67876883d0d9a3fddd14adb..af3909f8a618d5112ba5b0008ecfe2ee346f2edf 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/web/tests_viewer.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/web/tests_viewer.html.erb
@@ -34,7 +34,6 @@
   <table class="data width100 tests_viewer"  id="test_data">
   <thead>
     <tr>
-      <th class="thin">&nbsp;</th>
       <th class="thin">&nbsp;</th>
       <th class="thin right"><%= message('test_viewer.duration') -%></th>
       <th><%= message('test_viewer.unit_test_name') -%></th>
@@ -65,22 +64,23 @@
          failure = block.elements['failure']
          block_message = !failure.nil? ? failure : block_message
       %>
-      <td class="thin" nowrap>
-        <% if !block_message.nil? %>
-          <a id="expandLink_<%= index -%>" href="#" onclick="expandTests(<%= index -%>);"><%= message('test_viewer.expand') -%></a>
-          <a id="collapseLink_<%= index -%>" class="collapse" href="#" onclick="collapseTests(<%= index -%>);" style="display: none;"><%= message('test_viewer.collapse') -%></a>
-        <% else %>
-          &nbsp;
-        <% end %>
-      </td>
       <td class="thin" nowrap>
         <img id="test_status_<%= index -%>_<%= status -%>" src="<%= icon_url -%>" />
       </td>
       <td id="test_time_<%= index -%>" class="thin right" nowrap><%= block.attributes['time'] -%> ms</td>
       <td>
-        <span><%= block.attributes['name'] -%></span>
+        <span id="test_name_<%= index -%>">
+          <% name = block.attributes['name'] %>
+          <% if !block_message.nil? %>
+            <a id="test_expandLink_<%= index -%>" href="#" onclick="expandTests(<%= index -%>);"><%= name -%></a>
+            <a id="test_collapseLink_<%= index -%>" class="collapse" href="#" onclick="collapseTests(<%= index -%>);" style="display: none;"><%= name -%></a>
+          <% else %>
+            <%= name -%>
+          <% end %>
+        </span>
+
         <% if !block_message.nil? %>
-          <div id="message_<%= index -%>" class="message" style="display: none;">
+          <div id="test_message_<%= index -%>" class="message" style="display:none; margin-top:5px;">
             <% message = block_message.attributes['message'] %>
             <% if !message.nil? %>
               <span><%= h message -%></span>

diff --git a/sonar-server/src/main/webapp/javascripts/resource.js b/sonar-server/src/main/webapp/javascripts/resource.js
index 7b4327dfd47027f6e3fe6ae15cc51275d8ee4d44..18d32d2f5197a4477c15d20de9d7e80c971f7942 100644 (file)
--- a/sonar-server/src/main/webapp/javascripts/resource.js
+++ b/sonar-server/src/main/webapp/javascripts/resource.js
@@ -187,13 +187,13 @@ function hVF(line) {
  Functions used in tests viewer
  */
 function expandTests(index){
-  $j(".tests_viewer #collapseLink_"+ index).show();
-  $j(".tests_viewer #expandLink_"+ index).hide();
-  $j(".tests_viewer #message_"+ index).show();
+  $j(".tests_viewer #test_collapseLink_"+ index).show();
+  $j(".tests_viewer #test_expandLink_"+ index).hide();
+  $j(".tests_viewer #test_message_"+ index).show();
 }
 
 function collapseTests(index){
-  $j(".tests_viewer #collapseLink_"+ index).hide();
-  $j(".tests_viewer #expandLink_"+ index).show();
-  $j(".tests_viewer #message_"+ index).hide();
+  $j(".tests_viewer #test_collapseLink_"+ index).hide();
+  $j(".tests_viewer #test_expandLink_"+ index).show();
+  $j(".tests_viewer #test_message_"+ index).hide();
 }
\ No newline at end of file