Merge pull request #12 in WFCC/cc34 from 11-formulaires to master

* commit '24382df1d9db47fe879e92dfc492e814662d1586':
  Boutons modifier et supprimer disparaissent si pas connecté pour question 11
  Theme connexion et inscription et padding content pour question 11

templates/atelier/index.html.twig

@@ -21,11 +21,16 @@
                 <td>{{ atelier.nom }}</td>
                 <td>{{ atelier.description | raw }}</td>
                 <td>
-                    <div class="d-flex flex-row">
+                    <div class="d-flex flex-row align-content-end">
                         <a class="btn btn-outline-primary m-1"
                            href="{{ path('app_atelier_show', {'id': atelier.id}) }}">Afficher</a>
-                        <a class="btn btn-outline-primary m-1"
-                           href="{{ path('app_atelier_edit', {'id': atelier.id}) }}">Modifier</a>
+                        {% if app.user and app.user == atelier.instructeur %}
+                            <a class="btn btn-outline-primary m-1"
+                               href="{{ path('app_atelier_edit', {'id': atelier.id}) }}">Modifier</a>
+                        {% else %}
+                            <button class="btn btn-outline-secondary m-1"
+                               href="{{ path('app_atelier_edit', {'id': atelier.id}) }}" disabled>Modifier</button>
+                        {% endif %}
                     </div>
                 </td>
             </tr>

templates/atelier/show.html.twig

@@ -27,9 +27,13 @@
     </table>
 
     <div class="d-flex flex-row">
+        {% if app.user and app.user == atelier.instructeur %}
         <a class="btn btn-outline-primary m-2" href="{{ path('app_atelier_edit', {'id': atelier.id}) }}">Modifier</a>
+        {% endif %}
         <a class="btn btn-outline-primary m-2" href="{{ path('app_atelier_index') }}">Retour à la liste</a>
+        {% if app.user and app.user == atelier.instructeur %}
         {{ include('atelier/_delete_form.html.twig') }}
+        {% endif %}
     </div>
 {% endblock %}
 

templates/base.html.twig

@@ -19,7 +19,8 @@
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
     <div class="container-fluid">
         <a class="navbar-brand" href="#">CC34</a>
-        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent"
+                aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
             <span class="navbar-toggler-icon"></span>
         </button>
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
@@ -33,17 +34,21 @@
 
             </ul>
         </div>
-            {% if app.user %}
-                <div class="me-2">
-                    <span class="navbar-text">{{ app.user.nom }} {{ app.user.prenom }}</span>
-                </div>
-                <a class="btn btn-secondary" href="{{ path('app_logout') }}">Se déconnecter</a>
-            {% elseif not app.user %}
-                <a class="btn btn-success" href="{{ path('app_login') }}">Se connecter</a>
-            {% endif %}
+        {% if app.user %}
+            <div class="me-2">
+                <span class="navbar-text">{{ app.user.nom }} {{ app.user.prenom }}</span>
+            </div>
+            <a class="btn btn-secondary" href="{{ path('app_logout') }}">Se déconnecter</a>
+        {% elseif not app.user %}
+            <a class="btn btn-success" href="{{ path('app_login') }}">Se connecter</a>
+        {% endif %}
     </div>
 </nav>
-<div class="container">{% block body %}{% endblock %}</div>
+<div class="container">
+    <main class="pt-4">
+        {% block body %}{% endblock %}
+    </main>
+</div>
 
 
 </body>

templates/registration/register.html.twig

@@ -1,19 +1,25 @@
 {% extends 'base.html.twig' %}
 
-{% block title %}Register{% endblock %}
+{% block title %}Inscription{% endblock %}
 
 {% block body %}
-    <h1>Register</h1>
+    <h1>Inscription</h1>
 
     {{ form_start(registrationForm) }}
     {{ form_row(registrationForm.email) }}
-    {{ form_row(registrationForm.nom) }}
-    {{ form_row(registrationForm.prenom) }}
+    <div class="row">
+        <div class="col">
+            {{ form_row(registrationForm.nom) }}
+        </div>
+        <div class="col">
+            {{ form_row(registrationForm.prenom) }}
+        </div>
+    </div>
     {{ form_row(registrationForm.plainPassword, {
-        label: 'Password'
+        label: 'Mot de passe'
     }) }}
 
 
-    <button type="submit" class="btn">Register</button>
+    <button type="submit" class="btn btn-primary">S'incrire</button>
     {{ form_end(registrationForm) }}
 {% endblock %}

templates/security/login.html.twig

@@ -3,28 +3,30 @@
 {% block title %}Log in!{% endblock %}
 
 {% block body %}
-<form method="post">
-    {% if error %}
-        <div class="alert alert-danger">{{ error.messageKey|trans(error.messageData, 'security') }}</div>
-    {% endif %}
+    <form method="post" class="mb-3">
+        <h1 class="h3 mb-3 font-weight-normal">Veuillez-vous connecter</h1>
+        {% if error %}
+            <div class="alert alert-danger">{{ error.messageKey|trans(error.messageData, 'security') }}</div>
+        {% endif %}
 
-    {% if app.user %}
-        <div class="mb-3">
-            You are logged in as {{ app.user.userIdentifier }}, <a href="{{ path('app_logout') }}">Logout</a>
-        </div>
-    {% endif %}
+        {% if app.user %}
+            <div class="mb-3">
+                You are logged in as {{ app.user.userIdentifier }}, <a href="{{ path('app_logout') }}">Logout</a>
+            </div>
+        {% endif %}
 
-    <h1 class="h3 mb-3 font-weight-normal">Veuillez-vous connecter</h1>
-    <label for="inputEmail">Email</label>
-    <input type="email" value="{{ last_username }}" name="email" id="inputEmail" class="form-control" autocomplete="email" required autofocus>
-    <label for="inputPassword">Mot de passe</label>
-    <input type="password" name="password" id="inputPassword" class="form-control" autocomplete="current-password" required>
+        <label for="inputEmail" class="form-label">Email</label>
+        <input type="email" value="{{ last_username }}" name="email" id="inputEmail" class="form-control"
+               autocomplete="email" required autofocus>
+        <label for="inputPassword" class="form-label">Mot de passe</label>
+        <input type="password" name="password" id="inputPassword" class="form-control" autocomplete="current-password"
+               required>
 
-    <input type="hidden" name="_csrf_token"
-           value="{{ csrf_token('authenticate') }}"
-    >
+        <input type="hidden" name="_csrf_token"
+               value="{{ csrf_token('authenticate') }}"
+        >
 
-    {#
+        {#
         Uncomment this section and add a remember_me option below your firewall to activate remember me functionality.
         See https://symfony.com/doc/current/security/remember_me.html
 
@@ -33,10 +35,11 @@
                 <input type="checkbox" name="_remember_me"> Remember me
             </label>
         </div>
-    #}
+        #}
 
-    <button class="btn btn-primary mt-4" type="submit">
-        Se connecter
-    </button>
-</form>
+        <a class="btn btn-outline-success mt-4" href="{{ path('app_register') }}">S'incrire</a>
+        <button class="btn btn-primary mt-4" type="submit">
+            Se connecter
+        </button>
+    </form>
 {% endblock %}