From 803c1903e226f95b8db37ac8e777394d800202b6 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Tue, 26 Aug 2014 19:06:51 +0600
Subject: [PATCH] SONAR-4407 Refactor the libraries page in order to drop GWT

Feedback applied
---
 server/sonar-web/src/main/coffee/libraries/view.coffee    | 2 +-
 server/sonar-web/src/main/hbs/libraries/libraries.hbs     | 4 ++--
 server/sonar-web/src/main/less/icons.less                 | 1 +
 server/sonar-web/src/main/less/libraries.less             | 8 ++++----
 .../webapp/WEB-INF/app/views/dependencies/index.html.erb  | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/server/sonar-web/src/main/coffee/libraries/view.coffee b/server/sonar-web/src/main/coffee/libraries/view.coffee
index 6e14ed82df6..90ca0673ec1 100644
--- a/server/sonar-web/src/main/coffee/libraries/view.coffee
+++ b/server/sonar-web/src/main/coffee/libraries/view.coffee
@@ -24,7 +24,7 @@ define [
       'change .js-test-libraries': 'toggleTestLibraries'
       'click @ui.collapseAll': 'collapseAll'
       'click @ui.expandAll': 'expandAll'
-      'click .libraries-tree-with-subtree > .libraries-tree-name': 'toggleSubTree'
+      'click .libraries-tree-with-subtree > a': 'toggleSubTree'
 
 
     onRender: ->
diff --git a/server/sonar-web/src/main/hbs/libraries/libraries.hbs b/server/sonar-web/src/main/hbs/libraries/libraries.hbs
index 1222cf102f9..5b050215262 100644
--- a/server/sonar-web/src/main/hbs/libraries/libraries.hbs
+++ b/server/sonar-web/src/main/hbs/libraries/libraries.hbs
@@ -32,9 +32,9 @@
           <ul>
             {{#recursive libraries}}
               <li class="{{#if to}}libraries-tree-with-subtree libraries-tree-subtree-collapsed{{/if}} {{#eq u 'test'}}libraries-tree-test{{/eq}}">
-                <i class="icon-dropdown"></i>&nbsp;
+                {{#if to}}<a>{{/if}}
                 {{qualifierIcon q}}
-                <span class="libraries-tree-name">{{n}}</span>
+                <span class="libraries-tree-name">{{n}}</span>{{#if to}}</a>{{/if}}
                 {{#if v}}
                   <span class="libraries-tree-version">{{v}}</span>
                 {{/if}}
diff --git a/server/sonar-web/src/main/less/icons.less b/server/sonar-web/src/main/less/icons.less
index 271349d43a7..f13dc75e7d5 100644
--- a/server/sonar-web/src/main/less/icons.less
+++ b/server/sonar-web/src/main/less/icons.less
@@ -209,6 +209,7 @@ a[class^="icon-"], a[class*=" icon-"] {
 .icon-qualifier-trk:before,
 .icon-qualifier-brc:before,
 .icon-qualifier-uts:before,
+.icon-qualifier-lib:before,
 .icon-qualifier-vw:before,
 .icon-qualifier-svw:before,
 .icon-qualifier-dev:before,
diff --git a/server/sonar-web/src/main/less/libraries.less b/server/sonar-web/src/main/less/libraries.less
index bf0f0612f72..9d659fad749 100644
--- a/server/sonar-web/src/main/less/libraries.less
+++ b/server/sonar-web/src/main/less/libraries.less
@@ -34,8 +34,8 @@
   }
 
   & > ul ul ul {
-    margin-left: 3px;
-    padding-left: 20px;
+    margin: 4px 0 4px 8px;
+    padding-left: 16px;
     border-left: 1px dashed #ddd;
   }
 
@@ -76,7 +76,7 @@
     &:hover { border-color: #ddd; }
   }
 
-  & > .icon-dropdown {
+  & > a > .icon-dropdown {
     visibility: visible;
   }
 }
@@ -87,7 +87,7 @@
     display: none;
   }
 
-  & > .icon-dropdown:before {
+  & > a > .icon-dropdown:before {
     content: "\f0da";
   }
 }
diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dependencies/index.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dependencies/index.html.erb
index 9594c549086..adfcecbf1b6 100644
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/dependencies/index.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dependencies/index.html.erb
@@ -86,7 +86,7 @@ padding: 5px;
      <% @project_snapshots.each do |project_snapshot|%>
       <tr class="<%= cycle('even', 'odd', :name => 'dep') -%>">
         <td>
-        <%= qualifier_icon(project_snapshot.project) %> <%= link_to h(project_snapshot.project.name(true)), "#{ApplicationController.root_context}/libraries/index/#{h @resource.kee}" -%><br/>
+        <%= qualifier_icon(project_snapshot.project) %> <%= link_to h(project_snapshot.project.name(true)), "#{ApplicationController.root_context}/libraries/index/#{project_snapshot.project_id}" -%><br/>
         <span class="small gray"><%= h project_snapshot.project.kee -%></span></td>
       </tr>
       <% end %>
-- 
2.39.5