Merge pull request #542 from annando/master

[friendica.git] / view / theme / dispy / default.php
diff --git a/view/theme/dispy/default.php b/view/theme/dispy/default.php

index e74ec1a4f993f4813f128a9e55fd32419112b26d..c3e6c911968458157d23c0cde13a18011b8055da 100644 (file)
--- a/view/theme/dispy/default.php
+++ b/view/theme/dispy/default.php
@@ -1,20 +1,44 @@
  <!DOCTYPE html>
  <html>
  <head>
-  <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+  <title><?php if(x($page,'title')) echo $page['title']; ?></title>
    <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
-  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
+  <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
  </head>
  <body>
-       <?php if(x($page,'nav')) echo $page['nav']; ?>
-       <aside>
-               <?php if(x($page,'aside')) echo $page['aside']; ?>
-               <?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?>
-       </aside>
-       <section><?php if(x($page,'content')) echo $page['content']; ?>
-               <div id="page-footer"></div>
-       </section>
-       <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
+       <header>
+               <?php if(x($page, 'header')) echo $page['header']; ?>
+       </header>
+       <article id="articlemain">
+               <header id="articleheader">
+                       <?php if(x($page, 'articleheader')) echo $page['articleheader']; ?>
+               </header>
+               <?php if(x($page,'nav')) echo $page['nav']; ?>
+               <aside id="asideleft">
+                       <?php if(x($page,'aside_left')) echo $page['aside_left']; ?>
+                       <?php if(x($page,'aside_left_bottom')) echo $page['aside_left_bottom']; ?>
+               </aside>
+               <section id="sectionmain">
+                       <?php if(x($page,'content')) echo $page['content']; ?>
+                       <footer id="sectionfooter">
+                       </footer>
+               </section>
+               <aside id="asidemain">
+                       <?php if(x($page,'aside')) echo $page['aside']; ?>
+                       <?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?>
+               </aside>
+               <aside id="asideright">
+                       <?php if(x($page,'aside_right')) echo $page['aside_right']; ?>
+                       <?php if(x($page,'aside_right_bottom')) echo $page['aside_right_bottom']; ?>
+               </aside>
+               <footer id="articlefooter">
+                       <?php if(x($page, 'articlefooter')) echo $page['articlefooter']; ?>
+               </footer>
+       </article>
+       <footer id="footer">
+               <?php if(x($page, 'footer')) echo $page['footer']; ?>
+       </footer>
+       <?php if (x($page, 'bottom')) echo $page['bottom']; ?>
  </body>
  </html>