From 2b840e0cfb63a453bea67a98541f3df9c273c5f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sat, 3 Aug 2013 08:57:35 +0200 Subject: twig implementation --- tpl/config.twig | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 tpl/config.twig (limited to 'tpl/config.twig') diff --git a/tpl/config.twig b/tpl/config.twig new file mode 100644 index 00000000..10c481de --- /dev/null +++ b/tpl/config.twig @@ -0,0 +1,41 @@ +{% extends "layout.twig" %} + +{% block title %}{% trans "config" %}{% endblock %} +{% block menu %} + +{% endblock %} +{% block content %} +
+

Bookmarklet

+

Thanks to the bookmarklet, you will be able to easily add a link to your poche. If you don't know how use a bookmarklet, have a look here.

+

Drag & drop this link to your bookmarks bar and have fun with poche.

+

poche it !

+ +

Password

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

Export

+

Click here to export your poche datas.

+
+{% endblock %} \ No newline at end of file -- cgit v1.2.3 From 4f5b44bd3bd490309eb2ba7b44df4769816ba729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sat, 3 Aug 2013 19:26:54 +0200 Subject: twig implementation --- tpl/config.twig | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'tpl/config.twig') diff --git a/tpl/config.twig b/tpl/config.twig index 10c481de..be2c0454 100644 --- a/tpl/config.twig +++ b/tpl/config.twig @@ -12,30 +12,30 @@ {% endblock %} {% block content %}
-

Bookmarklet

-

Thanks to the bookmarklet, you will be able to easily add a link to your poche. If you don't know how use a bookmarklet, have a look here.

-

Drag & drop this link to your bookmarks bar and have fun with poche.

-

poche it !

+

{% trans "Bookmarklet" %}

+

{% trans "Thanks to the bookmarklet, you will be able to easily add a link to your poche." %} {% trans "Have a look to this documentation:" %} http://inthepoche.com/?pages/Documentation.

+

{% trans "Drag & drop this link to your bookmarks bar and have fun with poche." %}

+

{% trans "poche it!" %}

-

Password

+

{% trans "Change your password" %}

- - + +
- - + +
- +
- - + +
-

Export

-

Click here to export your poche datas.

+

{% trans "Export your poche datas" %}

+

{% trans "Click here" %} {% trans "to export your poche datas." %}

{% endblock %} \ No newline at end of file -- cgit v1.2.3 From eb1af592194e225bf887e4893e697f0ab8dd9a26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 4 Aug 2013 20:58:31 +0200 Subject: refactoring --- tpl/config.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tpl/config.twig') diff --git a/tpl/config.twig b/tpl/config.twig index be2c0454..4e7bb9d4 100644 --- a/tpl/config.twig +++ b/tpl/config.twig @@ -15,7 +15,7 @@

{% trans "Bookmarklet" %}

{% trans "Thanks to the bookmarklet, you will be able to easily add a link to your poche." %} {% trans "Have a look to this documentation:" %} http://inthepoche.com/?pages/Documentation.

{% trans "Drag & drop this link to your bookmarks bar and have fun with poche." %}

-

{% trans "poche it!" %}

+

{% trans "poche it!" %}

{% trans "Change your password" %}

-- cgit v1.2.3 From c765c3679fee3ed9e4bad9954a808116187a7e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 4 Aug 2013 21:42:46 +0200 Subject: import in poche and not in an external file --- tpl/config.twig | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'tpl/config.twig') diff --git a/tpl/config.twig b/tpl/config.twig index 4e7bb9d4..9a51e566 100644 --- a/tpl/config.twig +++ b/tpl/config.twig @@ -13,7 +13,7 @@ {% block content %}

{% trans "Bookmarklet" %}

-

{% trans "Thanks to the bookmarklet, you will be able to easily add a link to your poche." %} {% trans "Have a look to this documentation:" %} http://inthepoche.com/?pages/Documentation.

+

{% trans "Thanks to the bookmarklet, you will be able to easily add a link to your poche." %} {% trans "Have a look to this documentation:" %} inthepoche.com.

{% trans "Drag & drop this link to your bookmarks bar and have fun with poche." %}

{% trans "poche it!" %}

@@ -35,6 +35,15 @@ + +

{% trans "Import" %}

+

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

+

{% trans "More infos in the official doc:" %} inthepoche.com

+

+

{% trans "Export your poche datas" %}

{% trans "Click here" %} {% trans "to export your poche datas." %}

-- cgit v1.2.3 From 63c35580c7d60e2278ee6fe9ba2d4440ff0308d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 4 Aug 2013 22:35:08 +0200 Subject: twig implementation --- tpl/config.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tpl/config.twig') diff --git a/tpl/config.twig b/tpl/config.twig index 9a51e566..c18806bc 100644 --- a/tpl/config.twig +++ b/tpl/config.twig @@ -40,11 +40,11 @@

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

{% trans "More infos in the official doc:" %} inthepoche.com

{% trans "Export your poche datas" %}

-

{% trans "Click here" %} {% trans "to export your poche datas." %}

+

{% trans "Click here" %} {% trans "to export your poche datas." %}

{% endblock %} \ No newline at end of file -- cgit v1.2.3 From a62788c61ef80e6b0f1cf0b6304b2dfd2223aa38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 5 Aug 2013 09:43:33 +0200 Subject: #100: welcome to you, instapaper users --- tpl/config.twig | 1 + 1 file changed, 1 insertion(+) (limited to 'tpl/config.twig') diff --git a/tpl/config.twig b/tpl/config.twig index c18806bc..dc49ee39 100644 --- a/tpl/config.twig +++ b/tpl/config.twig @@ -42,6 +42,7 @@

{% trans "Export your poche datas" %}

-- cgit v1.2.3 From 32520785018e3ec3a2ce200689e863099e9646f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 5 Aug 2013 12:34:16 +0200 Subject: close #69: in the config page, you are notified of the release of a new version --- tpl/config.twig | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'tpl/config.twig') diff --git a/tpl/config.twig b/tpl/config.twig index dc49ee39..a17a4b17 100644 --- a/tpl/config.twig +++ b/tpl/config.twig @@ -17,6 +17,14 @@

{% trans "Drag & drop this link to your bookmarks bar and have fun with poche." %}

{% trans "poche it!" %}

+

{% trans "Updating poche" %}

+

    +
  • {% trans "your version" %} : {{ constant('POCHE_VERSION') }}
    • +
  • {% trans "latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}{% trans "a more recent stable version is available." %}{% else %}{% trans "you are up to date." %}{% endif %}
    • +
  • {% trans "latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}{% trans "a more recent development version is available." %}{% else %}{% trans "you are up to date." %}{% endif %}
    • +
+

+

{% trans "Change your password" %}

-- cgit v1.2.3 From 4d0e2544917c8a7fba9eb6d3dccd5fd3790984a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 5 Aug 2013 12:39:24 +0200 Subject: link to download poche when update available --- tpl/config.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tpl/config.twig') diff --git a/tpl/config.twig b/tpl/config.twig index a17a4b17..a8be93b0 100644 --- a/tpl/config.twig +++ b/tpl/config.twig @@ -20,8 +20,8 @@

{% trans "Updating poche" %}

  • {% trans "your version" %} : {{ constant('POCHE_VERSION') }}
    • -
  • {% trans "latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}{% trans "a more recent stable version is available." %}{% else %}{% trans "you are up to date." %}{% endif %}
    • -
  • {% trans "latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}{% trans "a more recent development version is available." %}{% else %}{% trans "you are up to date." %}{% endif %}
    • +
  • {% trans "latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}{% trans "a more recent stable version is available." %}{% else %}{% trans "you are up to date." %}{% endif %}
    • +
  • {% trans "latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}{% trans "a more recent development version is available." %}{% else %}{% trans "you are up to date." %}{% endif %}

-- cgit v1.2.3 From 6a361945eaf86a978b82bd6fb3442fe64428d9df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 5 Aug 2013 21:56:32 +0200 Subject: new design, pagination & more --- tpl/config.twig | 80 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 39 insertions(+), 41 deletions(-) (limited to 'tpl/config.twig') diff --git a/tpl/config.twig b/tpl/config.twig index a8be93b0..95d5d8cf 100644 --- a/tpl/config.twig +++ b/tpl/config.twig @@ -11,49 +11,47 @@ {% endblock %} {% block content %} -
-

{% trans "Bookmarklet" %}

-

{% trans "Thanks to the bookmarklet, you will be able to easily add a link to your poche." %} {% trans "Have a look to this documentation:" %} inthepoche.com.

-

{% trans "Drag & drop this link to your bookmarks bar and have fun with poche." %}

-

{% trans "poche it!" %}

+

{% trans "Bookmarklet" %}

+

{% trans "Thanks to the bookmarklet, you will be able to easily add a link to your poche." %} {% trans "Have a look to this documentation:" %} inthepoche.com.

+

{% trans "Drag & drop this link to your bookmarks bar and have fun with poche." %}

+

{% trans "poche it!" %}

-

{% trans "Updating poche" %}

-

-

+

{% trans "Updating poche" %}

+

+

-

{% trans "Change your password" %}

- -
-
- - -
-
- - -
-
- -
-
- - - +

{% trans "Change your password" %}

+
+
+
+ + +
+
+ + +
+
+ +
+
+ + +
-

{% trans "Import" %}

-

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

-

{% trans "More infos in the official doc:" %} inthepoche.com

-

+

{% trans "Import" %}

+

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

+

{% trans "More infos in the official doc:" %} inthepoche.com

+

-

{% trans "Export your poche datas" %}

-

{% trans "Click here" %} {% trans "to export your poche datas." %}

-
+

{% trans "Export your poche datas" %}

+

{% trans "Click here" %} {% trans "to export your poche datas." %}

{% endblock %} \ No newline at end of file -- cgit v1.2.3