Merge branch 'master' from github.com/daftano. No issue #

[arvados.git] / apps / workbench / app / views / collections / show.html.erb

diff --git a/apps/workbench/app/views/collections/show.html.erb b/apps/workbench/app/views/collections/show.html.erb
index f91357b12067b4f4662bdfaebd6cf3ccfac81490..c6bad7d3aa3d865d576c98f9bb4b360aaafe0882 100644 (file)
--- a/apps/workbench/app/views/collections/show.html.erb
+++ b/apps/workbench/app/views/collections/show.html.erb
@@ -2,60 +2,50 @@
   <div class="col-md-6">
     <div class="panel panel-info">
       <div class="panel-heading">
-       <h3 class="panel-title">
-          <% i = 0 %>
-            <% @folder_links.each do |l| %>
-              <%= if i > 0 then ', ' end %>
-              <% i += 1 %>
-              <%= l.name %>
-            <% end %>
-       </h3>
+        <h3 class="panel-title">
+          <%= if @object.respond_to? :name
+                render_editable_attribute @object, :name
+              elsif @name_link
+                @name_link.name
+              else
+                @object.uuid
+              end %>
+        </h3>
       </div>
       <div class="panel-body">
+        <div class="arv-description-as-subtitle">
+          <%= render_editable_attribute @object, 'description', nil, { 'data-emptytext' => "(No description provided)", 'data-toggle' => 'manual' } %>
+        </div>
         <img src="/favicon.ico" class="pull-right" alt="" style="opacity: 0.3"/>
-        <% if not (@output_of.andand.any? or @log_of.andand.any?) %>
-          <p><i>No source information available.</i></p>
-        <% end %>
-
-        <% if @output_of.andand.any? %>
-          <p>This collection was the output of:<br />
-          <%= render_arvados_object_list_start(@output_of, 'Show all jobs',
-                jobs_path(filter: [['output', '=', @object.uuid]].to_json)) do |job| %>
-            <%= link_to_if_arvados_object(job, friendly_name: true) %><br />
-          <% end %>
-          </p>
-        <% end %>
-
-        <% if @log_of.andand.any? %>
-          <p>This collection contains log messages from:<br />
-          <%= render_arvados_object_list_start(@log_of, 'Show all jobs',
-                jobs_path(filter: [['log', '=', @object.uuid]].to_json)) do |job| %>
-            <%= link_to_if_arvados_object(job, friendly_name: true) %><br />
-          <% end %>
-          </p>
-        <% end %>
+        <p><i>Collection UUID:</i><br />
+          <%= render partial: "show_autoselect_text", locals: {text: @object.uuid, tagclass: "arvados-uuid"} %>
+        </p>
+        <p><i>Content address:</i><br />
+          <%= render partial: "show_autoselect_text", locals: {text: @object.portable_data_hash, tagclass: "arvados-uuid"} %>
+        </p>
+        <%= render partial: "show_source_summary" %>
       </div>
     </div>
   </div>
   <div class="col-md-3">
     <div class="panel panel-default">
       <div class="panel-heading">
-       <h3 class="panel-title">
-         Activity
-       </h3>
+        <h3 class="panel-title">
+          Activity
+        </h3>
       </div>
       <div class="panel-body smaller-text">
         <!--
-       <input type="text" class="form-control" placeholder="Search"/>
+        <input type="text" class="form-control" placeholder="Search"/>
         -->
-       <div style="height:0.5em;"></div>
+        <div style="height:0.5em;"></div>
         <% name_or_object = @name_link.andand.uuid ? @name_link : @object %>
         <% if name_or_object.created_at and not @logs.andand.any? %>
           <p>
-            Created: <%= name_or_object.created_at.to_s(:long) %>
+            Created: <%= name_or_object.created_at.to_s(:long) if name_or_object.created_at %>
           </p>
           <p>
-            Last modified: <%= name_or_object.modified_at.to_s(:long) %> by <%= link_to_if_arvados_object name_or_object.modified_by_user_uuid, friendly_name: true %>
+            Last modified: <%= name_or_object.modified_at.to_s(:long) if name_or_object.modified_at %> by <%= link_to_if_arvados_object name_or_object.modified_by_user_uuid, friendly_name: true %>
           </p>
         <% else %>
           <%= render_arvados_object_list_start(@logs, 'Show all activity',
@@ -71,36 +61,37 @@
       </div>
     </div>
   </div>
+  <% if current_user %>
   <div class="col-md-3">
     <div class="panel panel-default">
       <div class="panel-heading">
-       <h3 class="panel-title">
-         Sharing and permissions
-       </h3>
+        <h3 class="panel-title">
+          Sharing and permissions
+        </h3>
       </div>
       <div class="panel-body">
         <!--
-       <input type="text" class="form-control" placeholder="Search"/>
+        <input type="text" class="form-control" placeholder="Search"/>
         -->
 
         <div id="sharing-button">
           <%= render partial: 'sharing_button' %>
         </div>
 
-       <div style="height:0.5em;"></div>
+        <div style="height:0.5em;"></div>
         <% if @projects.andand.any? %>
           <p>Included in projects:<br />
           <%= render_arvados_object_list_start(@projects, 'Show all projects',
-                links_path(filter: [['head_uuid', '=', @object.uuid],
-                                    ['link_class', '=', 'name']].to_json)) do |project| %>
-          <%= link_to_if_arvados_object(project, friendly_name: true) %><br />
+                links_path(filters: [['head_uuid', '=', @object.uuid],
+                                     ['link_class', '=', 'name']].to_json)) do |project| %>
+            <%= link_to_if_arvados_object(project, friendly_name: true) %><br />
           <% end %>
           </p>
         <% end %>
         <% if @permissions.andand.any? %>
           <p>Readable by:<br />
           <%= render_arvados_object_list_start(@permissions, 'Show all permissions',
-                links_path(filter: [['head_uuid', '=', @object.uuid],
+                links_path(filters: [['head_uuid', '=', @object.uuid],
                                     ['link_class', '=', 'permission']].to_json)) do |link| %>
           <%= link_to_if_arvados_object(link.tail_uuid, friendly_name: true) %><br />
           <% end %>
@@ -110,6 +101,20 @@
       </div>
     </div>
   </div>
+  <% else %>
+  <div class="col-md-3">
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <h3 class="panel-title">
+          Welcome to Arvados
+        </h3>
+      </div>
+      <div class="panel-body">
+        You are accessing public data.
+      </div>
+    </div>
+  </div>
+  <% end %>
 </div>
 
-<%= render file: 'application/show.html.erb' %>
+<%= render file: 'application/show.html.erb', locals: local_assigns %>