diff options
| author | zottel <github@zottel.net> | 2012-04-15 14:11:11 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-04-15 14:11:11 +0200 |
| commit | a2c4ce74871dbe9e640cdeafc1574bda5b7fe144 (patch) | |
| tree | fce1c1b2d497adae72d77e09c6bf005c8900256b /view/theme/dispy/default.php | |
| parent | 0bad8de0562a50fa93b0af5fd4cf8d7123a11b46 (diff) | |
| parent | f299749758112361ee6384cd75d11b2c3a57352a (diff) | |
| download | volse-hubzilla-a2c4ce74871dbe9e640cdeafc1574bda5b7fe144.tar.gz volse-hubzilla-a2c4ce74871dbe9e640cdeafc1574bda5b7fe144.tar.bz2 volse-hubzilla-a2c4ce74871dbe9e640cdeafc1574bda5b7fe144.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/theme/dispy/default.php')
| -rw-r--r-- | view/theme/dispy/default.php | 39 |
1 files changed, 28 insertions, 11 deletions
diff --git a/view/theme/dispy/default.php b/view/theme/dispy/default.php index e74ec1a4f..729f9be2a 100644 --- a/view/theme/dispy/default.php +++ b/view/theme/dispy/default.php @@ -1,20 +1,37 @@ <!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"> + <?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="footer"> + <?php if(x($page, 'footer')) echo $page['footer']; ?> + </footer> + <?php if (x($page, 'bottom')) echo $page['bottom']; ?> </body> </html> |