From a78d6afeaafb372cb5d620db7361b8ad98f070dc Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 24 Aug 2015 19:58:23 +0200 Subject: Move baggy theme in its folder --- .../views/themes/baggy/Entry/edit.html.twig | 7 ++ .../views/themes/baggy/Entry/entries.html.twig | 48 ++++++++++ .../views/themes/baggy/Entry/entries.xml.twig | 34 +++++++ .../views/themes/baggy/Entry/entry.html.twig | 104 +++++++++++++++++++++ .../views/themes/baggy/Entry/new.html.twig | 7 ++ .../views/themes/baggy/Entry/new_form.html.twig | 15 +++ 6 files changed, 215 insertions(+) create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/edit.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/edit.html.twig new file mode 100644 index 00000000..0d4d5ad2 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/edit.html.twig @@ -0,0 +1,7 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{% trans %}Edit an entry{% endtrans %}{% endblock %} + +{% block content %} + {{ form(form) }} +{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig new file mode 100644 index 00000000..0d295431 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig @@ -0,0 +1,48 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title "Unread" %} + +{% block content %} + {% block pager %} + {% if entries is not empty %} +
+
{{ entries.count }} {% trans %}entries{% endtrans %}
+ +
+ {% endif %} + {% endblock %} + + {% if entries is empty %} +

{% trans %}No articles found.{% endtrans %}

+ {% else %} +
{{ form_rest(form) }}
+ {% for entry in entries %} +
+

{{ entry.title|raw }}

+ {% if entry.readingTime > 0 %} +
{% trans %}estimated reading time :{% endtrans %} {{ entry.readingTime }} min
+ {% else %} +
{% trans %}estimated reading time :{% endtrans %} < 1 min
+ {% endif %} + + + {% if entry.previewPicture is null %} +

{{ entry.content|striptags|slice(0, 300) }}…

+ {% else %} + {{ entry.title|raw }} + {% endif %} +
+ {% endfor %} + {% endif %} +{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig new file mode 100644 index 00000000..a39a8dc3 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig @@ -0,0 +1,34 @@ + + + + wallabag — {{type}} feed + {{ url('unread') }} + {{ "now"|date('D, d M Y H:i:s') }} + wallabag + wallabag {{type}} elements + + {% for entry in entries %} + + + <![CDATA[{{ entry.title }}]]> + wallabag + {{ url('view', { 'id': entry.id }) }} + {{ url('view', { 'id': entry.id }) }} + {{ entry.createdAt|date('D, d M Y H:i:s') }} + + 0 -%} + {% trans %}estimated reading time :{% endtrans %} {{ entry.readingTime }} min + {%- else -%} + {% trans %}estimated reading time :{% endtrans %} < 1 min + {%- endif %} + + {{ entry.content|raw -}} + ]]> + + + + {% endfor %} + + + diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig new file mode 100644 index 00000000..f58d0399 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@ -0,0 +1,104 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{{ entry.title|raw }} ({{ entry.domainName }}){% endblock %} + +{% block content %} +
+ +
+
+
+

{{ entry.title|raw }} ✎

+
+ + {% if entry.previewPicture is not null %} +
{{ entry.title|raw }}
+ {% endif %} +
+ {{ entry.content | raw }} +
+
+ + +{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new.html.twig new file mode 100644 index 00000000..95ed0785 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new.html.twig @@ -0,0 +1,7 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{% trans %}Save new entry{% endtrans %}{% endblock %} + +{% block content %} + {{ render(controller( "WallabagCoreBundle:Entry:addEntryForm" )) }} +{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig new file mode 100644 index 00000000..d182d552 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig @@ -0,0 +1,15 @@ +
+ + {% if form_errors(form) %} + {{ form_errors(form) }} + {% endif %} + + {% if form_errors(form.url) %} + {{ form_errors(form.url) }} + {% endif %} + + {{ form_label(form.url) }} + {{ form_widget(form.url) }} + + +
-- cgit v1.2.3 From d2fcbf5d846eabb89714f4c59ff6729e2666a948 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 24 Aug 2015 20:43:29 +0200 Subject: Handle filter form using some JS Instead of displaying an ugly form --- .../views/themes/baggy/Entry/entries.html.twig | 28 +++++++++++++++------- 1 file changed, 19 insertions(+), 9 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index 0d295431..28bf0ab9 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig @@ -4,24 +4,34 @@ {% block content %} {% block pager %} - {% if entries is not empty %}
{{ entries.count }} {% trans %}entries{% endtrans %}
- - {% endif %} {% endblock %} + + {% if entries is empty %}

{% trans %}No articles found.{% endtrans %}

{% else %} -
{{ form_rest(form) }}
{% for entry in entries %}

{{ entry.title|raw }}

-- cgit v1.2.3 From 5def3f5862c4c8cc3faa19cd79a3746570064790 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 25 Aug 2015 23:24:24 +0200 Subject: Filters view on side for baggy --- .../views/themes/baggy/Entry/entries.html.twig | 75 +++++++++++++++++++--- 1 file changed, 66 insertions(+), 9 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index 28bf0ab9..26cafc42 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig @@ -20,15 +20,6 @@
{% endblock %} - - {% if entries is empty %}

{% trans %}No articles found.{% endtrans %}

{% else %} @@ -55,4 +46,70 @@
{% endfor %} {% endif %} + + + {% endblock %} -- cgit v1.2.3 From 5e98404dfb701ca6653241496205f828952540db Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 13 Sep 2015 15:17:58 +0200 Subject: Re-add preview picture on baggy Which should has been removed on merge --- .../Resources/views/themes/baggy/Entry/entries.html.twig | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index 26cafc42..176290e4 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig @@ -65,6 +65,11 @@ {{ form_widget(form.isStarred) }} + +
+ {{ form_widget(form.previewPicture) }} + +
@@ -72,7 +77,7 @@
- {{ form_widget(form.readingTime.left_number, {'type': 'number'}) }} + {{ form_widget(form.readingTime.left_number, {'type': 'number'}) }}
-- cgit v1.2.3