Revert fix of IE7 + move filter description

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
index 54d231c9d23ece421d6163618b8ad58722cbaf28..dfae2b79f0f5904c1c3ba172d40000549ef43498 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/measures/search.html.erb
@@ -30,7 +30,7 @@
               <% if @filter.id %>
                 <li><a id="copy" href="<%= url_for :action => 'copy_form', :id => @filter.id -%>" class="link-action open-modal"><%= message('copy') -%></a></li>
               <% end %>
-              <% if !defined?(@unchanged) && @filter.id && @filter.owner?(current_user)%>
+              <% if !defined?(@unchanged) && @filter.id && @filter.owner?(current_user) %>
                 <li>
                   <%= link_to message('save'), params.merge({:action => 'save', :id => @filter.id}), :class => 'link-action', :id => 'save', :method => :post -%>
                 </li>
@@ -45,7 +45,7 @@
           <div class="page_title" id="filter-title">
             <% if @filter.id && @filter.name.present? %>
               <p>
-              <span class="h3"><%= h @filter.name -%></span>
+                <span class="h3"><%= h @filter.name -%></span>
               <span class="note">
                 <% if !@filter.shared %>
                   [<%= message 'measure_filter.private' -%>]
@@ -57,17 +57,16 @@
                   [<%= message 'shared_by' -%> Sonar]
                 <% end %>
               </span>
-              <% if @filter.owner?(current_user) %>
-                              &nbsp;<a href="<%= url_for :action => 'edit_form', :id => @filter.id -%>" class="open-modal" id="edit-filter"><%= image_tag 'pencil-small.png', :alt => message('edit') -%></a>
-                            <% end %>
+                <% if @filter.owner?(current_user) %>
+                  &nbsp;<a href="<%= url_for :action => 'edit_form', :id => @filter.id -%>" class="open-modal" id="edit-filter"><%= image_tag 'pencil-small.png', :alt => message('edit') -%></a>
+                <% end %>
               </p>
-              <% if @filter.description.present? %>
-                <p class="note"><%= h @filter.description -%></p>
-              <% end %>
-
             <% end %>
           </div>
         </div>
+        <% if @filter.description.present? %>
+          <p class="note"><%= h @filter.description -%></p>
+      <% end %>
 
         <%= render :partial => 'measures/display', :locals => {:filter => @filter, :edit_mode => edit_mode, :widget_id => nil} -%>
       </div>

diff --git a/sonar-server/src/main/webapp/stylesheets/layout.css b/sonar-server/src/main/webapp/stylesheets/layout.css
index 036f40c8f200ca1fd3e68f742b79cd90fd3e59bb..4aee93245dd18e7918f431a92e73266c5753e2ca 100644 (file)
--- a/sonar-server/src/main/webapp/stylesheets/layout.css
+++ b/sonar-server/src/main/webapp/stylesheets/layout.css
@@ -266,19 +266,18 @@ ul.sidebar select, ul.sidebar input {
   max-width: 200px;
   width: 200px;
   margin: 0;
-  display: table-cell;
+  display: block;
   vertical-align: top;
   border-top: none;
   border-left: none;
+  float: left;
 }
 
 .page-split-right {
-  position: relative;
-  display: table-cell;
+  display: block;
   margin: 0;
   vertical-align: top;
-  padding: 0;
-  width: 100%;
+  padding: 0 0 0 200px;
 }
 
 .gray-sidebar {