diff --git a/templates/_includes/html/base.html.twig b/templates/_includes/html/base.html.twig index 95fab2a..86df7bb 100644 --- a/templates/_includes/html/base.html.twig +++ b/templates/_includes/html/base.html.twig @@ -1,22 +1,23 @@ {% set styles=[ - "https://fonts.googleapis.com/css2?family=Kanit", - "https://fonts.googleapis.com/css2?family=Asap", - "https://meyerweb.com/eric/tools/css/reset/reset.css", - "https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css", - baseUrl~"icofont/icofont.css", - baseUrl~"styles/card.css", - baseUrl~"styles/colors.css", - baseUrl~"styles/form.css", - baseUrl~"styles/main.css", - baseUrl~"styles/nav.css", - baseUrl~"styles/table.css", + 'https://fonts.googleapis.com/css2?family=Kanit', + 'https://fonts.googleapis.com/css2?family=Asap', + 'https://meyerweb.com/eric/tools/css/reset/reset.css', + 'https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css', + baseUrl~'icofont/icofont.css', + baseUrl~'styles/card.css', + baseUrl~'styles/colors.css', + baseUrl~'styles/form.css', + baseUrl~'styles/main.css', + baseUrl~'styles/nav.css', + baseUrl~'styles/table.css', ]|merge(styles|default([])) %} {% set scripts=[ - baseUrl~"scripts/ajaxForm.js", + baseUrl~'scripts/ajaxForm.js', ]|merge(scripts|default([])) %} -{% set page=page|default("N/A") %} +{% set page=page|default('N/A') %} +{% set returnLink=returnLink|default('') %} @@ -34,7 +35,7 @@

+ {% if returnLink != '' %} + Retour + {% endif %} {{ page }}

diff --git a/templates/_includes/html/form/actors/add.html.twig b/templates/_includes/html/form/actors/add.html.twig index c52af26..6a104dd 100644 --- a/templates/_includes/html/form/actors/add.html.twig +++ b/templates/_includes/html/form/actors/add.html.twig @@ -1,17 +1,17 @@ -{{ form_start(form, {'attr': {'class': 'ajax-form'}}) }} +{{ form_start(form, {attr: {class: 'ajax-form'}}) }}
- {{ form_label(form.firstName, 'Prénom', {'label_attr': {'class': 'input-text-label'}}) }} - {{ form_widget(form.firstName, {'attr': {'class': 'w-100'}}) }} + {{ form_label(form.firstName, 'Prénom', {label_attr: {class: 'input-text-label'}}) }} + {{ form_widget(form.firstName, {attr: {class: 'w-100'}}) }}
- {{ form_label(form.lastName, 'Nom', {'label_attr': {'class': 'input-text-label'}}) }} - {{ form_widget(form.lastName, {'attr': {'class': 'w-100'}}) }} + {{ form_label(form.lastName, 'Nom', {label_attr: {class: 'input-text-label'}}) }} + {{ form_widget(form.lastName, {attr: {class: 'w-100'}}) }}
- {{ form_label(form.nickname, 'Surnom', {'label_attr': {'class': 'input-text-label'}}) }} - {{ form_widget(form.nickname, {'attr': {'class': 'w-100', 'title': 'Le nom tel qu\'il sera affiché.\nS\'il n\'est pas définit, il sera sous la form Prénom NOM.'}}) }} + {{ form_label(form.nickname, 'Surnom', {label_attr: {class: 'input-text-label'}}) }} + {{ form_widget(form.nickname, {attr: {class: 'w-100', title: 'Le nom tel qu\'il sera affiché.\nS\'il n\'est pas définit, il sera sous la form Prénom NOM.'}}) }}
-{{ form_widget(form.submit, {'attr': {'class': 'w-100'}, 'label': 'Nouvel acteur'}) }} +{{ form_widget(form.submit, {attr: {class: 'w-100'}, label: 'Nouvel acteur'}) }}

{{ form_end(form) }} \ No newline at end of file diff --git a/templates/_includes/html/form/actors/delete.html.twig b/templates/_includes/html/form/actors/delete.html.twig index 0859969..015466b 100644 --- a/templates/_includes/html/form/actors/delete.html.twig +++ b/templates/_includes/html/form/actors/delete.html.twig @@ -1,16 +1,16 @@ -{{ form_start(form, {'attr': {'class': 'ajax-form', 'data-form-confirmation': "Voulez-vous supprimer l'acteur "~data.actor.displayName~" ?\nCette action ne supprimera pas les activités et actions qui lui sont attribués."}}) }} -{{ form_widget(form.id, {'value': data.actor.id}) }} +{{ form_start(form, {attr: {class: 'ajax-form', 'data-form-confirmation': "Voulez-vous supprimer l'acteur "~data.actor.displayName~" ?\nCette action ne supprimera pas les activités et actions qui lui sont attribués."}}) }} +{{ form_widget(form.id, {value: data.actor.id}) }} {% if data.variant|default('icon') == 'icon' %} {{ form_widget(form.submit, { - 'label': 'Supprimer', - 'label_html': true, - 'attr': { - 'class': 'icon-button', - 'title': 'Supprimer l\'acteur', + label: 'Supprimer', + label_html: true, + attr: { + class: 'icon-button', + title: 'Supprimer l\'acteur', } })}} {% elseif data.variant == 'full' %} -{{ form_widget(form.submit, {'label': 'Supprimer l\'acteur'})}} +{{ form_widget(form.submit, {label: 'Supprimer l\'acteur'})}} {% endif %}

diff --git a/templates/actors/actor.html.twig b/templates/actors/actor.html.twig index 345d46a..300dd40 100644 --- a/templates/actors/actor.html.twig +++ b/templates/actors/actor.html.twig @@ -1,6 +1,19 @@ {% extends '_includes/html/base.html.twig' %} {% set page="Edition de l'acteur "~actor.displayName %} +{% set returnLink=url("actors_actors", {}, false) %} {% block pageContent %} +
+
+

Editer

+
+
+
+
+
+

Supprimer l'acteur

+
+
+
{% endblock %} \ No newline at end of file diff --git a/templates/actors/actors.html.twig b/templates/actors/actors.html.twig index 88e5438..9249d62 100644 --- a/templates/actors/actors.html.twig +++ b/templates/actors/actors.html.twig @@ -1,6 +1,6 @@ {% extends '_includes/html/base.html.twig' %} -{% set page="Acteurs" %} +{% set page='Acteurs' %} {% block pageContent %}
@@ -27,12 +27,12 @@ {{ actor.nickname }} {% if actor.active %}Actif - {% endif %} + {% endif %} Editer - {% include '_includes/html/genericForm.html.twig' with {'form': actorDeleteForm, 'data': {'actor': actor, 'variant': 'icon'}} only %} + {% include '_includes/html/genericForm.html.twig' with {'form': actorDeleteForm, 'data': {actor: actor, variant: 'icon'}} only %} {% endfor %}