Merge branch...

Merge branch 'tuleap-97-log-in-and-sign-in-buttons-should-not-be-displayed-on-capsule-list-page' into 'main' Add a new template to add connexion buttons only on register and login See merge request !20

Merge branch...
e3573da4 · Sebastien · 13d49136 · c34817f2 · e3573da4 · e3573da4
Commit e3573da4 authored Dec 9, 2021 by Sebastien
--- a/templates/connexion.html.twig
+++ b/templates/connexion.html.twig
+{% extends 'layout.html.twig' %}
+
+    {% block connexion %}
+    <div class="d-flex flex-row justify-content-center mb-10">
+        <a href="/login" class="btn btn-primary m-2 px-4 py-3" >LOG IN</a>
+        <a href="/register" class="btn btn-primary m-2 px-4 py-3" >SIGN IN</a>
+    </div>
+    {% endblock %}
--- a/templates/layout.html.twig
+++ b/templates/layout.html.twig
@@ -15,15 +15,13 @@
  <link rel="icon" type="image/x-icon" href="{{ asset('build/images/favicon.ico') }}" />
 </head>
  <body class="container">
-<div class="d-flex flex-row justify-content-center mb-5">
+  <div class="d-flex flex-row justify-content-center mb-4">
    <div class="d-flex flex-column">
      <a href="/my_capsules"><img id="header-memorekall-logo" class="memorekall-logo" src="{{ asset('build/images/MemoRekall.png') }}"></a>
-    <div class="d-flex flex-row justify-content-center">
-      <a href="/login" class="btn btn-primary m-2 px-4 py-3" >LOG IN</a>
-      <a href="/register" class="btn btn-primary m-2 px-4 py-3" >SIGN IN</a>
-    </div>
    </div>
  </div>
+
+  {%  block connexion %} {% endblock %}
  {% block body %}{% endblock %}
  </body>
 </html>
\ No newline at end of file
--- a/templates/registration/register.html.twig
+++ b/templates/registration/register.html.twig
-{% extends 'layout.html.twig' %}
+{% extends 'connexion.html.twig' %}

 {% block title %}Register{% endblock %}
 {% block body %}
-  <div class="d-flex flex-column justify-content-center">
+  <div class="mt-4">
    {% for flashError in app.flashes('verify_email_error') %}
      <div class="alert alert-danger col-6 mx-auto my-5 h1" role="alert">{{ flashError }}</div>
    {% endfor %}

--- a/templates/security/login.html.twig
+++ b/templates/security/login.html.twig
-{% extends 'layout.html.twig' %}
+{% extends 'connexion.html.twig' %}

 {% block title %}Log in{% endblock %}