DSM & Libraries: drop entry points for old pages

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
index 0bb0f9e1ae34370c12fd2d7a6959574938695e5e..d9c1cad458a0ba4610bfcd2ea2f5804397273d39 100644 (file)
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb
@@ -89,27 +89,19 @@
             <% end %>
 
             <% if @snapshot %>
-            <li class="spacer"></li>
-            <li class="sidebar-title"><%= message('sidebar.tools') -%></li>
-            <li class="<%= 'active' if request.request_uri.include?('/components/index') -%>">
-              <a href="<%= ApplicationController.root_context -%>/components/index/<%= @project.id -%>"><%= message('components.page') -%></a>
-            </li>
-            <li class="<%= 'active' if request.request_uri.include?('/drilldown/issues') -%>">
-              <a href="<%= ApplicationController.root_context -%>/drilldown/issues/<%= @project.id -%><%= "?"+period_param if period_param -%>"><%= message('issues_drilldown.page') -%></a>
-            </li>
-              <% project_metrics = @project.last_snapshot.metric_keys.to_java(:string) if @project.last_snapshot
-                controller.java_facade.getPages(Navigation::SECTION_RESOURCE.key, @project.scope, @project.qualifier, @project.language, project_metrics).each do |page|
-                page_url = (page.isController() ? "#{page.getId()}?id=#{@project.id}" : "/plugins/resource/#{@project.id}?page=#{page.getId()}")
-              %>
-              <li class="<%= 'active' if request.request_uri.include?(page_url) -%>">
-                <a href="<%= ApplicationController.root_context -%><%= page_url -%>"><%= h message(page.getId() + '.page', :default => page.getTitle()) -%></a>
+              <li class="spacer"></li>
+              <li class="sidebar-title"><%= message('sidebar.tools') -%></li>
+              <li class="<%= 'active' if request.request_uri.include?('/components/index') -%>">
+                <a href="<%= ApplicationController.root_context -%>/components/index/<%= @project.id -%>"><%= message('components.page') -%></a>
+              </li>
+              <li class="<%= 'active' if request.request_uri.include?('/drilldown/issues') -%>">
+                <a href="<%= ApplicationController.root_context -%>/drilldown/issues/<%= @project.id -%><%= "?"+period_param if period_param -%>"><%= message('issues_drilldown.page') -%></a>
               </li>
-              <% end %>
               <li class="<%= 'active' if request.request_uri.include?('/design/index') -%>">
-                <a href="<%= ApplicationController.root_context -%>/design/index/<%= @project.key -%>">Design (NEW)</a>
+                <a href="<%= ApplicationController.root_context -%>/design/index/<%= @project.key -%>"><%= message('design.page') -%></a>
               </li>
               <li class="<%= 'active' if request.request_uri.include?('/libraries/index') -%>">
-                <a href="<%= ApplicationController.root_context -%>/libraries/index/<%= @project.key -%>">Libraries (NEW)</a>
+                <a href="<%= ApplicationController.root_context -%>/libraries/index/<%= @project.key -%>"><%= message('libraries.page') -%></a>
               </li>
               <% if controller.java_facade.getResourceTypeBooleanProperty(@project.qualifier, 'comparable') %>
               <li class="<%= 'active' if request.request_uri.include?('/comparison/index') -%>">

diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index 1fa950fe99de1d3c3d496a9ae68bbcfce4661a7b..6ec7275a21f665b08f813cb502e1866ce2b69b12 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -517,6 +517,8 @@ issues_drilldown.page=Issues Drilldown
 source.page=Source
 timemachine.page=Time Machine
 comparison.page=Compare
+design.page=Design
+libraries.page=Libraries
 
 # GWT pages
 org.sonar.plugins.design.ui.page.DesignPage.page=Design