tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Layout restructured

This commit is contained in:
Thomas Gelf 2014-02-18 18:06:27 +00:00
parent 914806e229
commit 0f3f18f793
4 changed files with 55 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
application/layouts/scripts/body.phtml
View File

@ -1,28 +1,26 @@
<?= $this->action('topbar', 'layout'); ?>
<div class="row">
<!-- Only required for left/right tabs -->
<div class="col-sm-12 col-xs-12 col-md-2 col-lg-2">
<?= $this->partial('layout/menu.phtml', 'default', array(
'url' => \Icinga\Web\Url::fromRequest()->getRelativeUrl(),
'items' => \Icinga\Web\Menu::fromConfig()->getChildren(),
'sub' => false
)); ?>
<?php if (Icinga\Authentication\Manager::getInstance()->isAuthenticated()): ?>
<div id="layout">
<div id="header">
<ul id="notifications"></ul>
</div>
<div id="inner-layout">
<div id="sidebar">
<?= $this->layout()->navigation ?>
<?php echo $this->render('parts/navigation.phtml') ?>
</div>
<div id="main">
<div id="col1" class="container">
<?= $this->render('inline.phtml') ?>
</div>
<div class="col-sm-12 col-xs-12 col-md-10 col-lg-10">
<?= $this->mainDetail($this->render('inline.phtml'), $this->layout()->detailContent); ?>
<div id="col2" class="container">
<ul class="tabs"></ul>
</div>
</div>
<br/>
<div class="row">
<div class="col-md-12">
<!-- Make some space at the end of the page -->
<div class="panel">
<div class="panel-body text-center">
Icinga Web 2 &copy; 2014 Icinga Team
</div>
</div>
<div id="col3" class="container">
</div>
</div>
</div><!-- END of main -->
</div><!-- END of inner-layout -->
</div><!-- END of layout -->
<?php else: ?>
<?= $this->render('inline.phtml') ?>
<?php endif ?>

2
application/layouts/scripts/inline.phtml
View File

@ -1,2 +1,4 @@
<?= $this->layout()->moduleStart ?>
<?= $this->layout()->content ?>
<?= $this->layout()->benchmark ?>
<?= $this->layout()->moduleEnd ?>

51
application/layouts/scripts/layout.phtml
View File

@ -1,4 +1,20 @@
<!DOCTYPE html>
<?php
$jsfiles = array(
'js/fanzzzy/jquery-1.8.3.js',
'js/fanzzzy/helpers.js',
'js/fanzzzy/icinga.js',
'js/fanzzzy/icinga/logger.js',
'js/fanzzzy/icinga/utils.js',
'js/fanzzzy/icinga/ui.js',
'js/fanzzzy/icinga/timer.js',
'js/fanzzzy/icinga/loader.js',
'js/fanzzzy/icinga/events.js',
'js/fanzzzy/icinga/module.js',
'js/bpapp/bpapp.js',
);
?><!DOCTYPE html>
<!--[if lt IE 7]>
<html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
<!--[if IE 7]>
@ -11,35 +27,28 @@
<meta charset="utf-8">
<meta content="width=320; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title><?= $this->title ? $this->title : 'Icinga Web'; ?></title>
<title><?= $this->title ? $this->escape($this->title) : 'Icinga Web'; ?></title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<!-- Bootstrap and components -->
<link rel="stylesheet" href="<?= $this->baseUrl('static/stylesheet') ?>" media="screen">
<script type="text/javascript">
var base_url = '<?= $this->baseUrl() ?>';
var request_id = '<?= $this->requestId(); ?>';
ICINGA_DEBUG = true;
</script>
<link rel="stylesheet" href="<?= $this->href('css/icinga.css') ?>" media="screen" type="text/css" />
<? if (isset($_GET['iframe']) && $_GET['iframe'] === 'true'): ?>
<base target="_parent"/>
<? endif ?>
<script src="<?= $this->baseUrl('js/vendor/modernizr-2.6.2.min.js') ?>"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- Respond.js IE8 support of media queries -->
<!--[if lt IE 9]>
<script src="<?= $this->baseUrl('js/vendor/html5shiv.js');?>"></script>
<script src="<?= $this->baseUrl('js/vendor/respond.min.js');?>"></script>
<![endif]-->
</head>
<body>
<?= $this->render('body.phtml') ?>
<script data-main="<?php echo $this->baseUrl('js/main.js')?>"
src="<?php echo $this->baseUrl('js/vendor/require.js') ?>"></script>
<body id="body">
<?= $this->render('body.phtml') ?>
<?php foreach ($jsfiles as $file): ?>
<script type="text/javascript" src="<?= $this->href($file) ?>"></script>
<?php endforeach ?>
<script type="text/javascript">
var icinga = new Icinga({
baseUrl: '<?= $this->href('/') ?>',
});
</script>
</body>
</html>

55
application/layouts/scripts/login.phtml
View File

@ -1,55 +0,0 @@
<!DOCTYPE html>
<!--[if lt IE 7]>
<html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
<!--[if IE 7]>
<html class="no-js lt-ie9 lt-ie8"> <![endif]-->
<!--[if IE 8]>
<html class="no-js lt-ie9"> <![endif]-->
<!--[if gt IE 8]><!-->
<html class="no-js"> <!--<![endif]-->
<head>
<meta charset="utf-8">
<meta content="width=320; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title><?= $this->title ? $this->title : 'Icinga Web'; ?></title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<!-- Bootstrap and components -->
<link rel="stylesheet" href="<?= $this->baseUrl('static/stylesheet') ?>" media="screen">
<? if (isset($_GET['iframe']) && $_GET['iframe'] === 'true'): ?>
<base target="_parent"/>
<? endif ?>
<script src="<?= $this->baseUrl('js/vendor/modernizr-2.6.2.min.js') ?>"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="<?= $this->baseUrl('js/vendor/html5shiv.js');?>"></script>
<script src="<?= $this->baseUrl('js/vendor/respond.min.js');?>"></script>
<![endif]-->
</head>
<body class="login">
<div class="logo-container">
<div class="image-container">
<div class="hidden-xs">
<img src="<?= $this->baseUrl('img/logo_icinga_big.png') ?>" width="400px">
</div>
<div class="hidden-sm hidden-lg hidden-md">
<img src="<?= $this->baseUrl('img/logo_icinga_big.png') ?>" width="200px">
</div>
</div>
</div>
<div class="form-container">
<?= $this->layout()->content; ?>
<div class="footer">
<br/>
Icinga Web 2 &copy; 2013 Icinga Team
</div>
</div>
</body>
</html>