Autochanger management

bareos · Mar 15, 2016 · e48ac11 · e48ac11
1 parent d683070
commit e48ac11
Show file tree

Hide file tree

Showing 41 changed files with 4,248 additions and 208 deletions.
diff --git a/install/bareos/webui-profiles.conf b/install/bareos/webui-profiles.conf
@@ -10,7 +10,7 @@
 #
 Profile {
   Name = webui
-  CommandACL = status, messages, show, version, run, rerun, cancel, .api, .bvfs_*, list, llist, use, restore, .jobs, .filesets, .clients
+  CommandACL = status, messages, show, version, run, rerun, cancel, .api, .bvfs_*, list, llist, use, restore, .jobs, .filesets, .clients, import, export, move, mount, umount, unmount, update, label, release
   Job ACL = *all*
   Schedule ACL = *all*
   Catalog ACL = *all*

diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php
@@ -160,6 +160,18 @@
          array(
             'label' => 'Jobs',
             'route' => 'job',
+            'pages' => array(
+               array(
+                  'label' => 'Overview',
+                  'route' => 'job',
+                  'action' => 'index'
+               ),
+               array(
+                  'label' => 'Run',
+                  'route' => 'job',
+                  'action' => 'run'
+               ),
+            ),
          ),
          array(
             'label' => 'Restore',

diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml
@@ -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-2015 Bareos GmbH & Co. KG (http://www.bareos.org/)
+ * @copyright Copyright (c) 2013-2016 Bareos GmbH & Co. KG (http://www.bareos.org/)
  * @license   GNU Affero General Public License (http://www.gnu.org/licenses/)
  * @author    Frank Bergkemper
  *
@@ -30,84 +30,89 @@ echo $this->doctype();
 
 <html lang="en">
 
-    <head>
-   <meta charset="utf-8">
-   <?php echo $this->headTitle($_SESSION['bareos']['director'],'APPEND')->setSeparator(' | ')->setAutoEscape(false) ?>
-
-   <?php echo $this->headMeta()
-       ->appendName('viewport', 'width=device-width, initial-scale=1.0')
-       ->appendHttpEquiv('X-UA-Compatible', 'IE=edge')
-   ?>
-
-   <!-- 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-select.min.css')
-         ->prependStylesheet($this->basePath() . '/css/bootstrap.min.css')
-   ?>
-
-   <!-- Scripts -->
-   <?php echo $this->headScript()
-       ->prependFile($this->basePath() . '/js/bootstrap.min.js')
-       ->prependFile($this->basePath() . '/js/bootstrap-select.min.js')
-       ->prependFile($this->basePath() . '/js/excanvas.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',));
-   ?>
-
-    </head>
-
-    <body>
-
-   <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
-       <div class="container">
-            <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 href="http://www.bareos.org/" target="_blank"><img src="<?php echo $this->basePath('img/bareos-logo-small.png') ?>" alt="Bareos" /></a>&nbsp;
+<head>
+<meta charset="utf-8">
+
+<?php echo $this->headTitle($_SESSION['bareos']['director'],'APPEND')->setSeparator(' | ')->setAutoEscape(false) ?>
+
+<?php echo $this->headMeta()
+   ->appendName('viewport', 'width=device-width, initial-scale=1.0')
+   ->appendHttpEquiv('X-UA-Compatible', 'IE=edge')
+?>
+
+<!-- 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-select.min.css')
+   ->prependStylesheet($this->basePath() . '/css/bootstrap.min.css');
+?>
+
+<!-- Scripts -->
+<?php echo $this->headScript()
+   ->prependFile($this->basePath() . '/js/bootstrap.min.js')
+   ->prependFile($this->basePath() . '/js/bootstrap-select.min.js')
+   ->prependFile($this->basePath() . '/js/excanvas.min.js', 'text/jaavscript')
+   ->prependFile($this->basePath() . '/js/jquery.min.js', 'text/javascript')
+   ->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'));
+?>
+
+</head>
+
+<body>
+
+<!-- TOP NAVBAR -->
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+   <div class="container-fluid">
+      <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 href="http://www.bareos.org/" target="_blank"><img src="<?php echo $this->basePath('img/bareos-logo-small.png') ?>" alt="Bareos" /></a>&nbsp;
       </div>
       <div class="collapse navbar-collapse">
-         <?php echo $this->navigation('navigation')->menu()->setMinDepth(0)->setMaxDepth(0)->setUlClass('nav navbar-nav'); ?>
+         <span class="navbar-brand">Bareos <small>Open Source Data Protection</small></span>
          <ul class="nav navbar-nav navbar-right">
+            <li class="dropdown">
+               <a href="#"><span class="glyphicon glyphicon-th"></span>&nbsp;<?php echo $_SESSION['bareos']['director']; ?></a>
+            </li>
             <li class="dropdown">
                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
-                  <span class="glyphicon glyphicon-user" aria-hidden="true"></span>
-                  &nbsp;<?php echo $_SESSION['bareos']['username']; ?> <span class="caret"></span>
+                  <span class="glyphicon glyphicon-user" aria-hidden="true"></span>&nbsp;<?php echo $_SESSION['bareos']['username']; ?> <span class="caret"></span>
                </a>
                <ul class="dropdown-menu" role="menu">
+                  <li><a href="http://doc.bareos.org" target="_blank">Help</a></li>
+                  <li role="separator" class="divider"></li>
                   <li><a href="<?php echo $this->url('auth', array('action' => 'logout')); ?>">Logout</a></li>
                </ul>
             </li>
          </ul>
       </div>
-       </div>
-   </nav>
-
-   <div class="container">
-         <?php echo $this->content; ?>
    </div>
+</nav>
 
-   <footer class="footer">
-     <div class="container">
-      <div class="row">
-         <div class="col-md-8">
-            <p class="text-muted">Bareos WebUI Version 16.1.0 &copy; 2013 - <?php echo date('Y') ?> <a href="http://www.bareos.com/" target="_blank">Bareos GmbH  &amp; Co. KG</a>, GNU Affero General Public License Version 3</p>
-         </div>
-         <div class="col-md-4 text-right">
-            <p class="text-muted"><?php echo "Director: " . $_SESSION['bareos']['director']; ?></p>
-         </div>
-      </div>
-     </div>
-   </footer>
+<div class="container-fluid">
+<div class="row">
+
+<!-- LEFT NAVBAR -->
+<div class="col-xs-2 col-md-1 sidebar">
+   <?php echo $this->navigation('navigation')->menu()->setMinDepth(0)->setMaxDepth(0)->setUlClass('nav nav-sidebar'); ?>
+</div>
+
+<!-- CONTENT CONTAINER -->
+<div class="col-xs-14 col-md-11 col-xs-offset-2 col-md-offset-1 main">
+   <?php echo $this->content; ?>
+</div>
+
+</div>
+</div>
 
-   <?php echo $this->inlineScript() ?>
+<?php echo $this->inlineScript() ?>
 
-   </body>
+</body>
 
 </html>
 
diff --git a/module/Application/view/layout/login.phtml b/module/Application/view/layout/login.phtml
@@ -30,45 +30,48 @@ echo $this->doctype();
 
 <html lang="en">
 
-    <head>
-   <meta charset="utf-8">
-   <?php echo $this->headTitle('Bareos','PREPEND')->setSeparator(' - ')->setAutoEscape(false) ?>
+   <head>
 
-   <?php echo $this->headMeta()
-       ->appendName('viewport', 'width=device-width, initial-scale=1.0')
-       ->appendHttpEquiv('X-UA-Compatible', 'IE=edge')
-   ?>
+      <meta charset="utf-8">
 
-   <!-- Styles -->
-   <?php echo $this->headLink(array('rel' => 'shortcut icon', 'type' => 'image/vnd.microsoft.icon', 'href' => $this->basePath() . '/img/favicon.ico'))
+      <?php echo $this->headTitle('Bareos','PREPEND')->setSeparator(' - ')->setAutoEscape(false) ?>
+      <?php echo $this->headMeta()
+         ->appendName('viewport', 'width=device-width, initial-scale=1.0')
+         ->appendHttpEquiv('X-UA-Compatible', 'IE=edge')
+      ?>
+
+      <!-- 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-select.min.css')
          ->prependStylesheet($this->basePath() . '/css/bootstrap.min.css')
-   ?>
+      ?>
 
-   <!-- Scripts -->
-   <?php echo $this->headScript()
-       ->prependFile($this->basePath() . '/js/bootstrap.min.js')
-       ->prependFile($this->basePath() . '/js/bootstrap-select.min.js')
-       ->prependFile($this->basePath() . '/js/excanvas.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',));
-   ?>
+      <!-- Scripts -->
+      <?php echo $this->headScript()
+         ->prependFile($this->basePath() . '/js/bootstrap.min.js')
+         ->prependFile($this->basePath() . '/js/bootstrap-select.min.js')
+         ->prependFile($this->basePath() . '/js/excanvas.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',));
+      ?>
 
-    </head>
+   </head>
 
-    <body>
+<body>
 
    <div class="container text-center">
       <img src="<?php echo $this->basePath() . '/img/bareos.png'; ?>" />
       <br /><br /><br />
       <?php echo $this->content; ?>
+      <br />
+      <p class="text-muted">Bareos WebUI Version 16.1.0 &copy; 2013 - <?php echo date('Y') ?> <a href="http://www.bareos.com/" target="_blank">Bareos GmbH  &amp; Co. KG</a>,<br />GNU Affero General Public License Version 3</p>
    </div>
 
    <?php echo $this->inlineScript() ?>
 
-   </body>
+</body>
 
 </html>
 
diff --git a/module/Client/view/client/client/details.phtml b/module/Client/view/client/client/details.phtml
@@ -106,9 +106,9 @@ $(document).ready(function() {
          { "data": "jobretention" },
          { "data": "name" }
       ],
-      "paging":   false,
+      "paging": false,
       "ordering": false,
-      "info":     false,
+      "info": false,
       "pagingType": "full_numbers",
       "stateSave": true,
       "bFilter": false,
@@ -153,9 +153,9 @@ $(document).ready(function() {
          { "data": "jobfiles" },
          { "data": "jobbytes", "type": "file-size" }
       ],
-      "paging":   true,
+      "paging": true,
       "ordering": true,
-      "info":     true,
+      "info": true,
       "pagingType": "full_numbers",
       "stateSave": true,
       "order": [[0, 'desc']],

diff --git a/module/Client/view/client/client/index.phtml b/module/Client/view/client/client/index.phtml
@@ -86,9 +86,9 @@ $(document).ready(function() {
             "data": "name"
          }
       ],
-      "paging":   true,
+      "paging": true,
       "ordering": true,
-      "info":     true,
+      "info": true,
       "pagingType": "full_numbers",
       "stateSave": true,
       "order": [[0, 'asc']],

diff --git a/module/Dashboard/view/dashboard/dashboard/index.phtml b/module/Dashboard/view/dashboard/dashboard/index.phtml
@@ -42,7 +42,7 @@ $this->headTitle($title);
       </h3>
    </div>
 
-   <div class="panel-body">
+   <div class="panel-body" style="overflow-y: auto;">
 
       <div class="col-md-4">
 

diff --git a/module/Fileset/view/fileset/fileset/index.phtml b/module/Fileset/view/fileset/fileset/index.phtml
@@ -72,9 +72,9 @@ $this->headTitle($title);
          { "data": null },
          { "data": "createtime" },
       ],
-      "paging":   true,
+      "paging": true,
       "ordering": true,
-      "info":     true,
+      "info": true,
       "pagingType": "full_numbers",
       "stateSave": true,
       "order": [[0, 'desc']],

diff --git a/module/Job/view/job/job/details.phtml b/module/Job/view/job/job/details.phtml
@@ -135,9 +135,9 @@ $(document).ready(function() {
          { "data": "level" },
          { "data": "poolname" }
       ],
-      "paging":   false,
+      "paging": false,
       "ordering": false,
-      "info":     false,
+      "info": false,
       "pagingType": "full_numbers",
       "stateSave": true,
       "bFilter": false,
@@ -219,9 +219,9 @@ $(document).ready(function() {
          { "data": "endtime" },
          { "data": "realendtime" }
       ],
-      "paging":   false,
+      "paging": false,
       "ordering": false,
-      "info":     false,
+      "info": false,
       "pagingType": "full_numbers",
       "stateSave": true,
       "bFilter": false,
@@ -240,9 +240,9 @@ $(document).ready(function() {
          { "data": "joberrors" },
          { "data": null }
       ],
-      "paging":   false,
+      "paging": false,
       "ordering": false,
-      "info":     false,
+      "info": false,
       "pagingType": "full_numbers",
       "stateSave": true,
       "bFilter": false,
@@ -391,9 +391,9 @@ $(document).ready(function() {
          { "data": "time" },
          { "data": null }
       ],
-      "paging":   true,
+      "paging": true,
       "ordering": true,
-      "info":     true,
+      "info": true,
       "pagingType": "full_numbers",
       "stateSave": true,
       "order": [[0, 'desc']],

diff --git a/module/Job/view/job/job/index.phtml b/module/Job/view/job/job/index.phtml
@@ -192,9 +192,9 @@ $(document).ready(function() {
          { "data": "jobstatus" },
          { "data": null, "orderable": false }
       ],
-      "paging":   true,
+      "paging": true,
       "ordering": true,
-      "info":     true,
+      "info": true,
       "pagingType": "full_numbers",
       "stateSave": true,
       "order": [[1, 'desc']],

diff --git a/module/Job/view/job/job/run.phtml b/module/Job/view/job/job/run.phtml
@@ -82,9 +82,9 @@ $this->headTitle($title);
             "data": null
          }
       ],
-      "paging":   true,
+      "paging": true,
       "ordering": true,
-      "info":     true,
+      "info": true,
       "pagingType": "full_numbers",
       "stateSave": true,
       "order": [[0, 'asc']],