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

Modify application templates for proper bootstrap usage 

refs #4550
This commit is contained in:
Jannis Moßhammer 2013-08-21 16:11:22 +02:00 committed by Marius Hein
parent 0ba27704ae
commit dc2aad75d1
6 changed files with 101 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,17 +1,19 @@
<?php echo $this->render('parts/topbar.phtml') ?>
<div class="main">
<div class="row">
<!-- Only required for left/right tabs -->
<div class="tabbable tabs-left "style="height:100%;">
<div class="col-md-2">
<?php echo $this->render('parts/navigation.phtml') ?>
</div>
<div class="layout-main-detail collapsed">
<div id="icinga-main" container-id="icinga-main" class="icinga-container">
<div class="col-md-10">
<div id="icingamain" class="col-md-8">
<?= $this->render('inline.phtml') ?>
</div>
<div id="icinga-detail" class="icinga-container " container-id="icinga-detail">
</div>
</div>
<div id="icingadetail" class="col-md-2">
Details
</div>
</div>
</div>

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

@ -13,14 +13,19 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title></title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width">
<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('css/vendor/bootstrap/bootstrap.min.css') ?>" media="screen">
<link rel="stylesheet" href="<?= $this->baseUrl('css/normalize.min.css') ?>">
<link rel="stylesheet" href="<?= $this->baseUrl('css/vendor/bootstrap.css') ?>">
<link rel="stylesheet" href="<?= $this->baseUrl('css/vendor/datetimepicker/bootstrap-datetimepicker.min.css') ?>">
<link rel="stylesheet" href="<?= $this->baseUrl('css/vendor/ui-lightness/jquery-ui-1.10.3.custom.min.css') ?>">
<link rel="stylesheet" href="<?= $this->baseUrl('css/main.css') ?>">
<link rel="stylesheet" href="<?= $this->baseUrl('css/vendor/jquery.qtip.min.css') ?>">
<link rel="stylesheet" href="<?= $this->baseUrl('css/vendor/bootstrap/datetimepicker.min.css') ?>">
<!--
Not used until styling is clear (see #4550)
<link rel="stylesheet" href="<?= $this->baseUrl('css.php') ?>">
-->
<script type="text/javascript">
var base_url = '<?= $this->baseUrl() ?>';
ICINGA_DEBUG = true;
@ -30,17 +35,18 @@
<? endif ?>
<script src="<?php echo $this->baseUrl('js/vendor/modernizr-2.6.2.min.js') ?>"></script>
<link rel="stylesheet" href="<?php echo $this->baseUrl('css.php') ?>">
<link rel="stylesheet" href="<?php echo $this->baseUrl('css/vendor/bootstrap-responsive.min.css') ?>">
<link rel="stylesheet" href="<?php echo $this->baseUrl('css/vendor/font-awesome.min.css') ?>">
<!--[if IE 7]>
<link rel="stylesheet" href="<?php echo $this->baseUrl('css/vendor/font-awesome-ie7.min.css') ?>">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="./js/vendor/html5shiv.js"></script>
<script src="./js/vendor/respond.min.js"></script>
<![endif]-->
<script data-main="<?php echo $this->baseUrl('js/main.js')?>"
src="<?php echo $this->baseUrl('js/vendor/require.js') ?>"></script>
</head>
<body class="cranberry">
<?= $this->render('just-the-body.phtml') ?>
<?= $this->render('body.phtml') ?>
</body>
</html>

8
application/layouts/scripts/parts/navigation.phtml
View File

@ -6,7 +6,7 @@ $currentKey = isset($this->navkey) ? $this->navkey : $url;
$item = $this->navigation->keys("menu");
?>
<?php if ($this->auth()->isAuthenticated()): ?>
<ul class="nav nav-tabs icinga-navigation" >
<ul class="nav nav-stacked" >
<?php
$activeSet = false;
foreach ($item as $itemName) {
@ -31,10 +31,12 @@ $item = $this->navigation->keys("menu");
}
$activeSet = $activeSet || $active;
?>
<li class="<?= $active ? "active" : "" ?>"><a href="<?= $url ?>"><?= $itemName ?></a></li>
<li class="<?= $active ? "active" : "" ?>">
<a href="<?= $url ?>"><?= $itemName ?></a>
</li>
<?php
$class = "";
}
?>
</ul>
</ul>
<? endif ?>

16
application/layouts/scripts/parts/topbar.phtml
View File

@ -1,10 +1,11 @@
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner ">
<ul class="nav pull-left">
<li style="float:left"><a href="<?= $this->baseUrl('/') ?>" class="brand" style="margin-left:0px;">Icinga</a></li>
<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
<ul class="nav navbar-nav pull-left">
<li>
<a href="<?= $this->baseUrl('/') ?>" class="brand" style="margin-left:0px;">Icinga</a>
</li>
</ul>
<?php if ($this->auth()->isAuthenticated()): ?>
<ul class="nav pull-right" >
<ul class="nav navbar-nav pull-right" >
<!-- Remove component as of #4583 since it's not working-->
<!-- <li>-->
<!-- <form class="navbar-search" style="padding-top:0.2em">-->
@ -23,9 +24,10 @@
</li>
<li>
<a href="<?= $this->href('/authentication/logout'); ?>"><?= $this->translate('Logout'); ?></a>
</li>
</ul>
</li>
</ul>
<?php endif ?>
</div>
</div>
</nav>

16
application/views/scripts/mixedPagination.phtml
View File

@ -19,17 +19,18 @@ $title_next = sprintf(
$total
);
?><div class="pagination pagination-mini" style="margin:0px">
<ul>
?>
<ul class="pagination pagination-sm">
<!-- Previous page link -->
<?php if (isset($this->previous)): ?>
<li><a href="<?= $this->url()->setParam('page', $this->previous) ?>" title="<?= $title_prev ?>">« <?= $this->translate('Back') ?></a></li>
<?php else: ?>
<li class="disabled"><span>« <?= $this->translate('Back') ?></span></li>
<?php endif ?>
<!-- Numbered page links -->
<?php
foreach ($this->pagesInRange as $page):
$start = ($page - 1) * $limit + 1;
@ -43,7 +44,11 @@ foreach ($this->pagesInRange as $page):
if ($page === '...'): ?>
<li class="disabled"><span>...</span></li>
<?php else: ?>
<li<?= $class ?>><a href="<?= $this->url()->setParam('page', $page) ?>" title="<?= $title ?>"><?= $page ?></a></li>
<li <?= $class ?>>
<a href="<?= $this->url()->setParam('page', $page) ?>" title="<?= $title ?>">
<?= $page ?>
</a>
</li>
<?php
endif;
endforeach;
@ -54,5 +59,4 @@ endforeach;
<? else: ?>
<li class="disabled"><span><?= t('Next') ?> »</span></li>
<? endif ?>
</ul>
</div>
</ul>

2
library/Icinga/Web/Controller/ActionController.php
View File

@ -223,7 +223,7 @@ class ActionController extends ZfController
if ($this->_request->isXmlHttpRequest()) {
if ($this->replaceLayout || $this->_getParam('_render') === 'body') {
$this->_helper->layout()->setLayout('just-the-body');
$this->_helper->layout()->setLayout('body');
header('X-Icinga-Target: body');
} else {
$this->_helper->layout()->setLayout('inline');