diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2017-01-27 09:34:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-27 09:34:32 +0100 |
commit | 6fb06904ecde15b1b07d0a2af945338b416cf0e2 (patch) | |
tree | e76f3e8142399316ec5660fab8c646b2c34b8336 /src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig | |
parent | 05fa529bcfde01be5d320cb532900d72cf4b0830 (diff) | |
parent | 78295b99dd1721c613f1ce52e2debbe6f6db7753 (diff) | |
download | wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.tar.gz wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.tar.zst wallabag-6fb06904ecde15b1b07d0a2af945338b416cf0e2.zip |
Merge pull request #2416 from wallabag/2.2
wallabag 2.2.0
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig | 28 |
1 files changed, 20 insertions, 8 deletions
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 4679714e..859b166b 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 | |||
@@ -1,20 +1,25 @@ | |||
1 | {% extends "WallabagCoreBundle::layout.html.twig" %} | 1 | {% extends "WallabagCoreBundle::layout.html.twig" %} |
2 | 2 | ||
3 | {% block title %} | 3 | {% block title %} |
4 | {% set currentTag = '' %} | 4 | {% set filter = '' %} |
5 | {% if tag is defined %} | 5 | {% if tag is defined %} |
6 | {% set currentTag = tag %} | 6 | {% set filter = tag %} |
7 | {% endif %} | 7 | {% endif %} |
8 | {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'currentTag': currentTag} %} | 8 | {% if searchTerm is defined and searchTerm is not empty %} |
9 | {% set filter = searchTerm %} | ||
10 | {% endif %} | ||
11 | {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'filter': filter} %} | ||
9 | {% endblock %} | 12 | {% endblock %} |
10 | 13 | ||
11 | {% block content %} | 14 | {% block content %} |
12 | 15 | ||
16 | {% set listMode = app.user.config.listMode %} | ||
13 | <div class="results"> | 17 | <div class="results"> |
14 | <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div> | 18 | <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div> |
15 | <div class="pagination"> | 19 | <div class="pagination"> |
16 | <i class="btn-clickable download-btn material-icons md-36">file_download</i> | 20 | <a href="{{ path('switch_view_mode') }}"><i class="listMode-btn material-icons md-36">{% if listMode == 0 %}list{% else %}view_module{% endif %}</i></a> |
17 | <i class="btn-clickable filter-btn material-icons md-36">filter_list</i> | 21 | <i class="btn-clickable download-btn material-icons md-36 js-export-action">file_download</i> |
22 | <i class="btn-clickable filter-btn material-icons md-36 js-filters-action">filter_list</i> | ||
18 | {% if entries.getNbPages > 1 %} | 23 | {% if entries.getNbPages > 1 %} |
19 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} | 24 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} |
20 | {% endif %} | 25 | {% endif %} |
@@ -22,7 +27,7 @@ | |||
22 | </div> | 27 | </div> |
23 | 28 | ||
24 | {% for entry in entries %} | 29 | {% for entry in entries %} |
25 | <div id="entry-{{ entry.id|e }}" class="entry"> | 30 | <div id="entry-{{ entry.id|e }}" class="{% if listMode == 0 %}entry{% else %}listmode entry{% endif %}"> |
26 | <h2><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|e|raw }}">{{ entry.title|e|raw }}</a></h2> | 31 | <h2><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|e|raw }}">{{ entry.title|e|raw }}</a></h2> |
27 | 32 | ||
28 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} | 33 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} |
@@ -47,13 +52,13 @@ | |||
47 | <li><a title="{{ 'entry.list.delete'|trans }}" class="tool delete icon-trash icon" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.list.delete'|trans }}</span></a></li> | 52 | <li><a title="{{ 'entry.list.delete'|trans }}" class="tool delete icon-trash icon" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.list.delete'|trans }}</span></a></li> |
48 | <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.domainName|removeWww }}</span></a></li> | 53 | <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.domainName|removeWww }}</span></a></li> |
49 | </ul> | 54 | </ul> |
50 | {% if entry.previewPicture is null %} | 55 | {% if (entry.previewPicture is null or listMode == 1) %} |
51 | <ul class="card-entry-tags"> | 56 | <ul class="card-entry-tags"> |
52 | {% for tag in entry.tags %} | 57 | {% for tag in entry.tags %} |
53 | <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li> | 58 | <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li> |
54 | {% endfor %} | 59 | {% endfor %} |
55 | </ul> | 60 | </ul> |
56 | <p>{{ entry.content|striptags|slice(0, 300) }}…</p> | 61 | <p {% if listMode == 1 %}class="hide"{% endif %}>{{ entry.content|striptags|slice(0, 300) }}…</p> |
57 | {% else %} | 62 | {% else %} |
58 | <ul class="card-entry-labels"> | 63 | <ul class="card-entry-labels"> |
59 | {% for tag in entry.tags | slice(0, 3) %} | 64 | {% for tag in entry.tags | slice(0, 3) %} |
@@ -131,6 +136,13 @@ | |||
131 | </div> | 136 | </div> |
132 | </div> | 137 | </div> |
133 | 138 | ||
139 | <div id="filter-http-status" class="filter-group"> | ||
140 | {{ form_label(form.httpStatus) }} | ||
141 | <div class="input-field "> | ||
142 | {{ form_widget(form.httpStatus) }} | ||
143 | </div> | ||
144 | </div> | ||
145 | |||
134 | <div id="filter-reading-time" class="filter-group"> | 146 | <div id="filter-reading-time" class="filter-group"> |
135 | <div class=""> | 147 | <div class=""> |
136 | {{ form_label(form.readingTime) }} | 148 | {{ form_label(form.readingTime) }} |