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=01f63a7b2b46b6c0c5509483ca3d781c43dc3995;hb=d047530dc07ceb5a109cd0caa95055d8b071dbd4;hp=dde9411f53d0cbd47b7ee18361cb12f21ef10368;hpb=3b81212674bb4b2cf51ce51637e0093c952cefde;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 dde9411f..01f63a7b 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) }}
             </div>
+            <a href="#" title="{{ 'config.form_settings.help_theme'|trans }}">
+                <i class="material-icons">live_help</i>
+            </a>
         </fieldset>
 
         <fieldset class="w500p inline">
@@ -22,6 +25,9 @@
                 {{ form_errors(form.config.items_per_page) }}
                 {{ form_widget(form.config.items_per_page) }}
             </div>
+            <a href="#" title="{{ 'config.form_settings.help_items_per_page'|trans }}">
+                <i class="material-icons">live_help</i>
+            </a>
         </fieldset>
 
         <fieldset class="w500p inline">
@@ -34,6 +40,17 @@
                     <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a>
                 </p>
             </div>
+            <a href="#" title="{{ 'config.form_settings.help_reading_speed'|trans }}">
+                <i class="material-icons">live_help</i>
+            </a>
+        </fieldset>
+
+        <fieldset class="w500p inline">
+            <div class="row">
+                {{ 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>
         </fieldset>
 
         <fieldset class="w500p inline">
@@ -42,6 +59,9 @@
                 {{ form_errors(form.config.language) }}
                 {{ form_widget(form.config.language) }}
             </div>
+            <a href="#" title="{{ 'config.form_settings.help_language'|trans }}">
+                <i class="material-icons">live_help</i>
+            </a>
         </fieldset>
 
         <fieldset class="w500p inline">
@@ -54,15 +74,21 @@
                     <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a>
                 </p>
             </div>
+            <a href="#" title="{{ 'config.form_settings.help_pocket_consumer_key'|trans }}">
+                <i class="material-icons">live_help</i>
+            </a>
+        </fieldset>
 
+        <fieldset class="w500p inline">
             <div class="row">
-                    <h3>{{ 'config.form_settings.android_configuration'|trans }}</h3>
-                    <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" >Touch here to prefill your Android application</a>
-                    <img id="androidQrcode" />
-                    <script>
-                        const imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}');
-                        document.getElementById('androidQrcode').src=imgBase64;
-                    </script>
+                <h3>{{ 'config.form_settings.android_configuration'|trans }}</h3>
+                <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" >Touch here to prefill your Android application</a>
+                <br/>
+                <img id="androidQrcode" />
+                <script>
+                    const imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}');
+                    document.getElementById('androidQrcode').src = imgBase64;
+                </script>
             </div>
         </fieldset>
 
@@ -153,6 +179,9 @@
                 {{ form_errors(form.user.twoFactorAuthentication) }}
                 {{ form_widget(form.user.twoFactorAuthentication) }}
             </div>
+            <a href="#" title="{{ 'config.form_user.help_twoFactorAuthentication'|trans }}">
+                <i class="material-icons">live_help</i>
+            </a>
         </fieldset>
         {% endif %}
 
@@ -170,6 +199,11 @@
                         {{ 'config.reset.tags'|trans }}
                     </a>
                 </li>
+                <li>
+                    <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>
+                </li>
                 <li>
                     <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 }}
@@ -196,6 +230,10 @@
     {{ form_start(form.pwd) }}
         {{ form_errors(form.pwd) }}
 
+        <div class="row">
+            {{ 'config.form_password.description'|trans }}
+        </div>
+
         <fieldset class="w500p inline">
             <div class="row">
                 {{ form_label(form.pwd.old_password) }}