A few modifications and additions

bareos · Nov 4, 2013 · 51b02cd · 51b02cd
1 parent c2fd3de
commit 51b02cd
Show file tree

Hide file tree

Showing 12 changed files with 156 additions and 72 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/composer.phar b/composer.phar
diff --git a/module/Application/src/Application/Form/LoginForm.php b/module/Application/src/Application/Form/LoginForm.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Application\Form;
+
+use Zend\Form\Element\Password;
+use Zend\Form\Element\Submit;
+use Zend\Form\Element\Text;
+use Zend\Form\Form;
+
+class LoginForm extends Form
+{
+
+      public function __construct()
+      {
+
+	    $usernameElement = new Text('username');
+	    $usernameElement->setLabel('Username');
+	    $passwordElement = new Password('password');
+	    $passwordElement->setLabel('Password');
+	    $submitElement = new Submit('login');
+	    $submitElement->setValue('Login');
+	    $submitElement->setAttribute('class', 'btn');
+
+	    $this->add($usernameElement);
+	    $this->add($passwordElement);
+	    $this->add($submitElement);
+
+      }
+
+}
+
diff --git a/module/Application/src/Application/Form/LogoutForm.php b/module/Application/src/Application/Form/LogoutForm.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Application\Form;
+
+use Zend\Form\Element\Submit;
+use Zend\Form\Form;
+
+class LogoutForm extends Form
+{
+    public function __construct()
+    {
+
+        parent::__construct('logout');
+
+        $submitElement = new Submit('logout');
+        $submitElement->setValue('Logout');
+        $submitElement->setAttribute('class', 'btn');
+
+        $this->add($submitElement);
+
+    }
+}
diff --git a/module/Application/view/application/index/index.phtml b/module/Application/view/application/index/index.phtml
@@ -1,44 +1 @@
-<div class="jumbotron">
-    <h1><?php echo sprintf($this->translate('Welcome to %sbarbossa%s'), '<span class="zf-green">', '</span>') ?></h1>
-    <p><?php echo sprintf($this->translate('Congratulations! You have successfully installed %sbarbossa%s. You are currently running barbossa version %s.'), '<a href="https://github.com/fbergkemper/barbossa" target="_blank">', '</a>', \Zend\Version\Version::VERSION) ?></p>
-    <p><a class="btn btn-success btn-lg" href="https://github.com/fbergkemper/barbossa" target="_blank"><?php echo $this->translate('Fork barbossa on GitHub') ?> &raquo;</a></p>
-</div>
-
-<div class="row">
-
-    <div class="col-md-4">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h3 class="panel-title"><?php echo $this->translate('Follow Development') ?></h3>
-            </div>
-            <div class="panel-body">
-		<p><?php echo sprintf($this->translate('Barbossa is under active development. If you are interested in following the development of ZF2, there is a special ZF2 portal on the official Zend Framework website which provides links to the ZF2 %swiki%s, %sdev blog%s, %sissue tracker%s, and much more. This is a great resource for staying up to date with the latest developments!'), '<a href="http://framework.zend.com/wiki/display/ZFDEV2/Home">', '</a>', '<a href="http://framework.zend.com/zf2/blog">', '</a>', '<a href="https://github.com/zendframework/zf2/issues">', '</a>') ?></p>
-                <p><a class="btn btn-success pull-right" href="http://framework.zend.com/zf2" target="_blank"><?php echo $this->translate('ZF2 Development Portal') ?> &raquo;</a></p>
-            </div>
-        </div>
-    </div>
-
-    <div class="col-md-4">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h3 class="panel-title"><?php echo $this->translate('Discover Modules') ?></h3>
-            </div>
-            <div class="panel-body">
-                <p><?php echo sprintf($this->translate('The community is working on developing a community site to serve as a repository and gallery for ZF2 modules. The project is available %son GitHub%s. The site is currently live and currently contains a list of some of the modules already available for ZF2.'), '<a href="https://github.com/zendframework/modules.zendframework.com">', '</a>') ?></p>
-                <p><a class="btn btn-success pull-right" href="http://modules.zendframework.com/" target="_blank"><?php echo $this->translate('Explore ZF2 Modules') ?> &raquo;</a></p>
-            </div>
-        </div>
-    </div>
-
-    <div class="col-md-4">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h3 class="panel-title"><?php echo $this->translate('Help &amp; Support') ?></h3>
-            </div>
-            <div class="panel-body">
-                <p><?php echo sprintf($this->translate('If you need any help or support while developing with ZF2, you may reach us via IRC: %s#zftalk on Freenode%s. We\'d love to hear any questions or feedback you may have regarding the beta releases. Alternatively, you may subscribe and post questions to the %smailing lists%s.'), '<a href="irc://irc.freenode.net/zftalk">', '</a>', '<a href="http://framework.zend.com/wiki/display/ZFDEV/Mailing+Lists">', '</a>') ?></p>
-                <p><a class="btn btn-success pull-right" href="http://webchat.freenode.net?channels=zftalk" target="_blank"><?php echo $this->translate('Ping us on IRC') ?> &raquo;</a></p>
-            </div>
-        </div>
-    </div>
-</div>
+<?php
diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml
@@ -33,7 +33,7 @@
     <body>
 
 	<!-- Navigation start -->
-        <nav class="navbar navbar-fixed-top" role="navigation">
+        <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
             <div class="container">
 
 		<div class="navbar-header">

diff --git a/module/Client/view/client/client/index.phtml b/module/Client/view/client/client/index.phtml
@@ -8,6 +8,17 @@ $this->headTitle($title);
 <h2><?php echo $title; ?></h2>
 <hr />
 
+<?php foreach($clients as $client) : ?>
+
+<div class="col-md-12">
+<div class="panel panel-default">
+
+<div class="panel-heading">
+<h3 class="panel-title"><?php echo "Client " . $this->escapeHtml($client->clientid); ?></h3>
+</div>
+
+<div class="panel-body">
+
 <table class="table table-striped table-hover">
 
 <tr>
@@ -18,9 +29,6 @@ $this->headTitle($title);
 	<th>Fileretention</th>
 	<th>Jobretention</th>
 </tr>
-
-<?php foreach($clients as $client) : ?>
-
 <tr>
 
 	<td><a href="<?php echo $this->url('client', array('action'=>'details')); ?>"><?php echo $this->escapeHtml($client->clientid); ?></a></td>
@@ -32,6 +40,11 @@ $this->headTitle($title);
 
 </tr>
 
+</table>
+
+</div>
+</div>
+</div>
+
 <?php endforeach; ?>
 
-</table>
diff --git a/module/Fileset/view/fileset/fileset/index.phtml b/module/Fileset/view/fileset/fileset/index.phtml
@@ -8,6 +8,17 @@ $this->headTitle($title);
 <h2><?php echo $title; ?></h2>
 <hr />
 
+<?php foreach($filesets as $fileset) : ?>
+
+<div class="col-md-12">
+<div class="panel panel-default">
+
+<div class="panel-heading">
+<h3 class="panel-title"><?php echo $this->escapeHtml($fileset->fileset); ?></h3>
+</div>
+
+<div class="panel-body">
+
 <table class="table table-striped table-hover">
 
 <tr>
@@ -17,8 +28,6 @@ $this->headTitle($title);
 	<th>Createtime</th>
 </tr>
 
-<?php foreach($filesets as $fileset) : ?>
-
 <tr>
 
 	<td><a href="<?php echo $this->url('fileset', array('action'=>'details')); ?>"><?php echo $this->escapeHtml($fileset->filesetid); ?></a></td>
@@ -28,6 +37,12 @@ $this->headTitle($title);
 
 </tr>
 
+</table>
+
+</div>
+</div>
+</div>
+
 <?php endforeach; ?>
 
-</table>
+
diff --git a/module/Job/src/Job/Controller/JobController.php b/module/Job/src/Job/Controller/JobController.php
@@ -15,7 +15,7 @@ public function indexAction()
 
 		$paginator = $this->getJobTable()->fetchAll(true);
 		$paginator->setCurrentPageNumber( (int) $this->params()->fromQuery('page', 1) );
-		$paginator->setItemCountPerPage(15);
+		$paginator->setItemCountPerPage(10);
 
 		return new ViewModel(array('paginator' => $paginator));
 

diff --git a/module/Job/view/job/job/index.phtml b/module/Job/view/job/job/index.phtml
@@ -8,6 +8,17 @@ $this->headTitle($title);
 <h2><?php echo $title; ?></h2>
 <hr />
 
+<?php foreach ($this->paginator as $job) : ?>
+
+<div class="col-md-12">
+<div class="panel panel-default">
+
+<div class="panel-heading">
+<h3 class="panel-title"><?php echo "Job " . $this->escapeHtml($job->jobid); ?></h3>
+</div>
+
+<div class="panel-body">
+
 <table class="table table-striped table-hover">
 
 <tr>
@@ -24,8 +35,6 @@ $this->headTitle($title);
 
 </tr>
 
-<?php foreach ($this->paginator as $job) : ?>
-
 <tr>
 
 	<td><a href="<?php echo $this->url('job', array('action' => 'details', 'id' => $job->jobid)); ?>"><?php echo $this->escapeHtml($job->jobid); ?></a></td>
@@ -41,9 +50,15 @@ $this->headTitle($title);
 
 </tr>
 
+</table>
+
+</div>
+</div>
+</div>
+
 <?php endforeach; ?>
 
-</table>
+
 
 <?php
 

diff --git a/module/Media/view/media/media/index.phtml b/module/Media/view/media/media/index.phtml
@@ -8,6 +8,19 @@ $this->headTitle($title);
 <h2><?php echo $title; ?></h2>
 <hr />
 
+
+
+<?php foreach($this->paginator as $volume) : ?>
+
+<div class="col-md-12">
+<div class="panel panel-default">
+
+<div class="panel-heading">
+<h3 class="panel-title"><?php echo "Volume " . $this->escapeHtml($volume->mediaid); ?></h3>
+</div>
+
+<div class="panel-body">
+
 <table class="table table-striped table-hover">
 
 <tr>
@@ -24,8 +37,6 @@ $this->headTitle($title);
 
 </tr>
 
-<?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>
@@ -41,10 +52,14 @@ $this->headTitle($title);
 
 </tr>
 
-<?php endforeach; ?>
-
 </table>
 
+</div>
+</div>
+</div>
+
+<?php endforeach; ?>
+
 <?php
 
 echo $this->paginationControl(

diff --git a/module/Pool/view/pool/pool/index.phtml b/module/Pool/view/pool/pool/index.phtml
@@ -8,14 +8,25 @@ $this->headTitle($title);
 <h2><?php echo $title; ?></h2>
 <hr />
 
+<?php foreach($pools as $pool) : ?>
+
+<div class="col-md-12">
+<div class="panel panel-default">
+
+<div class="panel-heading">
+<h3 class="panel-title"><?php echo $this->escapeHtml($pool->name); ?></h3>
+</div>
+
+<div class="panel-body">
+
 <table class="table table-striped table-hover">
 
 <tr>
 	<th>Pool ID</th>
 	<th>Pool name</th>
 	<th>Pool type</th>
-	<th>Current volume number</th>
-	<th>Maximum volume number</th>
+	<th>Volumes</th>
+	<th>Maximum volumes</th>
 	<th>Volume retention</th>
 	<th>Maximum volume jobs</th>
 	<th>Maximum volume files</th>
@@ -24,12 +35,10 @@ $this->headTitle($title);
 
 </tr>
 
-<?php foreach($pools as $pool) : ?>
-
 <tr>
 
 	<td><a href="<?php echo $this->url('pool', array('action'=>'details')); ?>"><?php echo $this->escapeHtml($pool->poolid); ?></a></td>
-	<td><?php echo $this->escapeHtml($pool->name); ?></td>
+	<td><a href="<?php echo $this->url('pool', array('action'=>'details')); ?>"><?php echo $this->escapeHtml($pool->name); ?></a></td>
 	<td><?php echo $this->escapeHtml($pool->pooltype); ?></td>
 	<td><?php echo $this->escapeHtml($pool->numvols); ?></td>
 	<td><?php echo $this->escapeHtml($pool->maxvols); ?></td>
@@ -40,6 +49,12 @@ $this->headTitle($title);
 
 </tr>
 
+</table>
+
+</div>
+</div>
+</div>
+
 <?php endforeach; ?>
 
-</table>
+