From e55358c819f63348ccbcbddd5c30ab2562fa8b22 Mon Sep 17 00:00:00 2001 From: Emmanuel ROY Date: Fri, 9 Jul 2021 11:52:48 +0200 Subject: [PATCH] =?UTF-8?q?update=20:=20ajout=20de=20l'extension=20twig=20?= =?UTF-8?q?permettant=20de=20recalibrer=20l'application=20=C3=A0=20la=20fo?= =?UTF-8?q?is=20avec=20le=20moteur=20de=20rendu=20twig=20et=20blade,=20ici?= =?UTF-8?q?=20l'index=20peut=20=C3=AAtre=20soit=20twig=20soit=20blade?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/class/TwigControlleurAction.php | 84 +++++++++++++++++++ application/class/Vue.php | 1 + application/include/modeles/index.model | 2 +- .../include/vues/layout/body.html.twig | 49 +++++++---- .../{base.html.twig => system.html.twig} | 18 ++-- application/include/vues/view/index.html.twig | 11 ++- application/traitements/add-alert-example.php | 8 ++ 7 files changed, 148 insertions(+), 25 deletions(-) create mode 100644 application/class/TwigControlleurAction.php rename application/include/vues/system/{base.html.twig => system.html.twig} (81%) create mode 100644 application/traitements/add-alert-example.php diff --git a/application/class/TwigControlleurAction.php b/application/class/TwigControlleurAction.php new file mode 100644 index 0000000..e1b8162 --- /dev/null +++ b/application/class/TwigControlleurAction.php @@ -0,0 +1,84 @@ +$method(...$data); + } else { + return $slot->default(...$data); + } + } else { + /*HandleError*/ + } + } + public static function getClassMethodStatic($class, $method, $args = array()) + { + return $class::$method(...$args); + } +} \ No newline at end of file diff --git a/application/class/Vue.php b/application/class/Vue.php index 298c706..31250c9 100644 --- a/application/class/Vue.php +++ b/application/class/Vue.php @@ -60,6 +60,7 @@ class Vue switch ($engine){ case 'twig': $renderer = new \Windwalker\Renderer\TwigRenderer($paths); + $renderer->addExtension(new \MVC\Classe\TwigControlleurAction); $name .= '.html'; break; case 'blade': diff --git a/application/include/modeles/index.model b/application/include/modeles/index.model index 28294d9..da58bfe 100644 --- a/application/include/modeles/index.model +++ b/application/include/modeles/index.model @@ -2,7 +2,7 @@ name : index page_title : Accueil de l'application description : zatou stra bracadabla -engine : blade +engine : twig authentification : yes ariane : {acceuil} diff --git a/application/include/vues/layout/body.html.twig b/application/include/vues/layout/body.html.twig index 5ccabf1..bd4304e 100644 --- a/application/include/vues/layout/body.html.twig +++ b/application/include/vues/layout/body.html.twig @@ -1,3 +1,4 @@ +{% extends "system.html.twig" %} {% block body %} @@ -7,11 +8,12 @@ style="background: rgba(0, 0, 0, 0.59);">
@@ -38,8 +40,8 @@ @@ -52,24 +54,43 @@
- Vous êtes connecté en tant que {{$_SESSION['user_login']}} - Se Deconnecter + Vous êtes connecté en tant que {{session('user_login')}} + Se Deconnecter
+ + {%if ariane is defined %} + + {% endif %}
- {% if $_SESSION['alerts'] is defined %} - {% foreach $_SESSION['alerts'] as alert %} + {% if not session('alerts') == null %} + {% for alert in session('alerts') %} - {% endforeach %} + {% endfor %} {% endif %} + {% block content %}{% endblock %}
@@ -84,7 +105,7 @@

- +

@@ -116,4 +137,4 @@ -{% endblock %}} +{% endblock %} diff --git a/application/include/vues/system/base.html.twig b/application/include/vues/system/system.html.twig similarity index 81% rename from application/include/vues/system/base.html.twig rename to application/include/vues/system/system.html.twig index 3e5642c..52c11a4 100644 --- a/application/include/vues/system/base.html.twig +++ b/application/include/vues/system/system.html.twig @@ -27,29 +27,29 @@ - {% block top-css %} - - + {% block topCss %} + + {% endblock %} {% endblock %} -{% block top-javascript %}{% endblock %} +{% block topJavascript %}{% endblock %} {% block body %}{% endblock %} -{% block bottom-javascript %} - - +{% block bottomJavascript %} + + -/* +{# SCRIPT JS permettant de ne valider qu'une seule fois un formulaire ATTENTION tous les formulaires sont affecté Lors d'une validation bootstrap personnalisé veuillez utilisé la class do-resubmit sur le formulaire afin de permettre l'activation supplémentaire du bouton. -*/ +#}