From cf4e7841295b93a277490f228dd91a967924e0cf Mon Sep 17 00:00:00 2001
From: naomiaro <naomiaro@gmail.com>
Date: Mon, 3 Jan 2011 13:29:57 -0500
Subject: [PATCH] CC-1749 added pagination to media files display.

---
 application/controllers/LibraryController.php |   1 +
 application/models/StoredFile.php             |   2 +-
 .../views/scripts/library/contents.phtml      |   3 -
 .../views/scripts/library/paginator.phtml     | 100 ++++++++++--------
 4 files changed, 58 insertions(+), 48 deletions(-)

diff --git a/application/controllers/LibraryController.php b/application/controllers/LibraryController.php
index b12a98bbe..824d3b158 100644
--- a/application/controllers/LibraryController.php
+++ b/application/controllers/LibraryController.php
@@ -32,6 +32,7 @@ class LibraryController extends Zend_Controller_Action
 	
 		$this->_helper->layout->setLayout('library');
 
+		unset($this->search_sess->page);
 		unset($this->search_sess->md);
 		
 		$this->_helper->actionStack('contents', 'library');
diff --git a/application/models/StoredFile.php b/application/models/StoredFile.php
index cab6c3b71..930db0dd1 100644
--- a/application/models/StoredFile.php
+++ b/application/models/StoredFile.php
@@ -1841,7 +1841,7 @@ class StoredFile {
 			$paginate = " LIMIT ".$limit. " OFFSET " .$offset;
 			$sql = $sql . $paginate;
 		}
-		echo $sql;
+		//echo $sql;
 
 		return $CC_DBC->getAll($sql);
 	}
diff --git a/application/views/scripts/library/contents.phtml b/application/views/scripts/library/contents.phtml
index a365602df..1ea505484 100644
--- a/application/views/scripts/library/contents.phtml
+++ b/application/views/scripts/library/contents.phtml
@@ -22,9 +22,6 @@
 
 <?php 
 
-echo "page: " . $this->page;
-echo "curr: " . $this->curr;
-
 echo $this->paginationControl($this->paginator,
                                     'Sliding',
                                     'library/paginator.phtml'); 
diff --git a/application/views/scripts/library/paginator.phtml b/application/views/scripts/library/paginator.phtml
index ee091e39c..3e2c78656 100644
--- a/application/views/scripts/library/paginator.phtml
+++ b/application/views/scripts/library/paginator.phtml
@@ -1,44 +1,56 @@
- 
-<?php if ($this->pageCount): ?>
-<div class="paginationControl">
-<?php echo $this->firstItemNumber; ?> - <?php echo $this->lastItemNumber; ?>
-of <?php echo $this->totalItemCount; ?>
- 
-<!-- First page link -->
-<?php if (isset($this->previous)): ?>
-  <a href="<?php echo $this->url(array('page' => $this->first)); ?>">
-    First
-  </a> |
-<?php else: ?>
-  <span class="disabled">First</span> |
-<?php endif; ?>
- 
-<!-- Previous page link -->
-<?php if (isset($this->previous)): ?>
-  <a href="<?php echo $this->url(array('page' => $this->previous)); ?>">
-    &lt; Previous
-  </a> |
-<?php else: ?>
-  <span class="disabled">&lt; Previous</span> |
-<?php endif; ?>
- 
-<!-- Next page link -->
-<?php if (isset($this->next)): ?>
-  <a href="<?php echo $this->url(array('page' => $this->next)); ?>">
-    Next &gt;
-  </a> |
-<?php else: ?>
-  <span class="disabled">Next &gt;</span> |
-<?php endif; ?>
- 
-<!-- Last page link -->
-<?php if (isset($this->next)): ?>
-  <a href="<?php echo $this->url(array('page' => $this->last)); ?>">
-    Last
-  </a>
-<?php else: ?>
-  <span class="disabled">Last</span>
-<?php endif; ?>
- 
-</div>
-<?php endif; ?>
+<p>
+	<?php if ($this->pageCount): ?>
+	<div class="paginationControl">
+	<?php echo $this->firstItemNumber; ?> - <?php echo $this->lastItemNumber; ?>
+	of <?php echo $this->totalItemCount; ?>
+</p>
+
+<p>
+	<!-- First page link -->
+	<?php if (isset($this->previous)): ?>
+	  <a href="<?php echo $this->url(array('page' => $this->first)); ?>">
+		First
+	  </a> |
+	<?php else: ?>
+	  <span class="disabled">First</span> |
+	<?php endif; ?>
+	 
+	<!-- Previous page link -->
+	<?php if (isset($this->previous)): ?>
+	  <a href="<?php echo $this->url(array('page' => $this->previous)); ?>">
+		&lt; Previous
+	  </a> |
+	<?php else: ?>
+	  <span class="disabled">&lt; Previous</span> |
+	<?php endif; ?>
+	 
+	<!-- current pages links -->
+	<?php foreach ($this->pagesInRange as $page): ?>
+		<?php if ($this->current != $page): ?>
+			<a href="<?php echo $this->url(array('page' => $page));?>"><?php echo $page; ?></a>
+		<?php else: ?>
+			<?php echo $page; ?>
+		<?php endif; ?>
+	<?php endforeach; ?>
+
+	<!-- Next page link -->
+	<?php if (isset($this->next)): ?>
+	  <a href="<?php echo $this->url(array('page' => $this->next)); ?>">
+		Next &gt;
+	  </a> |
+	<?php else: ?>
+	  <span class="disabled">Next &gt;</span> |
+	<?php endif; ?>
+	 
+	<!-- Last page link -->
+	<?php if (isset($this->next)): ?>
+	  <a href="<?php echo $this->url(array('page' => $this->last)); ?>">
+		Last
+	  </a>
+	<?php else: ?>
+	  <span class="disabled">Last</span>
+	<?php endif; ?>
+	 
+	</div>
+	<?php endif; ?>
+</p>