X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f107a5232d5e8788ae19daf1c5f6639f0c3cdb68..7276cc563eb93589279f58b045f893a7c3b83835:/apps/workbench/app/views/folders/show.html.erb

diff --git a/apps/workbench/app/views/folders/show.html.erb b/apps/workbench/app/views/folders/show.html.erb
index c02c48b921..11bb52c70b 100644
--- a/apps/workbench/app/views/folders/show.html.erb
+++ b/apps/workbench/app/views/folders/show.html.erb
@@ -3,16 +3,16 @@
     <div class="panel panel-info">
       <div class="panel-heading">
 	<h3 class="panel-title">
-	  <%= render_editable_attribute @object, 'name', nil, { 'data-emptytext' => "New folder" } %>
+	  <%= render_editable_attribute @object, 'name', nil, {data: {emptytext: "New folder"}} %>
 	</h3>
       </div>
       <div class="panel-body">
         <img src="/favicon.ico" class="pull-right" alt="" style="opacity: 0.3"/>
-	<p>
-	  <%= render_editable_attribute @object, 'description', nil, { 'data-emptytext' => "Created: #{@object.created_at.to_s(:long)}", 'data-toggle' => 'manual', 'id' => "#{@object.uuid}-description" } %>
-	</p>
+	<%= render_editable_attribute @object, 'description', nil, { 'data-emptytext' => "Created: #{@object.created_at.to_s(:long)}", 'data-toggle' => 'manual', 'id' => "#{@object.uuid}-description" } %>
         <% if @object.attribute_editable? 'description' %>
-	<a href="#" class="btn btn-xs btn-info" data-toggle="x-editable" data-toggle-selector="#<%= @object.uuid %>-description">Edit description</a>
+        <div style="margin-top: 1em;">
+          <a href="#" class="btn btn-xs btn-default" data-toggle="x-editable" data-toggle-selector="#<%= @object.uuid %>-description"><i class="fa fa-fw fa-pencil"></i> Edit description</a>
+        </div>
         <% end %>
       </div>
     </div>
@@ -24,7 +24,7 @@
 	  Activity
 	</h3>
       </div>
-      <div class="panel-body">
+      <div class="panel-body smaller-text">
         <!--
 	<input type="text" class="form-control" placeholder="Search"/>
         -->
@@ -38,9 +38,9 @@
 	</p>
         <% end %>
         <% if @logs.any? %>
-	<%= link_to raw('Show all activity &nbsp; <i class="fa fa-hand-o-right"></i>'),
-            logs_path(filters: [['object_uuid','=',@object.uuid]]),
-            class: 'btn btn-sm btn-info' %>
+	<%= link_to raw('Show all activity &nbsp; <i class="fa fa-fw fa-arrow-circle-right"></i>'),
+            logs_path(filters: [['object_uuid','=',@object.uuid]].to_json),
+            class: 'btn btn-xs btn-default' %>
         <% else %>
         <p>
           Created: <%= @object.created_at.to_s(:long) %>
@@ -65,42 +65,22 @@
         -->
 	<div style="height:0.5em;"></div>
         <p>Owner: <%= link_to_if_arvados_object @object.owner_uuid, friendly_name: true %></p>
+        <% if @share_links.any? %>
+        <p>Shared with:
+          <% @share_links.andand.each do |link| %>
+          <br /><%= link_to_if_arvados_object link.tail_uuid, friendly_name: true %>
+          <% end %>
+        </p>
+        <% end %>
       </div>
     </div>
   </div>
 </div>
 
+<% if @show_cards %>
+<!-- disable cards section until we have bookmarks -->
 <div class="row">
-  <div class="card arvados-object">
-    <div class="card-top green">
-      <a href="#">
-        <img src="/favicon.ico" alt=""/>
-      </a>
-    </div>
-    <div class="card-info">
-      <a class="title" href="#">Test dataset</a>
-      <div class="desc">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</div>
-    </div>
-    <div class="card-bottom">
-      <button class="btn btn-default btn-block">Show details</button>
-    </div>
-  </div>
-
-  <div class="card arvados-object">
-    <div class="card-top green">
-      <a href="#">
-        <img src="/favicon.ico" alt=""/>
-      </a>
-    </div>
-    <div class="card-info">
-      <a class="title" href="#">GATK Exome Pipeline</a>
-      <div class="desc">exome p.e. fastq -&gt; vcf</div>
-    </div>
-    <div class="card-bottom">
-      <button class="btn btn-default btn-block">Show details</button>
-    </div>
-  </div>
-
+  <% @objects[0..3].each do |object| %>
   <div class="card arvados-object">
     <div class="card-top blue">
       <a href="#">
@@ -108,29 +88,17 @@
       </a>
     </div>
     <div class="card-info">
-      <a class="title" href="#">Reference result</a>
-      <div class="desc">Known good -- checked concordance against other datasets</div>
+      <span class="title"><%= @objects.name_for(object) || object.class_for_display %></span>
+      <div class="desc"><%= object.respond_to?(:description) ? object.description : object.uuid %></div>
     </div>
     <div class="card-bottom">
-      <button class="btn btn-default btn-block">Show details</button>
-    </div>
-  </div>
-
-  <div class="card arvados-object">
-    <div class="card-top blue">
-      <a href="#">
-        <img src="/favicon.ico" alt=""/>
-      </a>
-    </div>
-    <div class="card-info">
-      <a class="title" href="#">Some other thing</a>
-      <div class="desc">(Objects that are "starred" appear in this area)</div>
-    </div>
-    <div class="card-bottom">
-      <button class="btn btn-default btn-block">Show details</button>
+      <%= render :partial => "show_object_button", :locals => {object: object, htmloptions: {class: 'btn-default btn-block'}} %>
     </div>
   </div>
+  <% end %>
 </div>
+<!-- end disabled cards section -->
+<% end %>
 
 <div class="row">
   <div class="col-md-12">
@@ -144,7 +112,7 @@
           </div>
           <div class="col-md-6">
             <div class="input-group input-group-sm pull-right">
-              <input type="text" class="form-control" placeholder="Search folder contents"/>
+              <input type="text" class="form-control search-folder-contents" placeholder="Search folder contents"/>
             </div>
           </div>
         </div>
@@ -152,46 +120,68 @@
       <div class="panel-body">
         <p>
         </p>
-        <table class="table">
+        <table class="table table-condensed arv-index">
           <tbody>
             <colgroup>
+              <col width="3%" />
+              <col width="8%" />
               <col width="30%" />
+              <col width="15%" />
+              <col width="15%" />
               <col width="20%" />
-              <col width="20%" />
-              <col width="30%" />
+              <col width="8%" />
             </colgroup>
-            <% @objects.each do |object| %>
-            <tr>
-              <td>
-                <% name_link = @objects.links_for(object, 'name').first || Link.new(link_class: "name", owner_uuid: @object.uuid, tail_uuid: @object.uuid, head_uuid: object.uuid, name: "") %>
-                <%= render_editable_attribute name_link, 'name', nil, { 'data-emptytext' => "Unnamed #{object.class}" } %>
-              </td>
-              <td>
-                <%= object.content_summary %>
-              </td>
-              <td title="<%= object.modified_at %>">
-                <span>
-                  <%= raw distance_of_time_in_words(object.modified_at, Time.now).sub('about ','~').sub(' ','&nbsp;') + '&nbsp;ago' %>
-                </span>
-              </td>
-              <td class="arvados-uuid">
-                <%= link_to_if_arvados_object(object, {no_tags: true}) %>
-              </td>
-            </tr>
+            <% @objects_and_names.each do |object, name_link| %>
+              <tr data-object-uuid="<%= (name_link && name_link.uuid) || object.uuid %>">
+                <td>
+                  <%= render :partial => "selection_checkbox", :locals => {object: object} %>
+                </td>
+                <td>
+                  <%= render :partial => "show_object_button", :locals => {object: object, size: 'xs'} %>
+                </td>
+                <td>
+                  <%= render_editable_attribute name_link, 'name', nil, {data: {emptytext: "Unnamed #{object.class_for_display}"}} %>
+                </td>
+                <td>
+                  <%= object.content_summary %>
+                </td>
+                <td title="<%= object.modified_at %>">
+                  <span>
+                    <%= raw distance_of_time_in_words(object.modified_at, Time.now).sub('about ','~').sub(' ','&nbsp;') + '&nbsp;ago' rescue object.modified_at %>
+                  </span>
+                </td>
+                <td class="arvados-uuid">
+                  <%= object.uuid %>
+                </td>
+                <td>
+                  <% if @object.editable? %>
+                    <%= link_to({action: 'remove_item', id: @object.uuid, item_uuid: ((name_link && name_link.uuid) || object.uuid)}, method: :delete, remote: true, data: {confirm: "You are about to remove #{object.class_for_display} #{object.uuid} from this folder.\n\nAre you sure?"}, class: 'btn btn-xs btn-default') do %>
+                      Remove <i class="fa fa-fw fa-ban"></i>
+                    <% end %>
+                  <% end %>
+                </td>
+              </tr>
             <% end %>
           </tbody>
           <thead>
             <tr>
               <th>
-                Name
               </th>
               <th>
               </th>
               <th>
-                Modified
+                name
+              </th>
+              <th>
+                type
+              </th>
+              <th>
+                modified
+              </th>
+              <th>
+                uuid
               </th>
               <th>
-                UUID
               </th>
             </tr>
           </thead>