Fix rendering in IE6

5 files changed, 31 insertions, 74 deletions

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb
index 40c1ccf4614..c66a9272183 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/resource_controller.rb
@@ -303,7 +303,8 @@ class ResourceController < ApplicationController
     end
 
     def highlighted?
-      !hidden? && @highlighted==true
+      # highlighted if the @highlighted has not been set or has been set to true
+      !hidden? && @highlighted!=false
     end
 
     def deprecated_conditions_label=(label)
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_header_coverage.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_header_coverage.html.erb
index a7a297576bd..96c67ece219 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_header_coverage.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_header_coverage.html.erb
@@ -1,7 +1,7 @@
 <div id="coverage_header" class="tab_header">
     <% if @period && measure('new_coverage') %>
       <p>On new code:</p>
-      <table class="metrics">
+      <table>
         <tr>
           <td class="big" rowspan="2"><%= format_variation('new_coverage', :period => @period, :style => 'none') -%></td>
 
@@ -41,7 +41,7 @@
         </tr>
       </table>
     <% else %>
-      <table class="metrics">
+      <table>
         <tr>
           <td class="big" rowspan="2"><%= format_measure('coverage', :default => '-') -%></td>
           <td class="sep"> </td>
@@ -60,6 +60,5 @@
     <% end %>
   
   <%= render :partial => 'options' -%>
-  <div class="clear"></div>
 </div>
 
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_header_violations.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_header_violations.html.erb
index fc97be464c7..9e6522c5f88 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_header_violations.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_header_violations.html.erb
@@ -1,40 +1,30 @@
 <div id="violations_header" class="tab_header">
   <% if @period && measure('new_violations') %>
-    <table class="bottomcol">
+    <table>
       <tr>
         <td><span class="big"><%= format_variation('new_violations', :default => 0, :period => @period, :style => 'none') -%></span> new violations</td>
-      </tr>
-    </table>
-    <table class="bottomcol">
-      <tr>
+
+        <td class="sep"> </td>
         <td><%= image_tag 'priority/BLOCKER.png' -%></td>
         <td class="name">Blocker:</td>
         <td class="value"><%= format_variation('new_blocker_violations', :default => 0, :period => @period, :style => 'none') -%></td>
-      </tr>
-    </table>
-    <table class="bottomcol">
-      <tr>
+
+        <td class="sep"> </td>
         <td><%= image_tag 'priority/CRITICAL.png' -%></td>
         <td class="name">Critical:</td>
         <td class="value"><%= format_variation('new_critical_violations', :default => 0, :period => @period, :style => 'none') -%></td>
-      </tr>
-    </table>
-    <table class="bottomcol">
-      <tr>
+
+        <td class="sep"> </td>
         <td><%= image_tag 'priority/MAJOR.png' -%></td>
         <td class="name">Major:</td>
         <td class="value"><%= format_variation('new_major_violations', :default => 0, :period => @period, :style => 'none') -%></td>
-      </tr>
-    </table>
-    <table class="bottomcol">
-      <tr>
+
+        <td class="sep"> </td>
         <td><%= image_tag 'priority/MINOR.png' -%></td>
         <td class="name">Minor:</td>
         <td class="value"><%= format_variation('new_minor_violations', :default => 0, :period => @period, :style => 'none') -%></td>
-      </tr>
-    </table>
-    <table class="bottomcol">
-      <tr>
+
+        <td class="sep"> </td>
         <td><%= image_tag 'priority/INFO.png' -%></td>
         <td class="name">Info:</td>
         <td class="value"><%= format_variation('new_info_violations', :default => 0, :period => @period, :style => 'none') -%></td>
@@ -42,41 +32,31 @@
     </table>
 
   <% else %>
-    <table class="bottomcol">
+    <table class="sourceHeader">
       <tr>
-        <td><span class="big"><%= format_measure('violations', :default => 0) -%></span> violations</td>
-      </tr>
-    </table>
-    <table class="bottomcol">
-      <tr>
-        <td><%= image_tag 'priority/BLOCKER.png' -%></td>
+        <td nowrap><span class="big"><%= format_measure('violations', :default => 0) -%></span> violations</td>
+
+        <td class="sep"> </td>
+        <td nowrap><%= image_tag 'priority/BLOCKER.png' -%></td>
         <td class="name">Blocker:</td>
         <td class="value"><%= format_measure('blocker_violations', :default => 0) -%></td>
-      </tr>
-    </table>
-    <table class="bottomcol">
-      <tr>
+
+        <td class="sep"> </td>
         <td><%= image_tag 'priority/CRITICAL.png' -%></td>
         <td class="name">Critical:</td>
         <td class="value"><%= format_measure('critical_violations', :default => 0) -%></td>
-      </tr>
-    </table>
-    <table class="bottomcol">
-      <tr>
+
+        <td class="sep"> </td>
         <td><%= image_tag 'priority/MAJOR.png' -%></td>
         <td class="name">Major:</td>
         <td class="value"><%= format_measure('major_violations', :default => 0) -%></td>
-      </tr>
-    </table>
-    <table class="bottomcol">
-      <tr>
+
+        <td class="sep"> </td>
         <td><%= image_tag 'priority/MINOR.png' -%></td>
         <td class="name">Minor:</td>
         <td class="value"><%= format_measure('minor_violations', :default => 0) -%></td>
-      </tr>
-    </table>
-    <table class="bottomcol">
-      <tr>
+
+        <td class="sep"> </td>
         <td><%= image_tag 'priority/INFO.png' -%></td>
         <td class="name">Info:</td>
         <td class="value"><%= format_measure('info_violations', :default => 0) -%></td>
@@ -85,6 +65,6 @@
   <% end %>
 
   <%= render :partial => 'options' -%>
-  <div class="clear"></div>
+  
 </div>
 
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_measure.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_measure.html.erb
index ba75aeb993d..6bbc9d09136 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_measure.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_measure.html.erb
@@ -2,9 +2,7 @@
   <td class="name"><%= h(title) -%>: </td>
   <td class="value">
     <%= format_measure(measure) -%>
-    <% if defined?(ratio) && ratio %>
-    /<%= format_measure(ratio) -%>
-    <% end %>
+    <% if defined?(ratio) && ratio %> / <%= format_measure(ratio) -%><% end %>
   </td>
 <% else %>
   <td colspan="2"></td>
diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index ea9c29643e5..2e666eebf99 100644
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -612,12 +612,6 @@ ul.operations li a {
 
 
 /* SOURCE */
-#source_metrics {
-  width: 100%;
-}
-#source_metrics {
-  width: 100%;
-}
 .sources2 {
   width: 100%;
   border-top: 1px solid #DDD;
@@ -748,20 +742,7 @@ span.rulename a:hover {
   margin-bottom: 10px;
   color: #444;
 }
-.tab_header .col {
-  vertical-align:top;
-}
-.tab_header table.metrics {
-  margin-right: 10px;
-  display: inline-block;
-  vertical-align: top;
-}
-.tab_header table.bottomcol {
-  margin-right: 10px;
-  display: inline-block;
-  vertical-align: bottom;
-}
-.tab_header table.metrics td, .tab_header table.bottomcol td {
+.tab_header td {
   padding-right: 7px;
 }
 .tab_header td.name {
@@ -790,8 +771,6 @@ span.rulename a:hover {
 
 
 
-
-
 #gwtpage {
 	width: 100%;
 	clear: both;