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

Ship only one CSS and one JS file

This commit is contained in:
Thomas Gelf 2014-03-27 07:32:45 +00:00
parent 5c89512e05
commit 17ce27a985
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@ use Icinga\Web\JavaScript;
<title><?= $this->title ? $this->escape($this->title) : 'Icinga Web' ?></title> <title><?= $this->title ? $this->escape($this->title) : 'Icinga Web' ?></title>
<!-- TODO: viewport and scale settings make no sense for us, fix this --> <!-- TODO: viewport and scale settings make no sense for us, fix this -->
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<link rel="stylesheet" href="<?= $this->href('css/icinga.css') ?>" media="screen" type="text/css" /> <link rel="stylesheet" href="<?= $this->href('css/icinga.min.css') ?>" media="screen" type="text/css" />
<? if (isset($_GET['iframe']) && $_GET['iframe'] === 'true'): ?> <? if (isset($_GET['iframe']) && $_GET['iframe'] === 'true'): ?>
<base target="_parent"/> <base target="_parent"/>
<? endif ?> <? endif ?>
@ -33,9 +33,7 @@ use Icinga\Web\JavaScript;
<div id="layout" class="default-layout"> <div id="layout" class="default-layout">
<?= $this->render('body.phtml') ?> <?= $this->render('body.phtml') ?>
</div> </div>
<?php foreach (JavaScript::listFiles() as $file): ?> <script type="text/javascript" src="<?= $this->href('js/icinga.min.js') ?>"></script>
<script type="text/javascript" src="<?= $this->href($file) ?>"></script>
<?php endforeach ?>
<script type="text/javascript"> <script type="text/javascript">
var icinga = new Icinga({ var icinga = new Icinga({
baseUrl: '<?= $this->href('/') ?>', baseUrl: '<?= $this->href('/') ?>',