From 50b1032386c8ab28695be60ec52461e30012280b Mon Sep 17 00:00:00 2001
From: Fabrice Bellingard <fabrice.bellingard@sonarsource.com>
Date: Thu, 29 Nov 2012 14:46:01 +0100
Subject: [PATCH] SONAR-3972 Add breadcrumbs on tool pages

---
 .../src/main/resources/org/sonar/l10n/core.properties       | 3 +++
 .../webapp/WEB-INF/app/controllers/comparison_controller.rb | 2 +-
 .../WEB-INF/app/controllers/dependencies_controller.rb      | 2 ++
 .../webapp/WEB-INF/app/controllers/reviews_controller.rb    | 2 ++
 .../main/webapp/WEB-INF/app/views/layouts/_tools.html.erb   | 6 +++---
 .../main/webapp/WEB-INF/app/views/reviews/index.html.erb    | 1 -
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
index 8becc0439de..ef7ba122791 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -305,6 +305,9 @@ layout.user_panel.anonymous_user=Anonymous
 layout.user_panel.non_authenticated_user=Unauthenticated user
 
 sidebar.tools=Tools
+sidebar.tools.comparison=Comparison
+sidebar.tools.dependency=Dependency
+sidebar.tools.review=Review
 sidebar.project_settings=Configuration
 sidebar.security=Security
 sidebar.system=System
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/comparison_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/comparison_controller.rb
index 4d0ebd0ac2b..b7b13db7131 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/comparison_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/comparison_controller.rb
@@ -61,7 +61,7 @@ class ComparisonController < ApplicationController
     unless @snapshots.empty?
       @permalink = url_for :controller => 'comparison', :action => 'index', :sids => @snapshots.map {|s| s.id.to_s}.join(','), :metrics => @metrics.map {|m| m.key}.join(',')
     end
-    add_breadcrumbs message('sidebar.tools'), {:name => message('comparison.page'), :url => {:controller => 'comparison', :action => 'index'}}
+    add_breadcrumbs message('sidebar.tools'), {:name => message('sidebar.tools.comparison'), :url => {:controller => 'comparison', :action => 'index'}}
   end
   
   def versions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/dependencies_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/dependencies_controller.rb
index 91c62d822f9..8b7eba87315 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/dependencies_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/dependencies_controller.rb
@@ -92,6 +92,8 @@ class DependenciesController < ApplicationController
       end
 
     end
+    
+    add_breadcrumbs message('sidebar.tools'), {:name => message('sidebar.tools.dependency'), :url => {:controller => 'dependencies', :action => 'index'}}
   end
 
   private
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/reviews_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/reviews_controller.rb
index a4b1c4cabf1..fc9ea5318f5 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/reviews_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/reviews_controller.rb
@@ -30,6 +30,8 @@ class ReviewsController < ApplicationController
   def index
     init_params()
     search_reviews()
+    
+    add_breadcrumbs message('sidebar.tools'), {:name => message('sidebar.tools.review'), :url => {:controller => 'reviews', :action => 'index'}}
   end
 
   # Used for the "OLD" permalink "http://localhost:9000/reviews/view/1"
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_tools.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_tools.html.erb
index a5c93c4ecf0..2e358d6751f 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_tools.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_tools.html.erb
@@ -3,9 +3,9 @@
   
   <div id="tools-menu" class="dropdown-menu" style="display: none">
     <ul>
-      <li><a href="<%= ApplicationController.root_context -%>/dependencies/index"><%= message('dependencies.page') -%></a></li>
-      <li><a href="<%= ApplicationController.root_context -%>/comparison/index"><%= message('comparison.page') -%></a></li>
-      <li><a href="<%= ApplicationController.root_context -%>/reviews/index"><%= message('reviews.page') -%></a></li>
+      <li><a href="<%= ApplicationController.root_context -%>/dependencies/index"><%= message('sidebar.tools.dependency') -%></a></li>
+      <li><a href="<%= ApplicationController.root_context -%>/comparison/index"><%= message('sidebar.tools.comparison') -%></a></li>
+      <li><a href="<%= ApplicationController.root_context -%>/reviews/index"><%= message('sidebar.tools.review') -%></a></li>
     </ul>
   </div>
 </li>
\ No newline at end of file
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/index.html.erb
index 99e2f091302..3fc8a39a73a 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/reviews/index.html.erb
@@ -1,5 +1,4 @@
 <div id="reviews-search">
-  <h1><%= message('reviews') -%></h1>
   <% form_tag({:action => 'index'}, {:method => 'get'}) do %>
     <table id="reviews-form" class="header1">
       <thead>
-- 
2.39.5