From bdab023b4702e193017ed6f3a8365efc7e779f8b Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Tue, 18 Dec 2012 10:20:56 +0100
Subject: [PATCH] Fix compatibility with IE7

---
 .../webapp/WEB-INF/app/views/all_projects/index.html.erb   | 2 +-
 .../main/webapp/WEB-INF/app/views/layouts/_layout.html.erb | 7 ++++---
 .../WEB-INF/app/views/measures/_display_list.html.erb      | 6 +++---
 sonar-server/src/main/webapp/stylesheets/layout.css        | 6 +++---
 sonar-server/src/main/webapp/stylesheets/style.css         | 3 +++
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/all_projects/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/all_projects/index.html.erb
index 4a65fb9a4d1..958b90d68ea 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/all_projects/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/all_projects/index.html.erb
@@ -33,7 +33,7 @@
   
       <tbody>
         <% @filter.rows.each do |row| %>
-          <tr class="<%= cycle 'even', 'odd' -%>">
+          <tr class="thin <%= cycle 'even', 'odd' -%>">
             <% if display_favourites %>
               <td class="thin"><%= link_to_favourite(row.snapshot.resource) -%></td>
             <% end %>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
index 8afb945d4f8..307618d963e 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
@@ -65,7 +65,8 @@
             <li class="<%= 'active' if request.request_uri.include?('/dependencies/index') -%>">
               <a href="<%= ApplicationController.root_context -%>/dependencies/index"><%= message('dependencies.page') -%></a></li>
             <li class="<%= 'active' if request.request_uri.include?('/comparison/index') -%>">
-              <a href="<%= ApplicationController.root_context -%>/comparison/index"><%= message('comparison.page') -%></a></li>
+              <a href="<%= ApplicationController.root_context -%>/comparison/index"><%= message('comparison.page') -%></a>
+            </li>
 
           <% elsif selected_section==Navigation::SECTION_RESOURCE %>
             <% ActiveDashboard.user_dashboards(current_user, false).each do |active_dashboard| %>
@@ -153,9 +154,9 @@
           <% end %>
 
           <%= yield :sidebar %>
-          <div id="logo">
+          <li id="logo">
             <center><a href="http://www.sonarsource.org/" target="SonarSource"><%= image_tag('sonar.png', :alt => message('layout.sonar.slogan'), :class => 'png') -%></a></center>
-          </div>
+          </li>
         </ul>
       </div>
     <% end %>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb
index b8bc8aa654f..9df1f2374d8 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/_display_list.html.erb
@@ -168,9 +168,9 @@
       <% end %>
       <% filter.display.columns.each_with_index do |column, index| %>
         <td class="nowrap <%= column.align -%>" index="<%= index -%>">
-          <a href="javascript:leftCol(<%= index -%>)" title="<%= h message('move_left') -%>" id="left-<%= column.key.parameterize -%>"><%= image_tag("controls/resultset_previous.png") -%></a>
-          <a href="javascript:deleteCol(<%= index -%>)" title="<%= h message('measure_filter.delete_column') -%>" id="delete-<%= column.key.parameterize -%>"><%= image_tag("cross-gray.png") -%></a>
-          <a href="javascript:rightCol(<%= index -%>)" title="<%= h message('move_right') -%>" id="right-<%= column.key.parameterize -%>"><%= image_tag("controls/resultset_next.png") -%></a>
+          <a href="javascript:leftCol(<%= index -%>)" id="left-<%= column.key.parameterize -%>"><%= image_tag("controls/resultset_previous.png", :alt => message('move_left')) -%></a>
+          <a href="javascript:deleteCol(<%= index -%>)" id="delete-<%= column.key.parameterize -%>"><%= image_tag("cross-gray.png", :alt => message('measure_filter.delete_column')) -%></a>
+          <a href="javascript:rightCol(<%= index -%>)" id="right-<%= column.key.parameterize -%>"><%= image_tag("controls/resultset_next.png", :alt => message('move_right')) -%></a>
         </td>
       <% end %>
   <% end %>
diff --git a/sonar-server/src/main/webapp/stylesheets/layout.css b/sonar-server/src/main/webapp/stylesheets/layout.css
index ed76d28fd1c..1d706ab8baf 100644
--- a/sonar-server/src/main/webapp/stylesheets/layout.css
+++ b/sonar-server/src/main/webapp/stylesheets/layout.css
@@ -175,7 +175,7 @@ body, a {
 }
 
 #body {
-  position: relative;
+/*  position: relative;*/
 }
 
 #footer {
@@ -193,7 +193,7 @@ body, a {
 
 #sidebar {
   width: 150px;
-  position: absolute;
+  float:left;
   margin: 0 0 0 10px;
   top: 0;
   left: 0;
@@ -245,7 +245,7 @@ ul.sidebar select, ul.sidebar input {
 
 #logo {
   text-align: center;
-  padding: 8px 0 0 0;
+  padding: 10px 0 0 0;
 }
 
 #logo a {
diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index 967ba3be1f4..0968300fb6a 100644
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -2118,6 +2118,9 @@ table.nowrap td, td.nowrap, th.nowrap {
   cursor: pointer;
   display: inline-block;
   text-decoration: none !important;
+  /* zoom and *display = ie7 hack for display:inline-block */
+  zoom: 1;
+  *display: inline;
 }
 
 .dropdown-menu {
-- 
2.39.5