X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fthemes%2Fbaggy%2FConfig%2Findex.html.twig;h=56fd8e0c1c4c88b3e30f4bdcd2fd5820236605d1;hb=540a9bc4a274fc5975b73a66ccf5b91bd3e226f5;hp=6ac6decb9195542078e866c9daf7c0797d122e86;hpb=86719c63bf47686ca55020e6b0443344de36d45a;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 6ac6decb..56fd8e0c 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
@@ -1,9 +1,9 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{% trans %}Config{% endtrans %}{% endblock %}
+{% block title %}{{ 'config.page_title'|trans }}{% endblock %}
 
 {% block content %}
-    <h2>{% trans %}Wallabag configuration{% endtrans %}</h2>
+    <h2>{{ 'config.tab_menu.settings'|trans }}</h2>
 
     {{ form_start(form.config) }}
         {{ form_errors(form.config) }}
@@ -24,6 +24,18 @@
             </div>
         </fieldset>
 
+        <fieldset class="w500p inline">
+            <div class="row">
+                {{ form_label(form.config.reading_speed) }}
+                {{ form_errors(form.config.reading_speed) }}
+                {{ form_widget(form.config.reading_speed) }}
+                <p>
+                    {{ 'config.form_settings.reading_speed.help_message'|trans }}
+                    <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a>
+                </p>
+            </div>
+        </fieldset>
+
         <fieldset class="w500p inline">
             <div class="row">
                 {{ form_label(form.config.language) }}
@@ -32,16 +44,28 @@
             </div>
         </fieldset>
 
+        <fieldset class="w500p inline">
+            <div class="row">
+                {{ form_label(form.config.pocket_consumer_key) }}
+                {{ form_errors(form.config.pocket_consumer_key) }}
+                {{ form_widget(form.config.pocket_consumer_key) }}
+                <p>
+                    &raquo;
+                    <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a>
+                </p>
+            </div>
+        </fieldset>
+
         {{ form_rest(form.config) }}
     </form>
 
-    <h2>{% trans %}RSS configuration{% endtrans %}</h2>
+    <h2>{{ 'config.tab_menu.rss'|trans }}</h2>
 
-    {{ form_start(form.rss) }}
+        {{ form_start(form.rss) }}
         {{ form_errors(form.rss) }}
 
         <div class="row">
-            {% trans %}RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader.{% endtrans %}
+            {{ 'config.form_rss.description'|trans }}
         </div>
 
         <fieldset class="w500p inline">
@@ -50,27 +74,31 @@
                 {% if rss.token %}
                     {{ rss.token }}
                 {% else %}
-                    <em>No token</em>
+                    <em>{{ 'config.form_rss.no_token'|trans }}</em>
                 {% endif %}
                 –
-                <a href="{{ path('generate_token') }}">Regenerate ?</a>
+                <a href="{{ path('generate_token') }}">
+                    {% if rss.token %}
+                        {{ 'config.form_rss.token_reset'|trans }}
+                    {% else %}
+                        {{ 'config.form_rss.token_create'|trans }}
+                    {% endif %}
+                </a>
             </div>
         </fieldset>
 
+        {% if rss.token %}
         <fieldset class="w500p inline">
             <div class="row">
-                <label>Rss links:</label>
-                {% if rss.token %}
-                    <ul>
-                        <li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">unread</a></li>
-                        <li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">fav</a></li>
-                        <li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">archives</a></li>
-                    </ul>
-                {% else %}
-                    <strong>You need to generate a token first.</strong>
-                {% endif %}
+                <label>{{ 'config.form_rss.rss_links'|trans }}</label>
+                <ul>
+                    <li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">unread</a></li>
+                    <li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">fav</a></li>
+                    <li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">archives</a></li>
+                </ul>
             </div>
         </fieldset>
+        {% endif %}
 
         <fieldset class="w500p inline">
             <div class="row">
@@ -83,7 +111,7 @@
         {{ form_rest(form.rss) }}
     </form>
 
-    <h2>{% trans %}User information{% endtrans %}</h2>
+    <h2>{{ 'config.tab_menu.user_info'|trans }}</h2>
 
     {{ form_start(form.user) }}
         {{ form_errors(form.user) }}
@@ -106,7 +134,7 @@
 
         {% if twofactor_auth %}
         <div class="row">
-            {% trans %}Enabling two factor authentication means you'll receive an email with a code on every new untrusted connexion{% endtrans %}
+            {{ 'config.form_user.two_factor_description'|trans }}
         </div>
 
         <fieldset class="w500p inline">
@@ -118,14 +146,19 @@
         </fieldset>
         {% endif %}
 
-        {{ form_rest(form.user) }}
+        {{ form_widget(form.user._token) }}
+        {{ form_widget(form.user.save) }}
     </form>
 
-    <h2>{% trans %}Change your password{% endtrans %}</h2>
+    <h2>{{ 'config.tab_menu.password'|trans }}</h2>
 
     {{ 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) }}
@@ -153,18 +186,22 @@
         {{ form_rest(form.pwd) }}
     </form>
 
-    <h2>{% trans %}Tagging rules{% endtrans %}</h2>
+    <h2>{{ 'config.tab_menu.rules'|trans }}</h2>
 
     <ul>
         {% for tagging_rule in app.user.config.taggingRules %}
         <li>
-            if « {{ tagging_rule.rule }} » then tag as « {{ tagging_rule.tags|join(', ') }} »
-            <a href="{{ path('delete_tagging_rule', {id: tagging_rule.id}) }}" title="{% trans %}Delete{% endtrans %}" class="tool delete icon-trash icon"></a>
+            {{ 'config.form_rules.if_label'|trans }}
+            « {{ tagging_rule.rule }} »
+            {{ 'config.form_rules.then_tag_as_label'|trans }}
+            « {{ tagging_rule.tags|join(', ') }} »
+            <a href="{{ path('edit_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.edit_rule_label'|trans }}" class="tool mode_edit">✎</a>
+            <a href="{{ path('delete_tagging_rule', {id: tagging_rule.id}) }}" title="{{ 'config.form_rules.delete_rule_label'|trans }}" class="tool delete icon-trash icon"></a>
         </li>
         {% endfor %}
     </ul>
 
-    {{ form_start(form.new_tagging_rule) }}
+        {{ form_start(form.new_tagging_rule) }}
         {{ form_errors(form.new_tagging_rule) }}
 
         <fieldset class="w500p inline">
@@ -185,46 +222,88 @@
 
         {{ form_rest(form.new_tagging_rule) }}
     </form>
-
-    {% if is_granted('ROLE_SUPER_ADMIN') %}
-    <h2>{% trans %}Add a user{% endtrans %}</h2>
-
-    {{ form_start(form.new_user) }}
-        {{ form_errors(form.new_user) }}
-
-        <fieldset class="w500p inline">
-            <div class="row">
-                {{ form_label(form.new_user.username) }}
-                {{ form_errors(form.new_user.username) }}
-                {{ form_widget(form.new_user.username) }}
-            </div>
-        </fieldset>
-
-        <fieldset class="w500p inline">
-            <div class="row">
-                {{ form_label(form.new_user.plainPassword.first) }}
-                {{ form_errors(form.new_user.plainPassword.first) }}
-                {{ form_widget(form.new_user.plainPassword.first) }}
-            </div>
-        </fieldset>
-
-        <fieldset class="w500p inline">
-            <div class="row">
-                {{ form_label(form.new_user.plainPassword.second) }}
-                {{ form_errors(form.new_user.plainPassword.second) }}
-                {{ form_widget(form.new_user.plainPassword.second) }}
-            </div>
-        </fieldset>
-
-        <fieldset class="w500p inline">
-            <div class="row">
-                {{ form_label(form.new_user.email) }}
-                {{ form_errors(form.new_user.email) }}
-                {{ form_widget(form.new_user.email) }}
-            </div>
-        </fieldset>
-
-        {{ form_rest(form.new_user) }}
-        {% endif %}
-    </form>
+    <div class="row">
+        <div class="input-field col s12">
+            <h3>{{ 'config.form_rules.faq.title'|trans }}</h3>
+
+            <h4>{{ 'config.form_rules.faq.tagging_rules_definition_title'|trans }}</h4>
+            <p class="help">{{ 'config.form_rules.faq.tagging_rules_definition_description'|trans|raw }}</p>
+
+            <h4>{{ 'config.form_rules.faq.how_to_use_them_title'|trans }}</h4>
+            <p class="help">{{ 'config.form_rules.faq.how_to_use_them_description'|trans|raw }}</p>
+
+            <h4>{{ 'config.form_rules.faq.variables_available_title'|trans }}</h4>
+            <p class="help">
+                {{ 'config.form_rules.faq.variables_available_description'|trans }}
+            </p>
+
+            <table class="bordered">
+                <thead>
+                <tr>
+                    <th>{{ 'config.form_rules.faq.variable_description.label'|trans }}</th>
+                    <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
+                    <th>{{ 'config.form_rules.faq.operator_description.label'|trans }}</th>
+                    <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
+                </tr>
+                </thead>
+
+                <tbody>
+                <tr>
+                    <td>title</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.title'|trans }}</td>
+                    <td>&lt;=</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.less_than'|trans }}</td>
+                </tr>
+                <tr>
+                    <td>url</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.url'|trans }}</td>
+                    <td>&lt;</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.strictly_less_than'|trans }}</td>
+                </tr>
+                <tr>
+                    <td>isArchived</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.isArchived'|trans }}</td>
+                    <td>&gt;=</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.greater_than'|trans }}</td>
+                </tr>
+                <tr>
+                    <td>isStarred</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.isStarred'|trans }}</td>
+                    <td>&gt;</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.strictly_greater_than'|trans }}</td>
+                </tr>
+                <tr>
+                    <td>content</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.content'|trans }}</td>
+                    <td>=</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.equal_to'|trans }}</td>
+                </tr>
+                <tr>
+                    <td>language</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.language'|trans }}</td>
+                    <td>!=</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.not_equal_to'|trans }}</td>
+                </tr>
+                <tr>
+                    <td>mimetype</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.mimetype'|trans }}</td>
+                    <td>OR</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.or'|trans }}</td>
+                </tr>
+                <tr>
+                    <td>readingTime</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.readingTime'|trans }}</td>
+                    <td>AND</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.and'|trans }}</td>
+                </tr>
+                <tr>
+                    <td>domainName</td>
+                    <td>{{ 'config.form_rules.faq.variable_description.domainName'|trans }}</td>
+                    <td>matches</td>
+                    <td>{{ 'config.form_rules.faq.operator_description.matches'|trans|raw }}</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
 {% endblock %}