From 561ea4c851309dd2ea5947eb51c6a68fa7df8bb7 Mon Sep 17 00:00:00 2001
From: Michael RICOIS <mricois@scores-decisions.com>
Date: Mon, 16 Apr 2012 12:48:49 +0000
Subject: [PATCH] Meilleur affichage de la pagination

---
 .../default/scripts/surveillance/liste.phtml  | 46 ++++++++++---------
 public/themes/default/styles/surveillance.css | 16 ++++++-
 2 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/application/views/default/scripts/surveillance/liste.phtml b/application/views/default/scripts/surveillance/liste.phtml
index 70503f904..df6dfeb8b 100644
--- a/application/views/default/scripts/surveillance/liste.phtml
+++ b/application/views/default/scripts/surveillance/liste.phtml
@@ -67,19 +67,20 @@ par
 <h2>Liste des surveillances</h2>
 <div class="paragraph">
 <?php if ($this->curPage>=1) { ?>
-<a href="<?=$this->url(array(
-	'action' => 'liste',
-	'page' => $this->curPage-1))
-?>" title="Page précédente..."> << </a>
+<a class="pagination" href="<?=$this->url(array('action' => 'liste', 'page' => $this->curPage-1))?>" 
+	title="Page précédente..."> &lt;&lt; </a>
 <?php } ?>
 <?php if ($this->curPage!=$this->totPage) { ?>
-<span>Page <?=$this->curPage+1?>/<?=$this->totPage?></span>
+<span>Page <select name="page">
+<?php for ($i=1;$i<$this->totPage+1;$i++) {?> 	
+<option value="<?=$this->url(array('action' => 'liste', 'page' => $i-1))?>"
+ <?=($i==$this->curPage+1)? ' selected' : ''?>><?=$i?></option>
+<?php }?></select> / <?=$this->totPage?>
+</span>
 <?php } ?>
 <?php if ($this->curPage+1<$this->totPage) { ?>
-<a href="<?=$this->url(array(
-	'action' => 'liste',
-	'page' => $this->curPage+1))
-?>" title="Page suivante..."> >>  </a>
+<a class="pagination" href="<?=$this->url(array('action' => 'liste', 'page' => $this->curPage+1))?>" 
+	title="Page suivante..."> &gt;&gt; </a>
 <?php } ?>
 </div>
 
@@ -229,23 +230,22 @@ par
 </table>
 </div>
 
-<pre><?php //print_r($this->surveillances) ?></pre>
-
 <div class="paragraph">
-<?php if ($this->curPage>1) { ?>
-<a href="<?=$this->url(array(
-	'action' => 'liste',
-	'page' => $this->curPage-1))
-?>" title="Page précédente..."> << </a>
+<?php if ($this->curPage>=1) { ?>
+<a class="pagination" href="<?=$this->url(array('action' => 'liste', 'page' => $this->curPage-1))?>" 
+	title="Page précédente..."> &lt;&lt; </a>
 <?php } ?>
 <?php if ($this->curPage!=$this->totPage) { ?>
-<span>Page <?=$this->curPage+1?>/<?=$this->totPage?></span>
+<span>Page <select name="page">
+<?php for ($i=1;$i<$this->totPage+1;$i++) {?> 	
+<option value="<?=$this->url(array('action' => 'liste', 'page' => $i-1))?>"
+ <?=($i==$this->curPage+1)? ' selected' : ''?>><?=$i?></option>
+<?php }?></select> / <?=$this->totPage?>
+</span>
 <?php } ?>
 <?php if ($this->curPage+1<$this->totPage) { ?>
-<a href="<?=$this->url(array(
-	'action' => 'liste',
-	'page' => $this->curPage+1))
-?>" title="Page suivante..."> >>  </a>
+<a class="pagination" href="<?=$this->url(array('action' => 'liste', 'page' => $this->curPage+1))?>" 
+	title="Page suivante..."> &gt;&gt; </a>
 <?php } ?>
 </div>
 
@@ -263,6 +263,10 @@ function submitTri() {
 }
 
 $(document).ready(function() {
+	$('select[name=page]').change(function(){
+		window.location.href = $(this).val();
+	});
+
     $('select[name=type]').change(function() {
 		submitTri();
     });
diff --git a/public/themes/default/styles/surveillance.css b/public/themes/default/styles/surveillance.css
index 7767d6d8a..e995d6dc3 100644
--- a/public/themes/default/styles/surveillance.css
+++ b/public/themes/default/styles/surveillance.css
@@ -97,4 +97,18 @@
 	background-color:#4D90FE; 
 	border:1px solid #3079ED;
 	color:#ffffff; 
-}
\ No newline at end of file
+}
+
+.pagination {
+    background: none repeat scroll 0 0 transparent; 
+    border: 0 none; 
+    font-weight: bold; 
+    margin: 0; 
+    min-width: 1.5em; 
+    padding: 0.3em 0.5em;
+}
+
+.pagination:hover {
+    background: black repeat scroll 0 0;
+    color:white;
+}