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=a1caf242211b0eb1353e59a1b70491c2b67bf8d3;hb=2b04b300f83cd4bb288c1fd00e2b77ec4f557a00;hp=4c01b128db3a29cdafa98221c21af1a7f43b1a78;hpb=66336f65714433996bb5574662d50d9a8cf03aff;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 4c01b128..a1caf242 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
@@ -14,6 +14,9 @@
{{ form_errors(form.config.theme) }}
{{ form_widget(form.config.theme) }}
+
+ live_help
+
+
@@ -77,42 +94,43 @@
{{ 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 %}
@@ -120,13 +138,13 @@
- {{ form_rest(form.rss) }}
+ {{ form_rest(form.feed) }}
{{ 'config.tab_menu.user_info'|trans }}
@@ -150,44 +168,41 @@
+ {{ 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 %}
@@ -204,6 +219,10 @@
{{ form_start(form.pwd) }}
{{ form_errors(form.pwd) }}
+
+ {{ 'config.form_password.description'|trans }}
+
+