fix a CSS issue on filters (settings panel must be inside the tab-panel)

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 e93191e52b52decf770a54a00ee928cb260679c6..0fe32f99f4928a6efb602dc54f1df5d9d5c28b34 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
@@ -1,5 +1,5 @@
 <% filter=data.filter %>
-<div class="tabs-panel marginbottom10">
+<div>
 <table class="data nowrap width100" id="results">
   <thead id="results-head">
     <tr>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/filters/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/filters/index.html.erb
index c25aa0f1e1574590d1bcd500f13651d46ef72bf1..0e39d5c80adb88d278c9ac0ed06b976ef1f0597b 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/filters/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/filters/index.html.erb
@@ -1,2 +1,4 @@
 <%= render :partial => 'filters/tabs', :locals => {:selected_tab=> (@active && @active.filter ? @active.filter.id : nil) } %>
-<%= render :partial => "filters/#{@filter.default_view}", :locals => {:data => @data, :edit_mode => false } if @filter %>
\ No newline at end of file
+<div class="tabs-panel">
+<%= render :partial => "filters/#{@filter.default_view}", :locals => {:data => @data, :edit_mode => false } if @filter %>
+</div>
\ No newline at end of file

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/filters/new.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/filters/new.html.erb
index acfbc4ba246f2407b39e60d4504747dc071a6f9a..e0fc74769497e28c5c289d3930388eef5240e143 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/filters/new.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/filters/new.html.erb
@@ -15,6 +15,7 @@ table#columns td {
     return false;
   }
 </script>
+<div class="tabs-panel">
 <h1>Settings</h1>
 <div class="admin">
   <form id="filter_form" name="filter_form" action="<%= url_for :action => (@filter.id ? 'update' : 'create'), :id => @filter.id -%>" method="post">
@@ -190,4 +191,5 @@ $('name').focus();
   </div>
   <br/>
   <%= render :partial => "filters/#{@filter.default_view}", :locals => {:data => @data, :edit_mode => true} %>
-<% end %>
\ No newline at end of file
+<% end %>
+</div>
\ No newline at end of file