X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fthemes%2Fmaterial%2FConfig%2Findex.html.twig;h=3fbb49eac90a994bc50dccc360a18e32a329398b;hb=e61ee56031aa0788f9a40ec245d3c391d219d6c2;hp=698219b9ea54c0d13a910b33ff46d394177e2038;hpb=0d42217e4e8210dd2cf86f35ba9662ca02c8a2dc;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 698219b9..3fbb49ea 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 @@ -11,14 +11,11 @@
@@ -47,7 +44,10 @@ {{ 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 +

@@ -59,6 +59,30 @@ +
+
+ {{ form_label(form.config.pocket_consumer_key) }} + {{ form_errors(form.config.pocket_consumer_key) }} + {{ form_widget(form.config.pocket_consumer_key) }} +

+ » + https://getpocket.com/developer/docs/authentication +

+
+
+ +
+
+
Configure your Android application
+ Touch here to prefill your Android application + +
+ +
+ {{ form_widget(form.config.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} {{ form_rest(form.config) }} @@ -142,11 +166,9 @@
{{ 'config.form_user.two_factor_description'|trans }} -
-
-
-
+
+ {{ form_widget(form.user.twoFactorAuthentication) }} {{ form_label(form.user.twoFactorAuthentication) }} {{ form_errors(form.user.twoFactorAuthentication) }} @@ -155,8 +177,36 @@ {% endif %} {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} - {{ form_rest(form.user) }} + {{ form_widget(form.user._token) }} + +


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

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

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


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

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

+ +
+ {% endif %}
@@ -193,6 +243,7 @@
+ {% if app.user.config.taggingRules is not empty %}
    @@ -202,14 +253,18 @@ « {{ tagging_rule.rule }} » {{ 'config.form_rules.then_tag_as_label'|trans }} « {{ tagging_rule.tags|join(', ') }} » + + mode_edit + - + delete {% endfor %}
+ {% endif %} {{ form_start(form.new_tagging_rule) }} {{ form_errors(form.new_tagging_rule) }} @@ -247,121 +302,78 @@
{{ 'config.form_rules.faq.variables_available_title'|trans }}

{{ 'config.form_rules.faq.variables_available_description'|trans }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{ 'config.form_rules.faq.variable_description.label'|trans }}{{ 'config.form_rules.faq.meaning'|trans }}{{ 'config.form_rules.faq.operator_description.label'|trans }}{{ 'config.form_rules.faq.meaning'|trans }}
title{{ 'config.form_rules.faq.variable_description.title'|trans }}<={{ 'config.form_rules.faq.operator_description.less_than'|trans }}
url{{ 'config.form_rules.faq.variable_description.url'|trans }}<{{ 'config.form_rules.faq.operator_description.strictly_less_than'|trans }}
isArchived{{ 'config.form_rules.faq.variable_description.isArchived'|trans }}=>{{ 'config.form_rules.faq.operator_description.greater_than'|trans }}
isStarred{{ 'config.form_rules.faq.variable_description.isStarred'|trans }}>{{ 'config.form_rules.faq.operator_description.strictly_greater_than'|trans }}
content{{ 'config.form_rules.faq.variable_description.content'|trans }}={{ 'config.form_rules.faq.operator_description.equal_to'|trans }}
language{{ 'config.form_rules.faq.variable_description.language'|trans }}!={{ 'config.form_rules.faq.operator_description.not_equal_to'|trans }}
mimetype{{ 'config.form_rules.faq.variable_description.mimetype'|trans }}OR{{ 'config.form_rules.faq.operator_description.or'|trans }}
readingTime{{ 'config.form_rules.faq.variable_description.readingTime'|trans }}AND{{ 'config.form_rules.faq.operator_description.and'|trans }}
domainName{{ 'config.form_rules.faq.variable_description.domainName'|trans }}matches{{ 'config.form_rules.faq.operator_description.matches'|trans|raw }}

-
-
- - - {% if is_granted('ROLE_SUPER_ADMIN') %} -
- {{ 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) }} -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{ 'config.form_rules.faq.variable_description.label'|trans }}{{ 'config.form_rules.faq.meaning'|trans }}{{ 'config.form_rules.faq.operator_description.label'|trans }}{{ 'config.form_rules.faq.meaning'|trans }}
title{{ 'config.form_rules.faq.variable_description.title'|trans }}<={{ 'config.form_rules.faq.operator_description.less_than'|trans }}
url{{ 'config.form_rules.faq.variable_description.url'|trans }}<{{ 'config.form_rules.faq.operator_description.strictly_less_than'|trans }}
isArchived{{ 'config.form_rules.faq.variable_description.isArchived'|trans }}>={{ 'config.form_rules.faq.operator_description.greater_than'|trans }}
isStarred{{ 'config.form_rules.faq.variable_description.isStarred'|trans }}>{{ 'config.form_rules.faq.operator_description.strictly_greater_than'|trans }}
content{{ 'config.form_rules.faq.variable_description.content'|trans }}={{ 'config.form_rules.faq.operator_description.equal_to'|trans }}
language{{ 'config.form_rules.faq.variable_description.language'|trans }}!={{ 'config.form_rules.faq.operator_description.not_equal_to'|trans }}
mimetype{{ 'config.form_rules.faq.variable_description.mimetype'|trans }}OR{{ 'config.form_rules.faq.operator_description.or'|trans }}
readingTime{{ 'config.form_rules.faq.variable_description.readingTime'|trans }}AND{{ 'config.form_rules.faq.operator_description.and'|trans }}
domainName{{ 'config.form_rules.faq.variable_description.domainName'|trans }}matches{{ 'config.form_rules.faq.operator_description.matches'|trans|raw }}
- -
-
- {{ 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_widget(form.new_user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} - {{ form_rest(form.new_user) }} - +
- {% endif %}