X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fthemes%2Fmaterial%2FConfig%2Findex.html.twig;h=818fc4e718d0af40edc30612a55ecf94708506d6;hb=531c8d0a5c55fa93438e227a7d349235fbd31d28;hp=5b00eb7bd1e011cf61c4c00f3d69f2fee3c59484;hpb=dfd0a7bc5feb4fd7b77d7e2f3a25c5c3febc1eba;p=github%2Fwallabag%2Fwallabag.git
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..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 %}
+ {% 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) }}
@@ -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) }}