From a32231274060ec2de453124117518458c4fa00df Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 8 Sep 2013 20:54:11 +0200 Subject: Implemented Flattr changes Added a button to say if the article is flattrable or not and how many people have flattred this object. --- tpl/view.twig | 1 + 1 file changed, 1 insertion(+) (limited to 'tpl/view.twig') diff --git a/tpl/view.twig b/tpl/view.twig index 28508772..7b15c7c7 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -31,6 +31,7 @@ {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %} +
  • {% if flattr.status == "flattrable" %} This thing is flattrable !{% elseif flattr.status == "flattred" %} This thing has already been flattred by {{ flattr.numflattrs }} users and can be flattred !{% else %}This article cannot be flattred{% endif %}

    • {% trans "this article appears wrong?" %} {% trans "create an issue" %} {% trans "or" %} {% trans "contact us by mail" %}

    -- cgit v1.2.3 From af1d2792263d45c5ffea2e5485dd81bf59b7bded Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 8 Sep 2013 21:52:01 +0200 Subject: Fixed errors and changed source of flattrs Fixed errors, and the number displayed is no longer the number of peope who has flattred an article, but the number of flattrs he has got. --- tpl/view.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tpl/view.twig') diff --git a/tpl/view.twig b/tpl/view.twig index 7b15c7c7..c101db0a 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -31,7 +31,7 @@ {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %} -
  • {% if flattr.status == "flattrable" %} This thing is flattrable !{% elseif flattr.status == "flattred" %} This thing has already been flattred by {{ flattr.numflattrs }} users and can be flattred !{% else %}This article cannot be flattred{% endif %}
    • +
  • {% if flattr.status == "flattrable" %} This thing is flattrable !{% elseif flattr.status == "flattred" %} This thing has already been flattred {{ flattr.numflattrs }} times and can be flattred !{% else %}This article cannot be flattred{% endif %}

    • {% trans "this article appears wrong?" %} {% trans "create an issue" %} {% trans "or" %} {% trans "contact us by mail" %}

    -- cgit v1.2.3 From 964481d023676bee964141a1d14f638995ac8d30 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 10 Sep 2013 18:23:56 +0200 Subject: Fixed bugs, added a flattr button and an option There's a button and an option in define.inc.php to show the button or not. --- tpl/view.twig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tpl/view.twig') diff --git a/tpl/view.twig b/tpl/view.twig index c101db0a..283cfb5b 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -11,6 +11,7 @@ {% 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 == "flattrable" %}
  • flattr
    • {% elseif flattr.status == "flattred" %}
  • flattr{{ flattr.numflattrs }}
    • {% else %}{% endif %}{% endif %}
    @@ -31,7 +32,7 @@ {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %} -
  • {% if flattr.status == "flattrable" %} This thing is flattrable !{% elseif flattr.status == "flattred" %} This thing has already been flattred {{ flattr.numflattrs }} times and can be flattred !{% else %}This article cannot be flattred{% endif %}
    • + {% if constant('FLATTR') == 1 %}{% if flattr.status == "flattrable" %}
  • flattr
    • {% elseif flattr.status == "flattred" %}
  • flattr{{ flattr.numflattrs }}
    • {% else %}{% endif %}{% endif %}

    {% trans "this article appears wrong?" %} {% trans "create an issue" %} {% trans "or" %} {% trans "contact us by mail" %}

    -- cgit v1.2.3 From 9074534c935d852bd66133b56a769ff69ac9f58f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 10 Sep 2013 22:19:34 +0200 Subject: fix flattr span --- tpl/view.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tpl/view.twig') diff --git a/tpl/view.twig b/tpl/view.twig index ee16afa6..e51b79bc 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -11,7 +11,7 @@ {% 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') %}
  • flattr
    • {% elseif flattr.status == constant('FLATTRED') %}
  • flattr{{ flattr.numflattrs }}
    • {% endif %}{% endif %} + {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}
  • flattr
    • {% elseif flattr.status == constant('FLATTRED') %}
  • {% trans "flattr" %}{{ flattr.numflattrs }}
    • {% endif %}{% endif %}
    @@ -32,7 +32,7 @@ {% 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') %}
  • flattr
    • {% elseif flattr.status == constant('FLATTRED') %}
  • flattr{{ flattr.numflattrs }}
    • {% endif %}{% endif %} + {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}
  • flattr
    • {% elseif flattr.status == constant('FLATTRED') %}
  • {% trans "flattr" %}{{ flattr.numflattrs }}
    • {% endif %}{% endif %}

    {% trans "this article appears wrong?" %} {% trans "create an issue" %} {% trans "or" %} {% trans "contact us by mail" %}

    -- cgit v1.2.3 From 8ca368e7e382446f2333326fce8fb5f0e8955bc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 11 Sep 2013 06:40:29 +0200 Subject: fix flattr span --- tpl/view.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tpl/view.twig') diff --git a/tpl/view.twig b/tpl/view.twig index e51b79bc..2b6d91d5 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -11,7 +11,7 @@ {% 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') %}
  • flattr
    • {% elseif flattr.status == constant('FLATTRED') %}
  • {% trans "flattr" %}{{ flattr.numflattrs }}
    • {% endif %}{% endif %} + {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}
  • {% trans "flattr" %}
    • {% elseif flattr.status == constant('FLATTRED') %}
  • {% trans "flattr" %}{{ flattr.numflattrs }}
    • {% endif %}{% endif %}
    @@ -32,7 +32,7 @@ {% 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') %}
  • flattr
    • {% elseif flattr.status == constant('FLATTRED') %}
  • {% trans "flattr" %}{{ flattr.numflattrs }}
    • {% endif %}{% endif %} + {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}
  • {% trans "flattr" %}
    • {% elseif flattr.status == constant('FLATTRED') %}
  • {% trans "flattr" %}{{ flattr.numflattrs }}
    • {% endif %}{% endif %}

    {% trans "this article appears wrong?" %} {% trans "create an issue" %} {% trans "or" %} {% trans "contact us by mail" %}

    -- cgit v1.2.3 From a8778dc23e60e65b47e2aae5d4cdf92660ee4c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 17 Sep 2013 13:27:16 +0200 Subject: fix bug #105: Scroll position save / sync --- tpl/view.twig | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'tpl/view.twig') diff --git a/tpl/view.twig b/tpl/view.twig index 2b6d91d5..f9405f45 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -37,4 +37,23 @@

    {% trans "this article appears wrong?" %} {% trans "create an issue" %} {% trans "or" %} {% trans "contact us by mail" %}

    + + {% endblock %} \ No newline at end of file -- cgit v1.2.3 From 00dbaf90bc44ef3ed0abaebb15307756e054a027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 20 Sep 2013 10:21:39 +0200 Subject: merge #224 --- tpl/view.twig | 59 ----------------------------------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 tpl/view.twig (limited to 'tpl/view.twig') diff --git a/tpl/view.twig b/tpl/view.twig deleted file mode 100644 index f9405f45..00000000 --- a/tpl/view.twig +++ /dev/null @@ -1,59 +0,0 @@ -{% extends "layout.twig" %} -{% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %} -{% block content %} -
    -
    - -
    -
    -

    {{ entry.title|raw }}

    -
    {{ entry.url | e | getDomain }}
    -
    - -
    - -

    {% trans "this article appears wrong?" %} {% trans "create an issue" %} {% trans "or" %} {% trans "contact us by mail" %}

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