move <header> and <nav> tag into nav.tpl. add notification popup items template

2011-07-25 16:53:27 +02:00
parent e6444adafd
commit 5fb2b522f4
2 changed files with 29 additions and 25 deletions
--- a/view/default.php
+++ b/view/default.php
@@ -6,8 +6,7 @@
  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
 </head>
 <body>
-	<header><?php if(x($page,'header')) echo $page['header']; ?></header>
-	<nav><div id="top-margin"></div><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
+	<?php if(x($page,'nav')) echo $page['nav']; ?>
 	<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
 	<section><?php if(x($page,'content')) echo $page['content']; ?>
 		<div id="page-footer"></div>