[Feature] Fileset details and more

- Fileset: Fileset history and current fileset configuration display in details view - Dashboard: Some minor changes on flash messages and job status display - Tabbed Navigation in director, administration and job module view for sub-functions - Directories for install and documentation added - Apache configuration file added
bareos · Nov 22, 2013 · faf9cff · faf9cff
1 parent 9103752
commit faf9cff
Show file tree

Hide file tree

Showing 18 changed files with 295 additions and 162 deletions.
diff --git a/install/apache/barbossa.conf b/install/apache/barbossa.conf
@@ -0,0 +1,44 @@
+#
+# barbossa - Web interface of a Bareos backup system
+# Apache conf
+# 
+# Allows only localhost by default
+#
+
+LoadModule rewrite_module modules/mod_rewrite.so
+
+# AccessFileName .htaccess
+# RewriteLog "/var/log/httpd/mod_rewrite.log"
+# RewriteLogLevel 3
+
+SetEnv "APP_ENV" "development"
+#SetEnv "APP_ENV" "production"
+
+Alias /barbossa  /srv/www/htdocs/barbossa/public
+<Directory /srv/www/htdocs/barbossa/public>
+   RewriteEngine On
+
+   RewriteBase   /barbossa
+   RewriteCond %{REQUEST_FILENAME} -s [OR]
+   RewriteCond %{REQUEST_FILENAME} -l [OR]
+   RewriteCond %{REQUEST_FILENAME} -d
+   RewriteRule ^.*$ - [NC,L]
+   RewriteRule ^.*$ index.php [NC,L]
+
+   php_flag magic_quotes_gpc off
+   php_flag register_globals off
+
+   Options Indexes FollowSymLinks
+   AllowOverride All
+   Order deny,allow
+
+   Deny from all
+   Allow from 127.0.0.1
+   Allow from localhost
+   Allow from ::1
+   #
+   # change the settings below
+   #
+   # Allow from <your network>
+</Directory>
+
diff --git a/module/Admin/view/admin/admin/index.phtml b/module/Admin/view/admin/admin/index.phtml
@@ -1,39 +1,19 @@
 <?php
 
-$title = 'Administration';
+$title = 'Administration Overview';
 $this->headTitle($title);
 
 ?>
 
 <h2><?php echo $title; ?></h2>
 <hr />
 
-<div class="row">
+<ul class="nav nav-tabs">
+	<li class="active"><a href="<?php echo $this->url('admin', array('action'=>'index')); ?>"><?php echo $this->translate('Overview'); ?></a></li>
+	<li><a href="<?php echo $this->url('admin', array('action'=>'roles')); ?>"><?php echo $this->translate('Roles'); ?></a></li>
+	<li><a href="<?php echo $this->url('admin', array('action'=>'users')); ?>"><?php echo $this->translate('Users'); ?></a></li>
+</ul>
 
-  <div class="col-md-2">
+<br />
 
-	  <div class="panel panel-default">
-
-	      <div class="panel-heading">
-		  <h3 class="panel-title"><?php echo $this->translate('Administration'); ?></h3>
-	      </div>
-
-	      <div class="panel-body">
-
-	      <table class="table table-striped table-hover">
-		<tr><td><a href="<?php echo $this->url('admin', array('action'=>'roles')); ?>"><?php echo $this->translate('Roles'); ?></a></td></tr>
-		<tr><td><a href="<?php echo $this->url('admin', array('action'=>'users')); ?>"><?php echo $this->translate('Users'); ?></a></td></tr>
-	      </table>
-
-	      </div>
-
-	  </div>
-
-  </div>
-
-  <div class="col-md-10">
-
-  </div>
-
-</div>
 
diff --git a/module/Admin/view/admin/admin/roles.phtml b/module/Admin/view/admin/admin/roles.phtml
@@ -6,4 +6,12 @@ $this->headTitle($title);
 ?>
 
 <h2><?php echo $title; ?></h2>
-<hr />
+<hr />
+
+<ul class="nav nav-tabs">
+	<li><a href="<?php echo $this->url('admin', array('action'=>'index')); ?>"><?php echo $this->translate('Overview'); ?></a></li>
+	<li class="active"><a href="<?php echo $this->url('admin', array('action'=>'roles')); ?>"><?php echo $this->translate('Roles'); ?></a></li>
+	<li><a href="<?php echo $this->url('admin', array('action'=>'users')); ?>"><?php echo $this->translate('Users'); ?></a></li>
+</ul>
+
+<br />
diff --git a/module/Admin/view/admin/admin/users.phtml b/module/Admin/view/admin/admin/users.phtml
@@ -6,4 +6,12 @@ $this->headTitle($title);
 ?>
 
 <h2><?php echo $title; ?></h2>
-<hr />
+<hr />
+
+<ul class="nav nav-tabs">
+	<li><a href="<?php echo $this->url('admin', array('action'=>'index')); ?>"><?php echo $this->translate('Overview'); ?></a></li>
+	<li><a href="<?php echo $this->url('admin', array('action'=>'roles')); ?>"><?php echo $this->translate('Roles'); ?></a></li>
+	<li class="active"><a href="<?php echo $this->url('admin', array('action'=>'users')); ?>"><?php echo $this->translate('Users'); ?></a></li>
+</ul>
+
+<br />
diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml
@@ -34,19 +34,23 @@
 
 	<!-- Navigation start -->
         <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
-            <div class="container">
+            <!-- <div class="container"> -->
 
-		<div class="navbar-header">
+		<!-- <div class="navbar-header"> -->
                     <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+		    	<span class="sr-only">Toggle navigation</span>
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                         <span class="icon-bar"></span>
                     </button>
-                    <a class="navbar-brand" href="<?php echo $this->url('dashboard') ?>"><!--<img src="<?php echo $this->basePath('img/zf2-logo.png') ?>" alt="barbossa"/>&nbsp;--><?php echo $this->translate('barbossa') ?></a>
-                </div>
+                    <a class="navbar-brand" href="<?php echo $this->url('dashboard') ?>">
+		    	<!--<img src="<?php echo $this->basePath('img/zf2-logo.png') ?>" alt="barbossa"/>&nbsp;-->
+		    	<?php echo $this->translate('barbossa') ?>
+		    </a>
+                <!-- </div> -->
 
                 <!--<div class="container">-->
-                <!--<div class="collapse navbar-collapse">-->
+                <!-- <div class="collapse navbar-collapse"> -->
 			<?php 
 		    		echo $this->navigation('navigation')
 			    		->menu()
@@ -60,10 +64,10 @@
         	        <li class="active"><a href="<?php echo $this->url('job') ?>"><?php echo $this->translate('Jobs') ?></a></li>
                 	</ul> 
 		    	-->
-                <!--</div>-->
+                <!-- </div> -->
                 <!--</div>-->
 
-            </div>
+            <!-- </div> -->
         </nav>
         <!-- Navigation end -->
 
@@ -82,8 +86,8 @@
 
     		<?php echo $this->content; ?>
 
-            <hr>
-
+            <hr />
+		
             <footer>
                 <p>&copy; 2013 - <?php echo date('Y') ?> Frank Bergkemper, <?php echo $this->translate('GNU Affero General Public License Version 3') ?></p>
             </footer>

diff --git a/module/Dashboard/view/dashboard/dashboard/index.phtml b/module/Dashboard/view/dashboard/dashboard/index.phtml
@@ -9,7 +9,7 @@ $this->headTitle($title);
 <hr />
 
 <script type="text/javascript">
-    
+
     function chart1() {
 
       var data = [
@@ -89,7 +89,7 @@ $flash->setMessageOpenFormat('
 
 <div class="col-md-12">
 
-	<div class="panel panel-default">
+	<div class="panel panel-info">
 
             <div class="panel-heading">
                 <h3 class="panel-title"><?php echo $this->translate('Running jobs') ?></h3>
@@ -219,7 +219,7 @@ $flash->setMessageOpenFormat('
 
 <div class="col-md-12">
 
-	<div class="panel panel-default">
+	<div class="panel panel-danger">
 
             <div class="panel-heading">
                 <h3 class="panel-title"><?php echo $this->translate('Unsuccessful jobs (last 24 hours)') ?></h3>
@@ -287,7 +287,7 @@ $flash->setMessageOpenFormat('
 
 <div class="col-md-12">
 
-	<div class="panel panel-default">
+	<div class="panel panel-success">
 
             <div class="panel-heading">
                 <h3 class="panel-title"><?php echo $this->translate('Successful jobs (last 24 hours)') ?></h3>

diff --git a/module/Director/view/director/director/index.phtml b/module/Director/view/director/director/index.phtml
@@ -6,32 +6,18 @@
 <h2><?php echo $title; ?></h2>
 <hr />
 
-<div class="row">
+<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>
+</ul>
 
-  <div class="col-md-3">
+<br />
 
-	  <div class="panel panel-default">
-
-	      <div class="panel-heading">
-		  <h3 class="panel-title"><?php echo $this->translate('Director'); ?></h3>
-	      </div>
-
-	      <div class="panel-body">
-
-	      <table class="table table-striped table-hover">
-		<tr><td><a href="<?php echo $this->url('director', array('action'=>'index')); ?>"><?php echo $this->translate('Director status'); ?></a></td></tr>
-		<tr><td><a href="<?php echo $this->url('director', array('action'=>'messages')); ?>"><?php echo $this->translate('Director messages'); ?></a></td></tr>
-		<tr><td><a href="<?php echo $this->url('director', array('action'=>'scheduler')); ?>"><?php echo $this->translate('Director scheduler status'); ?></a></td></tr>
-		<tr><td><a href="<?php echo $this->url('director', array('action'=>'version')); ?>"><?php echo $this->translate('Director version'); ?></a></td></tr>
-	      </table>
-
-	      </div>
-
-	  </div>
-
-  </div>
+<div class="row">
 
-  <div class="col-md-9">
+  <div class="col-md-12">
 
     <pre style="font-size: 8pt;">
     <code>

diff --git a/module/Director/view/director/director/messages.phtml b/module/Director/view/director/director/messages.phtml
@@ -6,32 +6,18 @@
 <h2><?php echo $title; ?></h2>
 <hr />
 
-<div class="row">
+<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>
+</ul>
 
-  <div class="col-md-3">
+<br />
 
-	  <div class="panel panel-default">
-
-	      <div class="panel-heading">
-		  <h3 class="panel-title"><?php echo $this->translate('Director'); ?></h3>
-	      </div>
-
-	      <div class="panel-body">
-
-	      <table class="table table-striped table-hover">
-		<tr><td><a href="<?php echo $this->url('director', array('action'=>'index')); ?>"><?php echo $this->translate('Director status'); ?></a></td></tr>
-		<tr><td><a href="<?php echo $this->url('director', array('action'=>'messages')); ?>"><?php echo $this->translate('Director messages'); ?></a></td></tr>
-		<tr><td><a href="<?php echo $this->url('director', array('action'=>'scheduler')); ?>"><?php echo $this->translate('Director scheduler status'); ?></a></td></tr>
-		<tr><td><a href="<?php echo $this->url('director', array('action'=>'version')); ?>"><?php echo $this->translate('Director version'); ?></a></td></tr>
-	      </table>
-
-	      </div>
-
-	  </div>
-
-  </div>
+<div class="row">
 
-  <div class="col-md-9">
+  <div class="col-md-12">
 
     <pre style="font-size: 8pt;">
     <code>

diff --git a/module/Director/view/director/director/scheduler.phtml b/module/Director/view/director/director/scheduler.phtml
@@ -6,32 +6,18 @@
 <h2><?php echo $title; ?></h2>
 <hr />
 
-<div class="row">
+<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>
+</ul>
 
-  <div class="col-md-3">
+<br />
 
-	  <div class="panel panel-default">
-
-	      <div class="panel-heading">
-		  <h3 class="panel-title"><?php echo $this->translate('Director'); ?></h3>
-	      </div>
-
-	      <div class="panel-body">
-
-	      <table class="table table-striped table-hover">
-		<tr><td><a href="<?php echo $this->url('director', array('action'=>'index')); ?>"><?php echo $this->translate('Director status'); ?></a></td></tr>
-		<tr><td><a href="<?php echo $this->url('director', array('action'=>'messages')); ?>"><?php echo $this->translate('Director messages'); ?></a></td></tr>
-		<tr><td><a href="<?php echo $this->url('director', array('action'=>'scheduler')); ?>"><?php echo $this->translate('Director scheduler status'); ?></a></td></tr>
-		<tr><td><a href="<?php echo $this->url('director', array('action'=>'version')); ?>"><?php echo $this->translate('Director version'); ?></a></td></tr>
-	      </table>
-
-	      </div>
-
-	  </div>
-
-  </div>
+<div class="row">
 
-  <div class="col-md-9">
+  <div class="col-md-12">
 
     <pre style="font-size: 8pt;">
     <code>

diff --git a/module/Director/view/director/director/version.phtml b/module/Director/view/director/director/version.phtml
@@ -6,32 +6,18 @@
 <h2><?php echo $title; ?></h2>
 <hr />
 
-<div class="row">
+<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>
+</ul>
 
-  <div class="col-md-3">
+<br />
 
-	  <div class="panel panel-default">
-
-	      <div class="panel-heading">
-		  <h3 class="panel-title"><?php echo $this->translate('Director'); ?></h3>
-	      </div>
-
-	      <div class="panel-body">
-
-	      <table class="table table-striped table-hover">
-		<tr><td><a href="<?php echo $this->url('director', array('action'=>'index')); ?>"><?php echo $this->translate('Director status'); ?></a></td></tr>
-		<tr><td><a href="<?php echo $this->url('director', array('action'=>'messages')); ?>"><?php echo $this->translate('Director messages'); ?></a></td></tr>
-		<tr><td><a href="<?php echo $this->url('director', array('action'=>'scheduler')); ?>"><?php echo $this->translate('Director scheduler status'); ?></a></td></tr>
-		<tr><td><a href="<?php echo $this->url('director', array('action'=>'version')); ?>"><?php echo $this->translate('Director version'); ?></a></td></tr>
-	      </table>
-
-	      </div>
-
-	  </div>
-
-  </div>
+<div class="row">
 
-  <div class="col-md-9">
+  <div class="col-md-12">
 
     <pre style="font-size: 8pt;">
     <code>