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=5a90f2273ad2a5d2b952bca863ef3c2de786c246;hpb=7a2157b8d73e041a304dfed6fbdfcfb0b2c67ee9;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 5a90f227..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 @@
@@ -62,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) }} @@ -145,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) }} @@ -158,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 %}
@@ -196,6 +243,7 @@
+ {% if app.user.config.taggingRules is not empty %}
    @@ -205,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) }} @@ -322,49 +374,6 @@
- - {% 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) }} -
-
- -
-
- {{ 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 %}