wait #6854 fix git conflits

diff --git a/public/packages/fluidbook/toolbox/css/style.less b/public/packages/fluidbook/toolbox/css/style.less
index a3fdedff1469d10c1556b147ebb54f0453e44e23..1a076b48dd4e4823d9b045ba2e65666b80611f6a 100644 (file)
--- a/public/packages/fluidbook/toolbox/css/style.less
+++ b/public/packages/fluidbook/toolbox/css/style.less
@@ -532,5 +532,9 @@ table.dataTable thead .sorting::before, table.dataTable thead .sorting::after, t
     }
 }
 
+.editview #form_shortcuts a.bold {
+    font-weight: bold;
+}
+
 
 @import 'context-menu';

diff --git a/public/packages/fluidbook/toolbox/css/tools.less b/public/packages/fluidbook/toolbox/css/tools.less
index 1fff97d45f0e76d02a3b2ca11f7e28ab2d6be82f..dc1c5b31e206e5d2af67a2959df4bff2308d315e 100644 (file)
--- a/public/packages/fluidbook/toolbox/css/tools.less
+++ b/public/packages/fluidbook/toolbox/css/tools.less
@@ -1,8 +1,73 @@
 #tool{
     padding-top: 30px;
+    &:not(.main) {
+        h2 {
+            padding-bottom: 0;
+            margin-bottom: 0;
+        }
+    }
 
-    h2{
+    .back {
+        display: inline-block;
         padding-bottom: 20px;
+        margin-bottom: .5rem;
+    }
+    &:not(.main) h2 {
+        margin-bottom: 0;
+    }
+    .nav {
+        &-filter {
+            ul {
+                list-style: none;
+                display: flex;
+                padding: 0;
+                li {
+                    padding: 0 0.5rem;
+                    cursor: pointer;
+                    color: #869ab8;
+                    &:hover,
+                    &.active {
+                        color: #384c74;
+                    }
+                }
+            }
+        }
+        &-dropdown-items {
+            padding: 0;
+            display: grid;
+            grid-template-columns: repeat(2, 1fr);
+            list-style: none;
+            gap: 27px;
+            @media (min-width: 1180px) {
+                grid-template-columns: repeat(4, 1fr);
+            }
+            @media (min-width: 1400px) {
+                grid-template-columns: repeat(6, 1fr);
+            }
+        }
+        &-item {
+            background-color: rgba(70, 127, 207, 0.1);
+            border-radius: 4px;
+            position: relative;
+            height: 20vh;
+            &.hide {
+                display: none;
+            }
+        }
+        &-link {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            padding: 20px;
+            height: 100%;
+            i {
+                font-size: 50px;
+            }
+            span {
+                width: 90%;
+                text-align: center;
+            }
+        }
     }
 }
-

diff --git a/resources/views/tools/all.blade.php b/resources/views/tools/all.blade.php
new file mode 100644 (file)
index 0000000..aafa62f
--- /dev/null
+++ b/resources/views/tools/all.blade.php
@@ -0,0 +1,42 @@
+@extends(backpack_view('blank'))
+
+@section('after_styles')
+    <link rel="stylesheet" href="/packages/tools/css/style.css"/>
+@endsection
+
+@section('content')
+
+    <div id="tool" class="main">
+        <h2>Outils</h2>
+        <nav class="nav-filter navbar-expand-lg mb-0 pb-0 pt-0">
+            <ul class="list-none">
+                <li>
+                    <a class="d-none d-lg-block"><span class="la la-filter"></span></a>
+                </li>
+                <li data-filter="fluidbook">Fluidbook</li>
+                <li data-filter="development">Développement</li>
+                <li data-filter="excel">Excel</li>
+            </ul>
+        </nav>
+        <div id="grid" class="d-grid gap-8 feature-grid">
+            @include('tools.sidebar')
+        </div>
+    </div>
+
+@endsection
+
+@push('after_scripts')
+    <script>
+        (function ($) {
+            $(document).on( 'click', '[data-filter]', function() {
+                var filterValue = $(this).attr('data-filter');
+                var split = filterValue.split(',')
+                $(".nav-dropdown-items .nav-item").removeClass("hide")
+                $(":not(."+split.join(' .')+")").addClass("hide")
+
+                $("[data-filter]").removeClass("active")
+                $(this).addClass("active")
+            });
+        })(jQuery);
+    </script>
+@endpush

diff --git a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
index 676a5d7ef530307118cf532941155a2cdd1abba4..9468153d33900080cae18123a84a5333743715a1 100644 (file)
--- a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
+++ b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
@@ -152,9 +152,8 @@
 @endcanany
 
 @can('tools')
-    <li {!! sidebarState('tools') !!}><a class='nav-link nav-dropdown-toggle' href='#'><i
+    <li class="nav-item"><a class='nav-link' href='{{ backpack_url('tools/all') }}'><i
                 class='nav-icon la la-tools'></i>{{__('Outils')}}</a>
-        @include('tools.sidebar')
     </li>
 @endcan
 @canany(['users:read','company:read','managerolesandpersmissions'])

diff --git a/resources/views/vendor/backpack/crud/form_content.blade.php b/resources/views/vendor/backpack/crud/form_content.blade.php
index 4f43a273447eff84a9c383de3e9c6c44d2d06ff6..cce477863320d14c1c3b095ecd0bd900195fa3d2 100644 (file)
--- a/resources/views/vendor/backpack/crud/form_content.blade.php
+++ b/resources/views/vendor/backpack/crud/form_content.blade.php
@@ -1,5 +1,10 @@
-<input type="hidden" name="_http_referrer" value={{ session('referrer_url_override') ?? old('_http_referrer') ?? \URL::previous() ?? url($crud->route) }}>
+@if(Request::is('tools/*'))
+    <a href="{{ backpack_url("/tools/all") }}" class="back">
+        {{ __('Revenir sur la liste des outils') }}
+    </a>
+@endif
 
+<input type="hidden" name="_http_referrer" value={{ session('referrer_url_override') ?? old('_http_referrer') ?? \URL::previous() ?? url($crud->route) }}>
 {{-- See if we're using tabs --}}
 @if ($crud->tabsEnabled() && count($crud->getTabs()))
     @include('crud::inc.show_tabbed_fields')