Move wysiwyg svg sprite declaration at main layout level

area17 · Mar 2, 2020 · 6bb6e25 · 6bb6e25
1 parent 5f798ef
commit 6bb6e25
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 42 deletions.
diff --git a/views/layouts/main.blade.php b/views/layouts/main.blade.php
@@ -8,11 +8,12 @@
             @if(config('twill.dev_mode', false))
                 {!! file_get_contents(twillAsset('icons.svg')) !!}
                 {!! file_get_contents(twillAsset('icons-files.svg')) !!}
+                {!! file_get_contents(twillAsset('icons-wysiwyg.svg')) !!}
             @else
                 {!! File::exists(public_path(twillAsset('icons.svg'))) ? File::get(public_path(twillAsset('icons.svg'))) : '' !!}
                 {!! File::exists(public_path(twillAsset('icons-files.svg'))) ? File::get(public_path(twillAsset('icons-files.svg'))) : '' !!}
+                {!! File::exists(public_path(twillAsset('icons-wysiwyg.svg'))) ? File::get(public_path(twillAsset('icons-wysiwyg.svg'))) : '' !!}
             @endif
-            @stack('svg_sprite')
         </div>
         @if(config('twill.enabled.search', false))
             @partialView(($moduleName ?? null), 'navigation._overlay_navigation', ['search' => true])
@@ -36,45 +37,44 @@
                         <transition name="fade_search-overlay" @after-enter="afterAnimate">
                           <div class="headerSearch__wrapper" :style="positionStyle" v-show="open" v-cloak>
                             <div class="headerSearch__overlay" :style="positionStyle" @click="toggleSearch"></div>
-                            <a17-search endpoint="{{ route(config('twill.dashboard.search_endpoint')) }}" :open="open" :opened="opened"></a17-search>
-                          </div>
-                        </transition>
-                      </div>
-                    @endif
+                            <a17-search endpoint="{{ route(config('twill.dashboard.search_endpoint')) }}" :open="open"
+                                        :opened="opened"></a17-search>
+                        </div>
+                    </transition>
                 </div>
-            </header>
-            @hasSection('primaryNavigation')
-                @yield('primaryNavigation')
-            @else
-                @partialView(($moduleName ?? null), 'navigation._primary_navigation')
-                @partialView(($moduleName ?? null), 'navigation._breadcrumb')
-                @partialView(($moduleName ?? null), 'navigation._secondary_navigation')
             @endif
-            <section class="main">
-                <div class="app" id="app" v-cloak>
-                    @yield('content')
-                    @if (config('twill.enabled.media-library') || config('twill.enabled.file-library'))
-                        <a17-medialibrary ref="mediaLibrary"
-                                          :authorized="{{ json_encode(auth('twill_users')->user()->can('upload')) }}" :extra-metadatas="{{ json_encode(array_values(config('twill.media_library.extra_metadatas_fields', []))) }}"
-                                          :translatable-metadatas="{{ json_encode(array_values(config('twill.media_library.translatable_metadatas_fields', []))) }}"
-                        ></a17-medialibrary>
-                        <a17-dialog ref="warningMediaLibrary" modal-title="Delete media" confirm-label="Delete">
-                            <p class="modal--tiny-title"><strong>Delete media</strong></p>
-                            <p>Are you sure ?<br />This change can't be undone.</p>
-                        </a17-dialog>
-                    @endif
-                    <a17-notif variant="success"></a17-notif>
-                    <a17-notif variant="error"></a17-notif>
-                    <a17-notif variant="info" :auto-hide="false" :important="false"></a17-notif>
-                    <a17-notif variant="warning" :auto-hide="false" :important="false"></a17-notif>
-                </div>
-                <div class="appLoader">
+        </div>
+    </header>
+    @hasSection('primaryNavigation')
+        @yield('primaryNavigation')
+    @else
+        @partialView(($moduleName ?? null), 'navigation._primary_navigation')
+        @partialView(($moduleName ?? null), 'navigation._breadcrumb')
+        @partialView(($moduleName ?? null), 'navigation._secondary_navigation')
+    @endif
+    <section class="main">
+        <div class="app" id="app" v-cloak>
+            @yield('content')
+            @if (config('twill.enabled.media-library') || config('twill.enabled.file-library'))
+                <a17-medialibrary ref="mediaLibrary"
+                                  :authorized="{{ json_encode(auth('twill_users')->user()->can('upload')) }}"
+                                  :extra-metadatas="{{ json_encode(array_values(config('twill.media_library.extra_metadatas_fields', []))) }}"
+                                  :translatable-metadatas="{{ json_encode(array_values(config('twill.media_library.translatable_metadatas_fields', []))) }}"
+                ></a17-medialibrary>
+                <a17-dialog ref="warningMediaLibrary" modal-title="Delete media" confirm-label="Delete">
+                    <p class="modal--tiny-title"><strong>Delete media</strong></p>
+                    <p>Are you sure ?<br/>This change can't be undone.</p>
+                </a17-dialog>
+            @endif
+            <a17-notif variant="success"></a17-notif>
+            <a17-notif variant="error"></a17-notif>
+            <a17-notif variant="info" :auto-hide="false" :important="false"></a17-notif>
+            <a17-notif variant="warning" :auto-hide="false" :important="false"></a17-notif>
+        </div>
+        <div class="appLoader">
                     <span>
                         <span class="loader"><span></span></span>
                     </span>
-                </div>
-                @include('twill::partials.footer')
-            </section>
         </div>
         <script>
             window['{{ config('twill.js_namespace') }}'] = {};

diff --git a/views/partials/form/_wysiwyg.blade.php b/views/partials/form/_wysiwyg.blade.php
@@ -49,13 +49,6 @@
     @endpushonce
 @endif
 
-
-@if(File::exists(public_path("/assets/admin/icons/icons-wysiwyg.svg")))
-    @pushonce('svg_sprite:wysiwyg')
-    {!!  File::get(public_path("/assets/admin/icons/icons-wysiwyg.svg")) !!}
-    @endpushonce
-@endif
-
 @if($wysiwyg === 'quill')
     @if($translated)
         <a17-locale