From 38330bfd65181d63609b9350324aa13f1e967bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 20 Aug 2013 11:23:00 +0200 Subject: fix bug #112 link to shaarli --- tpl/view.twig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tpl/view.twig') diff --git a/tpl/view.twig b/tpl/view.twig index 2cbb9ca9..ba0aae30 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 %}
    • {% endif %} @@ -32,6 +33,7 @@
    • {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} + {% if constant('SHARE_SHAARLI') == 1 %}
    • {% endif %}

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

    -- cgit v1.2.3 From 29773c9729038510728738908b58fd8a86ef943b Mon Sep 17 00:00:00 2001 From: NumEricR Date: Fri, 23 Aug 2013 18:10:42 +0200 Subject: Fix HTML code of tools lists --- tpl/view.twig | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) (limited to 'tpl/view.twig') diff --git a/tpl/view.twig b/tpl/view.twig index ba0aae30..ead8d0cd 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -4,15 +4,12 @@
      -
    • -
      • - -
      • -
      • - {% if constant('SHARE_TWITTER') == 1 %}
      • {% endif %} - {% if constant('SHARE_MAIL') == 1 %}
      • {% endif %} - {% if constant('SHARE_SHAARLI') == 1 %}
      • {% endif %} - +
      • +
      • +
      • +
      • + {% if constant('SHARE_TWITTER') == 1 %}
      • {% endif %} + {% if constant('SHARE_MAIL') == 1 %}
      • {% endif %}
    @@ -25,16 +22,13 @@
      -
    • -
      • -
      • - -
      • -
      • - {% if constant('SHARE_TWITTER') == 1 %}
      • {% endif %} - {% if constant('SHARE_MAIL') == 1 %}
      • {% endif %} - {% if constant('SHARE_SHAARLI') == 1 %}
      • {% endif %} - +
      • +
      • +
      • +
      • +
      • + {% if constant('SHARE_TWITTER') == 1 %}
      • {% endif %} + {% if constant('SHARE_MAIL') == 1 %}
      • {% endif %}

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

    -- cgit v1.2.3 From 4b4afc7322cef96575649a47e34b1621a5aab1fd Mon Sep 17 00:00:00 2001 From: NumEricR Date: Fri, 23 Aug 2013 18:45:34 +0200 Subject: Add textual content on tools links --- tpl/view.twig | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'tpl/view.twig') diff --git a/tpl/view.twig b/tpl/view.twig index ead8d0cd..78207e15 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -4,12 +4,12 @@
    @@ -22,13 +22,13 @@

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

    -- cgit v1.2.3 From ffc966d72fa2b5016e143d490994459ff4591571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 23 Aug 2013 21:06:45 +0200 Subject: fix bug #151: HTML entities in titles are encoded twice --- 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 ba0aae30..0456471e 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -16,7 +16,7 @@
    -

    {{ entry.title|e }}

    +

    {{ entry.title|raw }}

    {{ entry.url | e | getDomain }}
    -- cgit v1.2.3 From 8413a63f7d9df2695653ab2ef1d77927da6ddc55 Mon Sep 17 00:00:00 2001 From: Nicolas Frandeboeuf Date: Fri, 23 Aug 2013 22:20:04 +0200 Subject: Clean markup in templates --- tpl/view.twig | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'tpl/view.twig') diff --git a/tpl/view.twig b/tpl/view.twig index 82d1fd2a..4dee38c8 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -5,32 +5,32 @@

    {{ entry.title|raw }}

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

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

    +

    {% 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 f3e4f109a3ae6cd58e0abc9e909ac823d5e3065a Mon Sep 17 00:00:00 2001 From: Nicolas Frandeboeuf Date: Fri, 23 Aug 2013 22:23:55 +0200 Subject: Revert "Clean markup in templates" This reverts commit 8413a63f7d9df2695653ab2ef1d77927da6ddc55. --- tpl/view.twig | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'tpl/view.twig') diff --git a/tpl/view.twig b/tpl/view.twig index 4dee38c8..82d1fd2a 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -5,32 +5,32 @@

    {{ entry.title|raw }}

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

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

    +

    {% 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 258d7032bbc0608cffd00a42fff50ea99f59ff23 Mon Sep 17 00:00:00 2001 From: nicofrand Date: Fri, 23 Aug 2013 22:38:14 +0200 Subject: Clean up the templates markup --- tpl/view.twig | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'tpl/view.twig') diff --git a/tpl/view.twig b/tpl/view.twig index 82d1fd2a..4dee38c8 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -5,32 +5,32 @@

    {{ entry.title|raw }}

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

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

    +

    {% 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 0269cd821311500acffed61edb1bc168d3fb5ec8 Mon Sep 17 00:00:00 2001 From: nicofrand Date: Fri, 23 Aug 2013 23:05:45 +0200 Subject: Add SHAARLI support to view template --- tpl/view.twig | 2 ++ 1 file changed, 2 insertions(+) mode change 100644 => 100755 tpl/view.twig (limited to 'tpl/view.twig') diff --git a/tpl/view.twig b/tpl/view.twig old mode 100644 new mode 100755 index 4dee38c8..219faa56 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -10,6 +10,7 @@
  • {% trans "delete" %}
    • {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} + {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %}
    @@ -29,6 +30,7 @@
  • {% trans "delete" %}
    • {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} + {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %}

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

    -- cgit v1.2.3 From fd99a8c02d7c625771656a5c5081560027d8e6e9 Mon Sep 17 00:00:00 2001 From: Nicolas Frandeboeuf Date: Fri, 23 Aug 2013 23:09:43 +0200 Subject: Revert "Add SHAARLI support to view template" This reverts commit 0269cd821311500acffed61edb1bc168d3fb5ec8. --- tpl/view.twig | 2 -- 1 file changed, 2 deletions(-) mode change 100755 => 100644 tpl/view.twig (limited to 'tpl/view.twig') diff --git a/tpl/view.twig b/tpl/view.twig old mode 100755 new mode 100644 index 219faa56..4dee38c8 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -10,7 +10,6 @@
  • {% trans "delete" %}
    • {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} - {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %}
    @@ -30,7 +29,6 @@
  • {% trans "delete" %}
    • {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} - {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %}

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

    -- cgit v1.2.3 From fa5f9764ae370d6eb5efd6b05bf8e257aae9899d Mon Sep 17 00:00:00 2001 From: nicofrand Date: Fri, 23 Aug 2013 23:11:34 +0200 Subject: Add SHAARLI support to view template --- tpl/view.twig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tpl/view.twig') diff --git a/tpl/view.twig b/tpl/view.twig index 4dee38c8..f78ac62e 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -10,6 +10,7 @@
  • {% trans "delete" %}
    • {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} + {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %}
    @@ -29,6 +30,7 @@
  • {% trans "delete" %}
    • {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} + {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %}

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

    -- cgit v1.2.3 From d7e8dd590c741a8901a2cf1ac3cb8e096645cffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 25 Aug 2013 08:43:22 +0200 Subject: links to original article were wrong --- 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 f78ac62e..97b76fee 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -15,11 +15,11 @@

    {{ entry.title|raw }}

    -
    {{ entry.url | e | getDomain }}
    +
    {{ entry.url | e | getDomain }}
      -- cgit v1.2.3 From 3044b21eb6db408c1e1981731040391829c80c22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 25 Aug 2013 08:49:21 +0200 Subject: title page in article view was wrong --- 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 97b76fee..28508772 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -1,5 +1,5 @@ {% extends "layout.twig" %} -{% block title %}{% trans "home" %}{% endblock %} +{% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %} {% block content %}
      -- cgit v1.2.3