From 45dac782ca854e6e393e2b872f2b2368ce1f5204 Mon Sep 17 00:00:00 2001
From: zmagod <zmago_devetak@yahoo.com>
Date: Wed, 3 Aug 2016 16:09:45 +0200
Subject: [PATCH 1/5] update sidebar [fixes SCI-303]

---
 app/assets/stylesheets/partials/_sidebar.scss |  9 +++-
 .../stylesheets/partials/_tree_view.scss      |  2 +-
 app/views/shared/_sidebar.html.erb            | 18 ++++---
 .../shared/sidebar/_experiments.html.erb      | 37 ++++++++-----
 app/views/shared/sidebar/_my_modules.html.erb | 52 ++++++++-----------
 5 files changed, 64 insertions(+), 54 deletions(-)

diff --git a/app/assets/stylesheets/partials/_sidebar.scss b/app/assets/stylesheets/partials/_sidebar.scss
index 202e9a2d7..759e5cd3e 100644
--- a/app/assets/stylesheets/partials/_sidebar.scss
+++ b/app/assets/stylesheets/partials/_sidebar.scss
@@ -37,6 +37,10 @@ $toggle-btn-size: 50px;
     #slide-panel {
       height: 100%;
 
+      .my-module-group-element{
+        border-left: 1px dotted $color-emperor;
+      }
+
       .sidebar-header {
         height: $toggle-btn-size;
         background: $color-theme-primary;
@@ -53,7 +57,10 @@ $toggle-btn-size: 50px;
           overflow: hidden;
           text-overflow: ellipsis;
           opacity: 1;
-
+            h5>a{
+              color: $color-white;
+              text-decoration: none;
+            }
           // Animations
           @include transition(opacity 0.5s ease);
         }
diff --git a/app/assets/stylesheets/partials/_tree_view.scss b/app/assets/stylesheets/partials/_tree_view.scss
index 6748248b1..0b9a4c392 100644
--- a/app/assets/stylesheets/partials/_tree_view.scss
+++ b/app/assets/stylesheets/partials/_tree_view.scss
@@ -30,7 +30,7 @@
   }
 
   &.leaf {
-    padding-left: 30px;
+    padding-left: 10px;
     .tree-link::before {
       content: "\25B8";
     }
diff --git a/app/views/shared/_sidebar.html.erb b/app/views/shared/_sidebar.html.erb
index 50443ec0b..21d52d34d 100644
--- a/app/views/shared/_sidebar.html.erb
+++ b/app/views/shared/_sidebar.html.erb
@@ -13,19 +13,23 @@
     </div>
 
     <div class="tree">
+      <% if !project_page? %>
       <ul>
-        <li class="<%= "active" if project_page? %>">
+        <li class="active">
           <span class="tree-link line-wrap">
             <i></i>
-            <% if !project_page? %>
-              <%= link_to @project.name, project_action_to_link_to(@project), title: @project.name %>
-            <% else %>
-              <span title="<%= @project.name %>"><%= @project.name %></span>
-            <% end %>
+              <%= link_to @project.name,
+                          project_action_to_link_to(@project),
+                          title: @project.name %>
           </span>
-          <%= render partial: 'shared/sidebar/experiments', locals: { project: @project } %>
+          <%= render partial: 'shared/sidebar/experiments',
+                    locals: { project: @project } %>
         </li>
       </ul>
+      <% else %>
+      <%= render partial: 'shared/sidebar/experiments',
+                locals: { project: @project } %>
+      <% end %>
     </div>
   </div>
 <% end %>
diff --git a/app/views/shared/sidebar/_experiments.html.erb b/app/views/shared/sidebar/_experiments.html.erb
index 4db6d6012..17283b1bf 100644
--- a/app/views/shared/sidebar/_experiments.html.erb
+++ b/app/views/shared/sidebar/_experiments.html.erb
@@ -1,22 +1,31 @@
 <ul>
   <% if project.active_experiments.present? then %>
-    <% project.active_experiments.each do |experiment| %>
-      <li class="<%= "active" if experiment_page? %>">
+    <% if experiment_page? %>
+      <li>
         <span class="tree-link line-wrap">
           <i></i>
-          <% if !experiment_page? %>
-            <%= link_to experiment.name, experiment_action_to_link_to(experiment), title: experiment.name %>
-          <% else %>
-            <span title="<%= experiment.name %>"><%= experiment.name %></span>
-          <% end %>
+          <span title="<%= @experiment.name %>"><%= @experiment.name %></span>
         </span>
-        <%= render partial: 'shared/sidebar/my_modules', locals: { experiment: experiment } %>
+        <%= render partial: 'shared/sidebar/my_modules', locals: { experiment: @experiment } %>
       </li>
+    <% else %>
+      <% project.active_experiments.each do |experiment| %>
+        <li>
+          <span class="tree-link line-wrap">
+            <i></i>
+            <% if can_view_experiment(experiment) %>
+              <%= link_to experiment.name,
+                          experiment_action_to_link_to(experiment),
+                          title: experiment.name,
+                          class: 'overview_exp_label'
+                          %>
+            <% else %>
+              <%= experiment.name %>
+            <% end %>
+          </span>
+          <%= render partial: 'shared/sidebar/my_modules', locals: { experiment: experiment } %>
+        </li>
+      <% end %>
     <% end %>
   <% end %>
-  <li>
-    <%= link_to new_project_experiment_path(project), id: 'new-experiment', remote: true do %>
-      <span class="glyphicon glyphicon-plus"></span> <i><%= t('experiments.new.create') %></i>
-    <% end %>
-  </li>
-</ul>
\ No newline at end of file
+</ul>
diff --git a/app/views/shared/sidebar/_my_modules.html.erb b/app/views/shared/sidebar/_my_modules.html.erb
index c5abf3112..9ffe999e5 100644
--- a/app/views/shared/sidebar/_my_modules.html.erb
+++ b/app/views/shared/sidebar/_my_modules.html.erb
@@ -2,35 +2,28 @@
   <ul>
     <% experiment.active_module_groups.each do |my_module_group| %>
       <li data-module-group="<%= my_module_group.id %>">
-        <span>
-          <i></i>
-          <span class="line-wrap short" title="<%= my_module_group.name %>">
-            <%= my_module_group.name %>
-          </span>
-          <% if is_canvas? %>
-            <a href="" class="canvas-center-on"><span class="glyphicon glyphicon-map-marker"></span></a>
-          <% end %>
-        </span>
         <% if my_module_group.my_modules.present? then %>
           <ul>
-            <% my_module_group.my_modules.sort_by{|m| m.workflow_order}.each do |my_module| %>
-              <li class="leaf <%= "active" if currently_active? my_module %>" data-module-id="<%= my_module.id %>">
-                <span class="tree-link">
-                  <% if currently_active? my_module %>
-                    <%= my_module.name %>
-                  <% else %>
-                    <% if can_view_module(my_module) then %>
-                      <%= link_to my_module.name, module_action_to_link_to(my_module), class: "module-link" %>
-                    <% else %>
+            <span class="my-module-group-element">
+              <% my_module_group.my_modules.sort_by{|m| m.workflow_order}.each do |my_module| %>
+                <li class="leaf <%= "active" if currently_active? my_module %>" data-module-id="<%= my_module.id %>">
+                  <span class="tree-link">
+                    <% if currently_active? my_module %>
                       <%= my_module.name %>
+                    <% else %>
+                      <% if can_view_module(my_module) then %>
+                        <%= link_to my_module.name, module_action_to_link_to(my_module), class: "module-link" %>
+                      <% else %>
+                        <%= my_module.name %>
+                      <% end %>
                     <% end %>
-                  <% end %>
-                  <% if is_canvas? %>
-                    <a href="#" class="canvas-center-on"><span class="glyphicon glyphicon-map-marker"></span></a>
-                  <% end %>
-                </span>
-              </li>
-            <% end %>
+                    <% if is_canvas? %>
+                      <a href="#" class="canvas-center-on"><span class="glyphicon glyphicon-map-marker"></span></a>
+                    <% end %>
+                  </span>
+                </li>
+              <% end %>
+            </span>
           </ul>
         <% end %>
       </li>
@@ -38,13 +31,10 @@
     <% modules_without_group = experiment.modules_without_group %>
     <% if modules_without_group.present? then %>
       <li>
-        <span>
-          <i></i>
-          <span class='sidebar-no-module-group'><%= t("sidebar.no_module_group") %></span>
-        </span>
         <ul>
           <% modules_without_group.each do |my_module| %>
-            <li class="leaf <%= "active" if currently_active? my_module %>" data-module-id="<%= my_module.id %>">
+            <li class="leaf <%= "active" if currently_active? my_module %>"
+                 data-module-id="<%= my_module.id %>">
               <span class="tree-link">
                 <% if currently_active? my_module %>
                     <%= my_module.name %>
@@ -61,4 +51,4 @@
       </li>
     <% end %>
   </ul>
-<% end %>
\ No newline at end of file
+<% end %>

From f8f87e9540714c52a9737810a21c53e54f0fba51 Mon Sep 17 00:00:00 2001
From: zmagod <zmago_devetak@yahoo.com>
Date: Wed, 3 Aug 2016 16:16:09 +0200
Subject: [PATCH 2/5] Feed the Hound

---
 app/assets/stylesheets/partials/_sidebar.scss | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/partials/_sidebar.scss b/app/assets/stylesheets/partials/_sidebar.scss
index 759e5cd3e..2889680cf 100644
--- a/app/assets/stylesheets/partials/_sidebar.scss
+++ b/app/assets/stylesheets/partials/_sidebar.scss
@@ -37,10 +37,6 @@ $toggle-btn-size: 50px;
     #slide-panel {
       height: 100%;
 
-      .my-module-group-element{
-        border-left: 1px dotted $color-emperor;
-      }
-
       .sidebar-header {
         height: $toggle-btn-size;
         background: $color-theme-primary;
@@ -57,10 +53,7 @@ $toggle-btn-size: 50px;
           overflow: hidden;
           text-overflow: ellipsis;
           opacity: 1;
-            h5>a{
-              color: $color-white;
-              text-decoration: none;
-            }
+
           // Animations
           @include transition(opacity 0.5s ease);
         }
@@ -140,6 +133,10 @@ $toggle-btn-size: 50px;
   }
 }
 
+.my-module-group-element{
+  border-left: 1px dotted $color-emperor;
+}
+
 #wrapper {
   @include sidebar-shown;
 }

From 756c3c777eb78c92ddfd967b7a55ea495f95eed4 Mon Sep 17 00:00:00 2001
From: zmagod <zmago_devetak@yahoo.com>
Date: Mon, 8 Aug 2016 08:33:18 +0200
Subject: [PATCH 3/5] styled workflow dots

---
 app/assets/stylesheets/partials/_sidebar.scss | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/partials/_sidebar.scss b/app/assets/stylesheets/partials/_sidebar.scss
index 2889680cf..f2c3ef9f2 100644
--- a/app/assets/stylesheets/partials/_sidebar.scss
+++ b/app/assets/stylesheets/partials/_sidebar.scss
@@ -133,8 +133,12 @@ $toggle-btn-size: 50px;
   }
 }
 
-.my-module-group-element{
-  border-left: 1px dotted $color-emperor;
+.my-module-group-element:before {
+  content : "";
+  position: absolute;
+  top: 25px;
+  bottom: 20px;
+  border-left:1px dotted $color-emperor;
 }
 
 #wrapper {

From e16abe486c85e97b6f83af998096e4250ce4d15b Mon Sep 17 00:00:00 2001
From: zmagod <zmago_devetak@yahoo.com>
Date: Mon, 8 Aug 2016 08:37:22 +0200
Subject: [PATCH 4/5] fix hound alert

---
 app/assets/stylesheets/partials/_sidebar.scss | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/partials/_sidebar.scss b/app/assets/stylesheets/partials/_sidebar.scss
index f2c3ef9f2..e701e00d7 100644
--- a/app/assets/stylesheets/partials/_sidebar.scss
+++ b/app/assets/stylesheets/partials/_sidebar.scss
@@ -133,12 +133,12 @@ $toggle-btn-size: 50px;
   }
 }
 
-.my-module-group-element:before {
-  content : "";
+.my-module-group-element::before {
+  border-left:1px dotted $color-emperor;
+  bottom: 20px;
+  content: "";
   position: absolute;
   top: 25px;
-  bottom: 20px;
-  border-left:1px dotted $color-emperor;
 }
 
 #wrapper {

From 520cf2e0cf32d890d591f0d8d0a12d7cc71db4f7 Mon Sep 17 00:00:00 2001
From: zmagod <zmago_devetak@yahoo.com>
Date: Mon, 8 Aug 2016 08:40:24 +0200
Subject: [PATCH 5/5] hound....

---
 app/assets/stylesheets/partials/_sidebar.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/partials/_sidebar.scss b/app/assets/stylesheets/partials/_sidebar.scss
index e701e00d7..716525173 100644
--- a/app/assets/stylesheets/partials/_sidebar.scss
+++ b/app/assets/stylesheets/partials/_sidebar.scss
@@ -134,7 +134,7 @@ $toggle-btn-size: 50px;
 }
 
 .my-module-group-element::before {
-  border-left:1px dotted $color-emperor;
+  border-left: 1px dotted $color-emperor;
   bottom: 20px;
   content: "";
   position: absolute;