Consistent style of tabs. Deprecate class "tabs2".

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/ghosts.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/ghosts.html.erb
index 35ad52db24b1f173216cf38bd07b5533a44cd055..1bc7b10e9e3a77edbb4565e4f7c5028ee3c857d2 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/ghosts.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/ghosts.html.erb
@@ -1,6 +1,6 @@
 <h1 class="marginbottom10"><%= message('bulk_deletion.page') -%></h1>
 
-<ul class="tabs2">
+<ul class="tabs">
 <% @tabs.each do |tab| %>
   <li>
     <a href="<%= url_for :action => 'index', :resource_type => tab %>" id="tab-<%= u tab -%>"><%= message('qualifiers.' + tab) -%></a>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb
index eeac7ec92d5857bca0b57d4f786b0df61bbfd989..a4982762bd170fdeba67577bdbcd7f87c227f59e 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb
@@ -1,6 +1,6 @@
 <h1 class="marginbottom10"><%= message('bulk_deletion.page') -%></h1>
 
-<ul class="tabs2">
+<ul class="tabs">
 <% @tabs.each do |tab| %>
   <li>
     <a href="<%= url_for :action => 'index', :qualifiers => tab %>" <%= "class='selected'" if @selected_tab==tab -%> id="tab-<%= u tab -%>"><%= message('qualifiers.' + tab) -%></a>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_tabs.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_tabs.html.erb
index 61cba5451716977ac94e7b37c4a1dfcac3399fe0..5a5ce051762b9bd3badedbaa16afdf2838c16bcf 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_tabs.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_tabs.html.erb
@@ -2,7 +2,7 @@
   new_tab = nil unless defined?(:new_tab)
   selected_tab = nil unless defined?(:selected_tab)
 %>
-<ul class="tabs2">
+<ul class="tabs">
   <li>
     <a href="<%= url_for :controller => 'rules_configuration', :action => 'index', :id => @profile.id %>" <%= "class='selected'" if selected_tab=='Coding rules' -%> id="tab-rules"><%= message('coding_rules') -%></a>
   </li>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb
index 657b69ddc70278e1ea5b9c49182f73b5d9a8d112..d8817fc4a10fc1ef40232db31cda7ac4442f82d2 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_tabs.html.erb
@@ -37,7 +37,7 @@
       </li>
       <% end %>
     </ul>
-    <ul class="tabs2">
+    <ul class="tabs">
       <% @extensions.each do |extension| %>
         <li>
           <a href="#" onclick="return loadResourceViewer('<%= @resource.id -%>','<%= extension.getId() -%>',<%= display_title -%>,'<%= params[:period] -%>', this)"

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_tabs.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_tabs.html.erb
index 60cec7b145af812168e053aa854e5093339c456c..71b40fc05bbbe35b101d36b05f3cdfbb941bb90e 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_tabs.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/_tabs.html.erb
@@ -1,7 +1,7 @@
 <%
   selected_tab = nil unless defined?(:selected_tab)
 %>
-<ul class="tabs2">
+<ul class="tabs">
   <li>
     <a href="<%= url_for :controller => 'roles', :action => 'projects' %>" <%= "class='selected'" if selected_tab=='Projects' -%>
        id="tab-projects"><%= message('projects') -%></a>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb
index 34912d8c1ffbc2388270def49edf8949f940a4c0..9381e4bbb22b462fad0083b69a6f077d349bf0b1 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb
@@ -12,7 +12,7 @@
          action='#'
   >
     <% subcategories = @subcategories_per_categories[@category] || [] -%>
-    <ul class="tabs2">
+    <ul class="tabs">
       <% subcategories.each do |subcategory| -%>
         <li>
           <%= link_to subcategory_name(@category, subcategory), {:controller => @resource ? 'project' : 'settings', :action => @resource ? 'settings' : 'index', :category => @category.key, :subcategory => subcategory.key, :id => (@resource && @resource.id)}, :class => @subcategory==subcategory ? 'selected' : nil -%>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_tabs.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_tabs.html.erb
index 2f1cac98bcd4ec339c4943fb52a02c5ad0ba8470..11c148d741f1648f5171d906e0b7cd354007acae 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_tabs.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_tabs.html.erb
@@ -1,4 +1,4 @@
-<ul class="tabs2">
+<ul class="tabs">
   <li>
     <a href="<%= url_for :action => 'index' -%>" class="<%= 'selected' if tab=='index' -%>">Installed Plugins</a>
   </li>

diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index bee477c2a7ad0b41c4a3e80ba4810a40b08f478a..54aa42c42902a98aafe31a56fc96665e48263f85 100644 (file)
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -1600,13 +1600,6 @@ ul.bullet li {
   font-size: 110%;
 }
 
-.tabs {
-  height: 20px;
-  border-bottom: 1px solid #DDD;
-  margin: 0;
-  padding: 0;
-}
-
 .tablinks {
   float: right;
   padding: 0 5px 0 10px;
@@ -1630,41 +1623,6 @@ ul.bullet li {
   font-size: 85%;
 }
 
-.tabs li {
-  display: inline;
-  list-style-type: none;
-  font-weight: normal;
-  color: #555;
-  background-color: #FFF;
-  vertical-align: baseline;
-  white-space: nowrap;
-  margin: 0;
-  border: 0;
-  padding: 0;
-}
-
-.tabs li a:link, .tabs li a:visited {
-  float: left;
-  background-color: #EFEFEF;
-  color: #555;
-  vertical-align: bottom;
-  height: 17px;
-  margin: 0 1px 0 0;
-  padding: 1px 10px;
-  border: 1px solid #cdcdcd;
-  border-radius: 4px 4px 0 0;
-  -moz-border-radius: 4px 4px 0 0;
-  -webkit-border-radius: 4px 4px 0 0;
-}
-
-.tabs li a.selected:link, .tabs li a.selected:visited {
-  text-decoration: none;
-  background-color: #4B9FD5;
-  color: #FFF;
-  border: 1px solid #CAE3F2;
-  margin: 0 1px 0 0;
-}
-
 .tabs-panel {
   border-right: 1px solid #DDD;
   border-bottom: 1px solid #DDD;
@@ -1673,7 +1631,8 @@ ul.bullet li {
   padding: 10px;
 }
 
-.tabs2 {
+/* tabs2 is deprecated since 4.1. It is kept for backward-compatibility */
+.tabs2, .tabs {
   height: 20px;
   border-bottom: 1px solid #DDD;
   margin: 0;
@@ -1681,7 +1640,7 @@ ul.bullet li {
   font-size: 93%;
 }
 
-.tabs2 li {
+.tabs2 li, .tabs li {
   display: inline;
   list-style-type: none;
   font-weight: normal;
@@ -1693,7 +1652,7 @@ ul.bullet li {
   padding: 0;
 }
 
-.tabs2 li a:link, .tabs2 li a:visited {
+.tabs2 li a:link, .tabs2 li a:visited, .tabs li a:link, .tabs li a:visited {
   float: left;
   color: #777;
   vertical-align: bottom;
@@ -1702,7 +1661,7 @@ ul.bullet li {
   padding: 1px 5px;
 }
 
-.tabs2 li a.selected:link, .tabs2 li a.selected:visited {
+.tabs2 li a.selected:link, .tabs2 li a.selected:visited, .tabs li a.selected:link, .tabs li a.selected:visited {
   text-decoration: none;
   color: #555;
   font-weight: bold;