X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fthemes%2Fmaterial%2FConfig%2Findex.html.twig;h=708ff951f609e3091207c527a5336e706d89309d;hb=19122cf66037f86375072ffa60b6a43b54f02f99;hp=b53ae2fef48be6eabc2b43146f01000443db9cc6;hpb=64a8781e453c40ff144d03405abe2dc1ccfacbe0;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 b53ae2fe..708ff951 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
@@ -24,23 +24,33 @@
                             {{ form_errors(form.config) }}
 
                             <div class="row">
-                                <div class="input-field col s12">
+                                <div class="input-field col s11">
                                     {{ form_label(form.config.theme) }}
                                     {{ form_errors(form.config.theme) }}
                                     {{ form_widget(form.config.theme) }}
                                 </div>
+                                <div class="input-field col s1">
+                                    <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_theme'|trans }}">
+                                        <i class="material-icons">live_help</i>
+                                    </a>
+                                </div>
                             </div>
 
                             <div class="row">
-                                <div class="input-field col s12">
+                                <div class="input-field col s11">
                                     {{ form_label(form.config.items_per_page) }}
                                     {{ form_errors(form.config.items_per_page) }}
                                     {{ form_widget(form.config.items_per_page) }}
                                 </div>
+                                <div class="input-field col s1">
+                                    <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_items_per_page'|trans }}">
+                                        <i class="material-icons">live_help</i>
+                                    </a>
+                                </div>
                             </div>
 
                             <div class="row">
-                                <div class="input-field col s12">
+                                <div class="input-field col s11">
                                     {{ form_label(form.config.reading_speed) }}
                                     {{ form_errors(form.config.reading_speed) }}
                                     {{ form_widget(form.config.reading_speed) }}
@@ -49,18 +59,36 @@
                                         <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a>
                                     </p>
                                 </div>
+                                <div class="input-field col s1">
+                                    <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_reading_speed'|trans }}">
+                                        <i class="material-icons">live_help</i>
+                                    </a>
+                                </div>
+                            </div>
+
+                        <div class="row">
+                            <div class="input-field col s12">
+                                {{ form_label(form.config.action_mark_as_read) }}
+                                {{ form_errors(form.config.action_mark_as_read) }}
+                                {{ form_widget(form.config.action_mark_as_read) }}
                             </div>
+                        </div>
 
                             <div class="row">
-                                <div class="input-field col s12">
+                                <div class="input-field col s11">
                                     {{ form_label(form.config.language) }}
                                     {{ form_errors(form.config.language) }}
                                     {{ form_widget(form.config.language) }}
                                 </div>
+                                <div class="input-field col s1">
+                                    <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_language'|trans }}">
+                                        <i class="material-icons">live_help</i>
+                                    </a>
+                                </div>
                             </div>
 
                             <div class="row">
-                                <div class="input-field col s12">
+                                <div class="input-field col s11">
                                     {{ form_label(form.config.pocket_consumer_key) }}
                                     {{ form_errors(form.config.pocket_consumer_key) }}
                                     {{ form_widget(form.config.pocket_consumer_key) }}
@@ -69,6 +97,23 @@
                                         <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a>
                                     </p>
                                 </div>
+                                <div class="input-field col s1">
+                                    <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_pocket_consumer_key'|trans }}">
+                                        <i class="material-icons">live_help</i>
+                                    </a>
+                                </div>
+                            </div>
+
+                            <div class="row">
+                                <div class="input-field col s12">
+                                    <h5>{{ 'config.form_settings.android_configuration'|trans }}</h5>
+                                    <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" class="waves-effect waves-light btn hide-on-large-only">Touch here to prefill your Android application</a>
+                                    <img id="androidQrcode" class="hide-on-med-and-down" />
+                                </div>
+                                <script>
+                                    const imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}');
+                                    document.getElementById('androidQrcode').src = imgBase64;
+                                </script>
                             </div>
 
                             {{ form_widget(form.config.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
@@ -152,7 +197,7 @@
 
                             {% if twofactor_auth %}
                             <div class="row">
-                                <div class="input-field col s12">
+                                <div class="input-field col s11">
                                     {{ 'config.form_user.two_factor_description'|trans }}
 
                                     <br />
@@ -161,6 +206,11 @@
                                     {{ form_label(form.user.twoFactorAuthentication) }}
                                     {{ form_errors(form.user.twoFactorAuthentication) }}
                                 </div>
+                                <div class="input-field col s1">
+                                    <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_user.help_twoFactorAuthentication'|trans }}">
+                                        <i class="material-icons">live_help</i>
+                                    </a>
+                                </div>
                             </div>
                             {% endif %}
 
@@ -179,6 +229,9 @@
                             <a href="{{ path('config_reset', { type: 'tags'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
                                 {{ 'config.reset.tags'|trans }}
                             </a>
+                            <a href="{{ path('config_reset', { type: 'archived'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
+                                {{ 'config.reset.archived'|trans }}
+                            </a>
                             <a href="{{ path('config_reset', { type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
                                 {{ 'config.reset.entries'|trans }}
                             </a>
@@ -201,6 +254,12 @@
                         {{ form_start(form.pwd) }}
                             {{ form_errors(form.pwd) }}
 
+                        <div class="row">
+                            <div class="input-field col s12">
+                                {{ 'config.form_password.description'|trans }}
+                            </div>
+                        </div>
+
                             <div class="row">
                                 <div class="input-field col s12">
                                     {{ form_label(form.pwd.old_password) }}