From 31a10069a52c2fd2aca3a835a7bdc1accae197f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 28 Feb 2014 20:36:32 +0100 Subject: [add] upload form for import --- themes/baggy/config.twig | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'themes/baggy/config.twig') diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index b37ac115..4026bf28 100644 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -103,13 +103,26 @@ {% endif %}

{% trans "Import" %}

-

{% trans "Please execute the import script locally as it can take a very long time." %}

-

{% trans "More info in the official documentation:" %} wallabag.org

+

1. {% trans "Select a file on your computer and upload it." %}

+
+
+
+ + +
+
+ +
+
+ + +
+

2. {% trans "Then, click on the right link below." %}

{% trans "Export your wallabag data" %}

-- cgit v1.2.3 From 53e3158dfe697ea59da1fa0e401e8da75ae13030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 28 Feb 2014 21:49:38 +0100 Subject: [add] cron to fetch content on imported entries --- themes/baggy/config.twig | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'themes/baggy/config.twig') diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index 4026bf28..8f35d797 100644 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -125,6 +125,14 @@
  • {% trans "Import from wallabag" %} {{ '(after uploaded %s file)'|trans|format(constant('POCHE_FILE')) }}
    • + {% if token == '' %} +

    {% trans "3. Your feed token is currently empty and must first be generated to fetch content. Click here to generate it." %}

    + {% else %} +

    3. {% trans "You can fetch content for imported items." %} Click here to fetch content for 10 articles.

    +

    {% trans "You can also create a cron task:" %}

    + 
    0 */4 * * *  cd /path/to/wallabag && php cron.php --limit=10 --user-id={{user_id}} --token={{token}} >/dev/null 2>&1
    + {% endif %} +

    {% trans "Export your wallabag data" %}

    {% if constant('STORAGE') == 'sqlite' %}

    {% trans "Click here" %} {% trans "to download your database." %}

    {% endif %} -- cgit v1.2.3 From 11c680f97aa07b48f33e264effb2975d6ca31a0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sat, 1 Mar 2014 19:10:17 +0100 Subject: [add] display last check of wallabag release --- themes/baggy/config.twig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'themes/baggy/config.twig') diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index b37ac115..33de701e 100644 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -25,9 +25,10 @@

    {% trans "Upgrading wallabag" %}

    +

    {% trans "You can clear cache to check the latest release." %}

    {% trans "Feeds" %}

    {% if token == '' %} -- cgit v1.2.3 From 4ca17924a186b0a0571a1129c37fe48b47ce1331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 6 Mar 2014 18:45:15 +0100 Subject: [fix] links for firefox / android / ios apps --- themes/baggy/config.twig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'themes/baggy/config.twig') diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index 33de701e..d83b69ab 100644 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -8,9 +8,10 @@

    {% trans "Saving articles" %}

    {% trans "There are several ways to save an article:" %} (?)

      -
    • Firefox: {% trans "download the extension" %}
      • +
    • Firefox: {% trans "download the extension" %}
    • Chrome: {% trans "download the extension" %}
      • -
    • Android: {% trans "via F-Droid" %} {% trans " or " %} {% trans "via Google Play" %}
      • +
    • Android: {% trans "via F-Droid" %} {% trans " or " %} {% trans "via Google Play" %}
      • +
    • iOS: {% trans "download the application" %}
    • Windows Phone: {% trans "download the application" %}
    • -- cgit v1.2.3 From 7c6aa8d826067ad2949952001ecf7197d8e4c011 Mon Sep 17 00:00:00 2001 From: Bob Maerten Date: Fri, 7 Mar 2014 16:44:05 +0100 Subject: Changed text to clarify import process. --- themes/baggy/config.twig | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'themes/baggy/config.twig') 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 @@

      {% trans "Your user id:" %} {{user_id}}

      {% trans "You can regenerate your token: generate!." %}

      {% endif %} - +

      {% trans "Change your theme" %}

      @@ -105,7 +105,8 @@ {% endif %}

      {% trans "Import" %}

      -

      1. {% trans "Select a file on your computer and upload it." %}

      +

      {% 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." %}

      +

      1. {% trans "First, select the export file on your computer and upload it." %}

      @@ -130,8 +131,8 @@ {% if token == '' %}

      {% trans "3. Your feed token is currently empty and must first be generated to fetch content. Click here to generate it." %}

      {% else %} -

      3. {% trans "You can fetch content for imported items." %} Click here to fetch content for 10 articles.

      -

      {% trans "You can also create a cron task:" %}

      +

      3. {% trans "Finaly, you have to fetch content for imported items." %} {% trans "Click here" %} {% trans "to fetch content for 10 articles" %}.

      +

      {% trans "If you have console access to your server, you can also create a cron task:" %}

      0 */4 * * *  cd /path/to/wallabag && php cron.php --limit=10 --user-id={{user_id}} --token={{token}} >/dev/null 2>&1
      {% endif %} -- cgit v1.2.3 From c0586a906c2bee5f5be445e614696a7078a7c906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 14 Mar 2014 08:37:40 +0100 Subject: [fix] new import section in old themes #559 --- themes/baggy/config.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'themes/baggy/config.twig') diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index 20ff9a00..a13af0c8 100644 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -12,7 +12,7 @@
    • Chrome: {% trans "download the extension" %}
    • Android: {% trans "via F-Droid" %} {% trans " or " %} {% trans "via Google Play" %}
    • iOS: {% trans "download the application" %}
      • -
    • Windows Phone: {% trans "download the application" %}
      • +
    • Windows Phone: {% trans "download the application" %}
    • @@ -131,7 +131,7 @@ {% if token == '' %}

      {% trans "3. Your feed token is currently empty and must first be generated to fetch content. Click here to generate it." %}

      {% else %} -

      3. {% trans "Finaly, you have to fetch content for imported items." %} {% trans "Click here" %} {% trans "to fetch content for 10 articles" %}.

      +

      3. {% trans "Finally, you have to fetch content for imported items." %} {% trans "Click here" %} {% trans "to fetch content for 10 articles" %}.

      {% trans "If you have console access to your server, you can also create a cron task:" %}

      0 */4 * * *  cd /path/to/wallabag && php cron.php --limit=10 --user-id={{user_id}} --token={{token}} >/dev/null 2>&1
      {% endif %} -- cgit v1.2.3 From d9bb0cdeb86fafa995fd17acea4dc5c097056fe6 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Thu, 3 Apr 2014 13:53:47 +0300 Subject: import w/o cron: explanation added --- themes/baggy/config.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'themes/baggy/config.twig') diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index fc7890ec..725b775e 100755 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -106,7 +106,7 @@

      {% trans "Import" %}

      {% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}

      -

      {% trans "Please select export file on your computer:" %}

      +

      {% trans "Please select export file on your computer and press \"Import\" button below.
      Wallabag will parse your file, insert all URLs and start fetching of articles if required.
      Fetching process is controlled by two constants in your config file: IMPORT_LIMIT (how many articles are fetched at once) and IMPORT_DELAY (delay between fetch of next batch of articles)." %}

      -- cgit v1.2.3 From 7d2f1aa2793595aa6cdc58a58260184234cfa809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 3 Apr 2014 14:39:13 +0200 Subject: [add] link on config page to fetch content --- themes/baggy/config.twig | 1 + 1 file changed, 1 insertion(+) (limited to 'themes/baggy/config.twig') diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index 725b775e..d441de7c 100755 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -118,6 +118,7 @@
      +

      {% trans "You can click here to fetch content for articles with no content." %}

      {% trans "Export your wallabag data" %}

      {% if constant('STORAGE') == 'sqlite' %} -- cgit v1.2.3