From 8905191413f20e7fba1d635a06cf5ec2ff86cbb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 7 Jan 2014 20:21:43 +0100 Subject: [add] import from poche, thank you @tsadiq #388 --- themes/default/config.twig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'themes/default') diff --git a/themes/default/config.twig b/themes/default/config.twig index 10df726e..ef615d39 100644 --- a/themes/default/config.twig +++ b/themes/default/config.twig @@ -105,8 +105,9 @@

{% trans "More info in the official docs:" %} inthepoche.com

{% trans "Export your poche data" %}

-- cgit v1.2.3 From 1cecaa7926cee3d8e1ce4c6e369c52ad98d49e3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 10 Jan 2014 16:33:10 +0100 Subject: [add] display token and user id --- themes/default/config.twig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'themes/default') diff --git a/themes/default/config.twig b/themes/default/config.twig index ef615d39..e22ea1da 100644 --- a/themes/default/config.twig +++ b/themes/default/config.twig @@ -38,6 +38,8 @@
  • {% trans "Favorites feed" %}
  • {% trans "Archive feed" %}
    • +

    {% trans "Your token:" %} {{token}}

    +

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

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

    {% endif %} -- cgit v1.2.3 From b8fdd2d85f76bb2dbf50bacec86e3be806bb2bcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 28 Jan 2014 10:37:37 +0100 Subject: [fix] change twitter account for sharing entry --- themes/default/view.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'themes/default') diff --git a/themes/default/view.twig b/themes/default/view.twig index e4a2fe74..e7d33ff6 100644 --- a/themes/default/view.twig +++ b/themes/default/view.twig @@ -9,8 +9,8 @@
  • {% trans "Toggle mark as read" %}
  • {% trans "Toggle favorite" %}
  • {% trans "Delete" %}
    • - {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} - {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} + {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} + {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %} {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}
  • {% trans "flattr" %}
    • {% elseif flattr.status == constant('FLATTRED') %}
  • {% trans "flattr" %}{{ flattr.numflattrs }}
    • {% endif %}{% endif %}
  • {% trans "Does this article appear wrong?" %}
    • -- cgit v1.2.3 From 3e0e7e1208e8d3ee3b23df42ea119d7c50b0db5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 28 Jan 2014 10:49:57 +0100 Subject: [fix] inthepoche.com => wallabag.org --- themes/default/_bookmarklet.twig | 2 +- themes/default/_footer.twig | 2 +- themes/default/config.twig | 12 ++++++------ themes/default/error.twig | 2 +- themes/default/install.twig | 2 +- themes/default/view.twig | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'themes/default') diff --git a/themes/default/_bookmarklet.twig b/themes/default/_bookmarklet.twig index 2f3b2d16..2e3071ad 100644 --- a/themes/default/_bookmarklet.twig +++ b/themes/default/_bookmarklet.twig @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/themes/default/_footer.twig b/themes/default/_footer.twig index 06148a57..f837ae38 100644 --- a/themes/default/_footer.twig +++ b/themes/default/_footer.twig @@ -1,4 +1,4 @@
    -

    {% trans "powered by" %} poche

    +

    {% trans "powered by" %} wallabag

    {% if constant('DEBUG_POCHE') == 1 %}

    {% trans "debug mode is on so cache is off." %} {% trans "your poche version:" %}{{constant('POCHE')}}. {% trans "storage:" %} {{constant('STORAGE')}}

    {% endif %}
    \ No newline at end of file diff --git a/themes/default/config.twig b/themes/default/config.twig index e22ea1da..ada238d6 100644 --- a/themes/default/config.twig +++ b/themes/default/config.twig @@ -6,10 +6,10 @@ {% endblock %} {% block content %}

    {% trans "Poching links" %}

    -

    {% trans "There are several ways to poche a link:" %} (?)

    +

    {% trans "There are several ways to poche a link:" %} (?)

    {% trans "Updating poche" %}

    {% trans "Feeds" %}

    @@ -104,7 +104,7 @@

    {% trans "Import" %}

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

    -

    {% trans "More info in the official docs:" %} inthepoche.com

    +

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

    -- cgit v1.2.3 From 21f50d5a08381d0d2f27d36b0d97a4f518eeefcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 28 Jan 2014 11:08:21 +0100 Subject: changed some poche with wallabag --- themes/default/install.twig | 4 ++-- themes/default/layout.twig | 2 +- themes/default/login.twig | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'themes/default') diff --git a/themes/default/install.twig b/themes/default/install.twig index 0dec2c48..c89c7e47 100644 --- a/themes/default/install.twig +++ b/themes/default/install.twig @@ -3,9 +3,9 @@ {% block content %}
    -

    {% trans "install your poche" %}

    +

    {% trans "install your wallabag" %}

    - {% trans "Poche is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on poche website." %} + {% trans "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." %}

    diff --git a/themes/default/layout.twig b/themes/default/layout.twig index fec7054a..dfebc3ea 100644 --- a/themes/default/layout.twig +++ b/themes/default/layout.twig @@ -10,7 +10,7 @@ - {% block title %}{% endblock %} - poche + {% block title %}{% endblock %} - wallabag {% include '_head.twig' %} {% include '_bookmarklet.twig' %} diff --git a/themes/default/login.twig b/themes/default/login.twig index e2a9a9f5..bf685240 100644 --- a/themes/default/login.twig +++ b/themes/default/login.twig @@ -1,11 +1,11 @@ {% extends "layout.twig" %} -{% block title %}{% trans "login to your poche" %}{% endblock %} +{% block title %}{% trans "login to your wallabag" %}{% endblock %} {% block content %} {% if http_auth == 0 %}

    -

    {% trans "Login to poche" %}

    +

    {% trans "Login to wallabag" %}

    {% if constant('MODE_DEMO') == 1 %}

    {% trans "you are in demo mode, some features may be disabled." %}

    {% endif %}
    -- cgit v1.2.3 From f4fbfaa7cbaaf07aae7d8f0533d293fa4dc605cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 28 Jan 2014 11:19:06 +0100 Subject: some fix to courgette theme --- themes/default/config.twig | 4 ++-- themes/default/theme.ini | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 themes/default/theme.ini (limited to 'themes/default') diff --git a/themes/default/config.twig b/themes/default/config.twig index ada238d6..df62520a 100644 --- a/themes/default/config.twig +++ b/themes/default/config.twig @@ -49,8 +49,8 @@
    diff --git a/themes/default/theme.ini b/themes/default/theme.ini new file mode 100644 index 00000000..9f3cfb6a --- /dev/null +++ b/themes/default/theme.ini @@ -0,0 +1 @@ +name = Default \ No newline at end of file -- cgit v1.2.3 From 1e1fd6f24da7b7bf08f7b26956a9467477265fff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 3 Feb 2014 12:43:34 +0100 Subject: [add] link to test file when we install wallabag #392 --- themes/default/error.twig | 3 +++ 1 file changed, 3 insertions(+) (limited to 'themes/default') diff --git a/themes/default/error.twig b/themes/default/error.twig index 8a6a4d6c..528a0985 100644 --- a/themes/default/error.twig +++ b/themes/default/error.twig @@ -8,4 +8,7 @@ {% endfor %}

    Don't forget the documentation.

    +

    + {% trans "You can check your configuration here." %} +

    {% endblock %} -- cgit v1.2.3