From 10b40f85d664da2b3ebcfd24d6e7145c9cd90d64 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 23 Oct 2015 10:14:22 +0200 Subject: [PATCH] add docs for Import feature --- docs/en/index.rst | 1 + docs/en/user/import.rst | 39 ++++++++++++++++++ docs/img/user/export_wllbg_1.png | Bin 0 -> 10954 bytes docs/img/user/import_wllbg.png | Bin 0 -> 11803 bytes .../themes/material/Import/index.html.twig | 33 +++++++++------ 5 files changed, 60 insertions(+), 13 deletions(-) create mode 100644 docs/en/user/import.rst create mode 100644 docs/img/user/export_wllbg_1.png create mode 100644 docs/img/user/import_wllbg.png 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: 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 00000000..d326b06e --- /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 0000000000000000000000000000000000000000..f9d24517edaee3212b37fbdda084be0f46c7787f GIT binary patch literal 10954 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 Y;1@mYFGj@g)u@29xPn-vh=KqA0*_Fxu>b%7 literal 0 HcmV?d00001 diff --git a/docs/img/user/import_wllbg.png b/docs/img/user/import_wllbg.png new file mode 100644 index 0000000000000000000000000000000000000000..6eec07e4552d62243dc0099ae8362842fdf7cae5 GIT binary patch literal 11803 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 literal 0 HcmV?d00001 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 @@ {% 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 %} -- 2.41.0