aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--docs/en/index.rst1
-rw-r--r--docs/en/user/import.rst39
-rw-r--r--docs/img/user/export_wllbg_1.pngbin0 -> 10954 bytes
-rw-r--r--docs/img/user/import_wllbg.pngbin0 -> 11803 bytes
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Import/index.html.twig33
5 files changed, 60 insertions, 13 deletions
diff --git a/docs/en/index.rst b/docs/en/index.rst
index 6ccfd44c..8cb1b479 100644
--- a/docs/en/index.rst
+++ b/docs/en/index.rst
@@ -24,6 +24,7 @@ The main documentation for the site is organized into a couple sections:
24 user/login 24 user/login
25 user/configuration 25 user/configuration
26 user/first_article 26 user/first_article
27 user/import
27 28
28user/organize 29user/organize
29user/filters 30user/filters
diff --git a/docs/en/user/import.rst b/docs/en/user/import.rst
new file mode 100644
index 00000000..d326b06e
--- /dev/null
+++ b/docs/en/user/import.rst
@@ -0,0 +1,39 @@
1Migrate to wallabag
2===================
3
4From wallabag 1.x
5-----------------
6
7Export your data from your wallabag 1.x
8~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
9
10On your config page, click on ``JSON export`` in the ``Export your wallabag data`` section.
11
12.. image:: ../../img/user/export_wllbg_1.png
13 :alt: Export from wallabag 1.x
14 :align: center
15
16You will have a ``wallabag-export-1-1970-01-01.json`` file.
17
18Import your data into wallabag 2.x
19~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
20
21Click on ``Import`` link in the menu, select your export file on your computer and import it.
22
23.. image:: ../../img/user/import_wllbg.png
24 :alt: Import from wallabag 1.x
25 :align: center
26
27All your wallabag 1.x articles will be imported.
28
29From Pocket
30-----------
31
32From Instapaper
33---------------
34
35From Readability
36----------------
37
38From HTML or JSON file
39----------------------
diff --git a/docs/img/user/export_wllbg_1.png b/docs/img/user/export_wllbg_1.png
new file mode 100644
index 00000000..f9d24517
--- /dev/null
+++ b/docs/img/user/export_wllbg_1.png
Binary files differ
diff --git a/docs/img/user/import_wllbg.png b/docs/img/user/import_wllbg.png
new file mode 100644
index 00000000..6eec07e4
--- /dev/null
+++ b/docs/img/user/import_wllbg.png
Binary files differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Import/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Import/index.html.twig
index 2c8c158d..47004144 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Import/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Import/index.html.twig
@@ -3,21 +3,28 @@
3{% block title %}{% trans %}import{% endtrans %}{% endblock %} 3{% block title %}{% trans %}import{% endtrans %}{% endblock %}
4 4
5{% block content %} 5{% block content %}
6 6<div class="row">
7 <div id="set1" class="col s12"> 7 <div class="col s12">
8 <form action="{{ path('import') }}" method="post" {{ form_enctype(form.import) }}> 8 <div class="card-panel settings">
9 {{ form_errors(form.import) }}
10 <div class="row"> 9 <div class="row">
11 <div class="input-field col s12"> 10 <div class="col s12">
12 {{ form_errors(form.import.file) }} 11 <form action="{{ path('import') }}" method="post" {{ form_enctype(form.import) }}>
13 {{ form_widget(form.import.file) }} 12 {{ form_errors(form.import) }}
14 <label class="required">{% trans %}File{% endtrans %}</label> 13 <div class="row">
14 <div class="input-field col s12">
15 <p>{% trans %}Please select your wallabag export and click on the below button to upload and import it.{% endtrans %}</p>
16 {{ form_errors(form.import.file) }}
17 {{ form_widget(form.import.file) }}
18 </div>
19 </div>
20 <div class="hidden">{{ form_rest(form.import) }}</div>
21 <button class="btn waves-effect waves-light" type="submit" name="action">
22 {% trans %}Upload file{% endtrans %}
23 </button>
24 </form>
15 </div> 25 </div>
16 </div> 26 </div>
17 <div class="hidden">{{ form_rest(form.import) }}</div> 27 </div>
18 <button class="btn waves-effect waves-light" type="submit" name="action">
19 {% trans %}Upload file{% endtrans %}
20 </button>
21 </form>
22 </div> 28 </div>
29</div>
23{% endblock %} 30{% endblock %}