Merge branch 'master' into 3296-user-profile

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

diff --git a/apps/workbench/app/views/collections/_show_recent.html.erb b/apps/workbench/app/views/collections/_show_recent.html.erb
index 2f4ab64771158001cc6fad08833cfd6456cead5b..2f81073305ad4f7598d61a133ddf8802a0f621e1 100644 (file)
--- a/apps/workbench/app/views/collections/_show_recent.html.erb
+++ b/apps/workbench/app/views/collections/_show_recent.html.erb
@@ -1,16 +1,14 @@
 <% content_for :tab_line_buttons do %>
-<div class="pull-right" style="width: 30%">
-  <%= form_tag collections_path, method: 'get', remote: true, class: 'form-search' do %>
-  <div class="input-group">
-    <%= text_field_tag :search, params[:search], class: 'form-control', placeholder: 'Search collections' %>
-    <span class="input-group-btn">
-      <%= button_tag(class: 'btn btn-info') do %>
-      <span class="glyphicon glyphicon-search"></span>
-      <% end %>
-    </span>
-  </div>  
-  <% end %>
-</div>
+ <%= form_tag collections_path, method: 'get', remote: true, class: 'form-search' do %>
+ <div class="input-group">
+   <%= text_field_tag :search, params[:search], class: 'form-control', placeholder: 'Search collections' %>
+   <span class="input-group-btn">
+     <%= button_tag(class: 'btn btn-info') do %>
+     <span class="glyphicon glyphicon-search"></span>
+     <% end %>
+   </span>
+ </div>
+ <% end %>
 <% end %>
 
 <%= render partial: "paging", locals: {results: @collections, object: @object} %>
@@ -21,10 +19,10 @@
 
 <table id="collections-index" class="topalign table table-condensed table-fixedlayout"> <!-- table-fixed-header-row -->
   <colgroup>
-    <col width="4%" />
+    <col width="8%" />
     <col width="10%" />
     <col width="34%" />
-    <col width="15%" />
+    <col width="11%" />
     <col width="12%" />
     <col width="29%" />
   </colgroup>
@@ -33,7 +31,7 @@
       <th></th>
       <th>uuid</th>
       <th>contents</th>
-      <th>age</th>
+      <th>created at</th>
       <th>storage</th>
       <th>tags</th>
     </tr>