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

phtml: Use short_open_tags instead of <?php echo

This commit is contained in:
Eric Lippmann 2013-07-10 17:03:51 +02:00
parent a035473914
commit 6d05361370
6 changed files with 26 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/layouts/scripts/just-the-body.phtml
View File

@ -6,9 +6,7 @@
<div class="layout-main-detail collapsed">
<div id="icinga-main" container-id="icinga-main" class="icinga-container">
<?php echo $this->layout()->moduleStart ?>
<?php echo $this->layout()->content ?>
<?php echo $this->layout()->moduleEnd ?>
<?= $this->render('inline.phtml') ?>
</div>
<div id="icinga-detail" class="icinga-container " container-id="icinga-detail">

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

@ -12,43 +12,25 @@
<meta name="description" content="">
<meta name="viewport" content="width=device-width">
<link rel="stylesheet" href="<?php echo $this->baseUrl('css/normalize.min.css') ?>">
<link rel="stylesheet" href="<?php echo $this->baseUrl('css/vendor/bootstrap.css') ?>">
<link rel="stylesheet" href="<?php echo $this->baseUrl('css/main.css') ?>">
<link rel="stylesheet" href="<?php echo $this->baseUrl('css/vendor/jquery.qtip.min.css') ?>">
<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/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') ?>">
<script type="text/javascript">
var base_url = '<?php echo $this->baseUrl() ?>';
var base_url = '<?= $this->baseUrl() ?>';
ICINGA_DEBUG = true;
</script>
<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') ?>">
<script data-main="<?php echo $this->baseUrl('js/main.js')?>" src="<?php echo $this->baseUrl('js/vendor/require.js') ?>"></script>
<? if (isset($_GET['iframe']) && $_GET['iframe'] === 'true'): ?>
<base target="_parent" />
<? endif ?>
<script src="<?= $this->baseUrl('js/vendor/modernizr-2.6.2.min.js') ?>"></script>
<link rel="stylesheet" href="<?= $this->baseUrl('css/icinga.css') ?>">
<link rel="stylesheet" href="<?= $this->baseUrl('css/vendor/bootstrap-responsive.min.css') ?>">
<script data-main="<?= $this->baseUrl('js/main.js')?>" src="<?= $this->baseUrl('js/vendor/require.js') ?>"></script>
</head>
<body class="cranberry">
<?php echo $this->render('parts/topbar.phtml') ?>
<div class="main">
<div class="tabbable tabs-left" style="height:100%;">
<?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">
<?php echo $this->layout()->moduleStart ?>
<?php echo $this->layout()->content ?>
<?php echo $this->layout()->moduleEnd ?>
</div>
<div id="icinga-detail" class="icinga-container " container-id="icinga-detail">
<!--<div class="container-controls">
<a class="container-expand-link" title="expand" target="_self" href="...">
<i class="icon-fullscreen"></i>
</a>
<a class="container-detach-link" title="detach" target="popup" href="...">
<i class="icon-share"></i>
</a>
</div>-->
</div><!-- End of icinga-detail -->
</div><!-- End of layout-main-detail -->
</div><!-- End of main -->
<body class="cranberry">
<?= $this->render('just-the-body.phtml') ?>
</body>
</html>

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

@ -5,8 +5,7 @@
$item = $this->navigation->listAll("menu");
?>
<?php if (true || $this->auth()->isAuthenticated()): ?>
<?php if ($this->auth()->isAuthenticated()): ?>
<ul class="nav nav-tabs icinga-navigation" >
<?php
$activeSet = false;
@ -32,10 +31,10 @@
}
$activeSet = $activeSet || $active;
?>
<li class="<?php echo $active ? "active" : "" ?>"><a href="<?php echo $url ?>"><?php echo $itemName ?></a></li>
<li class="<?= $active ? "active" : "" ?>"><a href="<?= $url ?>"><?= $itemName ?></a></li>
<?php
$class = "";
}
?>
</ul>
<?php endif ?>
<? endif ?>

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

@ -1,7 +1,7 @@
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner ">
<ul class="nav pull-left">
<li style="float:left"><a href="<?php echo $this->baseUrl('/') ?>" class="brand" style="margin-left:0px;">Icinga</a></li>
<li style="float:left"><a href="<?= $this->baseUrl('/') ?>" class="brand" style="margin-left:0px;">Icinga</a></li>
</ul>
<?php if ($this->auth()->isAuthenticated()): ?>
<ul class="nav pull-right" >
@ -11,13 +11,14 @@
</form>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?=
$this->escape($this->auth()->getUser()->getUsername())
?> <i class="icon-user icon-white" style="margin-top:0.2em"></i>
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><?php echo $this->qlink(_('Logout'), '/authentication/logout') ?></li>
<li><?= $this->qlink($this->translate('Settings'), 'settings') ?></li>
<li><?= $this->qlink($this->translate('Logout'), 'authentication/logout') ?></li>
</ul>
</li>
</ul>

5
application/views/scripts/index/welcome.phtml
View File

@ -1,3 +1,2 @@
<div class="clearfix" style="margin-top: 100px;">
<h1>Bootstrap loaded!</h1>
</div>
<h1>Welcome to Icinga!</h1>
You should install/configure some <?= $this->qlink('modules', 'modules/overview') ?> now!

1
public/.htaccess
View File

@ -1,6 +1,7 @@
SetEnv APPLICATION_ENV development
RewriteEngine on
RewriteRule ^css/icinga.css css.php
RewriteCond %{REQUEST_FILENAME} -s [OR]
RewriteCond %{REQUEST_FILENAME} -l [OR]
RewriteCond %{REQUEST_FILENAME} -d