diff options
| author | Fabrice Bellingard <fabrice.bellingard@sonarsource.com> | 2012-12-05 15:16:39 +0100 |
|---|---|---|
| committer | Fabrice Bellingard <fabrice.bellingard@sonarsource.com> | 2012-12-05 15:46:23 +0100 |
| commit | 9d13c2dd629e4e99e17ef05059d6e464e8968a54 (patch) | |
| tree | 8e54f67ee2fd6bc039fbd083186e8e2b8edb2b40 /sonar-server/src/main/webapp | |
| parent | 8e264cd428bc6ebcc987340f0521858dd41e1056 (diff) | |
| download | sonarqube-9d13c2dd629e4e99e17ef05059d6e464e8968a54.tar.gz sonarqube-9d13c2dd629e4e99e17ef05059d6e464e8968a54.zip | |
SONAR-3972 Remove permalink icon in the breadcrumbs bar
- And also do not display the star and the "Configuration" dropdown
when showing a review.
Diffstat (limited to 'sonar-server/src/main/webapp')
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/controllers/comparison_controller.rb | 5 | ||||
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb | 26 |
2 files changed, 8 insertions, 23 deletions
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 238de579673..a2ee45dbbc9 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 @@ -58,11 +58,6 @@ class ComparisonController < ApplicationController @metrics = Metric.by_keys(metrics) @metric_to_choose = Metric.all.select {|m| m.display? && !@metrics.include?(m)}.sort_by(&:short_name) - - # UI breadcrumb and permalink - 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 end def versions diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb index bc3d59fb704..1cef8792693 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb @@ -6,18 +6,13 @@ <div id="crumbs"> <ul id="crumbs-ops"> - <% if displayed_resource %> + <% if displayed_resource && !@review %> <li> <%= link_to_favourite(displayed_resource) -%> </li> - <% end %> - <% if @permalink %> - <li> - <a href="<%= @permalink -%>"><img src="<%= ApplicationController.root_context -%>/images/permalink.png" width="16" height="16" title="<%= message('permalink') -%>"/></a> - </li> - <% end %> - <% if displayed_resource && has_role?(:admin, displayed_resource) && !displayed_resource.entity? %> - <%= render 'layouts/menu_resource_settings' -%> + <% if has_role?(:admin, displayed_resource) && !displayed_resource.entity? %> + <%= render 'layouts/menu_resource_settings' -%> + <% end %> <% end %> </ul> <ul id="bc"> @@ -47,18 +42,13 @@ <div id="crumbs"> <ul id="crumbs-ops"> - <% if displayed_resource %> + <% if displayed_resource && !@review %> <li> <%= link_to_favourite(displayed_resource) -%> </li> - <% end %> - <% if !@review %> - <li> - <a href="<%= url_for(:overwrite_params => {:id => displayed_resource.key}) -%>"><img src="<%= ApplicationController.root_context -%>/images/permalink.png" width="16" height="16" title="<%= message('permalink') -%>"/></a> - </li> - <% end %> - <% if displayed_resource && has_role?(:admin, displayed_resource) && !displayed_resource.entity? %> - <%= render 'layouts/menu_resource_settings' -%> + <% if has_role?(:admin, displayed_resource) && !displayed_resource.entity? %> + <%= render 'layouts/menu_resource_settings' -%> + <% end %> <% end %> </ul> <ul id="bc"> |