SONAR-3802 move link of reviews from sidebar to top nav bar

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 5af08a41b808cf6647277f0fd8a1cde990ff7895..339e93dec12f2057fe47c1db35700ab9a9b792dc 100644 (file)
--- 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
@@ -287,6 +287,8 @@ layout.ask_a_questions=Ask a question
 layout.plugins=Plugins
 layout.evaluation=Embedded database should be used for evaluation purpose only
 layout.ie6_warn=Your web browser is outdated. This website may not display correctly.
+layout.dashboards=Dashboards
+layout.reviews=Reviews
 
 sidebar.project_settings=Configuration
 sidebar.security=Security

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
index 017707fa4fc5dc57bd26da237be0053a016250da..77295ad8bf20b99011afd6ca2aa95e7dc6165c9d 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
@@ -11,16 +11,10 @@
   <div id="nav-left">
     <ul>
       <li>
-        <% global_dashboards = ActiveDashboard.user_dashboards(current_user, true)
-           if global_dashboards.empty?
-        %>
-          <a href="<%= ApplicationController.root_context -%>/"><%= message('layout.home') -%></a>
-        <%
-           else
-             main_global_dashboard = global_dashboards[0]
-        %>
-          <a href="<%= ApplicationController.root_context -%>/dashboard/?did=<%= main_global_dashboard.dashboard_id -%>"><%= h main_global_dashboard.dashboard.name(true) -%></a>
-        <% end %>
+        <a href="<%= ApplicationController.root_context -%>"><%= message('layout.dashboards') -%></a>
+      </li>
+      <li>
+        <a href="<%= ApplicationController.root_context -%>/reviews"><%= message('layout.reviews') -%></a>
       </li>
     </ul>
   </div>
@@ -58,8 +52,6 @@
             </li>
           <% end %>
 
-          <li class="<%= 'selected' if controller.controller_path=='reviews' -%>">
-            <a href="<%= ApplicationController.root_context -%>/reviews/index"><%= message('reviews.page') -%></a></li>
           <li class="<%= 'selected' if controller.controller_path=='dependencies' -%>">
             <a href="<%= ApplicationController.root_context -%>/dependencies/index"><%= message('dependencies.page') -%></a></li>