X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fthemes%2Fmaterial%2FConfig%2Findex.html.twig;h=0ff21f223f4f1cff467c7cbcb07c6b3afb93b19a;hb=8a60bc4cc2b6b1cfb5d8beb7ddcafc51d89a64c9;hp=d47a585c82fa8eca12f1a1a5aa6cc2e4024fc316;hpb=1a0ea1f35adaef86580f6141943a110453372bcf;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 d47a585c..0ff21f22 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
@@ -1,6 +1,6 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{% trans %}Config{% endtrans %}{% endblock %}
+{% block title %}{% trans %}config{% endtrans %}{% endblock %}
 
 {% block content %}
 
@@ -11,7 +11,7 @@
                 <div class="row">
                     <div class="div_tabs col s12">
                         <ul class="tabs">
-                        <li class="tab col s3"><a class="active" href="#set1">{% trans %}Wallabag{% endtrans %}</a></li>
+                        <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>
@@ -57,36 +57,41 @@
 
 
                     <div id="set2" class="col s12">
-                        <form action="{{ path('config') }}" method="post" {{ form_enctype(form.rss) }}>
+                        <form action="{{ path('config') }}#set2" method="post" {{ form_enctype(form.rss) }}>
                             {{ form_errors(form.rss) }}
 
                             <div class="row">
                                 <div class="input-field col s12">
-                                    <label>Rss token</label>
-                                    {% if rss.token %}
-                                        {{ rss.token }}
-                                    {% else %}
-                                        <em>No token</em>
-                                    {% endif %}
-                                    –
-                                    <a href="{{ path('generate_token') }}">Regenerate ?</a>
+                                    {% trans %}RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.{% endtrans %}
                                 </div>
                             </div>
 
                             <div class="row">
                                 <div class="input-field col s12">
-                                    <label>Rss links:</label>
-                                    {% if rss.token %}
+                                    <label>{% trans %}RSS token{% endtrans %}</label>
+                                    <div>
+                                        {% if rss.token %}
+                                            {{ rss.token }}
+                                        {% else %}
+                                            <em>{% trans %}No token{% endtrans %}</em>
+                                        {% endif %}
+                                        – <a href="{{ path('generate_token') }}">{% if rss.token %}{% trans %}Reset your token{% endtrans %}{% else %}{% trans %}Create your token{% endtrans %}{% endif %}</a>
+                                    </div>
+                                </div>
+                            </div>
+                            {% if rss.token %}
+                            <div class="row">
+                                <div class="input-field col s12">
+                                    <label>{% trans %}RSS links{% endtrans %}</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>
+                                            <li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">{% trans %}unread{% endtrans %}</a></li>
+                                            <li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">{% trans %}starred{% endtrans %}</a></li>
+                                            <li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">{% trans %}archive{% endtrans %}</a></li>
                                         </ul>
-                                    {% else %}
-                                        <strong>You need to generate a token first.</strong>
-                                    {% endif %}
+
                                 </div>
                             </div>
+                            {% endif %}
 
                             <div class="row">
                                 <div class="input-field col s12">
@@ -106,7 +111,7 @@
 
 
                     <div id="set3" class="col s12">
-                        <form action="{{ path('config') }}" method="post" {{ form_enctype(form.user) }}>
+                        <form action="{{ path('config') }}#set3" method="post" {{ form_enctype(form.user) }}>
                             {{ form_errors(form.user) }}
 
                             <div class="row">
@@ -135,7 +140,7 @@
 
 
                     <div id="set4" class="col s12">
-                        <form action="{{ path('config') }}" method="post" {{ form_enctype(form.pwd) }}>
+                        <form action="{{ path('config') }}#set4" method="post" {{ form_enctype(form.pwd) }}>
                             {{ form_errors(form.pwd) }}
 
                             <div class="row">
@@ -164,7 +169,7 @@
 
                             <div class="hidden">{{ form_rest(form.pwd) }}</div>
                             <button class="btn waves-effect waves-light" type="submit" name="action">
-                                {% trans %}Update{% endtrans %}
+                                {% trans %}Save{% endtrans %}
                             </button>
 
                         </form>
@@ -172,7 +177,7 @@
 
 
                     <div id="set5" class="col s12">
-                        <form action="{{ path('config') }}" method="post" {{ form_enctype(form.new_user) }}>
+                        <form action="{{ path('config') }}#set5" method="post" {{ form_enctype(form.new_user) }}>
                             {{ form_errors(form.new_user) }}
 
                             <div class="row">