From 62e907c23827ca7c486279e6d76a688c5ede4795 Mon Sep 17 00:00:00 2001 From: Awilum Date: Wed, 26 Feb 2020 15:31:38 +0300 Subject: [PATCH] feat(admin-plugin): change settings to system in left admin panel nav --- site/plugins/admin/dependencies.php | 4 ++-- .../plugins/admin/templates/partials/base.html | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/site/plugins/admin/dependencies.php b/site/plugins/admin/dependencies.php index 7cea5532..933c1c13 100644 --- a/site/plugins/admin/dependencies.php +++ b/site/plugins/admin/dependencies.php @@ -23,8 +23,8 @@ $flextype->registry->set('plugins.admin.navigation.extends.fieldsets', ['title' $flextype->registry->set('plugins.admin.navigation.extends.themes', ['title' => __('admin_themes'),'icon' => 'fas fa-palette', 'link' => $flextype->router->pathFor('admin.themes.index')]); $flextype->registry->set('plugins.admin.navigation.extends.snippets', ['title' => __('admin_snippets'),'icon' => 'far fa-file-code', 'link' => $flextype->router->pathFor('admin.snippets.index')]); $flextype->registry->set('plugins.admin.navigation.extends.plugins', ['title' => __('admin_plugins'),'icon' => 'fas fa-plug', 'link' => $flextype->router->pathFor('admin.plugins.index')]); -$flextype->registry->set('plugins.admin.navigation.settings.tools', ['title' => __('admin_tools'),'icon' => 'fas fa-toolbox', 'link' => $flextype->router->pathFor('admin.tools.index')]); -$flextype->registry->set('plugins.admin.navigation.settings.api', ['title' => __('admin_api'),'icon' => 'fas fa-network-wired', 'link' => $flextype->router->pathFor('admin.api.index')]); +$flextype->registry->set('plugins.admin.navigation.system.tools', ['title' => __('admin_tools'),'icon' => 'fas fa-toolbox', 'link' => $flextype->router->pathFor('admin.tools.index')]); +$flextype->registry->set('plugins.admin.navigation.system.api', ['title' => __('admin_api'),'icon' => 'fas fa-network-wired', 'link' => $flextype->router->pathFor('admin.api.index')]); // Add Global Vars Admin Twig Extension $flextype->view->addExtension(new GlobalVarsAdminTwigExtension($flextype)); diff --git a/site/plugins/admin/templates/partials/base.html b/site/plugins/admin/templates/partials/base.html index a53d356c..9c9c5a6f 100644 --- a/site/plugins/admin/templates/partials/base.html +++ b/site/plugins/admin/templates/partials/base.html @@ -8,7 +8,7 @@ - {% do + {% do emitter.emit('onAdminThemeMeta') %} FLEXTYPE @@ -17,9 +17,9 @@ {% set vendor_build_css = site_url() ~ '/site/plugins/admin/assets/dist/css/vendor-build.min.css' %} {% set admin_panel_build_css = site_url() ~ '/site/plugins/admin/assets/dist/css/admin-panel-build.min.css' %} - {% do + {% do assets.add('css', vendor_build_css, 'admin', 1) %} - {% do + {% do assets.add('css', admin_panel_build_css, 'admin', 2) %} {% for assets_admin in assets.get('css', 'admin') %} @@ -28,7 +28,7 @@ {% endfor %} {% endfor %} - {% do + {% do emitter.emit('onAdminThemeHeader') %} {% endblock %} @@ -74,14 +74,14 @@ {% endfor %} - {% for key, item in registry.plugins.admin.navigation.settings %} + {% for key, item in registry.plugins.admin.navigation.system %}
  • {{ icon(item.icon) }}
  • {% endfor %} - {% for key, item in registry.plugins.admin.navigation.help %} + {% for key, item in registry.plugins.admin.navigation.information %}
  • {{ icon(item.icon) }} @@ -289,7 +289,7 @@ {% set admin_panel_build_js = site_url() ~ '/site/plugins/admin/assets/dist/js/admin-panel-build.min.js' %} - {% do + {% do assets.add('js', admin_panel_build_js, 'admin', 1) %} {% for assets_admin in assets.get('js', 'admin') %} {% for assets_by_priorities in assets_admin %} @@ -308,9 +308,9 @@ {% include "plugins/admin/templates/partials/modules/datetimepicker.html" %} {% include "plugins/admin/templates/partials/modules/clipboard.html" %} - {% do + {% do emitter.emit('onAdminThemeTail') %} {% block tail %}{% endblock %} - \ No newline at end of file +