Merge branch 'master' into 2380-ssh-doc

[arvados.git] / apps / workbench / app / views / projects / _index_projects.html.erb

diff --git a/apps/workbench/app/views/projects/_index_projects.html.erb b/apps/workbench/app/views/projects/_index_projects.html.erb
index 1e2d768112a36ca0ded1527d08c9ef0f8d72693d..b05a87dd499abbac1668204a58af2ae1a37639ad 100644 (file)
--- a/apps/workbench/app/views/projects/_index_projects.html.erb
+++ b/apps/workbench/app/views/projects/_index_projects.html.erb
@@ -3,7 +3,7 @@
     <% rowtype = projectnode[:object].class %>
     <% next if rowtype != Group and !show_root_node %>
     <div class="<%= 'project' if rowtype == Group %> row">
-      <div class="col-md-12" style="padding-left: <%= projectnode[:depth] - (show_root_node ? 0 : 1) %>em;">
+      <div class="col-md-4" style="padding-left: <%= projectnode[:depth] - (show_root_node ? 0 : 1) %>em;">
         <% if show_root_node and rowtype == String %>
           <i class="fa fa-fw fa-folder-open-o"></i>
           <%= projectnode[:object] %>
@@ -17,15 +17,14 @@
           <% end %>
         <% elsif rowtype == Group %>
           <i class="fa fa-fw fa-folder-o"></i>
-          <% opts = {} %>
-          <% opts[:title] = projectnode[:object].description %>
-          <% opts[:'data-toggle'] = 'tooltip' %>
-          <% opts[:'data-placement'] = 'bottom' %>
-          <%= link_to projectnode[:object], opts do %>
+          <%= link_to projectnode[:object] do %>
             <%= projectnode[:object].friendly_link_name %>
           <% end %>
         <% end %>
       </div>
+      <% if not projectnode[:object].description.blank? %>
+        <div class="col-md-8 small"><%= projectnode[:object].description %></div>
+      <% end %>
     </div>
   <% end %>
 </div>