From acd4412080dfb73ecaa7f9983728d1d55bc27ea4 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 2 Dec 2018 08:54:54 +0100 Subject: Create a dedicated tab to reset data --- .../views/themes/material/Config/index.html.twig | 63 +++++++++++----------- 1 file changed, 32 insertions(+), 31 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') 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 f896fe2d..35800989 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 @@ -16,6 +16,7 @@
  • {{ 'config.tab_menu.user_info'|trans }}
  • {{ 'config.tab_menu.password'|trans }}
  • {{ 'config.tab_menu.rules'|trans }}
    • +
  • {{ 'config.tab_menu.reset'|trans }}
    • @@ -218,37 +219,6 @@ {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} {{ form_widget(form.user._token) }} - -

    - -
    -
    {{ 'config.reset.title'|trans }}
    -

    {{ 'config.reset.description'|trans }}

    - - {{ 'config.reset.annotations'|trans }} - - - {{ 'config.reset.tags'|trans }} - - - {{ 'config.reset.archived'|trans }} - - - {{ 'config.reset.entries'|trans }} - -
    - - {% if enabled_users > 1 %} -

    - -
    -
    {{ 'config.form_user.delete.title'|trans }}
    -

    {{ 'config.form_user.delete.description'|trans }}

    - -
    - {% endif %}
    @@ -422,6 +392,37 @@
    + +
    +
    +
    {{ 'config.reset.title'|trans }}
    +

    {{ 'config.reset.description'|trans }}

    + + {{ 'config.reset.annotations'|trans }} + + + {{ 'config.reset.tags'|trans }} + + + {{ 'config.reset.archived'|trans }} + + + {{ 'config.reset.entries'|trans }} + +
    + + {% if enabled_users > 1 %} +

    + +
    +
    {{ 'config.form_user.delete.title'|trans }}
    +

    {{ 'config.form_user.delete.description'|trans }}

    + +
    + {% endif %} +
    -- cgit v1.2.3 From a6b242a1fd6f8900d80354361449f1bf62506ef9 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 2 Dec 2018 12:43:05 +0100 Subject: Enable OTP 2FA - Update SchebTwoFactorBundle to version 3 - Enable Google 2fa on the bundle - Disallow ability to use both email and google as 2fa - Update Ocramius Proxy Manager to handle typed function & attributes (from PHP 7) - use `$this->addFlash` shortcut instead of `$this->get('session')->getFlashBag()->add` - update admin to be able to create/reset the 2fa --- .../views/themes/material/Config/index.html.twig | 45 ++++++++++++++-------- 1 file changed, 30 insertions(+), 15 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') 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 35800989..887d154f 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 @@ -112,8 +112,7 @@ @@ -198,22 +197,38 @@ {% if twofactor_auth %} -
    -
    +
    {{ 'config.form_user.two_factor_description'|trans }} -
    - - {{ form_widget(form.user.twoFactorAuthentication) }} - {{ form_label(form.user.twoFactorAuthentication) }} - {{ form_errors(form.user.twoFactorAuthentication) }} -
    -
    - - live_help - +
    + {{ form_widget(form.user.emailTwoFactor) }} + {{ form_label(form.user.emailTwoFactor) }} + {{ form_errors(form.user.emailTwoFactor) }} +
    +
    + {{ form_widget(form.user.googleTwoFactor) }} + {{ form_label(form.user.googleTwoFactor) }} + {{ form_errors(form.user.googleTwoFactor) }} +
    -
    + + {% for OTPSecret in app.session.flashbag.get('OTPSecret') %} +
    + You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password. +
    + That code will disapear after a page reload. +

    + {{ OTPSecret.code }} +

    + Or you can scan that QR Code with your app: +
    + + + +
    + {% endfor %} {% endif %} {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} -- cgit v1.2.3 From 2dfbe9e5faf40364b60e6c76f3cc9fac5bf11fa4 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 2 Dec 2018 18:39:02 +0100 Subject: Fix tests --- .../Resources/views/themes/material/Config/index.html.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') 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 887d154f..ca7eb9f3 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 @@ -212,20 +212,20 @@
    - {% for OTPSecret in app.session.flashbag.get('OTPSecret') %} + {% for OtpQrCode in app.session.flashbag.get('OtpQrCode') %}
    You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password.
    That code will disapear after a page reload.

    - {{ OTPSecret.code }} + {{ app.user.getGoogleAuthenticatorSecret }}

    Or you can scan that QR Code with your app:
    {% endfor %} -- cgit v1.2.3 From 6e4fc956abc909232044e7af0fa37cbb1b510f18 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 3 Dec 2018 06:15:57 +0100 Subject: Better translations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace “Google Authenticator” by “Google Authenticator, Authy or FreeOTP” in all text. Translate how to use the code / qr code. --- .../Resources/views/themes/material/Config/index.html.twig | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') 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 ca7eb9f3..73cf592e 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 @@ -214,19 +214,18 @@ {% for OtpQrCode in app.session.flashbag.get('OtpQrCode') %}
    - You just enabled the OTP two factor authentication, open your OTP app and use that code to get a one time password. + {{ 'config.form_user.two_factor_code_description_1'|trans }}
    - That code will disapear after a page reload. + {{ 'config.form_user.two_factor_code_description_2'|trans }}

    - {{ app.user.getGoogleAuthenticatorSecret }} -

    - Or you can scan that QR Code with your app: -
    - +

    + {{ 'config.form_user.two_factor_code_description_3'|trans }} +

    + {{ app.user.getGoogleAuthenticatorSecret }}
    {% endfor %} {% endif %} -- cgit v1.2.3 From dfd0a7bc5feb4fd7b77d7e2f3a25c5c3febc1eba Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 3 Dec 2018 06:51:06 +0100 Subject: Add backup codes --- .../Resources/views/themes/material/Config/index.html.twig | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') 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 73cf592e..5b00eb7b 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 @@ -112,7 +112,7 @@ @@ -220,12 +220,16 @@



    {{ 'config.form_user.two_factor_code_description_3'|trans }}

    {{ app.user.getGoogleAuthenticatorSecret }} +

    + {{ 'config.form_user.two_factor_code_description_4'|trans }} +

    + {{ app.user.getBackupCodes|join("\n")|nl2br }} {% endfor %} {% endif %} -- cgit v1.2.3 From a0c5eb003f1cbeef10d5620e98870c7556e17c75 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 18 Jan 2019 22:46:44 +0100 Subject: Change the way to enable 2FA And add a step to validate a generated code from the OTP app --- .../views/themes/material/Config/index.html.twig | 65 ++++++++++------------ 1 file changed, 30 insertions(+), 35 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') 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 5b00eb7b..412c18f4 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 @@ -196,45 +196,40 @@ + {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} + {% if twofactor_auth %} +
    +
    - {{ 'config.form_user.two_factor_description'|trans }} - -
    - {{ form_widget(form.user.emailTwoFactor) }} - {{ form_label(form.user.emailTwoFactor) }} - {{ form_errors(form.user.emailTwoFactor) }} -
    -
    - {{ form_widget(form.user.googleTwoFactor) }} - {{ form_label(form.user.googleTwoFactor) }} - {{ form_errors(form.user.googleTwoFactor) }} -
    +
    {{ 'config.otp.page_title'|trans }}
    + +

    {{ 'config.form_user.two_factor_description'|trans }}

    + + + + + + + + + + + + + + + + + + + + + + +
    {{ 'config.form_user.two_factor.table_method'|trans }}{{ 'config.form_user.two_factor.table_state'|trans }}{{ 'config.form_user.two_factor.table_action'|trans }}
    {{ 'config.form_user.two_factor.emailTwoFactor_label'|trans }}{% if app.user.isEmailTwoFactor %}{{ 'config.form_user.two_factor.state_enabled'|trans }}{% else %}{{ 'config.form_user.two_factor.state_disabled'|trans }}{% endif %}{{ 'config.form_user.two_factor.action_email'|trans }}
    {{ 'config.form_user.two_factor.googleTwoFactor_label'|trans }}{% if app.user.isGoogleTwoFactor %}{{ 'config.form_user.two_factor.state_enabled'|trans }}{% else %}{{ 'config.form_user.two_factor.state_disabled'|trans }}{% endif %}{{ 'config.form_user.two_factor.action_app'|trans }}
    - - {% for OtpQrCode in app.session.flashbag.get('OtpQrCode') %} -
    - {{ 'config.form_user.two_factor_code_description_1'|trans }} -
    - {{ 'config.form_user.two_factor_code_description_2'|trans }} -

    - - -

    - {{ 'config.form_user.two_factor_code_description_3'|trans }} -

    - {{ app.user.getGoogleAuthenticatorSecret }} -

    - {{ 'config.form_user.two_factor_code_description_4'|trans }} -

    - {{ app.user.getBackupCodes|join("\n")|nl2br }} -
    - {% endfor %} {% endif %} - - {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} {{ form_widget(form.user._token) }} -- cgit v1.2.3 From 531c8d0a5c55fa93438e227a7d349235fbd31d28 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 13 Jun 2017 18:48:10 +0200 Subject: Changed RSS to Atom feed and improve paging --- .../views/themes/material/Config/index.html.twig | 44 +++++++++++----------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') 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 412c18f4..818fc4e7 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 @@ -12,7 +12,7 @@
    - {{ form_start(form.rss) }} - {{ form_errors(form.rss) }} + {{ form_start(form.feed) }} + {{ form_errors(form.feed) }}
    - {{ 'config.form_rss.description'|trans }} + {{ 'config.form_feed.description'|trans }}
    -
    {{ 'config.form_rss.token_label'|trans }}
    +
    {{ 'config.form_feed.token_label'|trans }}
    - {% if rss.token %} - {{ rss.token }} + {% if feed.token %} + {{ feed.token }} {% else %} - {{ 'config.form_rss.no_token'|trans }} + {{ 'config.form_feed.no_token'|trans }} {% endif %} – - {% if rss.token %} - {{ 'config.form_rss.token_reset'|trans }} + {% if feed.token %} + {{ 'config.form_feed.token_reset'|trans }} {% else %} - {{ 'config.form_rss.token_create'|trans }} + {{ 'config.form_feed.token_create'|trans }} {% endif %}
    - {% if rss.token %} + {% if feed.token %}
    -
    {{ 'config.form_rss.rss_links'|trans }}
    +
    {{ 'config.form_feed.feed_links'|trans }}
    @@ -165,14 +165,14 @@
    - {{ form_label(form.rss.rss_limit) }} - {{ form_errors(form.rss.rss_limit) }} - {{ form_widget(form.rss.rss_limit) }} + {{ form_label(form.feed.feed_limit) }} + {{ form_errors(form.feed.feed_limit) }} + {{ form_widget(form.feed.feed_limit) }}
    - {{ form_widget(form.rss.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} - {{ form_rest(form.rss) }} + {{ form_widget(form.feed.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} + {{ form_rest(form.feed) }}
    -- cgit v1.2.3 From c4bf12aadee9e1f757fd9d783b034bb57b03fb17 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 5 Jun 2019 17:55:13 +0200 Subject: Add ability to revoke feed token --- .../Resources/views/themes/material/Config/index.html.twig | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') 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 818fc4e7..a48c9e28 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 @@ -140,12 +140,13 @@ {% else %} {{ 'config.form_feed.no_token'|trans }} {% endif %} - – + {% if feed.token %} - {{ 'config.form_feed.token_reset'|trans }} + – {{ 'config.form_feed.token_reset'|trans }} + – {{ 'config.form_feed.token_revoke'|trans }} {% else %} - {{ 'config.form_feed.token_create'|trans }} - {% endif %} + – {{ 'config.form_feed.token_create'|trans }} + {% endif %} -- cgit v1.2.3 From 35c4c80148fd5f31cf34753890b2b0c69fc414ef Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 6 Jun 2019 13:51:25 +0200 Subject: Display login in config / user Just so the user can see its login --- .../Resources/views/themes/material/Config/index.html.twig | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') 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 a48c9e28..990546e8 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 @@ -181,6 +181,15 @@ {{ form_start(form.user) }} {{ form_errors(form.user) }} +
    +
    +
    {{ 'config.form_user.login_label'|trans }}
    +
    + {{ app.user.username }} +
    +
    +
    +
    {{ form_label(form.user.name) }} -- cgit v1.2.3 From 34be2d5de44ade2a78be73decc0b90a2c1bca720 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 26 Jun 2019 22:31:47 +0200 Subject: Add ability to import/export tagging rules - Add missing translations - Add some tests - Add `/api/taggingrule/export` API endpoint - Add baggy theme - Add error message when importing tagging rules failed - Also fix all translations (I think we are good now) --- .../views/themes/material/Config/index.html.twig | 89 +++++++++++++++++----- 1 file changed, 69 insertions(+), 20 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') 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 990546e8..d8e9694d 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 @@ -307,28 +307,77 @@
    {% endif %} - {{ form_start(form.new_tagging_rule) }} - {{ form_errors(form.new_tagging_rule) }} - -
    -
    - {{ form_label(form.new_tagging_rule.rule) }} - {{ form_errors(form.new_tagging_rule.rule) }} - {{ form_widget(form.new_tagging_rule.rule) }} +
      +
    • +
      +
      + {{ 'config.form_rules.card.new_tagging_rule'|trans }} + + {{ form_start(form.new_tagging_rule) }} + {{ form_errors(form.new_tagging_rule) }} + +
      +
      + {{ form_label(form.new_tagging_rule.rule) }} + {{ form_errors(form.new_tagging_rule.rule) }} + {{ form_widget(form.new_tagging_rule.rule) }} +
      +
      + +
      +
      + {{ form_label(form.new_tagging_rule.tags) }} + {{ form_errors(form.new_tagging_rule.tags) }} + {{ form_widget(form.new_tagging_rule.tags) }} +
      +
      + + {{ form_widget(form.new_tagging_rule.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} + {{ form_rest(form.new_tagging_rule) }} + +
      -
    - -
    -
    - {{ form_label(form.new_tagging_rule.tags) }} - {{ form_errors(form.new_tagging_rule.tags) }} - {{ form_widget(form.new_tagging_rule.tags) }} + +
  • +
    +
    + {{ 'config.form_rules.card.import_tagging_rules'|trans }} +

    {{ 'config.form_rules.card.import_tagging_rules_detail'|trans }}

    + {{ form_start(form.import_tagging_rule) }} + {{ form_errors(form.import_tagging_rule) }} +
    +
    + {{ form_errors(form.import_tagging_rule.file) }} +
    + {{ form.import_tagging_rule.file.vars.label|trans }} + {{ form_widget(form.import_tagging_rule.file) }} +
    +
    + +
    +
    +
    + + {{ form_widget(form.import_tagging_rule.import, { 'attr': {'class': 'btn waves-effect waves-light'} }) }} + + {{ form_rest(form.import_tagging_rule) }} + +
    -
    • - - {{ form_widget(form.new_tagging_rule.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} - {{ form_rest(form.new_tagging_rule) }} - + + {% if app.user.config.taggingRules is not empty %} +
  • +
    +
    + {{ 'config.form_rules.card.export_tagging_rules'|trans }} +

    {{ 'config.form_rules.card.export_tagging_rules_detail'|trans }}

    +
    +

    {{ 'config.form_rules.export'|trans }}

    +
    +
    +
    • + {% endif %} +
    -- cgit v1.2.3