From 8fb9b1b2808e8e344c19882ddcb202b346e7f51a Mon Sep 17 00:00:00 2001 From: Frank Bergkemper Date: Tue, 22 Mar 2016 18:20:31 +0100 Subject: [PATCH] Layout changes and cleanup --- module/Application/config/module.config.php | 54 +-- module/Application/view/layout/layout.phtml | 6 + module/Job/view/job/job/details.phtml | 8 +- module/Job/view/job/job/run.phtml | 2 +- module/Media/view/media/media/details.phtml | 8 + module/Media/view/media/media/index.phtml | 66 +--- module/Pool/view/pool/pool/details.phtml | 8 + module/Pool/view/pool/pool/index.phtml | 8 + .../view/storage/storage/details.phtml | 341 +++++------------- .../Storage/view/storage/storage/index.phtml | 10 +- public/css/style.css | 1 + 11 files changed, 184 insertions(+), 328 deletions(-) diff --git a/module/Application/config/module.config.php b/module/Application/config/module.config.php index 932c2894..e44e371a 100644 --- 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 index c883ce05..bf439fb1 100644 --- a/module/Application/view/layout/layout.phtml +++ b/module/Application/view/layout/layout.phtml @@ -61,6 +61,8 @@ echo $this->doctype(); + +