From 75103ed15b5ad9364c3a1b3548348c9f04a65a20 Mon Sep 17 00:00:00 2001 From: alp Date: Mon, 20 Apr 2020 12:13:57 +0300 Subject: [PATCH] revert for crud changes did by @mgoleli --- .../resources/views/layouts/default.twig | 1 + .../resources/views/partials/assets.twig | 21 +++++++++++-------- .../src/BaseThemeServiceProvider.php | 4 ++++ 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig b/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig index b52ab4017..7faa77ccc 100644 --- a/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig +++ b/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig @@ -19,6 +19,7 @@ {% include "theme::partials/header" %} +{{ addBlock('layouts/default/section')|raw }}
diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig b/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig index f37fa311c..56a4b7dab 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig @@ -2,21 +2,24 @@ Main CSS can be found in metadata.twig #} + + + {# Core Theme Components #} -{{ asset_add("theme.js", "theme::js/popper.min.js") }} -{{ asset_add("theme.js", "theme::js/bootstrap.min.js") }} -{{ asset_add("theme.js", "theme::js/modal_include.js") }} -{{ asset_add("theme.js", "theme::js/select2.js") }} -{{ asset_add("theme.js", "theme::js/params.js") }} -{{ asset_add("theme.js", "theme::js/jquery.maskedinput.js") }} +{{ asset_add("theme.js", "visiosoft.theme.base::js/popper.min.js") }} +{{ asset_add("theme.js", "visiosoft.theme.base::js/bootstrap.min.js") }} +{{ asset_add("theme.js", "visiosoft.theme.base::js/modal_include.js") }} +{{ asset_add("theme.js", "visiosoft.theme.base::js/select2.js") }} +{{ asset_add("theme.js", "visiosoft.theme.base::js/params.js") }} +{{ asset_add("theme.js", "visiosoft.theme.base::js/jquery.maskedinput.js") }} {{ asset_add("theme.js", "visiosoft.theme.base::js/intlTelInput.min.js") }} {{ asset_add("theme.js", "visiosoft.theme.base::js/utils.js") }} -{{ asset_add("theme.js", "theme::js/phoneField.js") }} +{{ asset_add("theme.js", "visiosoft.theme.base::js/phoneField.js") }} {# Theme Scripts #} -{#{{ asset_add("theme.js", "theme::js/plugins/*") }}#} -{{ asset_add("theme.js", "theme::js/theme/initialize.js") }} +{#{{ asset_add("theme.js", "visiosoft.theme.base::js/plugins/*") }}#} +{{ asset_add("theme.js", "visiosoft.theme.base::js/theme/initialize.js") }} {{ asset_script("theme.js") }} diff --git a/addons/default/visiosoft/base-theme/src/BaseThemeServiceProvider.php b/addons/default/visiosoft/base-theme/src/BaseThemeServiceProvider.php index bd906ef5c..55b13cff5 100644 --- a/addons/default/visiosoft/base-theme/src/BaseThemeServiceProvider.php +++ b/addons/default/visiosoft/base-theme/src/BaseThemeServiceProvider.php @@ -129,6 +129,10 @@ class BaseThemeServiceProvider extends AddonServiceProvider protected $mobile = [ //'streams::errors/404' => 'module::mobile/errors/404', //'streams::errors/500' => 'module::mobile/errors/500', + 'anomaly.module.users::login' => 'visiosoft.theme.base::addons/anomaly/users-module/login', + 'anomaly.module.users::register' => 'visiosoft.theme.base::addons/anomaly/users-module/register', + 'anomaly.module.users::password/forgot' => 'visiosoft.theme.base::addons/anomaly/users-module/password/forgot', + 'anomaly.module.users::password/reset' => 'visiosoft.theme.base::addons/anomaly/users-module/password/reset' ]; /**