Merge pull request #5696 from samvera/5680-file-manager-layout

Address 5680 file manager layout
samvera · Jun 15, 2022 · 1620b67 · 1620b67
2 parents 9d2c75e + 822d707
commit 1620b67
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/app/views/hyrax/base/_file_manager_actions.html.erb b/app/views/hyrax/base/_file_manager_actions.html.erb
@@ -1,5 +1,7 @@
-  <div class="actions form-group row card">
-    <%= button_tag t('.save'), class: "btn btn-primary disabled", data: { action: "save-actions" } %>
-    <%= button_tag t('.sort_alphabetically'), class: "btn btn-primary", data: { action: "alpha-sort-action" } %>
+  <div class="actions card">
+    <div class="d-flex">
+      <%= button_tag t('.save'), class: "btn btn-primary disabled mr-2", data: { action: "save-actions" } %>
+      <%= button_tag t('.sort_alphabetically'), class: "btn btn-primary ", data: { action: "alpha-sort-action" } %>
+    </div>
   </div>
   <%= render "file_manager_resource_form" %>
diff --git a/app/views/hyrax/base/_file_manager_members.html.erb b/app/views/hyrax/base/_file_manager_members.html.erb
@@ -1,6 +1,6 @@
 <%= content_tag :ul,
                 id: "sortable",
-                class: "list-unstyled grid clearfix",
+                class: "list-unstyled grid d-flex flex-wrap clearfix",
                 data: {
                   id: @form.id,
                   "class-name" => @form.model_name.plural,

diff --git a/app/views/hyrax/base/_file_manager_thumbnail.html.erb b/app/views/hyrax/base/_file_manager_thumbnail.html.erb
@@ -1 +1 @@
-<%= document_presenter(node)&.thumbnail&.thumbnail_tag({ class: 'thumbnail-inner' }, {}) %>
+<%= document_presenter(node)&.thumbnail&.thumbnail_tag({ class: 'thumbnail-inner mw-100' }, {}) %>
diff --git a/app/views/hyrax/base/file_manager.html.erb b/app/views/hyrax/base/file_manager.html.erb
@@ -6,13 +6,12 @@
 </ul>
 
 <% if !@form.member_presenters.empty? %>
-  <div data-action="file-manager">
-    <div class="col-md-3" id="file-manager-tools">
+  <div class="row" data-action="file-manager">
+    <div class="col-lg-3" id="file-manager-tools">
       <h2><%= t('.toolbar') %></h2>
       <%= render "file_manager_actions" %>
     </div>
-    <div class="col-md-3" id="label-tools-spacer" class="fixed"></div>
-    <div class="col-md-9" id="order-grid">
+    <div class="col-lg-9" id="order-grid">
       <%= render "file_manager_members" %>
     </div>
   </div>