summaryrefslogtreecommitdiff
path: root/app/layout/layout.phtml
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-03-12 23:24:52 +0100
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-03-12 23:24:52 +0100
commitc62ec2a14428b528e20896d4e62fa08891e1399c (patch)
treecdf6cbbd2d1b9182d385db36ec0c86b08bcf442e /app/layout/layout.phtml
parent8c562972062fbf3d750bd62893de248022850c23 (diff)
Grosse mise à jour du design, pas mal de trucs cassés au niveau du panneau de configuration
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>