aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2014-03-10 13:14:26 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2014-03-10 13:14:26 +0100
commitd47a05a9a5185e835d51341febc8257f5262ce03 (patch)
tree390987edef574a938005d82ee64d3b0e4ac9a1e0 /themes
parent17b2afefad1947042cc9fbbb841c3a023d00d96d (diff)
parent7c6aa8d826067ad2949952001ecf7197d8e4c011 (diff)
downloadwallabag-d47a05a9a5185e835d51341febc8257f5262ce03.tar.gz
wallabag-d47a05a9a5185e835d51341febc8257f5262ce03.tar.zst
wallabag-d47a05a9a5185e835d51341febc8257f5262ce03.zip
Merge pull request #535 from bobmaerten/clarify-import-process
Changed config section to clarify import process.
Diffstat (limited to 'themes')
-rw-r--r--themes/baggy/config.twig9
1 files changed, 5 insertions, 4 deletions
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index 95db92fe..20ff9a00 100644
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -44,7 +44,7 @@
44 <p>{% trans "Your user id:" %} <strong>{{user_id}}</strong></p> 44 <p>{% trans "Your user id:" %} <strong>{{user_id}}</strong></p>
45 <p>{% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}</p> 45 <p>{% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}</p>
46 {% endif %} 46 {% endif %}
47 47
48 <h2>{% trans "Change your theme" %}</h2> 48 <h2>{% trans "Change your theme" %}</h2>
49 <form method="post" action="?updatetheme" name="changethemeform"> 49 <form method="post" action="?updatetheme" name="changethemeform">
50 <fieldset class="w500p inline"> 50 <fieldset class="w500p inline">
@@ -105,7 +105,8 @@
105 {% endif %} 105 {% endif %}
106 106
107 <h2>{% trans "Import" %}</h2> 107 <h2>{% trans "Import" %}</h2>
108 <p>1. {% trans "Select a file on your computer and upload it." %}</p> 108 <p>{% trans "Importing from other services can be quite long, and webservers default configuration often prevents long scripts execution time, so it must be done in multiple parts." %}</p>
109 <p>1. {% trans "First, select the export file on your computer and upload it." %}</p>
109 <form method="post" action="?uploadfile" name="uploadfile" enctype="multipart/form-data"> 110 <form method="post" action="?uploadfile" name="uploadfile" enctype="multipart/form-data">
110 <fieldset class="w500p"> 111 <fieldset class="w500p">
111 <div class="row"> 112 <div class="row">
@@ -130,8 +131,8 @@
130 {% if token == '' %} 131 {% if token == '' %}
131 <p>{% trans "3. Your feed token is currently empty and must first be generated to fetch content. Click <a href='?feed&amp;action=generate'>here to generate it</a>." %}</p> 132 <p>{% trans "3. Your feed token is currently empty and must first be generated to fetch content. Click <a href='?feed&amp;action=generate'>here to generate it</a>." %}</p>
132 {% else %} 133 {% else %}
133 <p>3. {% trans "You can fetch content for imported items." %} <a href="cron.php?limit=10&amp;user-id={{ user_id }}&amp;token={{token}}" target="_blank">Click here</a> to fetch content for 10 articles.</p> 134 <p>3. {% trans "Finaly, you have to fetch content for imported items." %} <a href="cron.php?limit=10&amp;user-id={{ user_id }}&amp;token={{token}}" target="_blank">{% trans "Click here" %}</a> {% trans "to fetch content for 10 articles" %}.</p>
134 <p>{% trans "You can also create a cron task:" %}</p> 135 <p>{% trans "If you have console access to your server, you can also create a cron task:" %}</p>
135 <pre><code>0 */4 * * * cd /path/to/wallabag && php cron.php --limit=10 --user-id={{user_id}} --token={{token}} >/dev/null 2>&1</code></pre> 136 <pre><code>0 */4 * * * cd /path/to/wallabag && php cron.php --limit=10 --user-id={{user_id}} --token={{token}} >/dev/null 2>&1</code></pre>
136 {% endif %} 137 {% endif %}
137 138