[ARVADOS] updated: d7a07294a8d4a546852a33417972924f658e4024

[git at public.curoverse.com]

Summary of changes:
 .../app/assets/stylesheets/application.css.scss    |   12 ++++++-
 .../app/views/layouts/application.html.erb         |   38 +++++++++++--------
 2 files changed, 33 insertions(+), 17 deletions(-)

       via  d7a07294a8d4a546852a33417972924f658e4024 (commit)
      from  ce3845c8ce108518832ea6ad9a10bb9b98a48174 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit d7a07294a8d4a546852a33417972924f658e4024
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Feb 25 14:40:27 2014 -0800

    Move left nav all the way to the top left corner.

diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index 2c361f9..4e2c19c 100644
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -91,6 +91,11 @@ form.small-form-margin {
     padding: 2px 20px;
 }*/
 
+.left-nav ul ul li > div {
+    margin-left: 1.5em;
+    text-indent: -1.5em;
+}
+
 ul.arvados-nav {
     list-style: none;
     padding-left: 0em;
@@ -149,10 +154,12 @@ li.notification {
 }
 .arvados-nav-container {
     top: 70px; 
-    height: calc(100% - 70px); 
     overflow: auto; 
     z-index: 2;
 }
+.arvados-nav {
+    padding-top: 70px;
+}
 
 .arvados-nav-active {
     background: rgb(66, 139, 202);
@@ -161,6 +168,9 @@ li.notification {
 .arvados-nav-active a {
     color: white;
 }
+.arvados-nav-active a:hover {
+    color: white;
+}
 
 // See HeaderRowFixer in application.js
 table.table-fixed-header-row {
diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index 0716bcc..f141536 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -32,7 +32,7 @@
     padding-top: 70px; /* 70px to make the container go all the way to the bottom of the navbar */
     }
 
-    body > div.container-fluid > div.col-sm-9.col-sm-offset-3 {
+    body > div.container-fluid > div.col-sm-10.col-sm-offset-2 {
     overflow: auto;
     }
 
@@ -49,16 +49,20 @@
     width: 400px;
     overflow-y: auto;
     }
-
     @media (min-width: 768px) {
-    .left-nav {
-    position: fixed;
-    }
+        .left-nav {
+            position: fixed;
+            top: 0;
+            left: 0;
+            height: 100%;
+            padding-left: 0;
+        }
     }
+
     @media (max-width: 767px) {
-    .breadcrumbs {
-    display: none;
-    }
+        .breadcrumbs {
+            display: none;
+        }
     }
   </style>
 </head>
@@ -175,12 +179,12 @@
   </div>
 
   <div class="container-fluid">
-      <div class="col-sm-9 col-sm-offset-3">
+      <div class="col-sm-10 col-sm-offset-2">
         <div id="content">
           <%= yield %>
         </div>
       </div>
-      <div class="col-sm-3 left-nav">
+      <div class="col-sm-2 left-nav">
         <div class="arvados-nav-container">
         <% if current_user.andand.is_active %>
         <div class="well">
@@ -189,13 +193,13 @@
             <a href="/">Dashboard</a>
           </li>
 
-          <% [['Data', [['collections', 'Collections (data files)'],
+          <% [['Data', [['collections', 'Collections (data files)'],
                         ['humans'],
                         ['traits'],
                         ['specimens'],
                         ['links']]],
-              ['Activity', [['pipeline_instances', 'Recent pipeline instances'],
-                            ['jobs', 'Recent jobs']]],
+              ['Activity', [['pipeline_instances',],
+                            ['jobs']]],
               ['Compute', [['pipeline_templates'],
                            ['repositories', 'Code repositories'],
                            ['virtual_machines']]],
@@ -208,9 +212,11 @@
               <% j[1].each do |k| %>
                 <% unless k[0] == 'users' and !current_user.andand.is_admin %>
                   <li class="<%= 'arvados-nav-active' if (params[:controller] == k[0] && params[:action] != 'home') %>">
-                    <a href="/<%= k[0] %>">
-                      <%= if k[1] then k[1] else k[0].capitalize.gsub('_', ' ') end %>
-                    </a>
+                    <div>
+                      <a href="/<%= k[0] %>">
+                        <%= if k[1] then raw(k[1]) else k[0].capitalize.gsub('_', ' ') end %>
+                      </a>
+                    </div>
                   </li>
                 <% end %>
               <% end %>

-----------------------------------------------------------------------


hooks/post-receive
--