From fcb1fba5c2fdb12c9f4041bd334aaced6f302d91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 29 Sep 2015 14:31:52 +0200 Subject: * public registration * remove WSSE implementation * add oAuth2 implementation --- src/Wallabag/CoreBundle/Resources/config/services.yml | 11 +++++++++++ .../views/themes/baggy/Config/index.html.twig | 16 +++++++++++++--- .../views/themes/material/Config/index.html.twig | 19 +++++++++++++++---- .../views/themes/material/Security/login.html.twig | 1 + 4 files changed, 40 insertions(+), 7 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources') diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 3beb5d0e..96ea482a 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml @@ -13,6 +13,11 @@ services: tags: - { name: form.type, alias: config } + wallabag_core.form.registration: + class: Wallabag\CoreBundle\Form\Type\RegistrationType + tags: + - { name: form.type, alias: wallabag_user_registration } + wallabag_core.form.type.forgot_password: class: Wallabag\CoreBundle\Form\Type\ForgotPasswordType arguments: @@ -40,3 +45,9 @@ services: class: Wallabag\CoreBundle\Helper\ContentProxy arguments: - @wallabag_core.graby + + wallabag_core.registration_confirmed: + class: Wallabag\CoreBundle\EventListener\AuthenticationListener + arguments: [@service_container, @doctrine.orm.entity_manager] + tags: + - { name: kernel.event_subscriber } 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) }} + {% if is_granted('ROLE_SUPER_ADMIN') %}

{% trans %}Add a user{% endtrans %}

@@ -150,9 +151,17 @@
- {{ 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) }} +
+
+ +
+
+ {{ form_label(form.new_user.plainPassword.second) }} + {{ form_errors(form.new_user.plainPassword.second) }} + {{ form_widget(form.new_user.plainPassword.second) }}
@@ -165,5 +174,6 @@ {{ form_rest(form.new_user) }} + {% endif %}
{% 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 @@
  • {% trans %}RSS{% endtrans %}
  • {% trans %}User information{% endtrans %}
  • {% trans %}Password{% endtrans %}
    • + {% if is_granted('ROLE_SUPER_ADMIN') %}
  • {% trans %}Add a user{% endtrans %}
    • + {% endif %} @@ -175,7 +177,7 @@ - + {% if is_granted('ROLE_SUPER_ADMIN') %}
    {{ form_errors(form.new_user) }} @@ -190,9 +192,17 @@
    - {{ 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) }} +
    +
    + +
    +
    + {{ form_label(form.new_user.plainPassword.second) }} + {{ form_errors(form.new_user.plainPassword.second) }} + {{ form_widget(form.new_user.plainPassword.second) }}
    @@ -211,6 +221,7 @@
    + {% endif %} 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 %} + {% trans %}Register{% endtrans %} -- cgit v1.2.3 From 359b3f43cc42aa593cdba7dc8e1d6fa121cc3f6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 29 Sep 2015 17:05:17 +0200 Subject: * rename AuthenticationListener * add tests --- src/Wallabag/CoreBundle/Resources/config/services.yml | 2 +- .../CoreBundle/Resources/views/themes/baggy/Security/login.html.twig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources') diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 96ea482a..f2247260 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml @@ -47,7 +47,7 @@ services: - @wallabag_core.graby wallabag_core.registration_confirmed: - class: Wallabag\CoreBundle\EventListener\AuthenticationListener + class: Wallabag\CoreBundle\EventListener\RegistrationConfirmedListener arguments: [@service_container, @doctrine.orm.entity_manager] tags: - { name: kernel.event_subscriber } 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 @@
    + {% trans %}Register{% endtrans %} Forgot your password?
    -- cgit v1.2.3 From 772d8c4b93adc36baefda93ec37007e4a85321de Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 1 Oct 2015 22:25:23 +0200 Subject: Add test on RegistrationConfirmedListener And PLEASE @nicosomb, NEVER EVER inject the whole container inside a service. --- src/Wallabag/CoreBundle/Resources/config/services.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources') diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index f2247260..c38787de 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml @@ -34,7 +34,8 @@ services: wallabag_core.doctrine.prefixed_naming_strategy: class: Wallabag\CoreBundle\Doctrine\Mapping\PrefixedNamingStrategy - arguments: [%database_table_prefix%] + arguments: + - %database_table_prefix% wallabag_core.graby: class: Graby\Graby @@ -48,6 +49,11 @@ services: wallabag_core.registration_confirmed: class: Wallabag\CoreBundle\EventListener\RegistrationConfirmedListener - arguments: [@service_container, @doctrine.orm.entity_manager] + arguments: + - @doctrine.orm.entity_manager + - %theme% + - %items_on_page% + - %rss_limit% + - %language% tags: - { name: kernel.event_subscriber } -- cgit v1.2.3 From 1210dae10589515d6f3824c75639342c5e1d52dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= 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') 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 @@
  • {% trans %}config{% endtrans %}
  • {% trans %}about{% endtrans %}
    • -
  • {% trans %}logout{% endtrans %}
    • +
  • {% trans %}logout{% endtrans %}
    • {% 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 @@
    - {% trans %}Forgot your password?{% endtrans %} + {% trans %}Forgot your password?{% endtrans %}
    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 @@
  • {% trans %}tags{% endtrans %}
  • {% trans %}config{% endtrans %}
  • {% trans %}howto{% endtrans %}
    • -
  • {% trans %}About{% endtrans %}
    • -
  • {% trans %}logout{% endtrans %}
    • +
  • {% trans %}logout{% endtrans %}
    • -- cgit v1.2.3 From ec3ce598f6423fcccd88a4fdd77f817c50bc5ab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 5 Oct 2015 22:16:18 +0200 Subject: material design for register/login/recover pages --- .../CoreBundle/Resources/views/base.html.twig | 4 +-- .../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 7 files changed, 7 insertions(+), 125 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') diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig index 152c5c28..c94c0044 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig @@ -45,7 +45,7 @@ {% endblock %} - {% block title %}{% endblock %} - wallabag + {% block title %}{% endblock %} {% endblock %} @@ -60,7 +60,7 @@ {% block messages %}{% endblock %} -
    +
    {% block content %}{% endblock %}
    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 %} -
    -
    -

    {% trans %}Forgot password{% endtrans %}

    - -

    {{ 'An email has been sent to %email%. It contains a link you must click to reset your password.'|trans({'%email%': email}) }}

    -
    -
    -{% 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 %} -
    -
    -

    {% trans %}Forgot password{% endtrans %}

    - - {{ form_errors(form) }} - -

    Enter your email address below and we'll send you password reset instructions.

    - -
    - {{ form_label(form.email) }} - {{ form_errors(form.email) }} - {{ form_widget(form.email) }} -
    - -
    - -
    -
    - - {{ form_rest(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 %} -
    -
    -

    {% trans %}Login to wallabag{% endtrans %}

    - {% if error %} -
    {{ error.message }}
    - {% endif %} - - {% for flashMessage in app.session.flashbag.get('notice') %} -

    {{ flashMessage }}

    - {% endfor %} - -
    - - -
    - -
    - - -
    - -
    - - - {% trans %}Register{% endtrans %} - Forgot your password? -
    -
    -
    -{% 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 %} -
    -
    -

    {% trans %}Change password{% endtrans %}

    - - {{ form_errors(form) }} - -
    - {{ form_label(form.new_password.first) }} - {{ form_errors(form.new_password.first) }} - {{ form_widget(form.new_password.first) }} -
    - -
    - {{ form_label(form.new_password.second) }} - {{ form_errors(form.new_password.second) }} - {{ form_widget(form.new_password.second) }} -
    - -
    - -
    -
    - - {{ form_rest(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?= 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') 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