From cb45270d39be5fcbcf3c70a0d3ee4b58624bcfd6 Mon Sep 17 00:00:00 2001
From: Frank Bergkemper <frank.bergkemper@dass-it.de>
Date: Tue, 25 Aug 2015 18:10:19 +0200
Subject: [PATCH] Pool: Native director connectivity

Replaces database connection with native director connection.
---
 .../Application/view/partial/paginator.phtml  |  13 +-
 module/Media/config/module.config.php         |   1 -
 module/Pool/config/module.config.php          |   9 +-
 .../src/Pool/Controller/PoolController.php    |  76 +++++++----
 module/Pool/src/Pool/Model/Pool.php           |  65 +--------
 module/Pool/src/Pool/Model/PoolTable.php      |  98 +------------
 module/Pool/view/pool/pool/details.phtml      | 129 ++++++++++--------
 module/Pool/view/pool/pool/index.phtml        |  84 +++++-------
 8 files changed, 167 insertions(+), 308 deletions(-)

diff --git a/module/Application/view/partial/paginator.phtml b/module/Application/view/partial/paginator.phtml
index 41e2ac58..e06f1626 100644
--- a/module/Application/view/partial/paginator.phtml
+++ b/module/Application/view/partial/paginator.phtml
@@ -1,18 +1,17 @@
-
 <?php if($this->pageCount): ?>
 
 <div>
-	
-	<ul class="pagination pagination-centered">
+
+	<ul class="pagination">
 
 		<!-- previous page link -->
 		<?php if(isset($this->previous)): ?>
 		<li>
-			<a href="<?php echo $this->url($this->route, array(), null, true); ?>?page=<?php echo $this->previous; ?>">previous</a>
+			<a href="<?php echo $this->url($this->route, array(), null, true); ?>?page=<?php echo $this->previous; ?>"><span aria-hidden="true">&laquo;</span></a>
 		</li>
 		<?php else: ?>
 		<li class="disabled">
-			<a href="#">previous</a>
+			<a href="#"><span aria-hidden="true">&laquo;</span></a>
 		</li>
 		<?php endif; ?>
 
@@ -46,11 +45,11 @@
 		<!-- next page link -->
 		<?php if(isset($this->next)): ?>
 			<li>
-				<a href="<?php echo $this->url($this->route, array(), null, true); ?>?page=<?php echo $this->next; ?>">next</a>
+				<a href="<?php echo $this->url($this->route, array(), null, true); ?>?page=<?php echo $this->next; ?>"><span aria-hidden="true">&raquo;</span></a>
 			</li>
 		<?php else: ?>
 			<li class="disabled">
-				<a href="#">next</a>
+				<a href="#"><span aria-hidden="true">&raquo;</span></a>
 			</li>
 		<?php endif; ?>
 
diff --git a/module/Media/config/module.config.php b/module/Media/config/module.config.php
index ef5ddb99..8e2c1af3 100644
--- a/module/Media/config/module.config.php
+++ b/module/Media/config/module.config.php
@@ -53,7 +53,6 @@
 						'action' => 'index',
 					),
 				),
-				
 			),
 		),
 	),
diff --git a/module/Pool/config/module.config.php b/module/Pool/config/module.config.php
index 35b19d42..832f4692 100644
--- a/module/Pool/config/module.config.php
+++ b/module/Pool/config/module.config.php
@@ -40,10 +40,10 @@
 			'pool' => array(
 				'type' => 'segment',
 				'options' => array(
-					'route' => '/pool[/][:action][/:id][order_by/:order_by][/:order][/][limit/:limit]',
+					'route' => '/pool[/][:action/][:id][/][limit/:limit]',
 					'constraints' => array(
-						'action' => '(?!\blimit\b)(?!\border_by\b)[a-zA-Z][a-zA-Z0-9_-]*',
-						'id' => '[0-9]+',
+						'action' => '(?!\blimit\b)[a-zA-Z][a-zA-Z0-9_-]*',
+						'id' => '[a-zA-Z][a-zA-Z0-9_-]*',
 						'order_by' => '[a-zA-Z][a-zA-Z0-9_-]*',
                                                 'order' => 'ASC|DESC',
                                                 'limit' => '[0-9]+',
@@ -51,9 +51,10 @@
 					'defaults' => array(
 						'controller' => 'Pool\Controller\Pool',
 						'action' => 'index',
+						'limit' => '[0-9]+'
 					),
 				),
-				
+
 			),
 		),
 	),
diff --git a/module/Pool/src/Pool/Controller/PoolController.php b/module/Pool/src/Pool/Controller/PoolController.php
index 5f747ebe..06b45bbf 100644
--- a/module/Pool/src/Pool/Controller/PoolController.php
+++ b/module/Pool/src/Pool/Controller/PoolController.php
@@ -5,7 +5,7 @@
  * bareos-webui - Bareos Web-Frontend
  *
  * @link      https://github.com/bareos/bareos-webui for the canonical source repository
- * @copyright Copyright (c) 2013-2014 Bareos GmbH & Co. KG (http://www.bareos.org/)
+ * @copyright Copyright (c) 2013-2015 Bareos GmbH & Co. KG (http://www.bareos.org/)
  * @license   GNU Affero General Public License (http://www.gnu.org/licenses/)
  *
  * This program is free software: you can redistribute it and/or modify
@@ -27,32 +27,32 @@
 
 use Zend\Mvc\Controller\AbstractActionController;
 use Zend\View\Model\ViewModel;
+use Zend\Paginator\Adapter\ArrayAdapter;
+use Zend\Paginator\Paginator;
 
 class PoolController extends AbstractActionController
 {
 
-	protected $poolTable;
-	protected $mediaTable;
-
 	public function indexAction()
 	{
 		if($_SESSION['bareos']['authenticated'] == true && $this->SessionTimeoutPlugin()->timeout()) {
-				$order_by = $this->params()->fromRoute('order_by') ? $this->params()->fromRoute('order_by') : 'PoolId';
-				$order = $this->params()->fromRoute('order') ? $this->params()->fromRoute('order') : 'DESC';
+
+				$pools = $this->getPools();
+				$page = (int) $this->params()->fromQuery('page');
 				$limit = $this->params()->fromRoute('limit') ? $this->params()->fromRoute('limit') : '25';
-				$paginator = $this->getPoolTable()->fetchAll(true, $order_by, $order);
-				$paginator->setCurrentPageNumber( (int) $this->params()->fromQuery('page', 1) );
+
+				$paginator = new Paginator(new ArrayAdapter($pools));
+				$paginator->setCurrentPageNumber($page);
 				$paginator->setItemCountPerPage($limit);
 
 				return new ViewModel(
 					array(
+						'limit' => $limit,
+						//'pools' => $pools,
 						'paginator' => $paginator,
-										'order_by' => $order_by,
-										'order' => $order,
-										'limit' => $limit,
-						'pools' => $this->getPoolTable()->fetchAll(),
 					)
 				);
+
 		}
 		else {
 				return $this->redirect()->toRoute('auth', array('action' => 'login'));
@@ -62,16 +62,26 @@ public function indexAction()
 	public function detailsAction()
 	{
 		if($_SESSION['bareos']['authenticated'] == true && $this->SessionTimeoutPlugin()->timeout()) {
-				$id = (int) $this->params()->fromRoute('id', 0);
 
-				if (!$id) {
-					return $this->redirect()->toRoute('pool');
-				}
+
+				$poolname = $this->params()->fromRoute('id');
+				$page = $this->params()->fromQuery('page');
+				$limit = $this->params()->fromRoute('limit') ? $this->params()->fromRoute('limit') : '25';
+
+				$pool = $this->getPool($poolname);
+				$media = $this->getPoolMedia($poolname);
+
+                                $paginator = new Paginator(new ArrayAdapter($media));
+                                $paginator->setCurrentPageNumber($page);
+                                $paginator->setItemCountPerPage($limit);
 
 				return new ViewModel(
 					array(
-						'pool' => $this->getPoolTable()->getPool($id),
-						'media' => $this->getMediaTable()->getPoolVolumes($id),
+						'poolname' => $poolname,
+						'limit' => $limit,
+						'pool' => $pool,
+						//'media' => $media,
+						'paginator' => $paginator,
 					)
 				);
 		}
@@ -80,22 +90,28 @@ public function detailsAction()
 		}
 	}
 
-	public function getPoolTable()
+	private function getPool($pool)
 	{
-		if(!$this->poolTable) {
-			$sm = $this->getServiceLocator();
-			$this->poolTable = $sm->get('Pool\Model\PoolTable');
-		}
-		return $this->poolTable;
+		$director = $this->getServiceLocator()->get('director');
+                $result = $director->send_command("llist pool=".$pool, 2, null);
+                $pools = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
+                return $pools['result']['pools'][0];
 	}
 
-	public function getMediaTable()
+	private function getPools()
 	{
-		if(!$this->mediaTable) {
-			$sm = $this->getServiceLocator();
-			$this->mediaTable = $sm->get('Media\Model\MediaTable');
-		}
-		return $this->mediaTable;
+		$director = $this->getServiceLocator()->get('director');
+		$result = $director->send_command("llist pools", 2, null);
+		$pools = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
+		return $pools['result']['pools'];
+	}
+
+	private function getPoolMedia($pool)
+	{
+		$director = $this->getServiceLocator()->get('director');
+                $result = $director->send_command("llist media pool=".$pool, 2, null);
+                $media = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
+                return $media['result']['media'];
 	}
 
 }
diff --git a/module/Pool/src/Pool/Model/Pool.php b/module/Pool/src/Pool/Model/Pool.php
index 6c61e4f6..eb0d75ea 100644
--- a/module/Pool/src/Pool/Model/Pool.php
+++ b/module/Pool/src/Pool/Model/Pool.php
@@ -3,9 +3,9 @@
 /**
  *
  * bareos-webui - Bareos Web-Frontend
- * 
+ *
  * @link      https://github.com/bareos/bareos-webui for the canonical source repository
- * @copyright Copyright (c) 2013-2014 Bareos GmbH & Co. KG (http://www.bareos.org/)
+ * @copyright Copyright (c) 2013-2015 Bareos GmbH & Co. KG (http://www.bareos.org/)
  * @license   GNU Affero General Public License (http://www.gnu.org/licenses/)
  *
  * This program is free software: you can redistribute it and/or modify
@@ -25,65 +25,6 @@
 
 namespace Pool\Model;
 
-class Pool 
+class Pool
 {
-
-	public $poolid;
-	public $name;
-	public $numvols;
-	public $maxvols;
-	public $useonce;
-	public $usecatalog;
-	public $acceptanyvolume;
-	public $volretention;
-	public $voluseduration;
-	public $maxvoljobs;
-	public $maxvolfiles;
-	public $maxvolbytes;
-	public $autoprune;
-	public $recycle;
-	public $actiononpurge;
-	public $pooltype;
-	public $labeltype;
-	public $labelformat;
-	public $enabled;
-	public $scratchpoolid;
-	public $recyclepoolid;
-	public $nextpoolid;
-	public $migrationhighbytes;
-	public $migrationlowbytes;
-	public $migrationtime;
-
-	public function exchangeArray($data)
-	{
-		$data = array_change_key_case($data, CASE_LOWER);
-
-		$this->poolid = (!empty($data['poolid'])) ? $data['poolid'] : null;
-		$this->name = (!empty($data['name'])) ? $data['name'] : null;
-		$this->numvols = (!empty($data['numvols'])) ? $data['numvols'] : null;
-		$this->maxvols = (!empty($data['maxvols'])) ? $data['maxvols'] : null;
-		$this->useonce = (!empty($data['useonce'])) ? $data['useonce'] : null;
-		$this->usecatalog = (!empty($data['usecatalog'])) ? $data['usecatalog'] : null;
-		$this->acceptanyvolume = (!empty($data['acceptanyvolume'])) ? $data['acceptanyvolume'] : null;
-		$this->volretention = (!empty($data['volretention'])) ? $data['volretention'] : null;
-		$this->voluseduration = (!empty($data['voluseduration'])) ? $data['voluseduration'] : null;
-		$this->maxvoljobs = (!empty($data['maxvoljobs'])) ? $data['maxvoljobs'] : null;
-		$this->maxvolfiles = (!empty($data['maxvolfiles'])) ? $data['maxvolfiles'] : null;
-		$this->maxvolbytes = (!empty($data['maxvolbytes'])) ? $data['maxvolbytes'] : null;
-		$this->autoprune = (!empty($data['autoprune'])) ? $data['autoprune'] : null;
-		$this->recycle = (!empty($data['recycle'])) ? $data['recycle'] : null;
-		$this->actiononpurge = (!empty($data['actiononpurge'])) ? $data['actiononpurge'] : null;
-		$this->pooltype = (!empty($data['pooltype'])) ? $data['pooltype'] : null;
-		$this->labeltype = (!empty($data['labeltype'])) ? $data['labeltype'] : null;
-		$this->labelformat = (!empty($data['labelformat'])) ? $data['labelformat'] : null;
-		$this->enabled = (!empty($data['enabled'])) ? $data['enabled'] : null;
-		$this->scratchpoolid = (!empty($data['scratchpoolid'])) ? $data['scratchpoolid'] : null;
-		$this->recyclepoolid = (!empty($data['recyclepoolid'])) ? $data['recyclepoolid'] : null;
-		$this->nextpoolid = (!empty($data['nextpoolid'])) ? $data['nextpoolid'] : null;
-		$this->migrationhighbytes = (!empty($data['migrationhighbytes'])) ? $data['migrationhighbytes'] : null;
-		$this->migrationlowbytes = (!empty($data['migrationlowbytes'])) ? $data['migrationlowbytes'] : null;
-		$this->migrationtime = (!empty($data['migrationtime'])) ? $data['migrationtime'] : null;
-	}
-
 }
-
diff --git a/module/Pool/src/Pool/Model/PoolTable.php b/module/Pool/src/Pool/Model/PoolTable.php
index 0cdf3135..15c9fd6e 100644
--- a/module/Pool/src/Pool/Model/PoolTable.php
+++ b/module/Pool/src/Pool/Model/PoolTable.php
@@ -5,7 +5,7 @@
  * bareos-webui - Bareos Web-Frontend
  *
  * @link      https://github.com/bareos/bareos-webui for the canonical source repository
- * @copyright Copyright (c) 2013-2014 Bareos GmbH & Co. KG (http://www.bareos.org/)
+ * @copyright Copyright (c) 2013-2015 Bareos GmbH & Co. KG (http://www.bareos.org/)
  * @license   GNU Affero General Public License (http://www.gnu.org/licenses/)
  *
  * This program is free software: you can redistribute it and/or modify
@@ -25,100 +25,6 @@
 
 namespace Pool\Model;
 
-use Zend\Db\ResultSet\ResultSet;
-use Zend\Db\TableGateway\TableGateway;
-use Zend\Db\Sql\Select;
-use Zend\Paginator\Adapter\DbSelect;
-use Zend\Paginator\Paginator;
-use Zend\ServiceManager\ServiceLocatorAwareInterface;
-use Zend\ServiceManager\ServiceLocatorInterface;
-use Bareos\Db\Sql\BareosSqlCompatHelper;
-
-class PoolTable implements ServiceLocatorAwareInterface
+class PoolTable
 {
-
-	protected $tableGateway;
-	protected $serviceLocator;
-
-	public function __construct(TableGateway $tableGateway)
-	{
-		$this->tableGateway = $tableGateway;
-	}
-
-	public function setServiceLocator(ServiceLocatorInterface $serviceLocator) {
-                $this->serviceLocator = $serviceLocator;
-        }
-
-        public function getServiceLocator() {
-                return $this->serviceLocator;
-        }
-
-	public function getDbDriverConfig() {
-                $config = $this->getServiceLocator()->get('Config');
-                return $config['db']['adapters'][$_SESSION['bareos']['director']]['driver'];
-        }
-
-	public function fetchAll($paginated=false, $order_by=null, $order=null)
-	{
-		$bsqlch = new BareosSqlCompatHelper($this->getDbDriverConfig());
-		$select = new Select();
-                $select->from($bsqlch->strdbcompat("Pool"));
-
-		if($order_by != null && $order != null) {
-                        $select->order($bsqlch->strdbcompat($order_by) . " " . $order);
-                }
-                else {
-                        $select->order($bsqlch->strdbcompat("PoolId") . " DESC");
-                }
-
-		if($paginated) {
-                        $resultSetPrototype = new ResultSet();
-                        $resultSetPrototype->setArrayObjectPrototype(new Pool());
-                        $paginatorAdapter = new DbSelect(
-                                                $select,
-                                                $this->tableGateway->getAdapter(),
-                                                $resultSetPrototype
-                                        );
-                        $paginator = new Paginator($paginatorAdapter);
-                        return $paginator;
-                }
-		else {
-			$resultSet = $this->tableGateway->selectWith($select);
-			return $resultSet;
-		}
-	}
-
-	public function getPool($id)
-	{
-		$id = (int) $id;
-		$bsqlch = new BareosSqlCompatHelper($this->getDbDriverConfig());
-		$rowset = $this->tableGateway->select(
-			array(
-				$bsqlch->strdbcompat("PoolId") => $id
-			)
-		);
-		$row = $rowset->current();
-		if(!$row) {
-			throw new \Exception("Could not find row $id");
-		}
-		return $row;
-	}
-
-	public function getPoolNum()
-	{
-		$bsqlch = new BareosSqlCompatHelper($this->getDbDriverConfig());
-		$select = new Select();
-		$select->from($bsqlch->strdbcompat("Pool"));
-		$resultSetPrototype = new ResultSet();
-		$resultSetPrototype->setArrayObjectPrototype(new Pool());
-		$rowset = new DbSelect(
-			$select,
-			$this->tableGateway->getAdapter(),
-			$resultSetPrototype
-		);
-		$num = $rowset->count();
-		return $num;
-	}
-
 }
-
diff --git a/module/Pool/view/pool/pool/details.phtml b/module/Pool/view/pool/pool/details.phtml
index 0a030f9d..04aa1f73 100644
--- a/module/Pool/view/pool/pool/details.phtml
+++ b/module/Pool/view/pool/pool/details.phtml
@@ -3,9 +3,9 @@
 /**
  *
  * bareos-webui - Bareos Web-Frontend
- * 
+ *
  * @link      https://github.com/bareos/bareos-webui for the canonical source repository
- * @copyright Copyright (c) 2013-2014 Bareos GmbH & Co. KG (http://www.bareos.org/)
+ * @copyright Copyright (c) 2013-2015 Bareos GmbH & Co. KG (http://www.bareos.org/)
  * @license   GNU Affero General Public License (http://www.gnu.org/licenses/)
  * @author    Frank Bergkemper
  *
@@ -24,53 +24,44 @@
  *
  */
 
-$title = 'Pool details';
+$title = $pool['name'] . ' Pool';
 $this->headTitle($title);
 
 ?>
 
-<h3 class="text-muted"><?php echo $title; ?></h3>
-<hr />
-
 <div class="row">
 
 <div class="col-md-12">
 <div class="panel panel-default">
-	  
+
 <div class="panel-heading">
-<h3 class="panel-title">General Information</h3>
+<h3 class="panel-title">Pool</h3>
 </div>
-    
+
 <div class="panel-body">
 
-<table class="table table-striped table-hover" style="font-size: 9pt;">
+<table class="table table-bordered table-condensed">
 
 <tr>
-	<th>Pool</th>
-	<th>Name</th>
-	<th>Type</th>
-	<th><div align="right">Volumes</div></th>
-	<th><div align="right">Maximum volumes</div></th>
-	<th><div align="right">Volume retention</div></th>
-	<th><div align="right">Maximum volume jobs</div></th>
-	<th><div align="right">Maximum volume files</div></th>
-	<th><div align="right">Maximum volume bytes</div></th>
-	
-	
+	<th class="bg-primary">Pool</th>
+	<th class="bg-primary">Name</th>
+	<th class="bg-primary">Type</th>
+	<th class="bg-primary"><div align="right">Volumes</div></th>
+	<th class="bg-primary"><div align="right">Maximum volumes</div></th>
+	<th class="bg-primary"><div align="right">Volume retention</div></th>
+	<th class="bg-primary"><div align="right">Maximum volume jobs</div></th>
+	<th class="bg-primary"><div align="right">Maximum volume bytes</div></th>
 </tr>
 
 <tr>
-
-	<td><?php echo $this->escapeHtml($pool->poolid); ?></td>
-	<td><?php echo $this->escapeHtml($pool->name); ?></td>
-	<td><?php echo $this->escapeHtml($pool->pooltype); ?></td>
-	<td><div align="right"><?php echo $this->escapeHtml($pool->numvols); ?></div></td>
-	<td><div align="right"><?php echo $this->escapeHtml($pool->maxvols); ?></div></td>
-	<td><div align="right"><?php echo $this->printRetention($pool->volretention) . " days"; ?></div></td>
-	<td><div align="right"><?php echo $this->escapeHtml($pool->maxvoljobs); ?></div></td>
-	<td><div align="right"><?php echo $this->escapeHtml($pool->maxvolfiles); ?></div></td>
-	<td><div align="right"><?php echo $this->printBytes($pool->maxvolbytes); ?></div></td>
-
+	<td><?php echo $this->escapeHtml($this->pool['poolid']); ?></td>
+	<td><?php echo $this->escapeHtml($pool['name']); ?></td>
+	<td><?php echo $this->escapeHtml($pool['pooltype']); ?></td>
+	<td><div align="right"><?php echo $this->escapeHtml($pool['numvols']); ?></div></td>
+	<td><div align="right"><?php echo $this->escapeHtml($pool['maxvols']); ?></div></td>
+	<td><div align="right"><?php echo $this->printRetention($pool['volretention']) . " days"; ?></div></td>
+	<td><div align="right"><?php echo $this->escapeHtml($pool['maxvoljobs']); ?></div></td>
+	<td><div align="right"><?php echo $this->printBytes($pool['maxvolbytes']); ?></div></td>
 </tr>
 
 </table>
@@ -86,52 +77,72 @@ $this->headTitle($title);
 
 <div class="col-md-12">
 <div class="panel panel-default">
-    
+
 <div class="panel-heading">
 <h3 class="panel-title">Volumes</h3>
 </div>
-    
+
 <div class="panel-body">
 
-<table class="table table-striped table-hover" style="font-size: 9pt;">
+<p>
+Volumes per page: 
+<a href="<?php echo $this->url('pool', array('action' => 'details', 'id' => $this->poolname, 'limit' => '10', null, null, true)); ?>">10</a> | 
+<a href="<?php echo $this->url('pool', array('action' => 'details', 'id' => $this->poolname, 'limit' => '25', null, null, true)); ?>">25</a> | 
+<a href="<?php echo $this->url('pool', array('action' => 'details', 'id' => $this->poolname, 'limit' => '50', null, null, true)); ?>">50</a> | 
+<a href="<?php echo $this->url('pool', array('action' => 'details', 'id' => $this->poolname, 'limit' => '100', null, null, true)); ?>">100</a>
+</p>
+
+<table class="table table-bordered table-condensed">
 
 <tr>
-	<th>Volume</th>
-	<th>Name</th>
-	<th>Storage</th>
-	<th>Type</th>
-	<th>Last written</th>
-	<th>Status</th>
-	<th><div align="right">Retention</div></th>
-	<th><div align="right">Maximum bytes</div></th>
-	<th><div align="right">Current bytes</div></th>
-	<th><div align="right">Free bytes</div></th>
-	
+	<th class="bg-primary">Volume</th>
+	<th class="bg-primary">Name</th>
+	<th class="bg-primary">Storage</th>
+	<th class="bg-primary">Type</th>
+	<th class="bg-primary">Last written</th>
+	<th class="bg-primary">Status</th>
+	<th class="bg-primary"><div align="right">Retention</div></th>
+	<th class="bg-primary"><div align="right">Maximum bytes</div></th>
+	<th class="bg-primary"><div align="right">Current bytes</div></th>
+	<th class="bg-primary"><div align="right">Free bytes</div></th>
 </tr>
 
-<?php foreach($this->media as $volume) : ?>
+<?php foreach($this->paginator as $volume) : ?>
 
 <tr>
-
-	<td><a href="<?php echo $this->url('media', array('action'=>'details', 'id' => $volume->mediaid)); ?>"><?php echo $this->escapeHtml($volume->mediaid); ?></a></td>
-	<td><?php echo $this->escapeHtml($volume->volumename); ?></td>
-	<td><a href="<?php echo $this->url('storage', array('action'=>'details')); ?>"><?php echo $this->escapeHtml($volume->storageid); ?></a></td>
-	<td><?php echo $this->escapeHtml($volume->mediatype); ?></td>
-	<td><div title="<?php echo $volume->lastwritten; ?>"><?php echo $this->printHumanReadableTimeperiod($volume->lastwritten, "fuzzy"); ?></div></td>
-	<td><?php echo $this->escapeHtml($volume->volstatus); ?></td>
-	<td><div align="right"><?php echo $this->printExpiration($volume->volretention, $volume->lastwritten, $volume->volstatus); ?></div></td>
-	<td><div align="right"><?php echo $this->printBytes($volume->maxvolbytes); ?></div></td>
-	<td><div align="right"><?php echo $this->printBytes($volume->volbytes); ?></div></td>
-	<td><div align="right"><?php echo $this->printBytes($volume->maxvolbytes - $volume->volbytes); ?></div></td>
-	
+	<td><a href="<?php echo $this->url('media', array('action'=>'details', 'id' => $volume['mediaid'])); ?>"><?php echo $this->escapeHtml($volume['mediaid']); ?></a></td>
+	<td><a href="<?php echo $this->url('media', array('action'=>'details', 'id' => $volume['mediaid'])); ?>"><?php echo $this->escapeHtml($volume['volumename']); ?></a></td>
+	<td><a href="<?php echo $this->url('storage', array('action'=>'details', 'id' => $volume['storageid'])); ?>"><?php echo $this->escapeHtml($volume['storageid']); ?></a></td>
+	<td><?php echo $this->escapeHtml($volume['mediatype']); ?></td>
+	<td><div title="<?php echo $volume['lastwritten']; ?>"><?php echo $this->printHumanReadableTimeperiod($volume['lastwritten'], "fuzzy"); ?></div></td>
+	<td><?php echo $this->escapeHtml($volume['volstatus']); ?></td>
+	<td><div align="right"><?php echo $this->printExpiration($volume['volretention'], $volume['lastwritten'], $volume['volstatus']); ?></div></td>
+	<td><div align="right"><?php echo $this->printBytes($volume['maxvolbytes']); ?></div></td>
+	<td><div align="right"><?php echo $this->printBytes($volume['volbytes']); ?></div></td>
+	<td><div align="right"><?php echo $this->printBytes($volume['maxvolbytes'] - $volume['volbytes']); ?></div></td>
 </tr>
 
 <?php endforeach; ?>
 
 </table>
 
+<?php
+	echo $this->paginationControl(
+                        $this->paginator,
+                        'Elastic',
+                        array(
+				'partial/paginator.phtml',
+				'Pool'
+			),
+                        array(
+				'route' => 'pool',
+			)
+        );
+?>
+
 </div>
 </div>
 </div>
 
 </div>
+
diff --git a/module/Pool/view/pool/pool/index.phtml b/module/Pool/view/pool/pool/index.phtml
index 4f18ac32..af149dbc 100644
--- a/module/Pool/view/pool/pool/index.phtml
+++ b/module/Pool/view/pool/pool/index.phtml
@@ -3,9 +3,9 @@
 /**
  *
  * bareos-webui - Bareos Web-Frontend
- * 
+ *
  * @link      https://github.com/bareos/bareos-webui for the canonical source repository
- * @copyright Copyright (c) 2013-2014 Bareos GmbH & Co. KG (http://www.bareos.org/)
+ * @copyright Copyright (c) 2013-2015 Bareos GmbH & Co. KG (http://www.bareos.org/)
  * @license   GNU Affero General Public License (http://www.gnu.org/licenses/)
  * @author    Frank Bergkemper
  *
@@ -27,71 +27,58 @@
 $title = 'Pools';
 $this->headTitle($title);
 
-if($order_by == 'PoolId')
-        $url_order = $order == 'ASC' ? 'DESC' : 'ASC';
-elseif($order_by == 'Name')
-        $url_order = $order == 'ASC' ? 'DESC' : 'ASC';
-elseif($order_by == 'PoolType')
-        $url_order = $order == 'ASC' ? 'DESC' : 'ASC';
-
 ?>
 
-<h3 class="text-muted"><?php echo $title; ?></h3>
-<hr />
-
-<p>
-Pools per page:
-<a href="<?php echo $this->url('pool', array('order_by' => $this->order_by, 'order' => $this->order, 'limit' => '10', null, null, true)); ?>">10</a> |
-<a href="<?php echo $this->url('pool', array('order_by' => $this->order_by, 'order' => $this->order, 'limit' => '25', null, null, true)); ?>">25</a> |
-<a href="<?php echo $this->url('pool', array('order_by' => $this->order_by, 'order' => $this->order, 'limit' => '50', null, null, true)); ?>">50</a> |
-<a href="<?php echo $this->url('pool', array('order_by' => $this->order_by, 'order' => $this->order, 'limit' => '100', null, null, true)); ?>">100</a>
-</p>
-
 <div class="row">
 
 <div class="col-md-12">
 <div class="panel panel-default">
-    
+
+<div class="panel-heading">
+<h3 class="panel-title">Pools</h3>
+</div>
+
 <div class="panel-body">
 
-<table class="table table-striped table-hover" style="font-size: 9pt;">
+<p>
+Pools per page: 
+<a href="<?php echo $this->url('pool', array('limit' => '10', null, null, true)); ?>">10</a> | 
+<a href="<?php echo $this->url('pool', array('action' => 'index', 'limit' => '25', null, null, true)); ?>">25</a> | 
+<a href="<?php echo $this->url('pool', array('action' => 'index', 'limit' => '50', null, null, true)); ?>">50</a> | 
+<a href="<?php echo $this->url('pool', array('action' => 'index', 'limit' => '100', null, null, true)); ?>">100</a>
+</p>
+
+<table class="table table-bordered table-condensed">
 
 <tr>
-	<th><a href="<?php echo $this->url('pool', array('order_by' => 'PoolId', 'order' => $url_order, 'limit' => $this->limit)); ?>"><?php echo $this->translate("Pool"); ?></a></th>
-	<th><a href="<?php echo $this->url('pool', array('order_by' => 'Name', 'order' => $url_order, 'limit' => $this->limit)); ?>"><?php echo $this->translate("Name"); ?></a></th>
-	<th><a href="<?php echo $this->url('pool', array('order_by' => 'PoolType', 'order' => $url_order, 'limit' => $this->limit)); ?>"><?php echo $this->translate("Type"); ?></a></th>
-	<th><div align="right">Volumes</div></th>
-	<th><div align="right">Maximum volumes</div></th>
-	<th><div align="right">Volume retention</div></th>
-	<th><div align="right">Maximum volume jobs</div></th>
-	<th><div align="right">Maximum volume files</div></th>
-	<th><div align="right">Maximum volume bytes</div></th>	
-	
+	<th class="bg-primary"><div align="right">Pool</div></th>
+	<th class="bg-primary"><div align="right">Name</div></th>
+	<th class="bg-primary"><div align="right">Type</div></th>
+	<th class="bg-primary"><div align="right">Volumes</div></th>
+	<th class="bg-primary"><div align="right">Maximum volumes</div></th>
+	<th class="bg-primary"><div align="right">Volume retention</div></th>
+	<th class="bg-primary"><div align="right">Maximum volume jobs</div></th>
+	<th class="bg-primary"><div align="right">Maximum volume bytes</div></th>
+
 </tr>
 
 <?php foreach($this->paginator as $pool) : ?>
 
 <tr>
-
-	<td><a href="<?php echo $this->url('pool', array('action'=>'details', 'id' => $pool->poolid)); ?>"><?php echo $this->escapeHtml($pool->poolid); ?></a></td>
-	<td><a href="<?php echo $this->url('pool', array('action'=>'details', 'id' => $pool->poolid)); ?>"><?php echo $this->escapeHtml($pool->name); ?></a></td>
-	<td><?php echo $this->escapeHtml($pool->pooltype); ?></td>
-	<td><div align="right"><?php echo $this->escapeHtml($pool->numvols); ?></div></td>
-	<td><div align="right"><?php echo $this->escapeHtml($pool->maxvols); ?></div></td>
-	<td><div align="right"><div align="right"><?php echo $this->printRetention($pool->volretention) . " days"; ?></div></td>
-	<td><div align="right"><?php echo $this->escapeHtml($pool->maxvoljobs); ?></div></td>
-	<td><div align="right"><?php echo $this->escapeHtml($pool->maxvolfiles); ?></div></td>
-	<td><div align="right"><?php echo $this->printBytes($pool->maxvolbytes); ?></div></td>
-
+	<td><a href="<?php echo $this->url('pool', array('action'=>'details', 'id' => $pool['name'])); ?>"><?php echo $this->escapeHtml($pool['poolid']); ?></a></td>
+	<td><a href="<?php echo $this->url('pool', array('action'=>'details', 'id' => $pool['name'])); ?>"><?php echo $this->escapeHtml($pool['name']); ?></a></td>
+	<td><?php echo $this->escapeHtml($pool['pooltype']); ?></td>
+	<td><div align="right"><?php echo $this->escapeHtml($pool['numvols']); ?></div></td>
+	<td><div align="right"><?php echo $this->escapeHtml($pool['maxvols']); ?></div></td>
+	<td><div align="right"><div align="right"><?php echo $this->printRetention($pool['volretention']) . " days"; ?></div></td>
+	<td><div align="right"><?php echo $this->escapeHtml($pool['maxvoljobs']); ?></div></td>
+	<td><div align="right"><?php echo $this->printBytes($pool['maxvolbytes']); ?></div></td>
 </tr>
 
 <?php endforeach; ?>
 
 </table>
 
-</div>
-</div>
-
 <?php
 
 echo $this->paginationControl(
@@ -104,7 +91,6 @@ echo $this->paginationControl(
 ?>
 
 </div>
-
 </div>
-
-
+</div>
+</div>