Cleanup

bareos · Jan 27, 2014 · 2333a11 · 2333a11
1 parent 08db446
commit 2333a11
Show file tree

Hide file tree

Showing 15 changed files with 75 additions and 63 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -1,5 +1,9 @@
-This file contains a list of the people who have contributed code, documentation or translation to the project.
 
-Contributors:
+This file contains a list of the people who have contributed code, 
+documentation or translation to the project.
+
+Authors:
 
-Frank Bergkemper
+Frank Bergkemper <frank.bergkemper@dass-it.de>
+
+Contributors:
diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml
@@ -29,6 +29,7 @@ echo $this->doctype();
 ?>
 
 <html lang="en">
+
     <head>
         <meta charset="utf-8">
         <?php echo $this->headTitle('Bareos Web-Frontend | '. $this->translate('Version 0.0.1'))->setSeparator(' - ')->setAutoEscape(false) ?>
@@ -38,7 +39,7 @@ echo $this->doctype();
             ->appendHttpEquiv('X-UA-Compatible', 'IE=edge')
         ?>
 
-        <!-- Le styles -->
+        <!-- Styles -->
         <?php echo $this->headLink(array('rel' => 'shortcut icon', 'type' => 'image/vnd.microsoft.icon', 'href' => $this->basePath() . '/img/favicon.ico'))
                         ->prependStylesheet($this->basePath() . '/css/style.css')
                         ->prependStylesheet($this->basePath() . '/css/bootstrap-theme.min.css')
@@ -57,10 +58,11 @@ echo $this->doctype();
             ->prependFile($this->basePath() . '/js/jquery.jqplot.min.js')
             ->prependFile($this->basePath() . '/js/jquery.min.js')
             ->prependFile($this->basePath() . '/js/respond.min.js', 'text/javascript', array('conditional' => 'lt IE 9',))
-            ->prependFile($this->basePath() . '/js/html5shiv.js',   'text/javascript', array('conditional' => 'lt IE 9',))
-        ; ?>
+            ->prependFile($this->basePath() . '/js/html5shiv.js',   'text/javascript', array('conditional' => 'lt IE 9',)); 
+	?>
 
     </head>
+
     <body>
 
 	<!-- Navigation start -->
@@ -75,19 +77,23 @@ echo $this->doctype();
                         <span class="icon-bar"></span>
                     </button>
                     <a class="navbar-brand" href="<?php echo $this->url('dashboard') ?>">
-		    	<?php echo $this->translate('Bareos') ?>
+		    	<?php echo $this->escapeHtml('Bareos') ?>
 		    </a>
                 </div>
+
+		<!-- TODO -->
 
                 <!--<div class="container">-->
                 <!-- <div class="collapse navbar-collapse"> -->
+
 			<?php 
 		    		echo $this->navigation('navigation')
 			    		->menu()
 					->setMinDepth(0)
 					->setMaxDepth(0)
 					->setUlClass('nav navbar-nav');
 			?>
+
 			<!--                
 			<ul class="nav navbar-nav">
                         <li class="active"><a href="<?php echo $this->url('home') ?>"><?php echo $this->translate('Home') ?></a></li>
@@ -103,7 +109,8 @@ echo $this->doctype();
 
 
         <div class="container">
-
+
+	<!-- TODO CLEANUP BREADCRUMBS -->	
 	<!-- Breadcrumbs start
 	<p>
 		<?php echo $this->navigation('navigation')

diff --git a/module/Dashboard/view/dashboard/dashboard/index.phtml b/module/Dashboard/view/dashboard/dashboard/index.phtml
@@ -7,6 +7,7 @@
  * @link      http://github.com/fbergkemper/barbossa for the canonical source repository
  * @copyright Copyright (c) 2013-2014 dass-IT GmbH (http://www.dass-it.de/)
  * @license   GNU Affero General Public License (http://www.gnu.org/licenses/)
+ * @author    Frank Bergkemper
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -284,7 +285,7 @@ $flash->setMessageOpenFormat('
 		</h3>
             </div>
 
-	    <div class="panel-body panel-collapse collapse out" id="collapseSuccessful">
+	    <div class="panel-body panel-collapse collapse in" id="collapseSuccessful">
 
             <table class="table table-striped table-hover" style="font-size: 9pt;">
 

diff --git a/module/Director/view/director/director/index.phtml b/module/Director/view/director/director/index.phtml
@@ -23,7 +23,7 @@
  *
  */
 
-$title = 'Director status';
+$title = 'Director';
 $this->headTitle($title);
 
 ?>
@@ -32,10 +32,10 @@ $this->headTitle($title);
 <hr />
 
 <ul class="nav nav-tabs">
-	<li class="active"><a href="<?php echo $this->url('director', array('action'=>'index')); ?>"><?php echo $this->translate('Director status'); ?></a></li>
-	<li><a href="<?php echo $this->url('director', array('action'=>'messages')); ?>"><?php echo $this->translate('Director messages'); ?></a></li>
-	<li><a href="<?php echo $this->url('director', array('action'=>'scheduler')); ?>"><?php echo $this->translate('Director scheduler status'); ?></a></li>
-	<li><a href="<?php echo $this->url('director', array('action'=>'version')); ?>"><?php echo $this->translate('Director version'); ?></a></li>
+	<li class="active"><a href="<?php echo $this->url('director', array('action'=>'index')); ?>"><?php echo $this->translate('Status'); ?></a></li>
+	<li><a href="<?php echo $this->url('director', array('action'=>'messages')); ?>"><?php echo $this->translate('Messages'); ?></a></li>
+	<li><a href="<?php echo $this->url('director', array('action'=>'scheduler')); ?>"><?php echo $this->translate('Scheduler status'); ?></a></li>
+	<li><a href="<?php echo $this->url('director', array('action'=>'version')); ?>"><?php echo $this->translate('Version'); ?></a></li>
 </ul>
 
 <br />

diff --git a/module/Director/view/director/director/messages.phtml b/module/Director/view/director/director/messages.phtml
@@ -23,7 +23,7 @@
  *
  */
 
-$title = 'Director messages';
+$title = 'Director';
 $this->headTitle($title);
 
 ?>
@@ -32,10 +32,10 @@ $this->headTitle($title);
 <hr />
 
 <ul class="nav nav-tabs">
-	<li><a href="<?php echo $this->url('director', array('action'=>'index')); ?>"><?php echo $this->translate('Director status'); ?></a></li>
-	<li class="active"><a href="<?php echo $this->url('director', array('action'=>'messages')); ?>"><?php echo $this->translate('Director messages'); ?></a></li>
-	<li><a href="<?php echo $this->url('director', array('action'=>'scheduler')); ?>"><?php echo $this->translate('Director scheduler status'); ?></a></li>
-	<li><a href="<?php echo $this->url('director', array('action'=>'version')); ?>"><?php echo $this->translate('Director version'); ?></a></li>
+	<li><a href="<?php echo $this->url('director', array('action'=>'index')); ?>"><?php echo $this->translate('Status'); ?></a></li>
+	<li class="active"><a href="<?php echo $this->url('director', array('action'=>'messages')); ?>"><?php echo $this->translate('Messages'); ?></a></li>
+	<li><a href="<?php echo $this->url('director', array('action'=>'scheduler')); ?>"><?php echo $this->translate('Scheduler status'); ?></a></li>
+	<li><a href="<?php echo $this->url('director', array('action'=>'version')); ?>"><?php echo $this->translate('Version'); ?></a></li>
 </ul>
 
 <br />

diff --git a/module/Director/view/director/director/scheduler.phtml b/module/Director/view/director/director/scheduler.phtml
@@ -23,7 +23,7 @@
  *
  */
 
-$title = 'Director scheduler status';
+$title = 'Director';
 $this->headTitle($title);
 
 ?>
@@ -32,10 +32,10 @@ $this->headTitle($title);
 <hr />
 
 <ul class="nav nav-tabs">
-	<li><a href="<?php echo $this->url('director', array('action'=>'index')); ?>"><?php echo $this->translate('Director status'); ?></a></li>
-	<li><a href="<?php echo $this->url('director', array('action'=>'messages')); ?>"><?php echo $this->translate('Director messages'); ?></a></li>
-	<li class="active"><a href="<?php echo $this->url('director', array('action'=>'scheduler')); ?>"><?php echo $this->translate('Director scheduler status'); ?></a></li>
-	<li><a href="<?php echo $this->url('director', array('action'=>'version')); ?>"><?php echo $this->translate('Director version'); ?></a></li>
+	<li><a href="<?php echo $this->url('director', array('action'=>'index')); ?>"><?php echo $this->translate('Status'); ?></a></li>
+	<li><a href="<?php echo $this->url('director', array('action'=>'messages')); ?>"><?php echo $this->translate('Messages'); ?></a></li>
+	<li class="active"><a href="<?php echo $this->url('director', array('action'=>'scheduler')); ?>"><?php echo $this->translate('Scheduler status'); ?></a></li>
+	<li><a href="<?php echo $this->url('director', array('action'=>'version')); ?>"><?php echo $this->translate('Version'); ?></a></li>
 </ul>
 
 <br />

diff --git a/module/Director/view/director/director/version.phtml b/module/Director/view/director/director/version.phtml
@@ -23,7 +23,7 @@
  *
  */
 
-$title = 'Director version';
+$title = 'Director';
 $this->headTitle($title);
 
 ?>
@@ -32,10 +32,10 @@ $this->headTitle($title);
 <hr />
 
 <ul class="nav nav-tabs">
-	<li><a href="<?php echo $this->url('director', array('action'=>'index')); ?>"><?php echo $this->translate('Director status'); ?></a></li>
-	<li><a href="<?php echo $this->url('director', array('action'=>'messages')); ?>"><?php echo $this->translate('Director messages'); ?></a></li>
-	<li><a href="<?php echo $this->url('director', array('action'=>'scheduler')); ?>"><?php echo $this->translate('Director scheduler status'); ?></a></li>
-	<li class="active"><a href="<?php echo $this->url('director', array('action'=>'version')); ?>"><?php echo $this->translate('Director version'); ?></a></li>
+	<li><a href="<?php echo $this->url('director', array('action'=>'index')); ?>"><?php echo $this->translate('Status'); ?></a></li>
+	<li><a href="<?php echo $this->url('director', array('action'=>'messages')); ?>"><?php echo $this->translate('Messages'); ?></a></li>
+	<li><a href="<?php echo $this->url('director', array('action'=>'scheduler')); ?>"><?php echo $this->translate('Scheduler status'); ?></a></li>
+	<li class="active"><a href="<?php echo $this->url('director', array('action'=>'version')); ?>"><?php echo $this->translate('Version'); ?></a></li>
 </ul>
 
 <br />

diff --git a/module/Job/view/job/job/index.phtml b/module/Job/view/job/job/index.phtml
@@ -23,7 +23,7 @@
  *
  */
 
-$title = 'Job history';
+$title = 'Job overview';
 $this->headTitle($title);
 
 ?>
@@ -32,11 +32,11 @@ $this->headTitle($title);
 <hr />
 
 <ul class="nav nav-tabs">
-	<li class="active"><a href="<?php echo $this->url('job', array('action'=>'index')); ?>"><?php echo $this->translate('Job history'); ?></a></li>
-	<li><a href="<?php echo $this->url('job', array('action'=>'running')); ?>"><?php echo $this->translate('Running jobs'); ?></a></li>
-	<li><a href="<?php echo $this->url('job', array('action'=>'waiting')); ?>"><?php echo $this->translate('Waiting jobs'); ?></a></li>
-	<li><a href="<?php echo $this->url('job', array('action'=>'problem')); ?>"><?php echo $this->translate('Unsuccessful jobs'); ?></a></li>
-	<li><a href="<?php echo $this->url('job', array('action'=>'timeline')); ?>"><?php echo $this->translate('Job timeline'); ?></a></li>
+	<li class="active"><a href="<?php echo $this->url('job', array('action'=>'index')); ?>"><?php echo $this->translate('Overview'); ?></a></li>
+	<li><a href="<?php echo $this->url('job', array('action'=>'running')); ?>"><?php echo $this->translate('Running'); ?></a></li>
+	<li><a href="<?php echo $this->url('job', array('action'=>'waiting')); ?>"><?php echo $this->translate('Waiting'); ?></a></li>
+	<li><a href="<?php echo $this->url('job', array('action'=>'problem')); ?>"><?php echo $this->translate('Unsuccessful'); ?></a></li>
+	<li><a href="<?php echo $this->url('job', array('action'=>'timeline')); ?>"><?php echo $this->translate('Timeline'); ?></a></li>
 </ul>
 
 <br />

diff --git a/module/Job/view/job/job/problem.phtml b/module/Job/view/job/job/problem.phtml
@@ -23,7 +23,7 @@
  *
  */
 
-$title = 'Unsuccessful jobs (last 24 hours)';
+$title = 'Unsuccessful jobs (last 24h)';
 $this->headTitle($title);
 
 ?>
@@ -51,11 +51,11 @@ $flash->setMessageOpenFormat('
 ?>
 
 <ul class="nav nav-tabs">
-	<li><a href="<?php echo $this->url('job', array('action'=>'index')); ?>"><?php echo $this->translate('Job history'); ?></a></li>
-	<li><a href="<?php echo $this->url('job', array('action'=>'running')); ?>"><?php echo $this->translate('Running jobs'); ?></a></li>
-	<li><a href="<?php echo $this->url('job', array('action'=>'waiting')); ?>"><?php echo $this->translate('Waiting jobs'); ?></a></li>
-	<li class="active"><a href="<?php echo $this->url('job', array('action'=>'problem')); ?>"><?php echo $this->translate('Unsuccessful jobs'); ?></a></li>
-	<li><a href="<?php echo $this->url('job', array('action'=>'timeline')); ?>"><?php echo $this->translate('Job timeline'); ?></a></li>
+	<li><a href="<?php echo $this->url('job', array('action'=>'index')); ?>"><?php echo $this->translate('Overview'); ?></a></li>
+	<li><a href="<?php echo $this->url('job', array('action'=>'running')); ?>"><?php echo $this->translate('Running'); ?></a></li>
+	<li><a href="<?php echo $this->url('job', array('action'=>'waiting')); ?>"><?php echo $this->translate('Waiting'); ?></a></li>
+	<li class="active"><a href="<?php echo $this->url('job', array('action'=>'problem')); ?>"><?php echo $this->translate('Unsuccessful'); ?></a></li>
+	<li><a href="<?php echo $this->url('job', array('action'=>'timeline')); ?>"><?php echo $this->translate('Timeline'); ?></a></li>
 </ul>
 
 <br />

diff --git a/module/Job/view/job/job/running.phtml b/module/Job/view/job/job/running.phtml
@@ -51,11 +51,11 @@ $flash->setMessageOpenFormat('
 ?>
 
 <ul class="nav nav-tabs">
-	<li><a href="<?php echo $this->url('job', array('action'=>'index')); ?>"><?php echo $this->translate('Job history'); ?></a></li>
-	<li class="active"><a href="<?php echo $this->url('job', array('action'=>'running')); ?>"><?php echo $this->translate('Running jobs'); ?></a></li>
-	<li><a href="<?php echo $this->url('job', array('action'=>'waiting')); ?>"><?php echo $this->translate('Waiting jobs'); ?></a></li>
-	<li><a href="<?php echo $this->url('job', array('action'=>'problem')); ?>"><?php echo $this->translate('Unsuccessful jobs'); ?></a></li>
-	<li><a href="<?php echo $this->url('job', array('action'=>'timeline')); ?>"><?php echo $this->translate('Job timeline'); ?></a></li>
+	<li><a href="<?php echo $this->url('job', array('action'=>'index')); ?>"><?php echo $this->translate('Overview'); ?></a></li>
+	<li class="active"><a href="<?php echo $this->url('job', array('action'=>'running')); ?>"><?php echo $this->translate('Running'); ?></a></li>
+	<li><a href="<?php echo $this->url('job', array('action'=>'waiting')); ?>"><?php echo $this->translate('Waiting'); ?></a></li>
+	<li><a href="<?php echo $this->url('job', array('action'=>'problem')); ?>"><?php echo $this->translate('Unsuccessful'); ?></a></li>
+	<li><a href="<?php echo $this->url('job', array('action'=>'timeline')); ?>"><?php echo $this->translate('Timeline'); ?></a></li>
 </ul>
 
 <br />

diff --git a/module/Job/view/job/job/timeline.phtml b/module/Job/view/job/job/timeline.phtml
@@ -32,11 +32,11 @@ $this->headTitle($title);
 <hr />
 
 <ul class="nav nav-tabs">
-	<li><a href="<?php echo $this->url('job', array('action'=>'index')); ?>"><?php echo $this->translate('Job history'); ?></a></li>
-	<li><a href="<?php echo $this->url('job', array('action'=>'running')); ?>"><?php echo $this->translate('Running jobs'); ?></a></li>
-	<li><a href="<?php echo $this->url('job', array('action'=>'waiting')); ?>"><?php echo $this->translate('Waiting jobs'); ?></a></li>
-	<li><a href="<?php echo $this->url('job', array('action'=>'problem')); ?>"><?php echo $this->translate('Unsuccessful jobs'); ?></a></li>
-	<li class="active"><a href="<?php echo $this->url('job', array('action'=>'timeline')); ?>"><?php echo $this->translate('Job timeline'); ?></a></li>
+	<li><a href="<?php echo $this->url('job', array('action'=>'index')); ?>"><?php echo $this->translate('Overview'); ?></a></li>
+	<li><a href="<?php echo $this->url('job', array('action'=>'running')); ?>"><?php echo $this->translate('Running'); ?></a></li>
+	<li><a href="<?php echo $this->url('job', array('action'=>'waiting')); ?>"><?php echo $this->translate('Waiting'); ?></a></li>
+	<li><a href="<?php echo $this->url('job', array('action'=>'problem')); ?>"><?php echo $this->translate('Unsuccessful'); ?></a></li>
+	<li class="active"><a href="<?php echo $this->url('job', array('action'=>'timeline')); ?>"><?php echo $this->translate('Timeline'); ?></a></li>
 </ul>
 
 <br />
diff --git a/module/Job/view/job/job/waiting.phtml b/module/Job/view/job/job/waiting.phtml
@@ -23,7 +23,7 @@
  *
  */
 
-$title = 'Waiting Jobs';
+$title = 'Waiting jobs';
 $this->headTitle($title);
 
 ?>
@@ -51,11 +51,11 @@ $flash->setMessageOpenFormat('
 ?>
 
 <ul class="nav nav-tabs">
-	<li><a href="<?php echo $this->url('job', array('action'=>'index')); ?>"><?php echo $this->translate('Job history'); ?></a></li>
-	<li><a href="<?php echo $this->url('job', array('action'=>'running')); ?>"><?php echo $this->translate('Running jobs'); ?></a></li>
-	<li class="active"><a href="<?php echo $this->url('job', array('action'=>'waiting')); ?>"><?php echo $this->translate('Waiting jobs'); ?></a></li>
-	<li><a href="<?php echo $this->url('job', array('action'=>'problem')); ?>"><?php echo $this->translate('Unsuccessful jobs'); ?></a></li>
-	<li><a href="<?php echo $this->url('job', array('action'=>'timeline')); ?>"><?php echo $this->translate('Job timeline'); ?></a></li>
+	<li><a href="<?php echo $this->url('job', array('action'=>'index')); ?>"><?php echo $this->translate('Overview'); ?></a></li>
+	<li><a href="<?php echo $this->url('job', array('action'=>'running')); ?>"><?php echo $this->translate('Running'); ?></a></li>
+	<li class="active"><a href="<?php echo $this->url('job', array('action'=>'waiting')); ?>"><?php echo $this->translate('Waiting'); ?></a></li>
+	<li><a href="<?php echo $this->url('job', array('action'=>'problem')); ?>"><?php echo $this->translate('Unsuccessful'); ?></a></li>
+	<li><a href="<?php echo $this->url('job', array('action'=>'timeline')); ?>"><?php echo $this->translate('Timeline'); ?></a></li>
 </ul>
 
 <br />

diff --git a/module/Statistics/view/statistics/statistics/catalog.phtml b/module/Statistics/view/statistics/statistics/catalog.phtml
@@ -33,9 +33,9 @@ $this->headTitle($title);
 
 <ul class="nav nav-tabs">
 	<li><a href="<?php echo $this->url('statistics', array('action'=>'index')); ?>"><?php echo $this->translate('Job status'); ?></a></li>
-	<li><a href="<?php echo $this->url('statistics', array('action'=>'stored')); ?>"><?php echo $this->translate('Stored bytes'); ?></a></li>
-	<li><a href="<?php echo $this->url('statistics', array('action'=>'client')); ?>"><?php echo $this->translate('Client'); ?></a></li>
-	<li><a href="<?php echo $this->url('statistics', array('action'=>'backupjob')); ?>"><?php echo $this->translate('Backup job'); ?></a></li>
+	<!--<li><a href="<?php echo $this->url('statistics', array('action'=>'stored')); ?>"><?php echo $this->translate('Stored bytes'); ?></a></li>-->
+	<!--<li><a href="<?php echo $this->url('statistics', array('action'=>'client')); ?>"><?php echo $this->translate('Client'); ?></a></li>-->
+	<!--<li><a href="<?php echo $this->url('statistics', array('action'=>'backupjob')); ?>"><?php echo $this->translate('Backup job'); ?></a></li>-->
 	<li class="active"><a href="<?php echo $this->url('statistics', array('action'=>'catalog')); ?>"><?php echo $this->translate('Catalog'); ?></a></li>
 </ul>
 

diff --git a/module/Statistics/view/statistics/statistics/index.phtml b/module/Statistics/view/statistics/statistics/index.phtml
@@ -33,9 +33,9 @@ $this->headTitle($title);
 
 <ul class="nav nav-tabs">
 	<li class="active"><a href="<?php echo $this->url('statistics', array('action'=>'index')); ?>"><?php echo $this->translate('Job status'); ?></a></li>
-	<li><a href="<?php echo $this->url('statistics', array('action'=>'stored')); ?>"><?php echo $this->translate('Stored bytes'); ?></a></li>
-	<li><a href="<?php echo $this->url('statistics', array('action'=>'client')); ?>"><?php echo $this->translate('Client'); ?></a></li>
-	<li><a href="<?php echo $this->url('statistics', array('action'=>'backupjob')); ?>"><?php echo $this->translate('Backup job'); ?></a></li>
+	<!--<li><a href="<?php echo $this->url('statistics', array('action'=>'stored')); ?>"><?php echo $this->translate('Stored bytes'); ?></a></li>-->
+	<!--<li><a href="<?php echo $this->url('statistics', array('action'=>'client')); ?>"><?php echo $this->translate('Client'); ?></a></li>-->
+	<!--<li><a href="<?php echo $this->url('statistics', array('action'=>'backupjob')); ?>"><?php echo $this->translate('Backup job'); ?></a></li>-->
 	<li><a href="<?php echo $this->url('statistics', array('action'=>'catalog')); ?>"><?php echo $this->translate('Catalog'); ?></a></li>
 </ul>
 

diff --git a/public/img/zf2-logo.png b/public/img/zf2-logo.png