diff --git a/composer.json b/composer.json index 64bc202..2639a2c 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "doctrine/doctrine-bundle": "^2.12", "doctrine/doctrine-migrations-bundle": "^3.3", "doctrine/orm": "2.*", - "fourbis/cms-bundle": "2.*", + "fourbis/cms-bundle": "dev-master", "league/flysystem-webdav": "^3.24", "phpdocumentor/reflection-docblock": "^5.4", "phpstan/phpdoc-parser": "^1.28", diff --git a/composer.lock b/composer.lock index d4fffdf..cf2c200 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b4f3cf07ae0e653b182d56fa960e5511", + "content-hash": "8c12162ceb43812a1ed7bc9bf9122fa8", "packages": [ { "name": "deployer/deployer", @@ -1441,11 +1441,11 @@ }, { "name": "fourbis/cms-bundle", - "version": "2.4.25", - "source": { - "type": "git", - "url": "ssh://git@tunnel.git.4bis.tech:2213/4BIS_Innovations/CmsBundle.git", - "reference": "baf99cf3aa6a9b72a543a21c1abde3785a6d2885" + "version": "dev-master", + "dist": { + "type": "path", + "url": "CmsBundle", + "reference": "859704ef6181caa19e9e2529668fdb2bb02ab7d0" }, "require": { "doctrine/doctrine-bundle": "2.*", @@ -1473,7 +1473,9 @@ "Fourbis\\CmsBundle\\Tests\\": "tests" } }, - "time": "2024-04-09T10:04:32+00:00" + "transport-options": { + "relative": true + } }, { "name": "league/flysystem", @@ -10739,7 +10741,8 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "deployer/deployer": 5 + "deployer/deployer": 5, + "fourbis/cms-bundle": 20 }, "prefer-stable": true, "prefer-lowest": false, diff --git a/templates/base.html.twig b/templates/base.html.twig index 9a21d53..a3d9cfa 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -1,113 +1,56 @@ {% extends "layout.html.twig" %} -{% block title %} - AffiliateMNGR +{% block page_title %}{% block title %}{% endblock %} {{ cms_setting('seo-site-title').title |raw }}{% endblock page_title %} + + +{% block head_description %} + {{- (page | default(null) ? page.translate().description : + post | default(null) ? post.translate().description : + category | default(null) ? category.translate().description) |striptags -}} {% endblock %} -{% block favicons %} - - +{% block meta %} + {{ parent() }} + + + {% if not app.debug %} + + + + {% endif %} {% endblock %} -{% block fonts %} - - +{% block gtm_head_part %} {% endblock %} -{% block flash %} -
- {#
#} -
+ + +{% block gtm_body_part %} {% endblock %} -{% block header_javascripts %} - {# {{ encore_entry_script_tags('enginizer') }} #} +{% block navbar %} + {# {% include 'blocks/menu_test.html.twig' %} #} + {{ cms_render('nav-bar') | default('') |raw }} {% endblock %} - {% block stylesheets %} - {{ encore_entry_link_tags("app") }} - {% endblock %} +{% block default_head_javascripts %} + {{ encore_entry_script_tags('app') }} +{% endblock default_head_javascripts %} -{% block header %} - +{% block stylesheets %} + {{ encore_entry_link_tags('app') }} {% endblock %} - {% block sidebar %} - {% include 'menu/sidebar.html.twig' %} - {% endblock %} - -{% block main %} -
-
-
-
-

{% block page_title %}{% endblock %}

-
{% block page_sub_title %}{% endblock %}
-
-
- {% block extra_header_options %}{% endblock %} -
-
- {% block buttons %}{% endblock %} -
-
- -
- -
- {% block content %}{% endblock %} -
-
+{% block above_footer %} + + {{ cms_render_save('above-footer') | default('') |raw }} + {% endblock %} - -{% block footer %} - {# #} -{% endblock %} - -{% block back_to_top %} - -{% endblock %} - -{% block javascripts %} - {{ encore_entry_script_tags("app") }} +{% block footer_content %} + {{ cms_render('footer') | default('') |raw }} {% endblock %} \ No newline at end of file diff --git a/templates/layout.html.twig b/templates/layout.html.twig index f1024ee..7be7c13 100644 --- a/templates/layout.html.twig +++ b/templates/layout.html.twig @@ -1,36 +1,71 @@ - + + + + + - - + + {% block page_title %}{% endblock page_title %} + {% block meta %} + + + + + {% if block('head_description') %} + + {% endif %} + {% endblock meta %} + {% block meta_robots %} + + {% endblock meta_robots %} - {% block title %}{% endblock %} | Kieran Dev Project - - -{# #} -{# #} + {%- include '@cms_bundle/snippets/breadcrumbs.html.twig' -%} + {% block stylesheets %}{% endblock stylesheets %} - {% block favicons %}{% endblock %} + {% block default_head_javascripts %}{% endblock default_head_javascripts %} + {% block head_javascripts %}{% endblock head_javascripts %} - {% block fonts %}{% endblock %} - - {% block header_javascripts %}{% endblock %} - {% block stylesheets %}{% endblock %} + {% block gtm_head_part %}{% endblock gtm_head_part %} +{% block body %} + + {% block gtm_body_part %}{% endblock %} + {% block nav %} + {% block navbar %}{% endblock %} + {% endblock %} + {% block page_wrapper %} +
+ {% block page_wrapper_content %} + {% block content_wrapper %} + +
+ {% block content_wrapper_content %} + + {% block content_breadcrumbs %}{% endblock %} + {% block main_content_body %} + {% block main_content_title %}{% endblock main_content_title %} + {% block main_content %}{% endblock main_content %} + {% endblock %} - -{% block flash %}{% endblock %} + + {% endblock content_wrapper_content %} +
+ + {% endblock content_wrapper %} + {% endblock page_wrapper_content %} +
+ {% endblock page_wrapper %} + + {% block above_footer %}{% endblock %} -{% block header %}{% endblock %} - -{% block sidebar %}{% endblock %} - -{% block main %}{% endblock %} - -{% block footer %}{% endblock %} - -{% block back_to_top %}{% endblock %} - -{% block javascripts %}{% endblock %} - + {% block footer_wrapper %} + {% block footer_content %}{% endblock footer_content %} + {% endblock footer_wrapper %} + + {% block default_footer_javascripts %}{% endblock default_footer_javascripts %} + {% block footer_javascripts %}{% endblock footer_javascripts %} + +{% endblock body %} \ No newline at end of file