diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2014-08-25 15:14:19 +0600 |
|---|---|---|
| committer | Stas Vilchik <vilchiks@gmail.com> | 2014-08-25 15:14:19 +0600 |
| commit | a42d8c32850f8c699e51d5a7edf411082907390a (patch) | |
| tree | 796208b6c1b3ac745aa5da4c1ed95621f4cfd2b1 | |
| parent | 5df1df16f0a17ce8739c590b1f3f14761e0a4dde (diff) | |
| download | sonarqube-a42d8c32850f8c699e51d5a7edf411082907390a.tar.gz sonarqube-a42d8c32850f8c699e51d5a7edf411082907390a.zip | |
DSM & Libraries: drop entry points for old pages
| -rw-r--r-- | server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb | 26 | ||||
| -rw-r--r-- | sonar-core/src/main/resources/org/sonar/l10n/core.properties | 2 |
2 files changed, 11 insertions, 17 deletions
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 0bb0f9e1ae3..d9c1cad458a 100644 --- 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 1fa950fe99d..6ec7275a21f 100644 --- 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 |