Merge branch 'master' into 4638-ssh-notification

[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 b05a87dd499abbac1668204a58af2ae1a37639ad..bf92f3472eea73e3158b9ea4d2ecff5400992048 100644 (file)
--- a/apps/workbench/app/views/projects/_index_projects.html.erb
+++ b/apps/workbench/app/views/projects/_index_projects.html.erb
@@ -2,15 +2,17 @@
   <% tree.each do |projectnode| %>
     <% rowtype = projectnode[:object].class %>
     <% next if rowtype != Group and !show_root_node %>
-    <div class="<%= 'project' if rowtype == Group %> row">
+    <div class="<%= 'project' if rowtype.in?([Group,User]) %> row">
       <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>
+          <i class="fa fa-fw fa-share-alt"></i>
           <%= projectnode[:object] %>
         <% elsif show_root_node and rowtype == User %>
           <% if projectnode[:object].uuid == current_user.andand.uuid %>
-            <i class="fa fa-fw fa-folder-open-o"></i>
-            My Projects
+            <i class="fa fa-fw fa-folder-o"></i>
+            <%= link_to project_path(id: projectnode[:object].uuid) do %>
+              Home
+            <% end %>
           <% else %>
             <i class="fa fa-fw fa-folder-o"></i>
             <%= projectnode[:object].friendly_link_name %>
@@ -22,8 +24,8 @@
           <% end %>
         <% end %>
       </div>
-      <% if not projectnode[:object].description.blank? %>
-        <div class="col-md-8 small"><%= projectnode[:object].description %></div>
+      <% if projectnode[:object].respond_to?(:description) and not projectnode[:object].description.blank? %>
+        <div class="col-md-8 small"><%= render_attribute_as_textile(projectnode[:object], "description", projectnode[:object].description, true) %></div>
       <% end %>
     </div>
   <% end %>