moparisthebest/wallabag
1
0
Fork 0
mirror of https://github.com/moparisthebest/wallabag synced 2024-11-23 17:42:15 -05:00
Code Issues Releases Wiki Activity

Merge pull request #199 from NumEricR/nb-results

Browse Source 
Add the number of results next to pager
This commit is contained in:
Nicolas Lœuillet 2013-09-09 04:55:56 -07:00
commit ef6051b95e
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/poche/Poche.class.php
View File

@ -262,6 +262,7 @@ class Poche
$tpl_vars = array(
'entries' => '',
'page_links' => '',
'nb_results' => '',
);
if (count($entries) > 0) {
$this->pagination->set_total(count($entries));
@ -269,6 +270,7 @@ class Poche
$datas = $this->store->getEntriesByView($view, $this->user->getId(), $this->pagination->get_limit());
$tpl_vars['entries'] = $datas;
$tpl_vars['page_links'] = $page_links;
$tpl_vars['nb_results'] = count($entries);
}
Tools::logm('display ' . $view . ' view');
break;

21
tpl/css/style.css
View File

@ -98,6 +98,10 @@ a, a:hover, a:visited {
#main #content .entrie {
border-bottom: 1px dashed #222;
}
/* First entry */
#main #content .results + .entrie {
clear: both;
}
#main .entrie .tools {
list-style-type: none;
@ -189,11 +193,22 @@ a, a:hover, a:visited {
}
/* Pagination */
.pagination {
clear: both;
.results {
overflow: hidden;
padding-bottom: 20px;
padding-top: 10px;
}
.nb-results {
float: left;
font-size: 0.9em;
line-height: 24px;
vertical-align: middle;
}
/* Pagination */
.pagination {
float: right;
text-align: right;
}
.pagination a {

11
tpl/home.twig
View File

@ -18,10 +18,17 @@
</ul>
{% endblock %}
{% block content %}
{{ page_links | raw }}
{% if entries is empty %}
<div class="messages warning"><p>{% trans "No link available here!" %}</p></div>
{% else %}
{% block pager %}
{% if nb_results > 1 %}
<div class="results">
<div class="nb-results">{{ nb_results }} {% trans "results" %}</div>
{{ page_links | raw }}
</div>
{% endif %}
{% endblock %}
{% for entry in entries %}
<div id="entry-{{ entry.id|e }}" class="entrie">
<h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
@ -36,5 +43,5 @@
</div>
{% endfor %}
{% endif %}
{{ page_links | raw }}
{{ block('pager') }}
{% endblock %}