diff --git a/assets/vue/App.vue b/assets/vue/App.vue index a424fa5523..a1e6bf7d82 100644 --- a/assets/vue/App.vue +++ b/assets/vue/App.vue @@ -79,7 +79,7 @@ const layout = computed(() => { const queryParams = new URLSearchParams(window.location.search) - if (queryParams.has("lp") || (queryParams.has("origin") && "learnpath" === queryParams.get("origin"))) { + if (queryParams.has("lp_id") || (queryParams.has("origin") && "learnpath" === queryParams.get("origin"))) { return "EmptyLayout" } diff --git a/assets/vue/components/layout/DashboardLayout.vue b/assets/vue/components/layout/DashboardLayout.vue index 5563058d6a..5d0769a699 100644 --- a/assets/vue/components/layout/DashboardLayout.vue +++ b/assets/vue/components/layout/DashboardLayout.vue @@ -1,7 +1,10 @@ diff --git a/src/CoreBundle/Resources/views/Index/vue.html.twig b/src/CoreBundle/Resources/views/Index/vue.html.twig index d2a5981cb4..0502d8bbd9 100644 --- a/src/CoreBundle/Resources/views/Index/vue.html.twig +++ b/src/CoreBundle/Resources/views/Index/vue.html.twig @@ -1,18 +1,6 @@ -{% extends "@ChamiloCore/Layout/base-layout.html.twig" %} -{% block chamilo_wrap %} - {%- autoescape %} - {% if not from_vue %} -
- {% endif %} - {% endautoescape -%} - {% autoescape false %} -
- {%- block content %} - {% include '@ChamiloCore/Layout/vue_setup.html.twig' %} - {% endblock -%} -
- {% endautoescape %} -{% endblock %} +{% extends "@ChamiloCore/Layout/no_layout.html.twig" %} -{% block chamilo_footer %} +{%- block content %} + {% include '@ChamiloCore/Layout/vue_setup.html.twig' %} + {# {{ encore_entry_script_tags('vue') }}#} {% endblock %} diff --git a/src/CoreBundle/Resources/views/Layout/no_layout.html.twig b/src/CoreBundle/Resources/views/Layout/no_layout.html.twig index 5a645357a7..389cce5758 100644 --- a/src/CoreBundle/Resources/views/Layout/no_layout.html.twig +++ b/src/CoreBundle/Resources/views/Layout/no_layout.html.twig @@ -13,11 +13,6 @@ {% endblock -%} {% endautoescape %} - {% endblock %} {% block chamilo_footer %}