X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fthemes%2Fbaggy%2FConfig%2Findex.html.twig;h=eba4539fa6a4e98ffc921786219d82774ca608a7;hb=35c4c80148fd5f31cf34753890b2b0c69fc414ef;hp=2bf64cd6a237ec46bb606673f8c0e4f01ce54774;hpb=d0702f9fbd7aa8bf47948b44007cccde2fa66cc6;p=github%2Fwallabag%2Fwallabag.git
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 2bf64cd6..eba4539f 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
@@ -82,12 +82,11 @@
@@ -95,43 +94,42 @@
{{ form_rest(form.config) }}
- {{ 'config.tab_menu.rss'|trans }}
+ {{ 'config.tab_menu.feed'|trans }}
- {{ 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 }}
- {% if rss.token %}
+ {% if feed.token %}
@@ -139,19 +137,25 @@
- {{ form_rest(form.rss) }}
+ {{ form_rest(form.feed) }}
{{ 'config.tab_menu.user_info'|trans }}
{{ form_start(form.user) }}
{{ form_errors(form.user) }}
+
+ {{ form_widget(form.user.save) }}
+
{% if twofactor_auth %}
+ {{ 'config.otp.page_title'|trans }}
+
{{ 'config.form_user.two_factor_description'|trans }}
-
- {% endif %}
+
+
+
+ {{ '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.reset.title'|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 }} |
+
+
+
+
+ {% endif %}
{{ form_widget(form.user._token) }}
- {{ form_widget(form.user.save) }}
{% if enabled_users > 1 %}
@@ -277,7 +270,7 @@
{% endfor %}
- {{ form_start(form.new_tagging_rule) }}
+ {{ form_start(form.new_tagging_rule) }}
{{ form_errors(form.new_tagging_rule) }}