From c1fcb6ce731e688578179aa7e1c2d4169246b9aa Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Mon, 1 Jun 2015 16:45:26 +0200
Subject: [PATCH] SONAR-6600 add module name to issues breadcrumbs

---
 .../src/main/js/apps/issues/controller.js     |  2 ++
 .../templates/issues-workspace-header.hbs     | 24 ++++++++++++++-----
 .../issues-workspace-list-component.hbs       |  8 +++----
 .../sonar-web/src/main/less/pages/issues.less |  5 ----
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/server/sonar-web/src/main/js/apps/issues/controller.js b/server/sonar-web/src/main/js/apps/issues/controller.js
index 15ccdda827f..4f1ab55a2d0 100644
--- a/server/sonar-web/src/main/js/apps/issues/controller.js
+++ b/server/sonar-web/src/main/js/apps/issues/controller.js
@@ -200,6 +200,8 @@ define([
         key: issue.get('component'),
         name: issue.get('componentLongName'),
         qualifier: issue.get('componentQualifier'),
+        subProject: issue.get('subProject'),
+        subProjectName: issue.get('subProjectLongName'),
         project: issue.get('project'),
         projectName: issue.get('projectLongName')
       };
diff --git a/server/sonar-web/src/main/js/apps/issues/templates/issues-workspace-header.hbs b/server/sonar-web/src/main/js/apps/issues/templates/issues-workspace-header.hbs
index 2def6f9aacc..2e2c9d2ff78 100644
--- a/server/sonar-web/src/main/js/apps/issues/templates/issues-workspace-header.hbs
+++ b/server/sonar-web/src/main/js/apps/issues/templates/issues-workspace-header.hbs
@@ -1,12 +1,24 @@
 <div class="issues-header-component nowrap">
   {{#if state.component}}
-    <a class="js-back">{{t "issues.return_to_list"}}</a>&nbsp;&nbsp;&nbsp;
+    <div class="component-name">
+      <div class="component-name-parent">
+        <a class="js-back">{{t "issues.return_to_list"}}</a>&nbsp;&nbsp;&nbsp;
+      </div>
 
-    {{#with state.component}}
-      {{qualifierIcon "TRK"}}&nbsp;<a href="{{dashboardUrl project}}" title="{{projectName}}">{{projectName}}</a>
-      &nbsp;&nbsp;
-      {{qualifierIcon qualifier}}&nbsp;<a href="{{dashboardUrl key}}" title="{{name}}">{{name}}</a>
-    {{/with}}
+      {{#with state.component}}
+        <div class="component-name-parent">
+          {{qualifierIcon "TRK"}}&nbsp;<a href="{{dashboardUrl project}}" title="{{projectName}}">{{projectName}}</a>
+        </div>
+        {{#if subProject}}
+          <div class="component-name-parent">
+            {{qualifierIcon "TRK"}}&nbsp;<a href="{{dashboardUrl subProject}}" title="{{subProjectName}}">{{subProjectName}}</a>
+          </div>
+        {{/if}}
+        <div class="component-name-file">
+          {{qualifierIcon qualifier}}&nbsp;<a href="{{dashboardUrl key}}" title="{{name}}">{{name}}</a>
+        </div>
+      {{/with}}
+    </div>
   {{else}}
     &nbsp;
   {{/if}}
diff --git a/server/sonar-web/src/main/js/apps/issues/templates/issues-workspace-list-component.hbs b/server/sonar-web/src/main/js/apps/issues/templates/issues-workspace-list-component.hbs
index 51c814e9cef..43d94de426f 100644
--- a/server/sonar-web/src/main/js/apps/issues/templates/issues-workspace-list-component.hbs
+++ b/server/sonar-web/src/main/js/apps/issues/templates/issues-workspace-list-component.hbs
@@ -1,13 +1,13 @@
-<div class="issues-workspace-list-component">
-  <a class="issues-workspace-list-component-part" href="{{dashboardUrl project}}">
+<div class="component-name issues-workspace-list-component">
+  <a class="component-name-parent link-no-underline" href="{{dashboardUrl project}}">
     {{qualifierIcon "TRK"}}&nbsp;{{projectLongName}}
   </a>
   {{#if subProject}}
-    <a class="issues-workspace-list-component-part" href="{{dashboardUrl subProject}}">
+    <a class="component-name-parent link-no-underline" href="{{dashboardUrl subProject}}">
       {{qualifierIcon "TRK"}}&nbsp;{{subProjectLongName}}
     </a>
   {{/if}}
-  <a class="issues-workspace-list-component-part" href="{{dashboardUrl component}}">
+  <a class="component-name-file link-no-underline" href="{{dashboardUrl component}}">
     {{qualifierIcon componentQualifier}}&nbsp;{{componentLongName}}
   </a>
 </div>
diff --git a/server/sonar-web/src/main/less/pages/issues.less b/server/sonar-web/src/main/less/pages/issues.less
index e216be5d3c0..36659706e0f 100644
--- a/server/sonar-web/src/main/less/pages/issues.less
+++ b/server/sonar-web/src/main/less/pages/issues.less
@@ -49,11 +49,6 @@
   margin-top: 25px;
 }
 
-.issues-workspace-list-component-part {
-  margin-right: 10px;
-  border-bottom: none;
-}
-
 .issues-workspace-component-viewer {
   display: none;
   padding: 1px 10px;
-- 
2.39.5