diff --git a/application/layouts/scripts/body.phtml b/application/layouts/scripts/body.phtml index a42b46dcc..41c275d69 100755 --- a/application/layouts/scripts/body.phtml +++ b/application/layouts/scripts/body.phtml @@ -1,28 +1,26 @@ -action('topbar', 'layout'); ?> - -
- -
- partial('layout/menu.phtml', 'default', array( - 'url' => \Icinga\Web\Url::fromRequest()->getRelativeUrl(), - 'items' => \Icinga\Web\Menu::fromConfig()->getChildren(), - 'sub' => false - )); ?> +isAuthenticated()): ?> +
+ +
+ +
+
+ render('inline.phtml') ?>
- -
- mainDetail($this->render('inline.phtml'), $this->layout()->detailContent); ?> +
+
    - -
    -
    -
    -
    - -
    -
    - Icinga Web 2 © 2014 Icinga Team -
    -
    +
    -
    +
    +
    +
    + +render('inline.phtml') ?> + + diff --git a/application/layouts/scripts/inline.phtml b/application/layouts/scripts/inline.phtml index 47d5672fa..1157e8ca9 100644 --- a/application/layouts/scripts/inline.phtml +++ b/application/layouts/scripts/inline.phtml @@ -1,2 +1,4 @@ +layout()->moduleStart ?> layout()->content ?> layout()->benchmark ?> +layout()->moduleEnd ?> diff --git a/application/layouts/scripts/layout.phtml b/application/layouts/scripts/layout.phtml index 260292409..263b0a5cb 100755 --- a/application/layouts/scripts/layout.phtml +++ b/application/layouts/scripts/layout.phtml @@ -1,4 +1,20 @@ - + - - - + - - - - + - - render('body.phtml') ?> - + +render('body.phtml') ?> + + + + diff --git a/application/layouts/scripts/login.phtml b/application/layouts/scripts/login.phtml deleted file mode 100755 index 96f44cae8..000000000 --- a/application/layouts/scripts/login.phtml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - <?= $this->title ? $this->title : 'Icinga Web'; ?> - - - - - - - - - - - - - - - - - - -
    -
    - - -
    -
    -
    - layout()->content; ?> -
    -
    - Icinga Web 2 © 2013 Icinga Team -
    -
    - -