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

HTML changes

This commit is contained in:
Thomas Gelf 2014-02-18 18:16:03 +00:00
parent db19ddca25
commit 508a96124b
4 changed files with 35 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,17 +1,16 @@
<?php <?php
$jsfiles = array( $jsfiles = array(
'js/fanzzzy/jquery-1.8.3.js', 'js/jquery-1.8.3.js',
'js/fanzzzy/helpers.js', 'js/helpers.js',
'js/fanzzzy/icinga.js', 'js/icinga.js',
'js/fanzzzy/icinga/logger.js', 'js/icinga/logger.js',
'js/fanzzzy/icinga/utils.js', 'js/icinga/utils.js',
'js/fanzzzy/icinga/ui.js', 'js/icinga/ui.js',
'js/fanzzzy/icinga/timer.js', 'js/icinga/timer.js',
'js/fanzzzy/icinga/loader.js', 'js/icinga/loader.js',
'js/fanzzzy/icinga/events.js', 'js/icinga/events.js',
'js/fanzzzy/icinga/module.js', 'js/icinga/module.js',
'js/bpapp/bpapp.js',
); );
?><!DOCTYPE html> ?><!DOCTYPE html>

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

@ -1,3 +1,5 @@
<div id="menu-header"><img src="<?= $this->href('img/logo_icinga-inv.png') ?>" style="height: 2em; width:6em; float: left; margin-left: 1.5em; margin-right: 9em; margin-top: 0.5em;" alt="" /></div>
<div id="menu">
<?php <?php
@ -10,4 +12,5 @@ if ($this->auth()->isAuthenticated()) {
) )
); );
} }
?>
</div>

43
application/views/scripts/authentication/login.phtml
View File

@ -1,31 +1,18 @@
<?php if (isset($this->errorInfo)): ?> <div class="layout fullscreen login">
<div class="row"> <div class="main">
<br/> <div class="logo">
<div class="md-offset-2 col-md-8 col-sm-8 col-sm-offset-2"> <div class="image">
<div class="alert alert-danger"> <img src="<?= $this->baseUrl('img/logo_icinga_big.png') ?>" width="400px">
<?= $this->errorInfo ?> </div>
</div>
</div>
</div> </div>
<?php endif ?> <div class="form">
<div class="row"> <?php if (isset($this->errorInfo)): ?>
<div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3"> <div class="error">
<div class="container"> <?= $this->errorInfo ?>
<?= $this->form; ?>
</div>
</div> </div>
<?php endif ?>
<?= $this->form ?>
</div> </div>
<div class="footer">Icinga Web 2 &copy; 2013-2014 Icinga Team</div>
</div>
<script type="text/javascript"> </div>
/*
* Preserve the html anchor when redirecting to the originally called link. This
* is useful for preserving the detail view and the selection in that case.
*
* refs #4833
*
* TODO: Copy this snipped into the new login.phtml
*/
var url = document.URL.match(/(^[^#]*)/)[0] + encodeURIComponent(window.location.hash);
document.getElementById('form_login').action = url;
</script>

11
application/views/scripts/dashboard/index.phtml
View File

@ -1,5 +1,6 @@
<?= $this->tabs->render($this); ?> <div class="controls">
<?= $this->tabs ?>
<div class="dashboard" data-columns> </div>
<?= $this->dashboard->render($this); ?> <div class="dashboard">
</div> <?= $this->dashboard ?>
</div>