diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-04-11 19:35:51 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-04-11 19:35:51 +0200 |
| commit | ee714daf4d33f8258e1301438423fc10a3bdc916 (patch) | |
| tree | e3da18226db88c42819e2f29b67763581eb1c293 /view/theme/dispy/default.php | |
| parent | c88c2515e43f7a446a9b358fb657290a8a6c847a (diff) | |
| parent | a1d5026abf129fc520327881a293d17c1ab21eff (diff) | |
| download | volse-hubzilla-ee714daf4d33f8258e1301438423fc10a3bdc916.tar.gz volse-hubzilla-ee714daf4d33f8258e1301438423fc10a3bdc916.tar.bz2 volse-hubzilla-ee714daf4d33f8258e1301438423fc10a3bdc916.zip | |
Merge commit 'upstream/master'
Diffstat (limited to 'view/theme/dispy/default.php')
| -rw-r--r-- | view/theme/dispy/default.php | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/view/theme/dispy/default.php b/view/theme/dispy/default.php index e74ec1a4f..32393f08d 100644 --- a/view/theme/dispy/default.php +++ b/view/theme/dispy/default.php @@ -6,15 +6,31 @@ <?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> + <!-- header stuff will go here --> + </header> + <article id="articlemain"> + <?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="section-footer"></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> + </article> + <footer id="page-footer"> + <?php if(x($page,'footer')) echo $page['footer']; ?> + </footer> </body> </html> |