fix CSS on Chrome and Safari (data2 rows are too big)

+ filters: move links to alerts in the table footer

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/rule.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/rule.rb
index 6af4f028a07fd03700b7f504682fafdfff22cc31..be405edcc954d90ebadc1c230fe2b34f5ff13776 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/rule.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/rule.rb
@@ -76,7 +76,7 @@ class Rule < ActiveRecord::Base
 
   def self.to_i(key_or_id)
     id=key_or_id.to_i
-    if id<=0 and key_or_id
+    if id<=0 && key_or_id
       parts=key_or_id.split(':')
       if parts.size==2
         rule=Rule.find(:first, :conditions => {:plugin_name => parts[0], :plugin_rule_key => parts[1]})

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/filters/_list.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/filters/_list.html.erb
index a8c4c691831448b790ac0841825a9a143c028180..87b878a8af4a88f953d83f9dbdf2a3a2c5d31dd2 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/filters/_list.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/filters/_list.html.erb
@@ -36,6 +36,11 @@
           <% end %>
           <%= link_to_if data.page_id<data.page_count, 'next', {:overwrite_params => {:page_id => 1+data.page_id}} %>
         <% end %>
+
+        <% if @filter.projects_homepage? %>
+          &nbsp;&nbsp; <a href="<%= url_for :controller => :feeds, :action => 'projects', :id => EventCategory::KEY_ALERT -%>" class="nolink"><%= image_tag 'feed-icon-14x14.png' %></a>
+          <a href="<%= url_for :controller => :feeds, :action => 'projects', :id => EventCategory::KEY_ALERT -%>" class="action">Alerts feed</a>
+        <% end %>
       </td>
     </tr>
   </tfoot>
@@ -86,10 +91,6 @@
   </tbody>
 </table>
 <br/>
-<% if @filter.projects_homepage? %>
-  <a href="<%= url_for :controller => :feeds, :action => 'projects', :id => EventCategory::KEY_ALERT -%>" class="nolink"><%= image_tag 'feed-icon-14x14.png' %></a>
-  <a href="<%= url_for :controller => :feeds, :action => 'projects', :id => EventCategory::KEY_ALERT -%>" class="action">Alerts feed</a>
-<% end %>
 <% if data.security_exclusions? %>
   <p class="notes">Due to security settings, some results are not being displayed.</p>
 <% end %>

diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index eac9a9b5bbb24c27d7c655797d0eac87bac6a285..9d728786e0e000b292c7f9b7e7826ca6372f9abf 100644 (file)
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -1431,13 +1431,13 @@ table.data2 > tbody > tr {
   border-right: 1px solid #ddd;
 }
 table.data2 > thead > tr {
-  height: 24px;
+  height: 20px;
   border: 0;
 }
 table.data2 > thead > tr > th, table.data2 > tbody > tr > td {
   border-bottom: 1px solid #DDD;
   padding: 3px 5px;
-  height: 24px;
+  height: 20px;
   vertical-align: middle;
 }
 table.data2 > tbody > tr > td {
@@ -1448,12 +1448,13 @@ table.data2 > thead > tr > th {
 }
 table.data2 > tfoot > tr > td {
   border-bottom: 0;
+  padding: 3px 5px;
 }
 table.data2 td, table.data2 td a, table.data2 th, table.data2 th a {
   color: #444;
 }
 table.data2 img, table.data2 input, table.data2 select {
-  vertical-align: text-bottom;
+  vertical-align: baseline;
 }
 .background-gray {
   background-color: #f4f4f4;