Merge branch '1499-workbench-tags'

[arvados.git] / apps / workbench / app / views / users / _tables.html.erb

diff --git a/apps/workbench/app/views/users/_tables.html.erb b/apps/workbench/app/views/users/_tables.html.erb
index cec0d87e6dc8461f3dc2472326496e682948b878..bcbf3d7c6df0a52ddbd1d488622f05a466e662d4 100644 (file)
--- a/apps/workbench/app/views/users/_tables.html.erb
+++ b/apps/workbench/app/views/users/_tables.html.erb
@@ -5,7 +5,7 @@
     <% if not current_user.andand.is_active or @my_jobs.empty? %>
       <br/>(None)
     <% else %>
-      <table class="table table-bordered table-condensed job-table">
+      <table class="table table-bordered table-condensed table-fixedlayout">
        <colgroup>
           <col width="28%" />
           <col width="38%" />
@@ -89,7 +89,7 @@
   <% if not current_user.andand.is_active or @my_pipelines.empty? %>
     <br/>(None)
   <% else %>
-    <table class="table table-bordered table-condensed job-table">
+    <table class="table table-bordered table-condensed table-fixedlayout">
       <colgroup>
         <col width="73%" />
         <col width="15%" />
@@ -140,17 +140,29 @@
 <div>
   <strong>Recent collections</strong>
   <%= link_to raw("Show all collections &rarr;"), collections_path, class: 'pull-right' %>
+  <div class="pull-right" style="padding-right: 1em">
+    <%= form_tag collections_path,
+          method: 'get',
+          class: 'form-search small-form-margin' do %>
+    <div class="input-append">
+      <%= text_field_tag :search, params[:search], class: 'search-query search-mini' %>
+      <%= submit_tag "Search", name: nil, class: 'btn btn-mini btn-info' %>
+    </div>  
+    <% end %>
+  </div>
   <% if not current_user.andand.is_active or @my_collections.empty? %>
     <br/>(None)
   <% else %>
-    <table class="table table-bordered table-condensed job-table">
+    <table class="table table-bordered table-condensed table-fixedlayout">
       <colgroup>
-        <col width="73%" />
+        <col width="46%" />
+        <col width="27%" />
         <col width="27%" />
       </colgroup>
 
       <tr>
        <th>Contents</th>
+       <th>Tags</th>
        <th>Age</th>
       </tr>
 
@@ -165,6 +177,13 @@
              </a>
             </small>
           </td>
+          <td>
+            <% if @my_tag_links[c.uuid] %>
+            <small>
+              <%= @my_tag_links[c.uuid].collect(&:name).join(", ") %>
+            </small>
+            <% end %>
+          </td>
           <td>
             <small>
              <%= raw(distance_of_time_in_words(c.created_at, Time.now).sub('about