diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views')
4 files changed, 5 insertions, 20 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 22f456da..04e51955 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 | |||
@@ -6,23 +6,16 @@ | |||
6 | {% block pager %} | 6 | {% block pager %} |
7 | <div class="results"> | 7 | <div class="results"> |
8 | <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div> | 8 | <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div> |
9 | <div class="pagination"> | 9 | <div class="pagination"> |
10 | <a href="#" id="filter">{{ 'entry.filters.title'|trans }}</a> | 10 | <a href="#" id="filter">{{ 'entry.filters.title'|trans }}</a> |
11 | {% if entries is not empty %} | 11 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} |
12 | – | ||
13 | {% for p in range(1, entries.nbPages) if entries.nbPages > 1 %} | ||
14 | <li> | ||
15 | <a href="{{ path(app.request.attributes.get('_route'), app.request.query.all|merge({'page': p})) }}" class="{{ currentPage == p ? 'current':''}}" >{{ p }}</a> | ||
16 | </li> | ||
17 | {% endfor %} | ||
18 | {% endif %} | ||
19 | </div> | 12 | </div> |
20 | </div> | 13 | </div> |
21 | {% endblock %} | 14 | {% endblock %} |
22 | 15 | ||
23 | {% for entry in entries %} | 16 | {% for entry in entries %} |
24 | <div id="entry-{{ entry.id|e }}" class="entry"> | 17 | <div id="entry-{{ entry.id|e }}" class="entry"> |
25 | <h2><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></h2> | 18 | <h2><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|raw }}</a></h2> |
26 | 19 | ||
27 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} | 20 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} |
28 | <div class="estimatedTime"> | 21 | <div class="estimatedTime"> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig index 5687e48c..0b54556a 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig | |||
@@ -67,7 +67,6 @@ | |||
67 | <tr><td>doctrine/lexer</td><td>MIT</td></tr> | 67 | <tr><td>doctrine/lexer</td><td>MIT</td></tr> |
68 | <tr><td>doctrine/migrations</td><td>LGPL-2.1</td></tr> | 68 | <tr><td>doctrine/migrations</td><td>LGPL-2.1</td></tr> |
69 | <tr><td>doctrine/orm</td><td>MIT</td></tr> | 69 | <tr><td>doctrine/orm</td><td>MIT</td></tr> |
70 | <tr><td>ezyang/htmlpurifier</td><td>LGPL</td></tr> | ||
71 | <tr><td>friendsofsymfony/oauth-server-bundle</td><td>MIT</td></tr> | 70 | <tr><td>friendsofsymfony/oauth-server-bundle</td><td>MIT</td></tr> |
72 | <tr><td>friendsofsymfony/oauth2-php</td><td>MIT</td></tr> | 71 | <tr><td>friendsofsymfony/oauth2-php</td><td>MIT</td></tr> |
73 | <tr><td>friendsofsymfony/rest-bundle</td><td>MIT</td></tr> | 72 | <tr><td>friendsofsymfony/rest-bundle</td><td>MIT</td></tr> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 15eb16d4..05cab954 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | |||
@@ -21,13 +21,7 @@ | |||
21 | <div class="nb-results left"> | 21 | <div class="nb-results left"> |
22 | {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} | 22 | {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} |
23 | </div> | 23 | </div> |
24 | <ul class="pagination right"> | 24 | {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }} |
25 | {% for p in range(1, entries.nbPages) if entries.nbPages > 1 %} | ||
26 | <li class="{{ currentPage == p ? 'active':'waves-effect'}}"> | ||
27 | <a href="{{ path(app.request.attributes.get('_route'), app.request.query.all|merge({'page': p})) }}">{{ p }}</a> | ||
28 | </li> | ||
29 | {% endfor %} | ||
30 | </ul> | ||
31 | </div> | 25 | </div> |
32 | {% endblock %} | 26 | {% endblock %} |
33 | <br /> | 27 | <br /> |
@@ -48,7 +42,7 @@ | |||
48 | <i class="card-title grey-text text-darken-4 activator mdi-navigation-more-vert right"></i> | 42 | <i class="card-title grey-text text-darken-4 activator mdi-navigation-more-vert right"></i> |
49 | {% endif %} | 43 | {% endif %} |
50 | 44 | ||
51 | <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|striptags|slice(0, 42)|raw }}</a></span> | 45 | <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|striptags|slice(0, 42)|raw }}</a></span> |
52 | 46 | ||
53 | <div class="estimatedTime grey-text"> | 47 | <div class="estimatedTime grey-text"> |
54 | <span class="tool reading-time"> | 48 | <span class="tool reading-time"> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig index 4b1fdcce..f77f092e 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig | |||
@@ -76,7 +76,6 @@ | |||
76 | <tr><td>doctrine/lexer</td><td>MIT</td></tr> | 76 | <tr><td>doctrine/lexer</td><td>MIT</td></tr> |
77 | <tr><td>doctrine/migrations</td><td>LGPL-2.1</td></tr> | 77 | <tr><td>doctrine/migrations</td><td>LGPL-2.1</td></tr> |
78 | <tr><td>doctrine/orm</td><td>MIT</td></tr> | 78 | <tr><td>doctrine/orm</td><td>MIT</td></tr> |
79 | <tr><td>ezyang/htmlpurifier</td><td>LGPL</td></tr> | ||
80 | <tr><td>friendsofsymfony/oauth-server-bundle</td><td>MIT</td></tr> | 79 | <tr><td>friendsofsymfony/oauth-server-bundle</td><td>MIT</td></tr> |
81 | <tr><td>friendsofsymfony/oauth2-php</td><td>MIT</td></tr> | 80 | <tr><td>friendsofsymfony/oauth2-php</td><td>MIT</td></tr> |
82 | <tr><td>friendsofsymfony/rest-bundle</td><td>MIT</td></tr> | 81 | <tr><td>friendsofsymfony/rest-bundle</td><td>MIT</td></tr> |