SONAR-5466 Workspace should display the project as well as the module

diff --git a/server/sonar-web/src/main/hbs/component-viewer/cw-workspace.hbs b/server/sonar-web/src/main/hbs/component-viewer/cw-workspace.hbs
index 1c0137f9f1277a7fab6df2c89b9a0e651d128f46..781b1ceba55bcf27cd6f8fa293d7483d816dcbd6 100644 (file)
--- a/server/sonar-web/src/main/hbs/component-viewer/cw-workspace.hbs
+++ b/server/sonar-web/src/main/hbs/component-viewer/cw-workspace.hbs
@@ -14,28 +14,24 @@
 <ul class="component-viewer-workspace-list">
   {{#eachReverse workspace}}
     <li class="component-viewer-workspace-item {{#if active}}active{{/if}}">
-      {{qualifierIcon component.q}}
-      <a class="link-action" data-key="{{component.key}}">{{component.name}}</a>
       <div class="text-ellipsis subtitle" title="{{component.projectName}} / {{component.subProjectName}}">
         {{component.projectName}} / {{component.subProjectName}}
       </div>
-      {{#if component.dir}}
-        <div class="text-ellipsis subtitle">{{component.dir}}</div>
-      {{/if}}
+      {{#if component.dir}}<div class="text-ellipsis subtitle">{{component.dir}}</div>{{/if}}
+      {{qualifierIcon component.q}} <a class="link-action" data-key="{{component.key}}">{{component.name}}</a>
+
       {{#if options}}
         <div class="component-viewer-workspace-transition">{{t 'component_viewer.transition' ../transition}}</div>
         <ul class="component-viewer-workspace-options">
           {{#each options}}
             <li class="component-viewer-workspace-option text-ellipsis {{#if active}}active{{/if}}" title="{{name}}">
-              <a class="link-action" data-workspace-key="{{../component.key}}" data-key="{{key}}">{{name}}</a>
               {{#if component}}
                 <div class="text-ellipsis subtitle" title="{{component.projectName}} / {{component.subProjectName}}">
                   {{component.projectName}} / {{component.subProjectName}}
                 </div>
               {{/if}}
-              {{#if subname}}
-                <div class="text-ellipsis subtitle" title="{{subname}}">{{subname}}</div>
-              {{/if}}
+              {{#if subname}}<div class="text-ellipsis subtitle" title="{{subname}}">{{subname}}</div>{{/if}}
+              <a class="link-action" data-workspace-key="{{../component.key}}" data-key="{{key}}">{{name}}</a>
             </li>
           {{/each}}
         </ul>

diff --git a/server/sonar-web/src/main/less/component-viewer.less b/server/sonar-web/src/main/less/component-viewer.less
index 8ba6499c025f8853af057db80e1dcd8561f0329a..84ce9a28f63881be78f8e580ca759458bbfa4b82 100644 (file)
--- a/server/sonar-web/src/main/less/component-viewer.less
+++ b/server/sonar-web/src/main/less/component-viewer.less
@@ -70,6 +70,7 @@
   white-space: nowrap;
 
   &.active > a { font-weight: bold; }
+  .subtitle { line-height: 16px; }
 }
 
 .component-viewer-workspace-item + .component-viewer-workspace-item {