Fix browse everything layout

pulibrary · Jun 29, 2022 · 1285803 · 1285803
1 parent 30a8b59
commit 1285803
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 101 deletions.
diff --git a/app/assets/stylesheets/components/browse_everything.scss b/app/assets/stylesheets/components/browse_everything.scss
@@ -1,101 +1,3 @@
-@import "jquery.treetable";
-@import "jquery.treetable.theme.browse";
-
-@mixin ev-link {
-  cursor: pointer;
-  a {
-    color: inherit;
-    background-color: inherit;
-    text-decoration: none;
-  }
-}
-
-#browse-everything {
-  overflow-y: hidden;
-  position: fixed !important;
-  margin: 0 0 0 -37.5%;
-  left: 50%;
-  top: 10%;
-  background-color: initial;
-  width: 75%;
-  z-index: 10001;
-
-  div {
-    background-color: white;
-  }
-
-  .modal-header {
-    padding: 8px;
-  }
-
-  .modal-body {
-    overflow: hidden;
-  }
-
-  .modal-footer {
-    margin: 0px;
-  }
-
-  .row {
-    margin: inherit;
-  }
-
-  .ev-files {
-    position: relative;
-    overflow-x: auto;
-    overflow-y: auto;
-
-    li {
-      overflow: hidden;
-      text-overflow: ellipsis;
-      .ev-file-name {
-        white-space: nowrap;
-      }
-      border-top: none;
-    }
-
-    &.detail {
-    }
-
-    &.list ul {
-      columns: 3;
-    }
-  }
-
-  .ev-container li {
-    cursor: pointer;
-  }
-
-  .ev-body {
-    padding: 0;
-  }
-
-  .ev-providers {
-    padding: 4px;
-  }
-
-  .ev-files {
-    table {
-      width: 100%;
-      max-width: 100%;
-      tr {
-        width: 100%;
-        max-width: 100%;
-        td {
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-        }
-      }
-    }
-  }
-
-  .ev-files {
-    height: 50vh;
-    li { @include ev-link; }
-  }
-
-  .ev-providers {
-    select { width: 30% }
-  }
+.modal-title {
+  margin-top: 0;
 }
diff --git a/app/views/browse_everything/_modal.html.erb b/app/views/browse_everything/_modal.html.erb
@@ -0,0 +1,19 @@
+<%# Overrides modal form from upstream browse_everything gem. Can delete once this issue is fixed: samvera/browse-everything#409 %>
+
+<div class="modal fade" id="browse-everything-modal" tabindex="-1" role="dialog" aria-labelledby="browse-everything-modal-title" aria-hidden="true">
+  <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h4 class="modal-title" id="browse-everything-modal-title">Select Your Files</h4>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <%= render 'browse_everything/javascript_app' %>
+      </div>
+    </div>
+  </div>
+</div>
+
+<% render 'browse_everything/javascript_app' %>
diff --git a/app/views/bulk_ingest/show.html.erb b/app/views/bulk_ingest/show.html.erb
@@ -40,6 +40,7 @@
             Select Folder on Server
           </button>
           <%= render 'browse_everything/modal' %>
+
         </div>
       </div>
     </div>
@@ -50,8 +51,8 @@
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
         <h4 class="modal-title" id="myModalLabel">Example directory structures</h4>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
       </div>
       <div class="modal-body">
         <p>Single volume work:</p>