SONAR-1722 rename the Inheritance Tree tab + add missing image

4 files changed, 8 insertions, 8 deletions

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb
index ea222e8aa56..fcd05e004fd 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/profiles_controller.rb
@@ -24,7 +24,7 @@ class ProfilesController < ApplicationController
   verify :method => :post, :only => ['create', 'delete', 'copy', 'set_as_default', 'restore', 'set_projects', 'rename', 'change_parent'], :redirect_to => { :action => 'index' }
 
   # the backup action is allow to non-admin users : see http://jira.codehaus.org/browse/SONAR-2039
-  before_filter :admin_required, :except => [ 'index', 'show', 'projects', 'permalinks', 'export', 'backup', 'hierarchy' ]
+  before_filter :admin_required, :except => [ 'index', 'show', 'projects', 'permalinks', 'export', 'backup', 'inheritance' ]
 
   #
   #
@@ -187,10 +187,10 @@ class ProfilesController < ApplicationController
 
   #
   #
-  # GET /profiles/hierarchy?id=<profile id>
+  # GET /profiles/inheritance?id=<profile id>
   #
   #
-  def hierarchy
+  def inheritance
     @profile = Profile.find(params[:id])
     
     profiles=Profile.find(:all, :conditions => ['language=? and id<>? and (parent_name is null or parent_name<>?)', @profile.language, @profile.id, @profile.name], :order => 'name')
@@ -212,7 +212,7 @@ class ProfilesController < ApplicationController
       messages = java_facade.changeParentProfile(id, parent_name)
     end
     flash_validation_messages(messages)
-    redirect_to :action => 'hierarchy', :id => id
+    redirect_to :action => 'inheritance', :id => id
   end
 
 
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 c1dad1849de..47ccff6a5f5 100644
--- 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
@@ -16,7 +16,7 @@
     <a href="<%= url_for :controller => 'profiles', :action => 'permalinks', :id => @profile.id -%>" <%= "class='selected'" if selected_tab=='Permalinks' -%>>Permalinks</a>
   </li>
   <li>
-    <a href="<%= url_for :controller => 'profiles', :action => 'hierarchy', :id => @profile.id -%>" <%= "class='selected'" if selected_tab=='Hierarchy' -%>>Hierarchy</a>
+    <a href="<%= url_for :controller => 'profiles', :action => 'inheritance', :id => @profile.id -%>" <%= "class='selected'" if selected_tab=='inheritance' -%>>Inheritance Tree</a>
   </li>
   <% if new_tab %>
   <li>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/hierarchy.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/inheritance.html.erb
index 41c0df853a0..7d3e1c04da9 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/hierarchy.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/inheritance.html.erb
@@ -1,5 +1,5 @@
 <h1 class="marginbottom10"><%= link_to 'Quality profiles', :controller => 'profiles', :action => 'index' -%> / <%= h @profile.language -%> / <%= h @profile.name %></h1>
-<%= render :partial => 'profiles/tabs', :locals => {:selected_tab=>'Hierarchy'} %>
+<%= render :partial => 'profiles/tabs', :locals => {:selected_tab=>'inheritance'} %>
 
 <div class="tabs-panel marginbottom10">
 
@@ -8,7 +8,7 @@
       <td align="center"  valign="top">
         <div>
             <% @profile.ancestors.reverse.each do |parent| %>
-              <a href="<%= url_for :action => 'hierarchy', :id => parent.id -%>"><%= parent.name -%></a> <span class="note">(<%= parent.active_rules.size -%> rules)</span><br/>
+              <a href="<%= url_for :action => 'inheritance', :id => parent.id -%>"><%= parent.name -%></a> <span class="note">(<%= parent.active_rules.size -%> rules)</span><br/>
               <%= image_tag 'blue-up.png' -%><br/>
             <% end %>
 
@@ -18,7 +18,7 @@
               <%= image_tag 'blue-up.png' -%><br/>
               <% @profile.children.each_with_index do |child,index| %>
                 <%= ', ' if index>0 -%>
-                <a href="<%= url_for :action => 'hierarchy', :id => child.id -%>"><%= child.name -%></a> <span class="note">(<%= child.active_rules.size -%> rules)</span>
+                <a href="<%= url_for :action => 'inheritance', :id => child.id -%>"><%= child.name -%></a> <span class="note">(<%= child.active_rules.size -%> rules)</span>
               <% end %>
               <br/><%= image_tag 'blue-up.png' -%><br/>
               ...
diff --git a/sonar-server/src/main/webapp/images/up-blue-24.png b/sonar-server/src/main/webapp/images/up-blue-24.png
new file mode 100644
index 00000000000..a3507b3c058
--- /dev/null
+++ b/sonar-server/src/main/webapp/images/up-blue-24.png