X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fthemes%2Fmaterial%2FConfig%2Findex.html.twig;h=2b0b08289e935e233648b5554ec0de5d536d420a;hb=6432b9277ed5dcf269590e421bd0aac4ad66f09c;hp=810c02fa178a4aec0b26ccec963b3d1b04bc154c;hpb=9b88658c047514a75bc9a9e3578cbeba32c5c5d7;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 810c02fa..2b0b0828 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,14 @@
                 <div class="row">
                     <div class="div_tabs col s12">
                         <ul class="tabs">
-                        <li class="tab col s3"><a class="active" href="#set1">{% trans %}Settings{% endtrans %}</a></li>
-                        <li class="tab col s3"><a href="#set2">{% trans %}RSS{% endtrans %}</a></li>
-                        <li class="tab col s3"><a href="#set3">{% trans %}User information{% endtrans %}</a></li>
-                        <li class="tab col s3"><a href="#set4">{% trans %}Password{% endtrans %}</a></li>
-                        <li class="tab col s3"><a href="#set5">{% trans %}Tagging rules{% endtrans %}</a></li>
-                        {% if is_granted('ROLE_SUPER_ADMIN') %}
-                        <li class="tab col s3"><a href="#set6">{% trans %}Add a user{% endtrans %}</a></li>
-                        {% endif %}
+                            <li class="tab col s3"><a class="active" href="#set1">{% trans %}Settings{% endtrans %}</a></li>
+                            <li class="tab col s3"><a href="#set2">{% trans %}RSS{% endtrans %}</a></li>
+                            <li class="tab col s3"><a href="#set3">{% trans %}User information{% endtrans %}</a></li>
+                            <li class="tab col s3"><a href="#set4">{% trans %}Password{% endtrans %}</a></li>
+                            <li class="tab col s3"><a href="#set5">{% trans %}Tagging rules{% endtrans %}</a></li>
+                            {% if is_granted('ROLE_SUPER_ADMIN') %}
+                            <li class="tab col s3"><a href="#set6">{% trans %}Add a user{% endtrans %}</a></li>
+                            {% endif %}
                         </ul>
                     </div>
 
@@ -42,6 +42,15 @@
                                 </div>
                             </div>
 
+                            <div class="row">
+                                <div class="input-field col s12">
+                                    {{ form_label(form.config.reading_speed) }}
+                                    {{ form_errors(form.config.reading_speed) }}
+                                    {{ form_widget(form.config.reading_speed) }}
+                                    <p>{% trans %}You can use online tools to estimate your reading speed{% endtrans %} (<a href="http://www.myreadspeed.com/calculate/">{% trans %}like this one{%endtrans%}</a>).</p>
+                                </div>
+                            </div>
+
                             <div class="row">
                                 <div class="input-field col s12">
                                     {{ form_label(form.config.language) }}
@@ -131,6 +140,12 @@
                             </div>
 
                             {% if twofactor_auth %}
+                            <div class="row">
+                                <div class="input-field col s12">
+                                    {% trans %}Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion{% endtrans %}
+                                </div>
+                            </div>
+
                             <div class="row">
                                 <div class="input-field col s12">
                                     {{ form_widget(form.user.twoFactorAuthentication) }}
@@ -200,7 +215,7 @@
                             </div>
                         </div>
 
-                        <form action="{{ path('config') }}#set5" method="post" {{ form_enctype(form.new_tagging_rule) }}>
+                        {{ form_start(form.new_tagging_rule) }}
                             {{ form_errors(form.new_tagging_rule) }}
 
                             <div class="row">
@@ -227,14 +242,33 @@
 
                         <div class="row">
                             <div class="input-field col s12">
+                                <h4>{% trans %}FAQ{% endtrans %}</h4>
+
+                                <h5>{% trans %}What does « tagging rules » mean?{% endtrans %}</h5>
                                 <p class="help">
-                                    {% trans %}The following variables can be used to create tagging rules:{% endtrans %}
+                                    {% trans %}
+                                    They are rules used by Wallabag to automatically tag new entries.<br />Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble to manually classify your entries.
+                                    {% endtrans %}
+                                </p>
+
+                                <h5>{% trans %}How do I use them?{% endtrans %}</h5>
+                                <p class="help">
+                                    {% trans %}
+                                    Let assume you want to tag new entries as « <i>short reading</i> » when the reading time is inferior to 3 minutes.<br />In that case, you should put « readingTime &lt;= 3 » in the <i>Rule</i> field and « <i>short reading</i> » in the <i>Tags</i> field.<br />Several tags can added simultaneously by separating them by a comma: « <i>short reading, must read</i> »<br />Complex rules can be written by using predefined operators: if « <i>readingTime &gt;= 5 AND domainName = "github.com"</i> » then tag as « <i>long reading, github </i> »
+                                    {% endtrans %}
+                                </p>
+
+                                <h5>{% trans %}Which variables and operators can I use to write rules?{% endtrans %}</h5>
+                                <p class="help">
+                                    {% trans %}The following variables and operators can be used to create tagging rules:{% endtrans %}
 
                                     <table>
                                         <thead>
                                             <tr>
-                                                <th>Variable</th>
-                                                <th>Meaning</th>
+                                                <th>{% trans %}Variable{% endtrans %}</th>
+                                                <th>{% trans %}Meaning{% endtrans %}</th>
+                                                <th>{% trans %}Operator{% endtrans %}</th>
+                                                <th>{% trans %}Meaning{% endtrans %}</th>
                                             </tr>
                                         </thead>
 
@@ -242,38 +276,60 @@
                                             <tr>
                                                 <td>title</td>
                                                 <td>{% trans %}Title of the entry{% endtrans %}</td>
+                                                <td>&lt;=</td>
+                                                <td>{% trans %}Less than…{% endtrans %}</td>
                                             </tr>
                                             <tr>
                                                 <td>url</td>
                                                 <td>{% trans %}URL of the entry{% endtrans %}</td>
+                                                <td>&lt;</td>
+                                                <td>{% trans %}Strictly less than…{% endtrans %}</td>
                                             </tr>
                                             <tr>
                                                 <td>isArchived</td>
                                                 <td>{% trans %}Whether the entry is archived or not{% endtrans %}</td>
+                                                <td>=&gt;</td>
+                                                <td>{% trans %}Greater than…{% endtrans %}</td>
                                             </tr>
                                             <tr>
-                                                <td>isStared</td>
+                                                <td>isStarred</td>
                                                 <td>{% trans %}Whether the entry is starred or not{% endtrans %}</td>
+                                                <td>&gt;</td>
+                                                <td>{% trans %}Strictly greater than…{% endtrans %}</td>
                                             </tr>
                                             <tr>
                                                 <td>content</td>
                                                 <td>{% trans %}The entry's content{% endtrans %}</td>
+                                                <td>=</td>
+                                                <td>{% trans %}Equal to…{% endtrans %}</td>
                                             </tr>
                                             <tr>
                                                 <td>language</td>
                                                 <td>{% trans %}The entry's language{% endtrans %}</td>
+                                                <td>!=</td>
+                                                <td>{% trans %}Not equal to…{% endtrans %}</td>
                                             </tr>
                                             <tr>
                                                 <td>mimetype</td>
                                                 <td>{% trans %}The entry's mime-type{% endtrans %}</td>
+                                                <td>OR</td>
+                                                <td>{% trans %}One rule or another{% endtrans %}</td>
                                             </tr>
                                             <tr>
                                                 <td>readingTime</td>
                                                 <td>{% trans %}The estimated entry's reading time, in minutes{% endtrans %}</td>
+                                                <td>AND</td>
+                                                <td>{% trans %}One rule and another{% endtrans %}</td>
                                             </tr>
                                             <tr>
                                                 <td>domainName</td>
                                                 <td>{% trans %}The domain name of the entry{% endtrans %}</td>
+                                                <td>matches</td>
+                                                <td>
+                                                    {% trans %}
+                                                    Tests that a <i>subject</i> is matches a <i>search</i> (case-insensitive).<br />Example: <code>title matches "football"</code>
+                                                    {% endtrans %}
+                                                </td>
                                             </tr>
                                         </tbody>
                                     </table>
@@ -283,7 +339,7 @@
                     </div>
 
                     {% if is_granted('ROLE_SUPER_ADMIN') %}
-                    <div id="set5" class="col s12">
+                    <div id="set6" class="col s12">
                         {{ form_start(form.new_user) }}
                             {{ form_errors(form.new_user) }}