9587: tab line buttons in trash page

diff --git a/apps/workbench/app/views/trash_items/_show_trash_items.html.erb b/apps/workbench/app/views/trash_items/_show_trash_items.html.erb
index f069527a2cd0849905168da381066172218a6868..2b777fafd717fa45813b1994ff8dd5337cf579d2 100644 (file)
--- a/apps/workbench/app/views/trash_items/_show_trash_items.html.erb
+++ b/apps/workbench/app/views/trash_items/_show_trash_items.html.erb
@@ -1,29 +1,52 @@
-<%= form_tag({}, {id: "trash_items"}) do |f| %>
-  <table id="trash-index" class="topalign table table-condensed table-fixedlayout">
-    <colgroup>
-      <col width="5%" />
-      <col width="15%" />
-      <col width="10%" />
-      <col width="10%" />
-      <col width="30%" />
-      <col width="25%" />
-      <col width="5%" />
-    </colgroup>
+<div class="container">
+  <div class="col-md-6 pull-left">
+    <div class="btn-group btn-group-sm">
+      <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Selection... <span class="caret"></span></button>
+      <ul class="dropdown-menu" role="menu">
+        <li><%= link_to "Un-trash selected items", '#',
+                method: :post,
+                'data-href' => untrash_items_trash_items_path,
+                'data-selection-param-name' => 'selection[]',
+                'data-selection-action' => 'untrash-items',
+                'data-toggle' => 'dropdown'
+          %></li>
+      </ul>
+    </div>
+  </div>
+  <div class="col-md-6 pull-right">
+    <input type="text" class="form-control filterable-control recent-trash-items"
+           placeholder="Search trash"
+           data-filterable-target="#recent-trash-items"
+           value="<%= params[:search] %>" />
+  </div>
 
-    <thead>
-      <tr class="contain-align-left">
-        <th></th>
-        <th>Name</th>
-        <th>Created at</th>
-        <th>Trashed at</th>
-        <th>Contents</th>
-        <th>Tags</th>
-        <th></th>
-      </tr>
-    </thead>
+  <div>
+    <table id="trash-index" class="topalign table table-condensed table-fixedlayout">
+      <colgroup>
+        <col width="5%" />
+        <col width="15%" />
+        <col width="10%" />
+        <col width="10%" />
+        <col width="30%" />
+        <col width="25%" />
+        <col width="5%" />
+      </colgroup>
 
-    <tbody data-infinite-scroller="#recent-trash-items" id="recent-trash-items"
-      data-infinite-content-href="<%= url_for partial: :trash_rows %>" >
-    </tbody>
-  </table>
-<% end %>
+      <thead>
+        <tr class="contain-align-left">
+          <th></th>
+          <th>Name</th>
+          <th>Created at</th>
+          <th>Trashed at</th>
+          <th>Contents</th>
+          <th>Tags</th>
+          <th></th>
+        </tr>
+      </thead>
+
+      <tbody data-infinite-scroller="#recent-trash-items" id="recent-trash-items"
+        data-infinite-content-href="<%= url_for partial: :trash_rows %>" >
+      </tbody>
+    </table>
+  </div>
+</div>

diff --git a/apps/workbench/app/views/trash_items/index.html.erb b/apps/workbench/app/views/trash_items/index.html.erb
index 673ffdcb76826ad240d03b11833b703c224490bd..bd55a3fdb5ea8b1e92079f0c7a5d43533e4cbb8a 100644 (file)
--- a/apps/workbench/app/views/trash_items/index.html.erb
+++ b/apps/workbench/app/views/trash_items/index.html.erb
@@ -1,26 +1 @@
-<% content_for :tab_line_buttons do %>
-  <div class="input-group">
-    <div class="col-md-6 pull-left">
-      <div class="btn-group btn-group-sm">
-        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Selection... <span class="caret"></span></button>
-        <ul class="dropdown-menu" role="menu">
-          <li><%= link_to "Un-trash selected items", '#',
-                  method: :post,
-                  'data-href' => untrash_items_trash_items_path,
-                  'data-selection-param-name' => 'selection[]',
-                  'data-selection-action' => 'untrash-items',
-                  'data-toggle' => 'dropdown'
-            %></li>
-        </ul>
-      </div>
-    </div>
-    <div class="col-md-6 pull-right">
-      <input type="text" class="form-control filterable-control recent-trash-items"
-           placeholder="Search trash"
-           data-filterable-target="#recent-trash-items"
-           value="<%= params[:search] %>" />
-    </div>
-  </div>
-<% end %>
-
 <%= render partial: 'show_trash_items' %>