From d7acde5cc3e391c4588c94f71252418ee39d13a2 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sun, 20 Nov 2016 20:07:47 +0100
Subject: Use the correct template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When resetting the password, the overriden template we used wasn’t well spelled.

And since we are using a locked version of FOSUser (on a custom commit), the translation of `resetting.check_email` is wrong in any language but english.
---
 .../UserBundle/Resources/views/Resetting/checkEmail.html.twig | 11 -----------
 .../Resources/views/Resetting/check_email.html.twig           | 11 +++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 src/Wallabag/UserBundle/Resources/views/Resetting/checkEmail.html.twig
 create mode 100644 src/Wallabag/UserBundle/Resources/views/Resetting/check_email.html.twig

(limited to 'src/Wallabag/UserBundle/Resources/views')

diff --git a/src/Wallabag/UserBundle/Resources/views/Resetting/checkEmail.html.twig b/src/Wallabag/UserBundle/Resources/views/Resetting/checkEmail.html.twig
deleted file mode 100644
index 66cbdc28..00000000
--- a/src/Wallabag/UserBundle/Resources/views/Resetting/checkEmail.html.twig
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends "FOSUserBundle::layout.html.twig" %}
-
-{% trans_default_domain 'FOSUserBundle' %}
-
-{% block fos_user_content %}
-<div class="card-content">
-    <div class="row">
-        {{ 'resetting.check_email'|trans({'%email%': email}) }}
-    </div>
-</div>
-{% endblock fos_user_content %}
diff --git a/src/Wallabag/UserBundle/Resources/views/Resetting/check_email.html.twig b/src/Wallabag/UserBundle/Resources/views/Resetting/check_email.html.twig
new file mode 100644
index 00000000..e9d46dcc
--- /dev/null
+++ b/src/Wallabag/UserBundle/Resources/views/Resetting/check_email.html.twig
@@ -0,0 +1,11 @@
+{% extends "FOSUserBundle::layout.html.twig" %}
+
+{% trans_default_domain 'FOSUserBundle' %}
+
+{% block fos_user_content %}
+<div class="card-content">
+    <div class="row">
+        <p>{{ 'resetting.check_email'|trans({'%tokenLifetime%': tokenLifetime}) }}</p>
+    </div>
+</div>
+{% endblock fos_user_content %}
-- 
cgit v1.2.3


From cda0662311c6ae95682d102d4c528edfc71f7c99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Mon, 28 Nov 2016 12:44:17 +0100
Subject: Removed FOSUser attributes removed in alpha4 See
 https://github.com/FriendsOfSymfony/FOSUserBundle/blob/master/Upgrade.md\#200-alpha3-to-200-alpha4

---
 src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig  | 8 --------
 src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig | 2 --
 2 files changed, 10 deletions(-)

(limited to 'src/Wallabag/UserBundle/Resources/views')

diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig
index 67843f20..3ffd15f5 100644
--- a/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig
@@ -47,14 +47,6 @@
                                     </div>
                                 </div>
 
-                                <div class="row">
-                                    <div class="input-field col s12">
-                                        {{ form_widget(edit_form.locked) }}
-                                        {{ form_label(edit_form.locked) }}
-                                        {{ form_errors(edit_form.locked) }}
-                                    </div>
-                                </div>
-
                                 {% if twofactor_auth %}
                                 <div class="row">
                                     <div class="input-field col s12">
diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
index 996bdb1a..daba29e4 100644
--- a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
@@ -17,7 +17,6 @@
                                     <th>{{ 'user.form.username_label'|trans }}</th>
                                     <th>{{ 'user.form.email_label'|trans }}</th>
                                     <th>{{ 'user.form.last_login_label'|trans }}</th>
-                                    <th>{{ 'user.form.locked_label'|trans }}</th>
                                     <th>{{ 'user.list.actions'|trans }}</th>
                                 </tr>
                             </thead>
@@ -27,7 +26,6 @@
                                     <td>{{ user.username }}</td>
                                     <td>{{ user.email }}</td>
                                     <td>{% if user.lastLogin %}{{ user.lastLogin|date('Y-m-d H:i:s') }}{% endif %}</td>
-                                    <td>{% if user.locked %}{{ 'user.list.yes'|trans }}{% else %}{{ 'user.list.no'|trans }}{% endif %}</td>
                                     <td>
                                         <a href="{{ path('user_edit', { 'id': user.id }) }}">{{ 'user.list.edit_action'|trans }}</a>
                                     </td>
-- 
cgit v1.2.3


From 68da51d2a39f5922a34090a0ec4ece295f85054d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Thu, 1 Dec 2016 10:51:04 +0100
Subject: Fixed 404 for wallabag logo in 2FA

---
 .../UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/UserBundle/Resources/views')

diff --git a/src/Wallabag/UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig b/src/Wallabag/UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig
index 3731f13b..5d1f22b7 100644
--- a/src/Wallabag/UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig
@@ -74,7 +74,7 @@
 
                 <table cellpadding="0" cellspacing="0" border="0" align="center" id="card">
                     <tr>
-                        <td style="padding: 20px;" width="96px" valign="top"><img class="image_fix" src="{{ asset('bundles/wallabagcore/themes/material/img/logo-other_themes.png') }}" alt="logo" title="{{ wallabag_url }}" style="width: 96px; height: 96px;" /></td>
+                        <td style="padding: 20px;" width="96px" valign="top"><img class="image_fix" src="{{ absolute_url(asset('bundles/wallabagcore/themes/_global/img/logo-other_themes.png')) }}" alt="logo" title="{{ wallabag_url }}" style="width: 96px; height: 96px;" /></td>
                         <td style="padding: 20px; padding-left: 0;" valign="top" id="cell_desc">
                             <h1>wallabag</h1>
                             <h5>{{ "auth_code.on"|trans({}, 'wallabag_user') }} {{ wallabag_url }}</h5>
-- 
cgit v1.2.3