From fcb1fba5c2fdb12c9f4041bd334aaced6f302d91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Tue, 29 Sep 2015 14:31:52 +0200
Subject: * public registration * remove WSSE implementation * add oAuth2
 implementation

---
 .../views/themes/baggy/Config/index.html.twig         | 16 +++++++++++++---
 .../views/themes/material/Config/index.html.twig      | 19 +++++++++++++++----
 .../views/themes/material/Security/login.html.twig    |  1 +
 3 files changed, 29 insertions(+), 7 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
index c90bb2e3..64305b16 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
@@ -135,6 +135,7 @@
         {{ form_rest(form.pwd) }}
     </form>
 
+    {% if is_granted('ROLE_SUPER_ADMIN') %}
     <h2>{% trans %}Add a user{% endtrans %}</h2>
 
     <form action="{{ path('config') }}" method="post" {{ form_enctype(form.new_user) }}>
@@ -150,9 +151,17 @@
 
         <fieldset class="w500p inline">
             <div class="row">
-                {{ form_label(form.new_user.password) }}
-                {{ form_errors(form.new_user.password) }}
-                {{ form_widget(form.new_user.password) }}
+                {{ form_label(form.new_user.plainPassword.first) }}
+                {{ form_errors(form.new_user.plainPassword.first) }}
+                {{ form_widget(form.new_user.plainPassword.first) }}
+            </div>
+        </fieldset>
+
+        <fieldset class="w500p inline">
+            <div class="row">
+                {{ form_label(form.new_user.plainPassword.second) }}
+                {{ form_errors(form.new_user.plainPassword.second) }}
+                {{ form_widget(form.new_user.plainPassword.second) }}
             </div>
         </fieldset>
 
@@ -165,5 +174,6 @@
         </fieldset>
 
         {{ form_rest(form.new_user) }}
+        {% endif %}
     </form>
 {% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index 0ff21f22..0d8e9f24 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -15,7 +15,9 @@
                         <li class="tab col s3"><a href="#set2">{% trans %}RSS{% endtrans %}</a></li>
                         <li class="tab col s3"><a href="#set3">{% trans %}User information{% endtrans %}</a></li>
                         <li class="tab col s3"><a href="#set4">{% trans %}Password{% endtrans %}</a></li>
+                        {% if is_granted('ROLE_SUPER_ADMIN') %}
                         <li class="tab col s3"><a href="#set5">{% trans %}Add a user{% endtrans %}</a></li>
+                        {% endif %}
                         </ul>
                     </div>
 
@@ -175,7 +177,7 @@
                         </form>
                     </div>
 
-
+                    {% if is_granted('ROLE_SUPER_ADMIN') %}
                     <div id="set5" class="col s12">
                         <form action="{{ path('config') }}#set5" method="post" {{ form_enctype(form.new_user) }}>
                             {{ form_errors(form.new_user) }}
@@ -190,9 +192,17 @@
 
                             <div class="row">
                                 <div class="input-field col s12">
-                                    {{ form_label(form.new_user.password) }}
-                                    {{ form_errors(form.new_user.password) }}
-                                    {{ form_widget(form.new_user.password) }}
+                                    {{ form_label(form.new_user.plainPassword.first) }}
+                                    {{ form_errors(form.new_user.plainPassword.first) }}
+                                    {{ form_widget(form.new_user.plainPassword.first) }}
+                                </div>
+                            </div>
+
+                            <div class="row">
+                                <div class="input-field col s12">
+                                    {{ form_label(form.new_user.plainPassword.second) }}
+                                    {{ form_errors(form.new_user.plainPassword.second) }}
+                                    {{ form_widget(form.new_user.plainPassword.second) }}
                                 </div>
                             </div>
 
@@ -211,6 +221,7 @@
 
                         </form>
                     </div>
+                    {% endif %}
                 </div>
 
             </div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
index 4eb6d2b8..10f380fe 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
@@ -49,6 +49,7 @@
                             {% trans %}Login{% endtrans %}
                             <i class="mdi-content-send right"></i>
                         </button>
+                        <a href="{{ path('fos_user_registration_register') }}">{% trans %}Register{% endtrans %}</a>
                     </div>
                 </form>
             </div>
-- 
cgit v1.2.3


From 359b3f43cc42aa593cdba7dc8e1d6fa121cc3f6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Tue, 29 Sep 2015 17:05:17 +0200
Subject: * rename AuthenticationListener * add tests

---
 .../CoreBundle/Resources/views/themes/baggy/Security/login.html.twig     | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig
index 5437d20c..9a59dfc6 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig
@@ -32,6 +32,7 @@
                 <div class="row mts txtcenter">
                     <input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}" />
                     <button type="submit">Login</button>
+                    <a href="{{ path('fos_user_registration_register') }}" class="button">{% trans %}Register{% endtrans %}</a>
                     <a href="{{ path('forgot_password') }}" class="small">Forgot your password?</a>
                 </div>
             </fieldset>
-- 
cgit v1.2.3


From 1210dae10589515d6f3824c75639342c5e1d52dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Fri, 2 Oct 2015 14:51:41 +0200
Subject: remove old implementation for login/register/recover

---
 src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig  | 2 +-
 .../Resources/views/themes/material/Security/login.html.twig           | 2 +-
 .../CoreBundle/Resources/views/themes/material/layout.html.twig        | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
index 3d573eaa..de4ed2e7 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
@@ -52,7 +52,7 @@
         </li>
         <li><a href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li>
         <li><a href="{{ path('about') }}">{% trans %}about{% endtrans %}</a></li>
-        <li><a class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
+        <li><a class="icon icon-power" href="{{ path('fos_user_security_logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
     </ul>
 {% endblock %}
 
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
index 10f380fe..b0da42ce 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
@@ -54,7 +54,7 @@
                 </form>
             </div>
             <div class="center">
-                <a href="{{ path('forgot_password') }}">{% trans %}Forgot your password?{% endtrans %}</a>
+                <a href="{{ path('fos_user_resetting_request') }}">{% trans %}Forgot your password?{% endtrans %}</a>
             </div>
         </div>
     </main>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
index 10dede8a..36e276f9 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -46,8 +46,7 @@
             <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"><a class="waves-effect" href="{{ path('tag') }}">{% trans %}tags{% endtrans %}</a></li>
             <li class="bold {% if currentRoute == 'config' %}active{% endif %}"><a class="waves-effect" href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li>
             <li class="bold {% if currentRoute == 'howto' %}active{% endif %}"><a class="waves-effect" href="{{ path('howto') }}">{% trans %}howto{% endtrans %}</a></li>
-            <li class="bold border-bottom {% if currentRoute == 'about' %}active{% endif %}"><a class="waves-effect" href="{{ path('about') }}">{% trans %}About{% endtrans %}</a></li>
-            <li class="bold"><a class="waves-effect" class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
+            <li class="bold"><a class="waves-effect" class="icon icon-power" href="{{ path('fos_user_security_logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
         </ul>
         <div class="nav-wrapper nav-panels">
             <a href="#" data-activates="slide-out" class="nav-panel-menu button-collapse"><i class="mdi-navigation-menu"></i></a>
-- 
cgit v1.2.3


From ec3ce598f6423fcccd88a4fdd77f817c50bc5ab6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@smile.fr>
Date: Mon, 5 Oct 2015 22:16:18 +0200
Subject: material design for register/login/recover pages

---
 .../themes/baggy/Security/checkEmail.html.twig     |  17 ---------
 .../themes/baggy/Security/forgotPassword.html.twig |  31 ----------------
 .../views/themes/baggy/Security/login.html.twig    |  40 ---------------------
 .../views/themes/baggy/Security/reset.html.twig    |  35 ------------------
 .../views/themes/material/public/css/main.css      |   5 +++
 .../material/public/img/logo-other_themes.png      | Bin 3922 -> 3058 bytes
 6 files changed, 5 insertions(+), 123 deletions(-)
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/checkEmail.html.twig
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/checkEmail.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/checkEmail.html.twig
deleted file mode 100644
index 056d65b5..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/checkEmail.html.twig
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{% trans %}Forgot password{% endtrans %}{% endblock %}
-
-{% block body_class %}login{% endblock %}
-
-{% block menu %}{% endblock %}
-
-{% block content %}
-    <form>
-        <fieldset class="w500p center">
-            <h2 class="mbs txtcenter">{% trans %}Forgot password{% endtrans %}</h2>
-
-            <p>{{ 'An email has been sent to %email%. It contains a link you must click to reset your password.'|trans({'%email%': email}) }}</p>
-        </fieldset>
-    </form>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig
deleted file mode 100644
index 4476ea7b..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig
+++ /dev/null
@@ -1,31 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{% trans %}Forgot password{% endtrans %}{% endblock %}
-
-{% block body_class %}login{% endblock %}
-
-{% block menu %}{% endblock %}
-
-{% block content %}
-        <form action="{{ path('forgot_password') }}" method="post" name="forgotPasswordform">
-            <fieldset class="w500p center">
-                <h2 class="mbs txtcenter">{% trans %}Forgot password{% endtrans %}</h2>
-
-                {{ form_errors(form) }}
-
-                <p>Enter your email address below and we'll send you password reset instructions.</p>
-
-                <div class="row">
-                    {{ form_label(form.email) }}
-                    {{ form_errors(form.email) }}
-                    {{ form_widget(form.email) }}
-                </div>
-
-                <div class="row mts txtcenter">
-                    <button type="submit">Send me reset instructions</button>
-                </div>
-            </fieldset>
-
-            {{ form_rest(form) }}
-        </form>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig
deleted file mode 100644
index 9a59dfc6..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig
+++ /dev/null
@@ -1,40 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{% trans %}login to your wallabag{% endtrans %}{% endblock %}
-
-{% block body_class %}login{% endblock %}
-
-{% block menu %}{% endblock %}
-{% block messages %}{% endblock %}
-
-{% block content %}
-        <form action="{{ path('login_check') }}" method="post" name="loginform">
-            <fieldset class="w500p center">
-                <h2 class="mbs txtcenter">{% trans %}Login to wallabag{% endtrans %}</h2>
-                {% if error %}
-                    <div>{{ error.message }}</div>
-                {% endif %}
-
-                {% for flashMessage in app.session.flashbag.get('notice') %}
-                    <p>{{ flashMessage }}</p>
-                {% endfor %}
-
-                <div class="row">
-                    <label class="col w150p" for="username">{% trans %}Username{% endtrans %}</label>
-                    <input type="text" id="username" name="_username" value="{{ last_username }}" />
-                </div>
-
-                <div class="row">
-                    <label class="col w150p" for="password">{% trans %}Password{% endtrans %}</label>
-                    <input type="password" id="password" name="_password" />
-                </div>
-
-                <div class="row mts txtcenter">
-                    <input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}" />
-                    <button type="submit">Login</button>
-                    <a href="{{ path('fos_user_registration_register') }}" class="button">{% trans %}Register{% endtrans %}</a>
-                    <a href="{{ path('forgot_password') }}" class="small">Forgot your password?</a>
-                </div>
-            </fieldset>
-        </form>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig
deleted file mode 100644
index fda88af2..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig
+++ /dev/null
@@ -1,35 +0,0 @@
-{% extends "WallabagCoreBundle::layout.html.twig" %}
-
-{% block title %}{% trans %}Change password{% endtrans %}{% endblock %}
-
-{% block body_class %}login{% endblock %}
-
-{% block menu %}{% endblock %}
-
-{% block content %}
-        <form action="{{ path('forgot_password_reset', {'token': token}) }}" method="post" name="loginform">
-            <fieldset class="w500p center">
-                <h2 class="mbs txtcenter">{% trans %}Change password{% endtrans %}</h2>
-
-                {{ form_errors(form) }}
-
-                <div class="row">
-                    {{ form_label(form.new_password.first) }}
-                    {{ form_errors(form.new_password.first) }}
-                    {{ form_widget(form.new_password.first) }}
-                </div>
-
-                <div class="row">
-                    {{ form_label(form.new_password.second) }}
-                    {{ form_errors(form.new_password.second) }}
-                    {{ form_widget(form.new_password.second) }}
-                </div>
-
-                <div class="row mts txtcenter">
-                    <button type="submit">Change password</button>
-                </div>
-            </fieldset>
-
-            {{ form_rest(form) }}
-        </form>
-{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
index 7a4e7df2..eb33f042 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
@@ -250,9 +250,14 @@ main ul.row {
 }
 
 .card .card-action a {
+    color: #ffffff;
     margin: 0;
 }
 
+.card .card-action a:hover {
+    color: #ffffff;
+}
+
 .settings .div_tabs {
     padding-bottom: 15px;
 }
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/img/logo-other_themes.png b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/img/logo-other_themes.png
index 32543a44..c90aa46f 100755
Binary files a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/img/logo-other_themes.png and b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/img/logo-other_themes.png differ
-- 
cgit v1.2.3


From e0d188809c6674f2fbe550b98d232b98913b2308 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@smile.fr>
Date: Mon, 5 Oct 2015 22:49:46 +0200
Subject: move css

---
 .../CoreBundle/Resources/views/themes/material/public/css/main.css    | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
index eb33f042..10f9a166 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
@@ -24,6 +24,10 @@ body {
     background: #f0f0f0;
 }
 
+body.login main {
+    padding: 0;
+}
+
 #warning_message {
     position: fixed;
     background-color: #ff6347;
-- 
cgit v1.2.3