diff options
| author | Simon <simon@kisikew.org> | 2012-04-10 23:01:57 -0700 |
|---|---|---|
| committer | Simon <simon@kisikew.org> | 2012-04-10 23:01:57 -0700 |
| commit | cdb6510b9f3007d2afd3081313caa7d045af1e7c (patch) | |
| tree | cbe3cec92574a36d6ff911d360f6f8eb17ca420b /view/theme/dispy/default.php | |
| parent | 967ed8e23f90e12963ce1d7e3e045c258c549835 (diff) | |
| parent | c79d1deb92d0107510d588e424163bbba1ab6996 (diff) | |
| download | volse-hubzilla-cdb6510b9f3007d2afd3081313caa7d045af1e7c.tar.gz volse-hubzilla-cdb6510b9f3007d2afd3081313caa7d045af1e7c.tar.bz2 volse-hubzilla-cdb6510b9f3007d2afd3081313caa7d045af1e7c.zip | |
Merge pull request #226 from simonlnu/master
re-factor default.php
Diffstat (limited to 'view/theme/dispy/default.php')
| -rw-r--r-- | view/theme/dispy/default.php | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/view/theme/dispy/default.php b/view/theme/dispy/default.php index 24df92a72..32393f08d 100644 --- a/view/theme/dispy/default.php +++ b/view/theme/dispy/default.php @@ -6,20 +6,31 @@ <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> </head> <body> - <?php if(x($page,'nav')) echo $page['nav']; ?> - <aside id="asideleft"> - <?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> - <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><?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> |