Ignore files that may not be commited

stijnhau · May 28, 2014 · f294bbe · f294bbe
1 parent 57a3976
commit f294bbe
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+/.buildpath
+/.project
+/.settings
diff --git a/config/ZfcUserList.global.php.dist b/config/ZfcUserList.global.php.dist
@@ -25,14 +25,15 @@ $settings = array(
     'userListElements' => array('Id' => 'id', 'Email address' => 'email', 'Display name' => 'display_name')
 
     /**
-     * [WIP]
+     * The amount of elements(users) shown per page.
      */
-    'orderBy' => 'username',
+    'elementsPerPage' => '10',
+
 
     /**
      * [WIP]
      */
-    'elementsPerPage' => '10',
+    'orderBy' => 'username',
 );
 
 /**

diff --git a/src/ZfcUserList/Controller/UserListController.php b/src/ZfcUserList/Controller/UserListController.php
@@ -22,7 +22,7 @@ public function listAction()
             $paginator = $users;
         }
 
-        $paginator->setItemCountPerPage(10);
+        $paginator->setItemCountPerPage($this->getOptions()->getElementsPerPage());
         $paginator->setCurrentPageNumber($this->getEvent()->getRouteMatch()->getParam('p'));
         return array(
             'users' => $paginator,

diff --git a/src/ZfcUserList/Options/ModuleOptions.php b/src/ZfcUserList/Options/ModuleOptions.php
@@ -19,6 +19,8 @@ class ModuleOptions extends AbstractOptions implements
      */
     protected $userListElements = array('Id' => 'id', 'Email address' => 'email');
 
+    protected $elementsPerPage = 10;
+
     protected $userMapper = 'ZfcUserList\Mapper\UserDoctrine';
 
     public function setUserMapper($userMapper)
@@ -40,4 +42,14 @@ public function getUserListElements()
     {
         return $this->userListElements;
     }
+
+    public function setElementsPerPage($elementsPerPage)
+    {
+        $this->elementsPerPage = $elementsPerPage;
+    }
+
+    public function getElementsPerPage()
+    {
+        return $this->elementsPerPage;
+    }
 }
diff --git a/view/zfc-user-list/user-list/pagination_userlist.phtml b/view/zfc-user-list/user-list/pagination_userlist.phtml
@@ -1,4 +1,4 @@
-<?php if ($this->pageCount): ?>
+<?php if ($this->pageCount):?>
 
 <ul class="pagination ">
 
@@ -9,7 +9,7 @@
 
     <!-- Previous page link -->
     <li<?php echo (isset($this->previous)) ? '' : ' class="disabled"'; ?>>
-        <a href="<?php echo $this->url('zfcuser/zfcuserlist', array('p' => $this->previous-9)); ?>">&lt; Previous 10</a>
+        <a href="<?php echo $this->url('zfcuser/zfcuserlist', array('p' => $this->previous-$this->itemCountPerPage+1)); ?>">&lt; Previous <?php echo $this->itemCountPerPage; ?></a>
     </li>
 
     <!-- Numbered page links -->
@@ -21,7 +21,7 @@
 
     <!-- Next page link -->
     <li<?php echo (isset($this->next)) ? '' : ' class="disabled"'; ?>>
-        <a href="<?php echo $this->url('zfcuser/zfcuserlist', array('p' => $this->next+9)); ?>">Next 10 &gt;</a>
+        <a href="<?php echo $this->url('zfcuser/zfcuserlist', array('p' => $this->next+$this->itemCountPerPage-1)); ?>">Next <?php echo $this->itemCountPerPage; ?> &gt;</a>
     </li>
 
     <!-- Last page link -->