From d51ecb6ea8383cbced9c4e3972187f43fbc61f4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 4 Aug 2013 17:35:02 +0200 Subject: ignore vendor --- tpl/view.twig | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 tpl/view.twig (limited to 'tpl/view.twig') diff --git a/tpl/view.twig b/tpl/view.twig new file mode 100644 index 00000000..e68cd1a1 --- /dev/null +++ b/tpl/view.twig @@ -0,0 +1,58 @@ + + + + + + + + + + + {$title} + + + + + + + + + + + + +
+
+ +
+
+ +
+
+

{$title}

+ +
+ {include="messages"} +
+
+ {$content} +
+
+ +
+ + +
+
+ this article appears wrong? create an issue or contact us by mail +
+ + + {include="js"} + {include="footer"} \ No newline at end of file -- cgit v1.2.3 From 3ba5f81b7bc99d7ff954aa5b76aca93c9e157e67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 4 Aug 2013 18:07:41 +0200 Subject: twig implementation --- tpl/view.twig | 65 ++++++++++++++++++++++------------------------------------- 1 file changed, 24 insertions(+), 41 deletions(-) (limited to 'tpl/view.twig') diff --git a/tpl/view.twig b/tpl/view.twig index e68cd1a1..d2ec2071 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -1,58 +1,41 @@ - - - - - - - - - - - {$title} - - - - - - - - - - - - -
+{% extends "layout.twig" %} +{% block title %}{% trans "home" %}{% endblock %} + +{% block content %} +
- +
-

{$title}

- +

{{ entry.title|e }}

+
- {include="messages"}
- {$content} + {{ content|striptags }}
- +
- - + +
- this article appears wrong? create an issue or contact us by mail + {% trans "this article appears wrong?" %} {% trans "create an issue" %} {% trans "or" %} {% trans "contact us by mail" %}
- +
+{% endblock %} - {include="js"} - {include="footer"} \ No newline at end of file +{% block js %} + + +{% endblock %} \ No newline at end of file -- cgit v1.2.3 From 2a1791a4b1c319fc5bbc286d0bc94827fe1feec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 4 Aug 2013 22:51:12 +0200 Subject: view of an article --- 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 d2ec2071..8ef5cd9c 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -2,7 +2,7 @@ {% block title %}{% trans "home" %}{% endblock %} {% block content %} -
+
@@ -21,7 +21,7 @@
- {{ content|striptags }} + {{ content | raw }}
-- 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/view.twig | 1 + 1 file changed, 1 insertion(+) (limited to 'tpl/view.twig') diff --git a/tpl/view.twig b/tpl/view.twig index 8ef5cd9c..bf9a9af9 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -8,6 +8,7 @@
    + {% if constant('SHARE_TWITTER') == 1 %}
  • {% endif %}
  • {% trans "dark" %}
  • -- cgit v1.2.3 From 55821e04c188997d258645975220828e195d0df4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 5 Aug 2013 15:54:37 +0200 Subject: share email +twitter / class messages --- tpl/view.twig | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'tpl/view.twig') diff --git a/tpl/view.twig b/tpl/view.twig index bf9a9af9..692f9555 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -1,42 +1,40 @@ {% extends "layout.twig" %} {% block title %}{% trans "home" %}{% endblock %} - +{% block messages %} +{% include '_messages.twig' %} +{% endblock %} {% block content %}
    -
    - -
      - {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} -
    • -
    • {% trans "dark" %}
    • -
    • +
    • +
    • +
    • -
    • {% trans "logout" %}
    • + {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} + {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %}
    -

    {{ entry.title|e }}

    - +

    {{ entry.title|e }}

    +
    {{ content | raw }}
    - +
    - {% 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 %} {% block js %} - {% endblock %} \ No newline at end of file -- 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/view.twig | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) (limited to 'tpl/view.twig') diff --git a/tpl/view.twig b/tpl/view.twig index 692f9555..d0d85f8b 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -1,18 +1,17 @@ {% extends "layout.twig" %} {% block title %}{% trans "home" %}{% endblock %} -{% block messages %} -{% include '_messages.twig' %} -{% endblock %} {% block content %} -
    +
    -
      -
    • -
    • -
    • -
    • - {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} - {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} +
        +
      • +
      • + +
      • +
      • + {% if constant('SHARE_TWITTER') == 1 %}
      • {% endif %} + {% if constant('SHARE_MAIL') == 1 %}
      • {% endif %} +
    @@ -20,17 +19,22 @@
    - -
    - - -
    -
    - {% trans "this article appears wrong?" %} {% trans "create an issue" %} {% trans "or" %} {% trans "contact us by mail" %} +
    +
      +
    • +
    • +
    • + +
    • +
    • + {% 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" %}

    {% endblock %} -- cgit v1.2.3 From d28a7ca30fa50845a54b0e21844b20b373b7fd44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 5 Aug 2013 21:59:21 +0200 Subject: remove js --- tpl/view.twig | 4 ---- 1 file changed, 4 deletions(-) (limited to 'tpl/view.twig') diff --git a/tpl/view.twig b/tpl/view.twig index d0d85f8b..e999afa1 100644 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -37,8 +37,4 @@

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

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