From e91707aa02fe225c5c6ef62808cce3f6fc1125ee Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Mon, 19 May 2014 17:35:30 +0200
Subject: [PATCH] SONAR-5209 Workspace

---
 .../main/coffee/component-viewer/main.coffee  |  14 ++++---
 .../coffee/component-viewer/workspace.coffee  |   6 +++
 .../src/main/hbs/component-viewer/layout.hbs  |   2 +-
 .../main/hbs/component-viewer/workspace.hbs   |   9 +++++
 .../src/main/less/component-viewer.less       |  38 +++++++++++++-----
 sonar-server/src/main/less/icons.less         |   8 ++++
 sonar-server/src/main/webapp/fonts/sonar.woff | Bin 17088 -> 17512 bytes
 7 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/sonar-server/src/main/coffee/component-viewer/main.coffee b/sonar-server/src/main/coffee/component-viewer/main.coffee
index 25d2ca5775b..07924a1ae08 100644
--- a/sonar-server/src/main/coffee/component-viewer/main.coffee
+++ b/sonar-server/src/main/coffee/component-viewer/main.coffee
@@ -59,7 +59,7 @@ define [
     initialize: (options) ->
       @settings = new Backbone.Model
         issues: false
-        coverage: false
+        coverage: true
         duplications: false
         scm: false
         workspace: false
@@ -86,11 +86,8 @@ define [
 
 
     onRender: ->
-      if @settings.get 'workspace'
-        @workspaceRegion.show @workspaceView
-        @$el.addClass 'component-viewer-workspace-enabled'
-      else
-        @$el.removeClass 'component-viewer-workspace-enabled'
+      @workspaceRegion.show @workspaceView
+      @$el.toggleClass 'component-viewer-workspace-enabled', @settings.get 'workspace'
       @sourceRegion.show @sourceView
       @headerRegion.show @headerView
 
@@ -124,6 +121,7 @@ define [
 
     requestSource: (key) ->
       $.get API_SOURCES, key: key, (data) =>
+        @source.clear()
         @source.set source: data.sources
 
 
@@ -176,6 +174,10 @@ define [
       @sourceView.render()
 
 
+    toggleWorkspace: ->
+      if @settings.get 'workspace' then @hideWorkspace() else @showWorkspace()
+
+
     showWorkspace: ->
       @settings.set 'workspace', true
       @render()
diff --git a/sonar-server/src/main/coffee/component-viewer/workspace.coffee b/sonar-server/src/main/coffee/component-viewer/workspace.coffee
index ab7662452df..4e36162ca8e 100644
--- a/sonar-server/src/main/coffee/component-viewer/workspace.coffee
+++ b/sonar-server/src/main/coffee/component-viewer/workspace.coffee
@@ -14,6 +14,8 @@ define [
 
 
     events:
+      'click .js-toggle-workspace': 'toggleWorkspace'
+
       'click .component-viewer-workspace-item > a[data-key]': 'goToWorkspaceItem'
       'click .component-viewer-workspace-option > a[data-key]': 'goToWorkspaceOption'
 
@@ -22,6 +24,10 @@ define [
       @delegateEvents()
 
 
+    toggleWorkspace: ->
+      @options.main.toggleWorkspace()
+
+
     goToWorkspaceItem: (e) ->
       key = $(e.currentTarget).data 'key'
       workspace = @options.main.workspace
diff --git a/sonar-server/src/main/hbs/component-viewer/layout.hbs b/sonar-server/src/main/hbs/component-viewer/layout.hbs
index 9bba8ff0a78..a010e4c4803 100644
--- a/sonar-server/src/main/hbs/component-viewer/layout.hbs
+++ b/sonar-server/src/main/hbs/component-viewer/layout.hbs
@@ -1,3 +1,3 @@
-<div class="component-viewer-workspace"></div>
 <div class="component-viewer-header"></div>
+<div class="component-viewer-workspace"></div>
 <div class="component-viewer-source"></div>
\ No newline at end of file
diff --git a/sonar-server/src/main/hbs/component-viewer/workspace.hbs b/sonar-server/src/main/hbs/component-viewer/workspace.hbs
index f1a83c56881..f409ed28d5e 100644
--- a/sonar-server/src/main/hbs/component-viewer/workspace.hbs
+++ b/sonar-server/src/main/hbs/component-viewer/workspace.hbs
@@ -1,3 +1,12 @@
+<button class="button-clean component-viewer-workspace-toggle js-toggle-workspace">
+  {{#if settings.workspace}}
+    <i class="icon-double-chevron-left"></i>
+  {{else}}
+    <i class="icon-double-chevron-right"></i>
+  {{/if}}
+
+</button>
+
 <ul class="component-viewer-workspace-list">
   {{#eachReverse workspace}}
     <li class="component-viewer-workspace-item">
diff --git a/sonar-server/src/main/less/component-viewer.less b/sonar-server/src/main/less/component-viewer.less
index 00d00114274..2b2bd42c6aa 100644
--- a/sonar-server/src/main/less/component-viewer.less
+++ b/sonar-server/src/main/less/component-viewer.less
@@ -1,7 +1,7 @@
 @import "variables";
 @import "mixins";
 
-@workspaceWidth: 260px;
+@workspaceWidth: 220px;
 
 
 .component-viewer {
@@ -12,10 +12,7 @@
 }
 
 .component-viewer-workspace-enabled {
-  border-left-width: 1px;
-
-  .component-viewer-workspace { display: block; }
-  .component-viewer-source { border-left: @workspaceWidth solid @barBackgroundColor; }
+  .component-viewer-workspace .component-viewer-workspace-list { display: block; }
 }
 
 
@@ -31,20 +28,28 @@
 
 
 .component-viewer-workspace {
-  display: none;
-  float: left;
-  width: @workspaceWidth;
-  .box-sizing(border-box);
+  position: relative;
+  display: table-cell;
+  vertical-align: top;
+  padding-right: 30px;
+  border: 1px solid @barBorderColor;
+  background-color: @barBackgroundColor;
 
   a:hover { text-decoration: underline; }
 }
 
 .component-viewer-workspace-list {
-  margin: 8px 0;
+  display: none;
+  width: @workspaceWidth;
+  padding: 8px 0;
+  .box-sizing(border-box);
 }
 
 .component-viewer-workspace-item {
   padding: 0 10px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 
   &:first-child > a { font-weight: bold; }
 }
@@ -70,8 +75,21 @@
   &.active > a { font-weight: bold; }
 }
 
+.component-viewer-workspace-toggle {
+  position: absolute;
+  top: 0; right: 0;
+  .size(30px, 30px);
+  .trans;
+
+  &:hover { background-color: @barBorderColor; }
+}
+
 
 .component-viewer-source {
+  display: table-cell;
+  vertical-align: top;
+  width: 100%;
+  padding-left: 10px;
 
   .code {
     width: 100%;
diff --git a/sonar-server/src/main/less/icons.less b/sonar-server/src/main/less/icons.less
index e3a950917fb..695fe31a8d3 100644
--- a/sonar-server/src/main/less/icons.less
+++ b/sonar-server/src/main/less/icons.less
@@ -435,6 +435,14 @@ a[class^="icon-"], a[class*=" icon-"] {
   content: "\f105";
   font-size: @iconSmallFontSize;
 }
+.icon-double-chevron-left:before {
+  content: "\f100";
+  font-size: @iconSmallFontSize;
+}
+.icon-double-chevron-right:before {
+  content: "\f101";
+  font-size: @iconSmallFontSize;
+}
 
 
 /*
diff --git a/sonar-server/src/main/webapp/fonts/sonar.woff b/sonar-server/src/main/webapp/fonts/sonar.woff
index fd856e1f43202e5c245440b4c13e7f01f2cf8de4..964b6c782678181de43906d6b58cc075af554b86 100755
GIT binary patch
delta 666
zcmY+C%}*0S7{=dWyX`=eE||74h9=dNcn~PGSO_B9YCjMU#Ykc_B(PCp5B9^b)kb6R
zVz+f|r#Kfc6mRrw?~3upMI)N{Co~?3X4NIecdJI($+NTbn|Gi0+0E=cBAp8H-c2Wy
z>BYq~Ks*C|fLGiPguj-(8^e9;vJXJ^={paz>C3?oK-7%|E0$bOT`#U@l>#yqfCMa^
z+B@O6sjMN3J;NIMNBx;q<p#3nxQ<xr+5S9~L5S=VuJK(6P^axuCaac^9iZ2srTs9o
zf6OW+G(3M4i|k#c79gi&SCRR#=%l4LS4TUA{2B&{&uw&4o`i(Cd*%o54!zbVxR1ab
zj}vAiOGIh!kr1(u6_ev*<D3YiLIP4eBs_43X?S;HWTJ8UN+dS9JMEp`pP6dE5)vWD
z!A0YTan8e!N8;;xxvEt(Y8K6+Q8ZPtuGKWXOpSu>!L71Zp}Cw`(eP0(>$u0L*)*D>
z#;Qzj=#5%~F=|+ZF;+vMH>!1wwsIot8d>(*fA+sAbzy|gx1dMo`N*|pBX2c(+%4QP
zn}^%wTcTF4cAab3gBq%#nyOL!7r~<2t-}Ef%ZF)CFg0xpk$aTipDj82@ef9EhyeWO
zY>*H>EXN4&Te3WGRyre%NPfvD39gqQbWhC`e<%0y@3J&_du4NTS(^C@P8)gvyxn^L
f;qS}?(MgixOVKa1=K>r<Iru_sh@{$gV)Nt|@r2%<

delta 395
zcmaFS!FZsRQLNnG&CNd~#Giq|=>P*40}wb>FfdL|bQGJY!&PtF&cI;Xo^q~C*gsg`
zh=IYb2B;tbg!v}%ZA#8fEC7n#VPIgC0pZ{y9Q)G~i-BVHKY(gDpjaRyH8F*O!2!r+
zFau$x<?H@t00n_!7C^oV2y<|=_-EvnQ~<?dfM$t+@LS`*Y+G^@D}V+%0x<&{7`p~A
z<R#{&0>yxe8P!4faHQUgg8bqVpyL-zeBmx?&M(Wrz+@u`BpEn?gl(M=gWF^m#{SLM
z8I2ex3o~mmJ2SXWc3`d*Fj{HMV|>|UubG?0B+ERjEt@YgyBcktWnRfKS=6D78{`K&
z1_cHd2D!=89P}q2cW{`@>1fAq$*;{X$1ly#$hU`q85~{~lM5W#C(m@`m#OH^J{r$&
p^Ob>{1*n^W;r#rq4lsK15l3@I*U5hzzfAt&q{`^JS<cyu5dd{oVL1Q*

-- 
2.39.5