Layout changes and cleanup

bareos · Mar 23, 2016 · 8fb9b1b · 8fb9b1b
1 parent e48ac11
commit 8fb9b1b
Show file tree

Hide file tree

Showing 11 changed files with 184 additions and 328 deletions.
diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php
@@ -133,30 +133,6 @@
             'label' => 'Dashboard',
             'route' => 'dashboard',
          ),
-         array(
-            'label' => 'Director',
-            'route' => 'director',
-         ),
-         array(
-            'label' => 'Filesets',
-            'route' => 'fileset',
-         ),
-         array(
-            'label' => 'Pools',
-            'route' => 'pool',
-         ),
-         array(
-            'label' => 'Volumes',
-            'route' => 'media',
-         ),
-         array(
-            'label' => 'Storages',
-            'route' => 'storage',
-         ),
-         array(
-            'label' => 'Clients',
-            'route' => 'client',
-         ),
          array(
             'label' => 'Jobs',
             'route' => 'job',
@@ -177,7 +153,35 @@
             'label' => 'Restore',
             'route' => 'restore',
          ),
+         array(
+            'label' => 'Clients',
+            'route' => 'client',
+         ),
+         array(
+            'label' => 'Storage',
+            'route' => 'storage',
+         ),
+         /*array(
+            'label' => 'Volumes',
+            'route' => 'media',
+         ),
+         array(
+            'label' => 'Pools',
+            'route' => 'pool',
+         ),*/
+         array(
+            'label' => 'Director',
+            'route' => 'director',
+         ),
+         /*array(
+            'label' => 'Filesets',
+            'route' => 'fileset',
+         ),
+         array(
+            'label' => 'Storages',
+            'route' => 'storage',
+         )*/
       ),
-    ),
+   ),
 );
 
diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml
@@ -61,6 +61,8 @@ echo $this->doctype();
 
 <body>
 
+<div class="spinner" id="spinner"></div>
+
 <!-- TOP NAVBAR -->
 <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
    <div class="container-fluid">
@@ -112,6 +114,10 @@ echo $this->doctype();
 
 <?php echo $this->inlineScript() ?>
 
+<script>
+   $('#spinner').fadeOut('normal');
+</script>
+
 </body>
 
 </html>

diff --git a/module/Job/view/job/job/details.phtml b/module/Job/view/job/job/details.phtml
@@ -130,7 +130,7 @@ $(document).ready(function() {
          { "data": "jobid" },
          { "data": "name" },
          { "data": "client" },
-         { "data": "fileset" },
+         { "data": null },
          { "data": "type" },
          { "data": "level" },
          { "data": "poolname" }
@@ -142,6 +142,12 @@ $(document).ready(function() {
       "stateSave": true,
       "bFilter": false,
       "columnDefs": [
+         {
+            "targets": 3,
+            "render": function(data, type, full, meta) {
+               return '<a href="<?php echo $this->basePath() . '/fileset/details/'; ?>'+data.filesetid+'">'+data.fileset+'</a>';
+            }
+         },
          {
             "targets": 4,
             "render": function(data, type, full, meta) {

diff --git a/module/Job/view/job/job/run.phtml b/module/Job/view/job/job/run.phtml
@@ -38,7 +38,7 @@ $this->headTitle($title);
 
 <div class="row">
 
-<div class="col-md-10">
+<div class="col-md-6">
 
 <div class="panel panel-default">
 

diff --git a/module/Media/view/media/media/details.phtml b/module/Media/view/media/media/details.phtml
@@ -29,6 +29,14 @@ $this->headTitle($title);
 
 ?>
 
+<ul class="nav nav-tabs">
+   <li><a href="<?php echo $this->url('storage', array('action'=>'index')); ?>"><?php echo $this->translate('Devices'); ?></a></li>
+   <li><a href="<?php echo $this->url('pool', array('action'=>'index')); ?>"><?php echo $this->translate('Pools'); ?></a></li>
+   <li class="active"><a href="<?php echo $this->url('media', array('action'=>'index')); ?>"><?php echo $this->translate('Volumes'); ?></a></li>
+</ul>
+
+<br />
+
 <div class="row">
 
 <div class="col-md-8">

diff --git a/module/Media/view/media/media/index.phtml b/module/Media/view/media/media/index.phtml
@@ -29,6 +29,14 @@ $this->headTitle($title);
 
 ?>
 
+<ul class="nav nav-tabs">
+   <li><a href="<?php echo $this->url('storage', array('action'=>'index')); ?>"><?php echo $this->translate('Devices'); ?></a></li>
+   <li><a href="<?php echo $this->url('pool', array('action'=>'index')); ?>"><?php echo $this->translate('Pools'); ?></a></li>
+   <li class="active"><a href="<?php echo $this->url('media', array('action'=>'index')); ?>"><?php echo $this->translate('Volumes'); ?></a></li>
+</ul>
+
+<br />
+
 <div class="row">
 
 <div class="col-md-12">
@@ -148,10 +156,6 @@ $(document).ready(function() {
       "order": [[4, "desc"]],
       "searching": true,
       "info": false,
-      /*"select": {
-         "style": "os",
-         "blurable": true
-      },*/
       "columns": [
          { "data": null, "orderable": false, "defaultContent": '', "className": 'details-control' },
          { "data": "volumename" },
@@ -209,58 +213,8 @@ $(document).ready(function() {
             "searchable": false
          }
       ],
-      "buttons": [/*
-         {
-            "text": '<span class="glyphicon glyphicon-trash" aria-hidden="true"></span>' + ' Delete',
-            "action": function(e, dt, node, conf) {
-               var sel_volumes = $.map(volumes.rows('.selected').data(), function(item) {
-                  return item['volumename'];
-               });
-
-               alert(sel_volumes);
-            }
-         },
-         {
-            "text": '<span class="glyphicon glyphicon-trash" aria-hidden="true"></span>' + ' Purge',
-            "action": function(e, dt, node, conf) {
-               var sel_volumes = $.map(volumes.rows('.selected').data(), function(item) {
-                  return item['volumename'];
-               });
-
-               alert(sel_volumes);
-            }
-         },
-         {
-            "text": '<span class="glyphicon glyphicon-trash" aria-hidden="true"></span>' + ' Prune',
-            "action": function(e, dt, node, conf) {
-               var sel_volumes = $.map(volumes.rows('.selected').data(), function(item) {
-                  return item['volumename'];
-               });
-
-               alert(sel_volumes);
-            }
-         },
-         {
-            "text": '<span class="glyphicon glyphicon-import" aria-hidden="true"></span>' + ' Import',
-            "action": function(e, dt, node, conf) {
-               var sel_volumes = $.map(volumes.rows('.selected').data(), function(item) {
-                  return item['volumename'];
-               });
-
-               alert(sel_volumes);
-            }
-         },
-         {
-            "text": '<span class="glyphicon glyphicon-export" aria-hidden="true"></span>' + ' Export',
-            "action": function(e, dt, node, conf) {
-               var sel_volumes = $.map(volumes.rows('.selected').data(), function(item) {
-                  return item['volumename'];
-               });
-
-               alert(sel_volumes);
-            }
-         },
-      */],
+      "buttons": [
+      ],
 
    } );
 

diff --git a/module/Pool/view/pool/pool/details.phtml b/module/Pool/view/pool/pool/details.phtml
@@ -29,6 +29,14 @@ $this->headTitle($title);
 
 ?>
 
+<ul class="nav nav-tabs">
+   <li><a href="<?php echo $this->url('storage', array('action'=>'index')); ?>"><?php echo $this->translate('Devices'); ?></a></li>
+   <li class="active"><a href="<?php echo $this->url('pool', array('action'=>'index')); ?>"><?php echo $this->translate('Pools'); ?></a></li>
+   <li><a href="<?php echo $this->url('media', array('action'=>'index')); ?>"><?php echo $this->translate('Volumes'); ?></a></li>
+</ul>
+
+<br />
+
 <!-- POOL -->
 <div class="row">
 

diff --git a/module/Pool/view/pool/pool/index.phtml b/module/Pool/view/pool/pool/index.phtml
@@ -29,6 +29,14 @@ $this->headTitle($title);
 
 ?>
 
+<ul class="nav nav-tabs">
+   <li><a href="<?php echo $this->url('storage', array('action'=>'index')); ?>"><?php echo $this->translate('Devices'); ?></a></li>
+   <li class="active"><a href="<?php echo $this->url('pool', array('action'=>'index')); ?>"><?php echo $this->translate('Pools'); ?></a></li>
+   <li><a href="<?php echo $this->url('media', array('action'=>'index')); ?>"><?php echo $this->translate('Volumes'); ?></a></li>
+</ul>
+
+<br />
+
 <div class="row">
 
 <div class="col-md-12">