wait #6854 fix git conflits

diff --git a/public/packages/fluidbook/toolbox/js/bundle.js b/public/packages/fluidbook/toolbox/js/bundle.js
index ca014657344d2e17964b315d6956cd72e8c9c9e7..1ebfae6e42c7124437283bea7e392a26c0d9cb95 100644 (file)
--- a/public/packages/fluidbook/toolbox/js/bundle.js
+++ b/public/packages/fluidbook/toolbox/js/bundle.js
@@ -52,6 +52,28 @@ $(function () {
             }
         });
     });
+
+
+    if($('.editview').length > 0) {
+        const section = $(".card-body")
+
+        $(window).on("scroll", function (e) {
+            var top = window.scrollY
+            const nav = []
+            section.each(function () {
+                if (top >= $(this).offset().top - 100) {
+                    let data = $(this).children("[data-name]").data('name')
+                    nav.push(data)
+                }
+            })
+
+            let current = nav.slice(-1)
+
+            $("a:not([href='#s_" + current + "'])").removeClass("active")
+            $("a[href='#s_" + current + "']").addClass("active")
+        })
+    }
+
 });
 
 function reloadPagePortions(callback) {

diff --git a/resources/views/tools/sidebar.blade.php b/resources/views/tools/sidebar.blade.php
index 7a1082d9389afa157ecbaa7184ec9c1f2b8813d1..d7afdcff5dba4930fbf8051f9c1b6f230b2e3a5b 100644 (file)
--- a/resources/views/tools/sidebar.blade.php
+++ b/resources/views/tools/sidebar.blade.php
@@ -1,71 +1,71 @@
 {{-- __('!! Outils') --}}
 <ul class='nav-dropdown-items'>
-    <li class='nav-item'><a class='nav-link' href='{{ backpack_url('opentools/pdf2svg') }}'><i
+    <li class='nav-item fluidbook'><a class='nav-link' href='{{ backpack_url('opentools/pdf2svg') }}'><i
                 class='nav-icon la la-images'></i>
             <span>{{__('Conversion de PDF en images')}}</span></a></li>
-    <li class='nav-item'><a class='nav-link' href='{{ backpack_url('tools/pdflayers') }}'><i
+    <li class='nav-item fluidbook'><a class='nav-link' href='{{ backpack_url('tools/pdflayers') }}'><i
                 class="las la-hand-scissors"></i>
             <span>{{__('Séparer les couches d\'un PDF')}}</span></a></li>
-    <li class='nav-item'><a class='nav-link' href='{{ backpack_url('tools/resizer') }}'><i
+    <li class='nav-item fluidbook'><a class='nav-link' href='{{ backpack_url('tools/resizer') }}'><i
                 class="nav-icon las la-compress-arrows-alt"></i>
             <span>{{__('Redimensionner des images')}}</span></a></li>
-    <li class='nav-item'><a class='nav-link' href='{{ backpack_url('tools/fluidbookassetsdownloader') }}'><i
+    <li class='nav-item fluidbook'><a class='nav-link' href='{{ backpack_url('tools/fluidbookassetsdownloader') }}'><i
                 class='nav-icon las la-cloud-download-alt'></i>
             <span>{{__('Téléchargement massif d\'assets dans un fluidbook')}}</span></a></li>
-    <li class='nav-item'><a class='nav-link' href='{{ backpack_url('tools/gitreposcreate') }}'><i
+    <li class='nav-item development'><a class='nav-link' href='{{ backpack_url('tools/gitreposcreate') }}'><i
                 class='nav-icon la la-git'></i>
             <span>{{__('Créer un répertoire GIT')}}</span></a></li>
-    <li class='nav-item'><a class='nav-link' href='{{ backpack_url('tools/dockerwebcontainer') }}'><i
+    <li class='nav-item development'><a class='nav-link' href='{{ backpack_url('tools/dockerwebcontainer') }}'><i
                 class='nav-icon lab la-docker'></i>
             <span>{{__('Créer un container web')}}</span></a></li>
-    <li class='nav-item'><a class='nav-link' href='{{ backpack_url('tools/tts') }}'><i
+    <li class='nav-item excel'><a class='nav-link' href='{{ backpack_url('tools/tts') }}'><i
                 class='nav-icon la la-volume-up'></i>
             <span>{{__('Text to speech')}}</span></a></li>
-    <li class='nav-item'><a class='nav-link' href='{{ backpack_url('tools/json2excel') }}'><i
+    <li class='nav-item fluidbook'><a class='nav-link' href='{{ backpack_url('tools/json2excel') }}'><i
                 class='nav-icon la la-file-excel'></i>
             <span>{{__('JSON to Excel')}}</span></a></li>
-    <li class='nav-item'><a class='nav-link' href='{{ backpack_url('opentools/excel2json') }}'><i
+    <li class='nav-item fluidbook'><a class='nav-link' href='{{ backpack_url('opentools/excel2json') }}'><i
                 class='nav-icon las la-code'></i>
             <span>{{__('Excel to JSON')}}</span></a></li>
-    <li class='nav-item'><a class='nav-link' href='{{ backpack_url('tools/fluidbookcopylinks') }}'><i
+    <li class='nav-item fluidbook'><a class='nav-link' href='{{ backpack_url('tools/fluidbookcopylinks') }}'><i
                 class='nav-icon las la-link'></i>
             <span>{{__('Copier les liens ou assets d\'un fluidbook')}}</span></a></li>
-    <li class='nav-item'><a class='nav-link' href='{{ backpack_url('tools/fluidbookreplicate') }}'><i
+    <li class='nav-item fluidbook'><a class='nav-link' href='{{ backpack_url('tools/fluidbookreplicate') }}'><i
                 class='nav-icon las la-clone'></i>
             <span>{{__('Dupliquer un fluidbook')}}</span></a></li>
-    <li class='nav-item'><a class='nav-link' href='{{ backpack_url('tools/fluidbookbranchcreate') }}'><i
+    <li class='nav-item fluidbook'><a class='nav-link' href='{{ backpack_url('tools/fluidbookbranchcreate') }}'><i
                 class='nav-icon la la-git'></i>
             <span>{{__('Créer une branche du player fluidbook')}}</span></a></li>
-    <li class='nav-item'><a class='nav-link' href='{{ backpack_url('tools/fluidbookbranchremove') }}'><i
+    <li class='nav-item fluidbook'><a class='nav-link' href='{{ backpack_url('tools/fluidbookbranchremove') }}'><i
                 class='nav-icon la la-git'></i>
             <span>{{__('Supprimer une branche du player fluidbook')}}</span></a></li>
-    <li class='nav-item'><a class='nav-link' href='{{ backpack_url('tools/fluidbookrefurl') }}'><i
+    <li class='nav-item fluidbook'><a class='nav-link' href='{{ backpack_url('tools/fluidbookrefurl') }}'><i
                 class='nav-icon las la-link'></i>
             <span>{{__('Importer des bases de données de références fluidbook')}}</span></a></li>
-    <li class='nav-item'><a class='nav-link' href='{{ backpack_url('tools/favicongen') }}'><i
+    <li class='nav-item development'><a class='nav-link' href='{{ backpack_url('tools/favicongen') }}'><i
                 class='nav-icon las la-icons'></i>
             <span>{{__('Générer des favicons')}}</span></a></li>
-    <li class='nav-item'><a class='nav-link' href='{{ backpack_url('tool-sprite') }}'><i
+    <li class='nav-item development'><a class='nav-link' href='{{ backpack_url('tool-sprite') }}'><i
                 class="nav-icon las la-marker"></i>
             <span>{{__('SVG Sprites')}}</span></a></li>
     @can('webflow:admin')
-        <li class='nav-item'><a class='nav-link' href='{{ backpack_url('tool-webflow') }}'><i class="nav-icon la"><img
+        <li class='nav-item development'><a class='nav-link' href='{{ backpack_url('tool-webflow') }}'><i class="nav-icon la"><img
                         src="/images/icons/icon-webflow.svg"/></i>
                 <span>{{__('Sites Webflow')}}</span></a></li>
     @endcan()
-    <li class='nav-item'><a class='nav-link' href='{{ backpack_url('opentools/sasscompiler') }}'><i
+    <li class='nav-item development'><a class='nav-link' href='{{ backpack_url('opentools/sasscompiler') }}'><i
                 class="nav-icon lab la-sass"></i>
             <span>{{__('Compileur SASS')}}</span></a></li>
-    <li class='nav-item'><a class='nav-link' href='{{ backpack_url('tools/svgcleaner') }}'><i
+    <li class='nav-item development'><a class='nav-link' href='{{ backpack_url('tools/svgcleaner') }}'><i
                 class='nav-icon la la-broom'></i>
             <span>{{__('Nettoyer un SVG')}}</span></a></li>
     @if (can('fluidbook-publication:admin'))
-        <li class='nav-item'><a class='nav-link' href='{{ backpack_url('tools/importfluidbooksettings') }}'><i
+        <li class='nav-item fluidbook'><a class='nav-link' href='{{ backpack_url('tools/importfluidbooksettings') }}'><i
                     class="las la-otter"></i>
                 <span>{{__('Importer les paramètres de fluidbook')}}</span></a></li>
     @endif
     @can('staticsite:manage')
-        <li class='nav-item'><a class='nav-link' href='{{ backpack_url('tools/staticsiteuploader') }}'><i
+        <li class='nav-item development'><a class='nav-link' href='{{ backpack_url('tools/staticsiteuploader') }}'><i
                     class="las la-cloud-upload-alt"></i>
                 <span>{{__('Sites statiques')}}</span></a></li>
     @endcan

diff --git a/resources/views/vendor/backpack/base/layouts/top_left.blade.php b/resources/views/vendor/backpack/base/layouts/top_left.blade.php
index 9675163bcd001af550037798dc98810c21ac8cf5..89d1f272a5afeaf2f9e2ed7c39b31352cc82b665 100644 (file)
--- a/resources/views/vendor/backpack/base/layouts/top_left.blade.php
+++ b/resources/views/vendor/backpack/base/layouts/top_left.blade.php
@@ -11,7 +11,9 @@
 
 @include(backpack_view('inc.main_header'))
 
-<div class="app-body">
+@php($editview = $crud->entry instanceof \App\Models\FluidbookPublication && $crud->getCurrentOperation() === "update")
+
+<div @class(['app-body','editview'=> $editview])>
 
     @include(backpack_view('inc.sidebar'))