Revert icon embedding

getkirby · Sep 24, 2019 · 21ebebd · 21ebebd
1 parent 9c37220
commit 21ebebd
Show file tree

Hide file tree

Showing 7 changed files with 1,032 additions and 340 deletions.
diff --git a/panel/dist/img/icons.svg b/panel/dist/img/icons.svg
diff --git a/panel/dist/js/app.js b/panel/dist/js/app.js
diff --git a/panel/public/img/icons.svg b/panel/public/img/icons.svg
diff --git a/panel/public/index.html b/panel/public/index.html
diff --git a/panel/src/components/Misc/Icons.vue b/panel/src/components/Misc/Icons.vue
diff --git a/src/Cms/Panel.php b/src/Cms/Panel.php
@@ -5,6 +5,7 @@
 use Exception;
 use Kirby\Http\Response;
 use Kirby\Http\Uri;
+use Kirby\Toolkit\F;
 use Kirby\Toolkit\Dir;
 use Kirby\Toolkit\View;
 use Throwable;
@@ -36,6 +37,11 @@ public static function customCss(App $kirby)
         return false;
     }
 
+    public static function icons(App $kirby): string
+    {
+        return F::read($kirby->root('kirby') . '/panel/dist/img/icons.svg');
+    }
+
     /**
      * Links all dist files in the media folder
      * and returns the link to the requested asset
@@ -97,6 +103,7 @@ public static function render(App $kirby)
             'config'    => $kirby->option('panel'),
             'assetUrl'  => $kirby->url('media') . '/panel/' . $kirby->versionHash(),
             'customCss' => static::customCss($kirby),
+            'icons'     => static::icons($kirby),
             'pluginCss' => $plugins->url('css'),
             'pluginJs'  => $plugins->url('js'),
             'panelUrl'  => $uri->path()->toString(true) . '/',

diff --git a/views/panel.php b/views/panel.php
@@ -30,6 +30,8 @@
     Please enable JavaScript in your browser
   </noscript>
 
+  <?= $icons ?>
+
   <script>window.panel = <?= json_encode($options, JSON_UNESCAPED_SLASHES) ?></script>
 
   <script src="<?= $assetUrl ?>/js/plugins.js" defer></script>