From 4457d168a71ca24ba9d33dbbca1f7822ed7a5443 Mon Sep 17 00:00:00 2001
From: Fabrice Bellingard <fabrice.bellingard@sonarsource.com>
Date: Thu, 29 Nov 2012 14:23:41 +0100
Subject: [PATCH] SONAR-37 & SONAR-2911 Improve rendering

- Add breadcrumb bar and put permalink inside
- Move the icons under the snapshot name, version and date
---
 .../app/controllers/comparison_controller.rb        |  7 ++++++-
 .../WEB-INF/app/views/comparison/index.html.erb     | 13 +++----------
 .../WEB-INF/app/views/layouts/_breadcrumb.html.erb  | 11 +++++++++++
 3 files changed, 20 insertions(+), 11 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 6de07617062..4d0ebd0ac2b 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
@@ -19,7 +19,7 @@
 #
 
 class ComparisonController < ApplicationController
-
+  
   def index
     snapshots = []
     resource_key = params[:resource]
@@ -57,6 +57,11 @@ class ComparisonController < ApplicationController
     
     @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
+    add_breadcrumbs message('sidebar.tools'), {:name => message('comparison.page'), :url => {:controller => 'comparison', :action => 'index'}}
   end
   
   def versions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/comparison/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/comparison/index.html.erb
index 938441aaff4..9000761e3a4 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/comparison/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/comparison/index.html.erb
@@ -49,7 +49,7 @@
           <th class="thin move-actions" style="padding: 5px !important;">
             <table>
               <tr>
-                <td style="vertical-align: top;">
+                <td style="vertical-align: bottom;">
                   <% if index > 0 %>
                     <a href="#" onclick="moveLeft(<%= index -%>)"><img src="<%= ApplicationController.root_context -%>/images/controls/move_left.png" title="<%= message('comparison.move_left') -%>"/></a>
                   <% else %>
@@ -57,14 +57,14 @@
                   <% end %>
                 </td>
                 <td class="nowrap" style="text-align: center;">
-                  <div style="width: 100%; text-align: center;"><a href="#" onclick="removeFromList(<%= index -%>, $j('#sids'))"><img src="<%= ApplicationController.root_context -%>/images/controls/cross.png" title="<%= message('comparison.remove_resource') -%>"/></a></div>
                   <a href="<%= ApplicationController.root_context -%>/dashboard/index/<%= s.resource.key -%>"><%= s.resource.name(true) -%></a>
                   <br/>
                   <span class="note"><b><%= s.event(EventCategory::KEY_VERSION).name -%></b></span>
                   <br/>
                   <span class="note"><%= human_short_date s.created_at -%></span>
+                  <div style="width: 100%; text-align: center;"><a href="#" onclick="removeFromList(<%= index -%>, $j('#sids'))"><img src="<%= ApplicationController.root_context -%>/images/controls/cross.png" title="<%= message('comparison.remove_resource') -%>"/></a></div>
                 </td>
-                <td class="thin" style="vertical-align: top;">
+                <td class="thin" style="vertical-align: bottom;">
                   <% if index < last_index %>
                     <a href="#" onclick="moveRight(<%= index -%>)"><img src="<%= ApplicationController.root_context -%>/images/controls/move_right.png" title="<%= message('comparison.move_right') -%>"/></a>
                   <% else %>
@@ -122,12 +122,6 @@
             </script>
           </span>  
         </th>
-        
-        <th class="thin" style="vertical-align: top">
-          <a href="<%= url_for :controller => 'comparison', :action => 'index', :sids => @snapshots.map {|s| s.id.to_s}.join(','), :metrics => @metrics.map {|m| m.key}.join(',') -%>">
-            <img src="<%= ApplicationController.root_context -%>/images/permalink.png" title="<%= message('permalink') -%>"/>
-          </a>
-        </th>
       </thead>
         
       <tbody>
@@ -156,7 +150,6 @@
             <% end %>
             
             <td></td>
-            <td></td>
           </tr>
         <% end %> 
       </tbody>
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 f84fe5e4911..6877f148f05 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
@@ -1,5 +1,13 @@
 <% if @breadcrumbs %>
+
   <div id="crumbs">
+    <% if @permalink %>
+      <ul id="crumbs-ops">
+        <li>
+          <a href="<%= @permalink -%>"><img src="<%= ApplicationController.root_context -%>/images/permalink.png" width="16" height="16" title="<%= message('permalink') -%>"/></a>
+        </li>
+      </ul>
+    <% end %>
     <ul id="bc">
       <%
          @breadcrumbs.each_with_index do |breadcrumb, index|
@@ -22,9 +30,11 @@
       <% end %>
     </ul>
   </div>
+  
 <% elsif @resource || @project
      displayed_resource = @resource || @project
 %>
+
   <div id="crumbs">
     <% if !@review %>
       <ul id="crumbs-ops">
@@ -76,4 +86,5 @@
       %>
     </ul>
   </div>
+
 <% end %>
\ No newline at end of file
-- 
2.39.5