X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fthemes%2Fbaggy%2FConfig%2Findex.html.twig;h=721948ef54605fd810b832d96596d361ad0723f6;hb=9f0957b831622ee577fa7d8f92ec0df6f3a8e274;hp=54faa788c0b466a6211535600bc35174b7401adb;hpb=f39e94ace35c2a30e2079706bb3d27d8a16c91ec;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 54faa788..4ef6ab3c 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
@@ -1,9 +1,9 @@
{% extends "WallabagCoreBundle::layout.html.twig" %}
-{% block title %}{% trans %}Config{% endtrans %}{% endblock %}
+{% block title %}{{ 'config.page_title'|trans }}{% endblock %}
{% block content %}
-
{% trans %}Wallabag configuration{% endtrans %}
+ {{ 'config.tab_menu.settings'|trans }}
{{ form_start(form.config) }}
{{ form_errors(form.config) }}
@@ -14,6 +14,9 @@
{{ form_errors(form.config.theme) }}
{{ form_widget(form.config.theme) }}
+
+ live_help
+
@@ -22,6 +25,9 @@
{{ form_errors(form.config.items_per_page) }}
{{ form_widget(form.config.items_per_page) }}
+
+ live_help
+
@@ -29,7 +35,21 @@
{{ form_label(form.config.reading_speed) }}
{{ form_errors(form.config.reading_speed) }}
{{ form_widget(form.config.reading_speed) }}
- {% trans %}You can use online tools to estimate your reading speed{% endtrans %} ({% trans %}like this one{%endtrans%} ).
+
+ {{ 'config.form_settings.reading_speed.help_message'|trans }}
+ myreadspeed
+
+
+
+ live_help
+
+
+
+
+
+ {{ form_label(form.config.action_mark_as_read) }}
+ {{ form_errors(form.config.action_mark_as_read) }}
+ {{ form_widget(form.config.action_mark_as_read) }}
@@ -39,60 +59,95 @@
{{ form_errors(form.config.language) }}
{{ form_widget(form.config.language) }}
+
+ live_help
+
+
+
+
+
+
+ live_help
+
+
+
+
+
{{ form_rest(form.config) }}
- {% trans %}RSS configuration{% endtrans %}
+ {{ 'config.tab_menu.feed'|trans }}
- {{ form_start(form.rss) }}
- {{ form_errors(form.rss) }}
+ {{ form_start(form.feed) }}
+ {{ form_errors(form.feed) }}
- {% trans %}RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader.{% endtrans %}
+ {{ 'config.form_feed.description'|trans }}
+ {% if feed.token %}
-
Rss links:
- {% if rss.token %}
-
- {% else %}
-
You need to generate a token first.
- {% endif %}
+
{{ 'config.form_feed.feed_links'|trans }}
+
+ {% endif %}
- {{ 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_rest(form.rss) }}
+ {{ form_rest(form.feed) }}
- {% trans %}User information{% endtrans %}
+ {{ 'config.tab_menu.user_info'|trans }}
{{ form_start(form.user) }}
{{ form_errors(form.user) }}
@@ -113,28 +168,61 @@
+ {{ form_widget(form.user.save) }}
+
{% if twofactor_auth %}
+ {{ 'config.otp.page_title'|trans }}
+
- {% trans %}Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion{% endtrans %}
+ {{ 'config.form_user.two_factor_description'|trans }}
-
-
- {{ form_label(form.user.twoFactorAuthentication) }}
- {{ form_errors(form.user.twoFactorAuthentication) }}
- {{ form_widget(form.user.twoFactorAuthentication) }}
-
-
+
+
+
+ {{ '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 }}
+
+
+
+
{% endif %}
- {{ form_rest(form.user) }}
+ {{ form_widget(form.user._token) }}
- {% trans %}Change your password{% endtrans %}
+ {% if enabled_users > 1 %}
+ {{ 'config.form_user.delete.title'|trans }}
+
+ {{ 'config.form_user.delete.description'|trans }}
+
+ {{ 'config.form_user.delete.button'|trans }}
+
+ {% endif %}
+
+ {{ 'config.tab_menu.password'|trans }}
{{ form_start(form.pwd) }}
{{ form_errors(form.pwd) }}
+
+ {{ 'config.form_password.description'|trans }}
+
+
{{ form_label(form.pwd.old_password) }}
@@ -162,13 +250,17 @@
{{ form_rest(form.pwd) }}
-
{% trans %}Tagging rules{% endtrans %}
+
{{ 'config.tab_menu.rules'|trans }}
{% for tagging_rule in app.user.config.taggingRules %}
- if « {{ tagging_rule.rule }} » then tag as « {{ tagging_rule.tags|join(', ') }} »
-
+ {{ 'config.form_rules.if_label'|trans }}
+ « {{ tagging_rule.rule }} »
+ {{ 'config.form_rules.then_tag_as_label'|trans }}
+ « {{ tagging_rule.tags|join(', ') }} »
+ â
+
{% endfor %}
@@ -194,46 +286,115 @@
{{ form_rest(form.new_tagging_rule) }}
-
- {% if is_granted('ROLE_SUPER_ADMIN') %}
-
{% trans %}Add a user{% endtrans %}
-
- {{ form_start(form.new_user) }}
- {{ form_errors(form.new_user) }}
-
-
-
- {{ form_label(form.new_user.username) }}
- {{ form_errors(form.new_user.username) }}
- {{ form_widget(form.new_user.username) }}
-
-
-
-
-
- {{ 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) }}
-
-
-
-
-
- {{ form_label(form.new_user.email) }}
- {{ form_errors(form.new_user.email) }}
- {{ form_widget(form.new_user.email) }}
-
-
-
- {{ form_rest(form.new_user) }}
- {% endif %}
-
+
+
+
{{ 'config.reset.title'|trans }}
+
+ {{ 'config.reset.description'|trans }}
+
+
{% endblock %}