diff --git a/docs/en/index.rst b/docs/en/index.rst index 6ccfd44c7..8cb1b4790 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: user/login user/configuration user/first_article + user/import user/organize user/filters diff --git a/docs/en/user/import.rst b/docs/en/user/import.rst new file mode 100644 index 000000000..d326b06ea --- /dev/null +++ b/docs/en/user/import.rst @@ -0,0 +1,39 @@ +Migrate to wallabag +=================== + +From wallabag 1.x +----------------- + +Export your data from your wallabag 1.x +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +On your config page, click on ``JSON export`` in the ``Export your wallabag data`` section. + +.. image:: ../../img/user/export_wllbg_1.png + :alt: Export from wallabag 1.x + :align: center + +You will have a ``wallabag-export-1-1970-01-01.json`` file. + +Import your data into wallabag 2.x +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Click on ``Import`` link in the menu, select your export file on your computer and import it. + +.. image:: ../../img/user/import_wllbg.png + :alt: Import from wallabag 1.x + :align: center + +All your wallabag 1.x articles will be imported. + +From Pocket +----------- + +From Instapaper +--------------- + +From Readability +---------------- + +From HTML or JSON file +---------------------- diff --git a/docs/img/user/export_wllbg_1.png b/docs/img/user/export_wllbg_1.png new file mode 100644 index 000000000..f9d24517e Binary files /dev/null and b/docs/img/user/export_wllbg_1.png differ diff --git a/docs/img/user/import_wllbg.png b/docs/img/user/import_wllbg.png new file mode 100644 index 000000000..6eec07e45 Binary files /dev/null and b/docs/img/user/import_wllbg.png 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 2c8c158d7..470041441 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 @@ {% block title %}{% trans %}import{% endtrans %}{% endblock %} {% block content %} - -
-
- {{ form_errors(form.import) }} +
+
+
-
- {{ form_errors(form.import.file) }} - {{ form_widget(form.import.file) }} - +
+ + {{ form_errors(form.import) }} +
+
+

{% trans %}Please select your wallabag export and click on the below button to upload and import it.{% endtrans %}

+ {{ form_errors(form.import.file) }} + {{ form_widget(form.import.file) }} +
+
+ + +
- - - +
+
{% endblock %}