Correct podfile sidebar (#799)

* Use Boostrap 5 classes for podfile folder sidebar * minor correcttions on podfiles display * Remove merge artifacts
EsupPortail · Apr 6, 2023 · dab8119 · dab8119
1 parent 2ff1500
commit dab8119
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 17 deletions.
diff --git a/pod/podfile/static/podfile/js/filewidget.js b/pod/podfile/static/podfile/js/filewidget.js
@@ -120,14 +120,14 @@ if (typeof loaded == "undefined") {
     bsdirs.hide();
   });
 
-  document.querySelectorAll("#open-folder-icon > *").forEach((el) => {
+  /*document.querySelectorAll("#open-folder-icon > *").forEach((el) => {
     el.style = "pointer-events: none; cursor : pointer;";
   });
   if (document.getElementById("open-folder-icon")) {
     document.getElementById("open-folder-icon").style.cursor = "pointer";
-  }
+  }*/
 
-  document.addEventListener("click", (e) => {
+  /*document.addEventListener("click", (e) => {
     if (
       e.target.id != "open-folder-icon" &&
       !e.target.matches("open-folder-icon i")
@@ -141,7 +141,7 @@ if (typeof loaded == "undefined") {
 
     e.preventDefault();
     document.getElementById("dirs").classList.add("open");
-  });
+  });*/
 
   document.addEventListener("change", (e) => {
     if (e.target.id != "ufile") return;
@@ -167,7 +167,7 @@ if (typeof loaded == "undefined") {
     var data_form = new FormData(e.target);
 
     var url = e.target.getAttribute("action");
-    
+
     fetch(url, {
       method: "POST",
       body: data_form,
@@ -701,7 +701,7 @@ if (typeof loaded == "undefined") {
       foldname =
         '<span class="folder_name" id="folder-name-' +
         foldid +
-        '">  ' +
+        '">' +
         foldname +
         "</span>";
     }

diff --git a/pod/podfile/templates/podfile/home_content.html b/pod/podfile/templates/podfile/home_content.html
@@ -1,19 +1,23 @@
 {% load i18n %}
 
 <div class="container-fluid h-100" id="podfile">
+  <div class="open-folder p-0" id="open-folder-icon">
+    <button class="navbar-toggler pod-navbar__button-toggler"
+            type="button"
+            aria-controls="dirs"
+            aria-expanded="false"
+            data-bs-toggle="collapse"
+            data-bs-target="#dirs"
+            title="{% trans 'Toggle folders menu' %}">
+      <i class="bi bi-list" aria-hidden="true"></i>
+    </button>
+  </div>
   <div class="row">
-    <div class="col col-4" id="dirs">
+    <div class="col col-4 collapse collapse-horizontal" id="dirs">
       {% include 'podfile/userfolder.html' %}
     </div>
-    <div class="open-folder p-0" id="open-folder-icon">
-	    <button class="navbar-toggler pod-navbar__button-toggler"
-              aria-controls="dirs"
-              data-bs-target="#dirs"
-              title="{% trans 'Toggle folders menu' %}">
-        <i class="bi bi-list" aria-hidden="true"></i>
-      </button>
-    </div>
-    <div class="col col-8 col-md-offset-1" id="files">
+
+    <div class="col" id="files">
       {% include 'podfile/list_folder_files.html' with folder=current_session_folder %}
   </div>
 </div>

diff --git a/pod/podfile/templates/podfile/userfolder.html b/pod/podfile/templates/podfile/userfolder.html
@@ -23,7 +23,8 @@
             {% trans "Add new folder" %}
         </button>
     </div>
-    <button id="close-folder-icon" type="button" class="btn-close" aria-label="{% trans 'Close' %}"></button>
+    <button id="close-folder-icon" type="button"
+            class="btn-close" aria-label="{% trans 'Close' %}"></button>
 </div>
   <label class="visually-hidden" for="folder-search">{% trans 'Search folder' %}</label>
   <input