aboutsummaryrefslogtreecommitdiff
path: root/app/layout/layout.phtml
diff options
context:
space:
mode:
Diffstat (limited to 'app/layout/layout.phtml')
-rw-r--r--app/layout/layout.phtml6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 5b2adae1e..4adcbef45 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -8,8 +8,12 @@
<?php echo self::headScript (); ?>
</head>
<body>
+<?php $this->partial ('header'); ?>
+
<div id="global">
+ <?php if (Request::controllerName () != 'configure') { ?>
<?php $this->partial ('aside'); ?>
+ <?php } ?>
<div id="main">
<?php $this->render (); ?>
@@ -21,7 +25,7 @@
<?php if (isset ($this->notification)) { ?>
<div class="notification <?php echo $this->notification['type']; ?>">
<?php echo $this->notification['content']; ?>
- <a class="close" href="">X</a>
+ <a class="close" href=""><i class="icon close"></i></a>
</div>
<?php } ?>
</body>