diff options
| author | simonbrandhof <simon.brandhof@gmail.com> | 2010-11-03 13:31:29 +0000 |
|---|---|---|
| committer | simonbrandhof <simon.brandhof@gmail.com> | 2010-11-03 13:31:29 +0000 |
| commit | c65fc45126f505d9373ad00c5b728bfb4744812e (patch) | |
| tree | 1c8337670064bae75784d342e7dea76bd958ecfb /sonar-server | |
| parent | 3faab136004d195fa89c4c32313200aae0a4c68a (diff) | |
| download | sonarqube-c65fc45126f505d9373ad00c5b728bfb4744812e.tar.gz sonarqube-c65fc45126f505d9373ad00c5b728bfb4744812e.zip | |
fix a CSS issue on filters (settings panel must be inside the tab-panel)
Diffstat (limited to 'sonar-server')
3 files changed, 7 insertions, 3 deletions
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 e93191e52b5..0fe32f99f49 100644 --- 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 c25aa0f1e15..0e39d5c80ad 100644 --- 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 acfbc4ba246..e0fc7476949 100644 --- 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 |