aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--inc/poche/Poche.class.php2
-rw-r--r--tpl/css/style.css21
-rw-r--r--tpl/home.twig11
3 files changed, 29 insertions, 5 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index a8f64151..89e94a3a 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -262,6 +262,7 @@ class Poche
262 $tpl_vars = array( 262 $tpl_vars = array(
263 'entries' => '', 263 'entries' => '',
264 'page_links' => '', 264 'page_links' => '',
265 'nb_results' => '',
265 ); 266 );
266 if (count($entries) > 0) { 267 if (count($entries) > 0) {
267 $this->pagination->set_total(count($entries)); 268 $this->pagination->set_total(count($entries));
@@ -269,6 +270,7 @@ class Poche
269 $datas = $this->store->getEntriesByView($view, $this->user->getId(), $this->pagination->get_limit()); 270 $datas = $this->store->getEntriesByView($view, $this->user->getId(), $this->pagination->get_limit());
270 $tpl_vars['entries'] = $datas; 271 $tpl_vars['entries'] = $datas;
271 $tpl_vars['page_links'] = $page_links; 272 $tpl_vars['page_links'] = $page_links;
273 $tpl_vars['nb_results'] = count($entries);
272 } 274 }
273 Tools::logm('display ' . $view . ' view'); 275 Tools::logm('display ' . $view . ' view');
274 break; 276 break;
diff --git a/tpl/css/style.css b/tpl/css/style.css
index 5aca9aec..5f7fd77d 100644
--- a/tpl/css/style.css
+++ b/tpl/css/style.css
@@ -98,6 +98,10 @@ a, a:hover, a:visited {
98#main #content .entrie { 98#main #content .entrie {
99 border-bottom: 1px dashed #222; 99 border-bottom: 1px dashed #222;
100} 100}
101/* First entry */
102#main #content .results + .entrie {
103 clear: both;
104}
101 105
102#main .entrie .tools { 106#main .entrie .tools {
103 list-style-type: none; 107 list-style-type: none;
@@ -189,11 +193,22 @@ a, a:hover, a:visited {
189} 193}
190 194
191 195
192/* Pagination */ 196.results {
193.pagination { 197 overflow: hidden;
194 clear: both;
195 padding-bottom: 20px; 198 padding-bottom: 20px;
196 padding-top: 10px; 199 padding-top: 10px;
200}
201
202.nb-results {
203 float: left;
204 font-size: 0.9em;
205 line-height: 24px;
206 vertical-align: middle;
207}
208
209/* Pagination */
210.pagination {
211 float: right;
197 text-align: right; 212 text-align: right;
198} 213}
199.pagination a { 214.pagination a {
diff --git a/tpl/home.twig b/tpl/home.twig
index f44e040e..771c36c5 100644
--- a/tpl/home.twig
+++ b/tpl/home.twig
@@ -20,10 +20,17 @@
20 {% endif %} 20 {% endif %}
21{% endblock %} 21{% endblock %}
22{% block content %} 22{% block content %}
23 {{ page_links | raw }}
24 {% if entries is empty %} 23 {% if entries is empty %}
25 <div class="messages warning"><p>{% trans "No link available here!" %}</p></div> 24 <div class="messages warning"><p>{% trans "No link available here!" %}</p></div>
26 {% else %} 25 {% else %}
26 {% block pager %}
27 {% if nb_results > 1 %}
28 <div class="results">
29 <div class="nb-results">{{ nb_results }} {% trans "results" %}</div>
30 {{ page_links | raw }}
31 </div>
32 {% endif %}
33 {% endblock %}
27 {% for entry in entries %} 34 {% for entry in entries %}
28 <div id="entry-{{ entry.id|e }}" class="entrie"> 35 <div id="entry-{{ entry.id|e }}" class="entrie">
29 <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2> 36 <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
@@ -38,5 +45,5 @@
38 </div> 45 </div>
39 {% endfor %} 46 {% endfor %}
40 {% endif %} 47 {% endif %}
41 {{ page_links | raw }} 48 {{ block('pager') }}
42{% endblock %} \ No newline at end of file 49{% endblock %} \ No newline at end of file