aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes/default
diff options
context:
space:
mode:
Diffstat (limited to 'themes/default')
-rwxr-xr-xthemes/default/_import.twig15
-rwxr-xr-x[-rw-r--r--]themes/default/config.twig25
-rwxr-xr-xthemes/default/home.twig5
3 files changed, 24 insertions, 21 deletions
diff --git a/themes/default/_import.twig b/themes/default/_import.twig
new file mode 100755
index 00000000..926696c1
--- /dev/null
+++ b/themes/default/_import.twig
@@ -0,0 +1,15 @@
1<script type="text/javascript">
2<!--
3 $(document).ready(function() {
4 $("body").css("cursor", "wait");
5
6 setTimeout(function(){
7 window.location = '/?import';
8 }, {{ import.delay }} );
9 });
10//-->
11</script>
12<div class="messages warning">
13 <p>{% trans "Download required for " %} {{ import.recordsDownloadRequired }} {% trans "records" %}.</p>
14 <p>{% trans "Downloading next " %} {{ import.recordsUnderDownload }} {% trans "articles, please wait" %}...</p>
15</div>
diff --git a/themes/default/config.twig b/themes/default/config.twig
index 5d20e0ea..7ccd0b36 100644..100755
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -104,36 +104,19 @@
104 {% endif %} 104 {% endif %}
105 105
106 <h2>{% trans "Import" %}</h2> 106 <h2>{% trans "Import" %}</h2>
107 <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> 107 <p>{% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}</p>
108 <p>1. {% trans "First, select the export file on your computer and upload it." %}</p> 108 <p>{% trans "Please select export file on your computer:" %}</p>
109 <form method="post" action="?uploadfile" name="uploadfile" enctype="multipart/form-data"> 109 <form method="post" action="?import" name="uploadfile" enctype="multipart/form-data">
110 <fieldset class="w500p"> 110 <fieldset class="w500p">
111 <div class="row"> 111 <div class="row">
112 <label class="col w150p" for="file">{% trans "File:" %}</label> 112 <label class="col w150p" for="file">{% trans "File:" %}</label>
113 <input class="col" type="file" id="file" name="file" tabindex="4"> 113 <input class="col" type="file" id="file" name="file" tabindex="4">
114 </div> 114 </div>
115 <div class="row mts txtcenter"> 115 <div class="row mts txtcenter">
116 <button class="bouton" type="submit" tabindex="4">{% trans "Upload" %}</button> 116 <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>
117 </div> 117 </div>
118 </fieldset> 118 </fieldset>
119 <input type="hidden" name="MAX_FILE_SIZE" value="1048576">
120 <input type="hidden" name="returnurl" value="{{ referer }}">
121 </form> 119 </form>
122 <p>2. {% trans "Then, click on the right link below." %}</p>
123 <ul>
124 <li><a href="./?import&amp;from=pocket">{% trans "Import from Pocket" %}</a> {{ '(after uploaded %s file)'|trans|format(constant('POCKET_FILE')) }}</li>
125 <li><a href="./?import&amp;from=readability">{% trans "Import from Readability" %}</a> {{ '(after uploaded %s file)'|trans|format(constant('READABILITY_FILE')) }}</li>
126 <li><a href="./?import&amp;from=instapaper">{% trans "Import from Instapaper" %}</a> {{ '(after uploaded %s file)'|trans|format(constant('INSTAPAPER_FILE')) }}</li>
127 <li><a href="./?import&amp;from=poche">{% trans "Import from wallabag" %}</a> {{ '(after uploaded %s file)'|trans|format(constant('POCHE_FILE')) }}</li>
128 </ul>
129
130 {% 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 {% else %}
133 <p>3. {% trans "Finally, 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 "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 {% endif %}
137 120
138 <h2>{% trans "Export your wallabag data" %}</h2> 121 <h2>{% trans "Export your wallabag data" %}</h2>
139 {% if constant('STORAGE') == 'sqlite' %} 122 {% if constant('STORAGE') == 'sqlite' %}
diff --git a/themes/default/home.twig b/themes/default/home.twig
index 7bee883b..d6cb98e8 100755
--- a/themes/default/home.twig
+++ b/themes/default/home.twig
@@ -16,6 +16,11 @@
16{% include '_sorting.twig' %} 16{% include '_sorting.twig' %}
17{% endblock %} 17{% endblock %}
18{% block content %} 18{% block content %}
19
20 {% if includeImport %}
21 {% include '_import.twig' %}
22 {% endif %}
23
19 {% if tag %} 24 {% if tag %}
20 <h3>{% trans "Tag" %}: <b>{{ tag.value }}</b></h3> 25 <h3>{% trans "Tag" %}: <b>{{ tag.value }}</b></h3>
21 {% endif %} 26 {% endif %}