Merge pull request #1750 from wallabag/v2-quickstart-documentation

Documentation about filters / Quickstart changes

2 files changed, 35 insertions, 5 deletions

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig
index 3984081c..319eaea3 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/quickstart.html.twig
@@ -4,32 +4,47 @@
 
 {% block content %}
 
-    <h2>{% trans %}Welcome to wallabag!{% endtrans %}</h2>
+    <h3>{% trans %}Welcome to wallabag!{% endtrans %}</h3>
     <p>{% trans %}We'll accompany you to visit wallabag and show you some features which can interess you.{% endtrans %}</p>
     <p>{% trans %}Follow us!{% endtrans %}</p>
     <h4>{% trans %}Configure the application{% endtrans %}</h4>
     <ul>
         <li><a href="{{ path('config') }}">{% trans %}Change language and design{% endtrans %}</a></li>
         <li><a href="{{ path('config') }}#set2">{% trans %}Enable RSS feeds{% endtrans %}</a></li>
+        <li><a href="{{ path('config') }}#set5">{% trans %}Write rules to automatically tag your articles{% endtrans %}</a></li>
     </ul>
-    <h3>{% trans %}First steps{% endtrans %}</h3>
+    {% if is_granted('ROLE_SUPER_ADMIN') %}
+        <h4>{% trans %}Administration{% endtrans %}</h4>
+        <p>{% trans %}As a administrator, you have privileges on wallabag. You can:{% endtrans %}</p>
+        <ul>
+            <li><a href="{{ path('config') }}#set6">{% trans %}Create a new user{% endtrans %}</a></li>
+            <li><a href="{{ path('craue_config_settings_modify') }}#set-analytics">{% trans %}Configure analytics{% endtrans %}</a></li>
+            <li><a href="{{ path('craue_config_settings_modify') }}#set-entry">{% trans %}Enable some parameters about article sharing{% endtrans %}</a></li>
+            <li><a href="{{ path('craue_config_settings_modify') }}#set-export">{% trans %}Configure export{% endtrans %}</a></li>
+            <li><a href="{{ path('craue_config_settings_modify') }}#set-import">{% trans %}Configure import{% endtrans %}</a></li>
+        </ul>
+    {% endif %}
+    <h4>{% trans %}First steps{% endtrans %}</h4>
     <ul>
         <li><a href="{{ path('new') }}">{% trans %}Save your first article{% endtrans %}</a></li>
         <li><a href="{{ path('unread') }}">{% trans %}And classify it!{% endtrans %}</a></li>
     </ul>
-    <h3>{% trans %}Migrate from an existing service{% endtrans %}</h3>
+    <h4>{% trans %}Migrate from an existing service{% endtrans %}</h4>
     <p>{% trans %}You're using an other service? We'll help you to retrieve your data on wallabag.{% endtrans %}</p>
     <ul>
         <li><a href="{{ path('import_pocket') }}">{% trans %}Migrate from Pocket{% endtrans %}</a></li>
         <li><a href="{{ path('import_wallabag_v1') }}">{% trans %}Migrate from wallabag v1{% endtrans %}</a></li>
+        <li><a href="{{ path('import_wallabag_v2') }}">{% trans %}Migrate from wallabag v2{% endtrans %}</a></li>
     </ul>
-    <h3>{% trans %}Full documentation{% endtrans %}</h3>
+    <h4>{% trans %}Full documentation{% endtrans %}</h4>
     <ul>
+        <li><a href="http://wallabag.readthedocs.org">{% trans %}Annotate your article{% endtrans %}</a></li>
         <li><a href="http://wallabag.readthedocs.org">{% trans %}Convert your articles into ePUB or PDF{% endtrans %}</a></li>
         <li><a href="http://wallabag.readthedocs.org">{% trans %}See how you can look for an article by using search engine and filters{% endtrans %}</a></li>
+        <li><a href="http://wallabag.readthedocs.org">{% trans %}What can I do if an article encounters errors during fetching?{% endtrans %}</a></li>
         <li><a href="http://wallabag.readthedocs.org">{% trans %}And so many other articles!{% endtrans %}</a></li>
     </ul>
-    <h3>{% trans %}Support{% endtrans %}</h3>
+    <h4>{% trans %}Support{% endtrans %}</h4>
     <p>{% trans %}If you need some help, we are here for you.{% endtrans %}</p>
     <ul>
         <li><a href="https://github.com/wallabag/wallabag/issues/">{% trans %}On GitHub{% endtrans %}</a></li>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig
index aff8dd2b..3d21271a 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/quickstart.html.twig
@@ -16,7 +16,19 @@
                     <ul>
                         <li><a href="{{ path('config') }}">{% trans %}Change language and design{% endtrans %}</a></li>
                         <li><a href="{{ path('config') }}#set2">{% trans %}Enable RSS feeds{% endtrans %}</a></li>
+                        <li><a href="{{ path('config') }}#set5">{% trans %}Write rules to automatically tag your articles{% endtrans %}</a></li>
                     </ul>
+                    {% if is_granted('ROLE_SUPER_ADMIN') %}
+                    <h4>{% trans %}Administration{% endtrans %}</h4>
+                    <p>{% trans %}As a administrator, you have privileges on wallabag. You can:{% endtrans %}</p>
+                    <ul>
+                        <li><a href="{{ path('config') }}#set6">{% trans %}Create a new user{% endtrans %}</a></li>
+                        <li><a href="{{ path('craue_config_settings_modify') }}#set-analytics">{% trans %}Configure analytics{% endtrans %}</a></li>
+                        <li><a href="{{ path('craue_config_settings_modify') }}#set-entry">{% trans %}Enable some parameters about article sharing{% endtrans %}</a></li>
+                        <li><a href="{{ path('craue_config_settings_modify') }}#set-export">{% trans %}Configure export{% endtrans %}</a></li>
+                        <li><a href="{{ path('craue_config_settings_modify') }}#set-import">{% trans %}Configure import{% endtrans %}</a></li>
+                    </ul>
+                    {% endif %}
                     <h4>{% trans %}First steps{% endtrans %}</h4>
                     <ul>
                         <li><a href="{{ path('new') }}">{% trans %}Save your first article{% endtrans %}</a></li>
@@ -27,11 +39,14 @@
                     <ul>
                         <li><a href="{{ path('import_pocket') }}">{% trans %}Migrate from Pocket{% endtrans %}</a></li>
                         <li><a href="{{ path('import_wallabag_v1') }}">{% trans %}Migrate from wallabag v1{% endtrans %}</a></li>
+                        <li><a href="{{ path('import_wallabag_v2') }}">{% trans %}Migrate from wallabag v2{% endtrans %}</a></li>
                     </ul>
                     <h4>{% trans %}Full documentation{% endtrans %}</h4>
                     <ul>
+                        <li><a href="http://wallabag.readthedocs.org">{% trans %}Annotate your article{% endtrans %}</a></li>
                         <li><a href="http://wallabag.readthedocs.org">{% trans %}Convert your articles into ePUB or PDF{% endtrans %}</a></li>
                         <li><a href="http://wallabag.readthedocs.org">{% trans %}See how you can look for an article by using search engine and filters{% endtrans %}</a></li>
+                        <li><a href="http://wallabag.readthedocs.org">{% trans %}What can I do if an article encounters errors during fetching?{% endtrans %}</a></li>
                         <li><a href="http://wallabag.readthedocs.org">{% trans %}And so many other articles!{% endtrans %}</a></li>
                     </ul>
                     <h4>{% trans %}Support{% endtrans %}</h4>