Convert passwd lost and recovery templates to twig

diff --git a/galette/lib/Galette/Controllers/AuthController.php b/galette/lib/Galette/Controllers/AuthController.php
index 4d2a13c0a658c81d67afdcd95c3787804aad4451..89db45f713ed30caea80f0f05fbcabea7e4f6239 100644 (file)
--- a/galette/lib/Galette/Controllers/AuthController.php
+++ b/galette/lib/Galette/Controllers/AuthController.php
@@ -256,7 +256,7 @@ class AuthController extends AbstractController
         // display page
         $this->view->render(
             $response,
-            'pages/lost_password.html.twig',
+            'pages/password_lost.html.twig',
             array(
                 'page_title'    => _T("Password recovery")
             )
@@ -456,7 +456,7 @@ class AuthController extends AbstractController
         // display page
         $this->view->render(
             $response,
-            'change_passwd.tpl',
+            'pages/password_recover.html.twig',
             array(
                 'hash'          => $hash,
                 'page_title'    => _T("Password recovery")

diff --git a/galette/templates/default/change_passwd.tpl b/galette/templates/default/change_passwd.tpl
deleted file mode 100644 (file)
index 9652024..0000000
--- a/galette/templates/default/change_passwd.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-{extends file="public_page.tpl"}
-{assign var=body_class value="front_page"}
-{block name="content"}
-        <form action="{path_for name="do-password-recovery"}" method="post" enctype="multipart/form-data" class="ui form">
-            <div class="ui segment">
-                <div class="field">
-                    <div class="ui left icon input">
-                        <i class="lock icon"></i><span class="hidden"><label for="mdp_adh">{_T string="New password:"}</label></span>
-                        <input type="password" name="mdp_adh" id="mdp_adh" value="" required="required"/>
-                    </div>
-                </div>
-                <div class="field">
-                    <div class="ui left icon input">
-                        <i class="lock icon"></i><span class="hidden"><label for="mdp_adh2">{_T string="Confirmation:"}</label></span>
-                        <input type="password" name="mdp_adh2" id="mdp_adh2" value="" required="required"/>
-                    </div>
-                </div>
-                <p class="ui orange center aligned message">{_T string="(at least 4 characters)"}</p>
-                <input type="submit" name="change_passwd" value="{_T string="Change my password"}" class="ui primary button"/>
-                <input type="hidden" name="hash" value="{$hash}"/>
-                {include file="forms_types/csrf.tpl"}
-            </div>
-        </form>
-{/block}

diff --git a/galette/templates/gtwig/pages/lost_password.html.twig b/galette/templates/gtwig/pages/lost_password.html.twig
deleted file mode 100644 (file)
index 9341ae7..0000000
--- a/galette/templates/gtwig/pages/lost_password.html.twig
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends 'public_page.html.twig' %}
-
-{% set body_class = "front_page" %}
-
-{% block content %}
-                <form action="{{ path_for('retrieve-pass') }}" method="post" enctype="multipart/form-data" class="ui form">
-                    <div class="ui segment">
-                        <div class="field">
-                            <div class="ui left icon input">
-                                <i class="user icon"></i><span class="hidden"><label for="login">{{ _T("Username or email:") }}</label></span>
-                                <input type="text" name="login" id="login" autofocus placeholder="{{ _T("Username or email:") }}"/>
-                            </div>
-                        </div>
-                        <input type="submit" class="ui fluid large primary submit button" name="lostpasswd" value="{{ _T("Recover password") }}" />
-                        <input type="hidden" name="valid" value="1"/>
-                        {% include "components/forms/csrf.html.twig" %}
-                    </div>
-                </form>
-{% endblock %}

diff --git a/galette/templates/gtwig/pages/password_lost.html.twig b/galette/templates/gtwig/pages/password_lost.html.twig
new file mode 100644 (file)
index 0000000..9341ae7
--- /dev/null
+++ b/galette/templates/gtwig/pages/password_lost.html.twig
@@ -0,0 +1,19 @@
+{% extends 'public_page.html.twig' %}
+
+{% set body_class = "front_page" %}
+
+{% block content %}
+                <form action="{{ path_for('retrieve-pass') }}" method="post" enctype="multipart/form-data" class="ui form">
+                    <div class="ui segment">
+                        <div class="field">
+                            <div class="ui left icon input">
+                                <i class="user icon"></i><span class="hidden"><label for="login">{{ _T("Username or email:") }}</label></span>
+                                <input type="text" name="login" id="login" autofocus placeholder="{{ _T("Username or email:") }}"/>
+                            </div>
+                        </div>
+                        <input type="submit" class="ui fluid large primary submit button" name="lostpasswd" value="{{ _T("Recover password") }}" />
+                        <input type="hidden" name="valid" value="1"/>
+                        {% include "components/forms/csrf.html.twig" %}
+                    </div>
+                </form>
+{% endblock %}

diff --git a/galette/templates/gtwig/pages/password_recover.html.twig b/galette/templates/gtwig/pages/password_recover.html.twig
new file mode 100644 (file)
index 0000000..a52d267
--- /dev/null
+++ b/galette/templates/gtwig/pages/password_recover.html.twig
@@ -0,0 +1,26 @@
+{% extends 'public_page.html.twig' %}
+
+{% set body_class = "front_page" %}
+
+{% block content %}
+        <form action="{{ path_for('do-password-recovery') }}" method="post" enctype="multipart/form-data" class="ui form">
+            <div class="ui segment">
+                <div class="field">
+                    <div class="ui left icon input">
+                        <i class="lock icon"></i><span class="hidden"><label for="mdp_adh">{{ _T('New password:') }}</label></span>
+                        <input type="password" name="mdp_adh" id="mdp_adh" value="" required="required" autofocus placeholder="{{ _T('New password:') }}"/>
+                    </div>
+                </div>
+                <div class="field">
+                    <div class="ui left icon input">
+                        <i class="lock icon"></i><span class="hidden"><label for="mdp_adh2">{{ _T('Confirmation:') }}</label></span>
+                        <input type="password" name="mdp_adh2" id="mdp_adh2" value="" required="required" placeholder="{{ _T('Confirmation:') }}"/>
+                    </div>
+                </div>
+                <p class="ui orange center aligned message">{{ _T('(at least 4 characters)') }}</p>
+                <input type="submit" name="change_passwd" value="{{ _T('Change my password') }}" class="ui fluid large primary submit button"/>
+                <input type="hidden" name="hash" value="{{ hash }}"/>
+                {% include "components/forms/csrf.html.twig" %}
+            </div>
+        </form>
+{% endblock %}