mirror of
https://github.com/wallabag/wallabag.git
synced 2024-11-27 11:31:05 +00:00
effect of block rebuilding on next page removed, issue #479
This commit is contained in:
parent
affbd83b48
commit
6065553c13
2 changed files with 41 additions and 40 deletions
|
@ -660,6 +660,7 @@ class Poche
|
||||||
'entries' => '',
|
'entries' => '',
|
||||||
'page_links' => '',
|
'page_links' => '',
|
||||||
'nb_results' => '',
|
'nb_results' => '',
|
||||||
|
'listmode' => (isset($_COOKIE['listmode']) ? true : false),
|
||||||
);
|
);
|
||||||
|
|
||||||
//if id is given - we retrive entries by tag: id is tag id
|
//if id is given - we retrive entries by tag: id is tag id
|
||||||
|
|
|
@ -12,45 +12,45 @@
|
||||||
{% include '_menu.twig' %}
|
{% include '_menu.twig' %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
{% block content %}
|
{% block content %}
|
||||||
{% if tag %}
|
{% if tag %}
|
||||||
<h3>{% trans "Tag" %}: <b>{{ tag.value }}</b></h3>
|
<h3>{% trans "Tag" %}: <b>{{ tag.value }}</b></h3>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if entries is empty %}
|
{% if entries is empty %}
|
||||||
<div class="messages warning"><p>{% trans "No articles found." %}</p></div>
|
<div class="messages warning"><p>{% trans "No articles found." %}</p></div>
|
||||||
{% else %}
|
{% else %}
|
||||||
<div>
|
<div>
|
||||||
{% include '_display-mode.twig' %}
|
{% include '_display-mode.twig' %}
|
||||||
{% include '_sorting.twig' %}
|
{% include '_sorting.twig' %}
|
||||||
</div>
|
</div>
|
||||||
{% block pager %}
|
{% block pager %}
|
||||||
{% if nb_results > 1 %}
|
{% if nb_results > 1 %}
|
||||||
<div class="results">
|
<div class="results">
|
||||||
<div class="nb-results">{{ nb_results }} {% trans "results" %}</div>
|
<div class="nb-results">{{ nb_results }} {% trans "results" %}</div>
|
||||||
{{ page_links | raw }}
|
{{ page_links | raw }}
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
<div class="list-entries">
|
<div class="list-entries">
|
||||||
{% for entry in entries %}
|
{% for entry in entries %}
|
||||||
<div id="entry-{{ entry.id|e }}" class="entrie">
|
<div id="entry-{{ entry.id|e }}" class="entrie"{% if listmode %} style="width:100%; margin-left:0;"{% endif %}>
|
||||||
<h2><a href="index.php?view=view&id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
|
<h2><a href="index.php?view=view&id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
|
||||||
{% if entry.content| getReadingTime > 0 %}
|
{% if entry.content| getReadingTime > 0 %}
|
||||||
<div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min</span></div>
|
<div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min</span></div>
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} <small class="inferieur"><</small> 1 min</span></div>
|
<div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} <small class="inferieur"><</small> 1 min</span></div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<ul class="tools links">
|
<ul class="tools links">
|
||||||
<li><a title="{% trans "Toggle mark as read" %}" class="tool icon-check icon {% if entry.is_read == 0 %}archive-off{% else %}archive{% endif %}" href="./?action=toggle_archive&id={{ entry.id|e }}"><span>{% trans "Toggle mark as read" %}</span></a></li>
|
<li><a title="{% trans "Toggle mark as read" %}" class="tool icon-check icon {% if entry.is_read == 0 %}archive-off{% else %}archive{% endif %}" href="./?action=toggle_archive&id={{ entry.id|e }}"><span>{% trans "Toggle mark as read" %}</span></a></li>
|
||||||
<li><a title="{% trans "toggle favorite" %}" class="tool icon-star icon {% if entry.is_fav == 0 %}fav-off{% else %}fav{% endif %}" href="./?action=toggle_fav&id={{ entry.id|e }}"><span>{% trans "toggle favorite" %}</span></a></li>
|
<li><a title="{% trans "toggle favorite" %}" class="tool icon-star icon {% if entry.is_fav == 0 %}fav-off{% else %}fav{% endif %}" href="./?action=toggle_fav&id={{ entry.id|e }}"><span>{% trans "toggle favorite" %}</span></a></li>
|
||||||
<li><a title="{% trans "delete" %}" class="tool delete icon-trash icon" href="./?action=delete&id={{ entry.id|e }}"><span>{% trans "delete" %}</span></a></li>
|
<li><a title="{% trans "delete" %}" class="tool delete icon-trash icon" href="./?action=delete&id={{ entry.id|e }}"><span>{% trans "delete" %}</span></a></li>
|
||||||
<li><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.url | e | getDomain }}</span></a></li>
|
<li><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.url | e | getDomain }}</span></a></li>
|
||||||
</ul>
|
</ul>
|
||||||
<p>{{ entry.content|striptags|slice(0, 300) }}...</p>
|
<p>{{ entry.content|striptags|slice(0, 300) }}...</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</div>
|
||||||
{% if view == 'home' %}{% if nb_results > 1 %}<a title="{% trans "Mark all the entries as read" %}" href="./?action=archive_all">{{ "Mark all the entries as read" }}</a>{% endif %}{% endif %}
|
{% if view == 'home' %}{% if nb_results > 1 %}<a title="{% trans "Mark all the entries as read" %}" href="./?action=archive_all">{{ "Mark all the entries as read" }}</a>{% endif %}{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{{ block('pager') }}
|
{{ block('pager') }}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
Loading…
Reference in a new issue