diff options
| author | friendica <info@friendica.com> | 2012-04-10 16:07:05 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-04-10 16:07:05 -0700 |
| commit | 703bfcb6d4bd21e68aaabd5f1b256106c505f0e9 (patch) | |
| tree | c4fc85a1c8cdacaed03fb358a11a714f4e556e18 /view/theme/dispy/default.php | |
| parent | 14d68a0dc031b271d26e735160651da52b55d562 (diff) | |
| parent | 0e97e2338a697141965e74ed3c68f7cd1aff4f7f (diff) | |
| download | volse-hubzilla-703bfcb6d4bd21e68aaabd5f1b256106c505f0e9.tar.gz volse-hubzilla-703bfcb6d4bd21e68aaabd5f1b256106c505f0e9.tar.bz2 volse-hubzilla-703bfcb6d4bd21e68aaabd5f1b256106c505f0e9.zip | |
Merge https://github.com/friendica/friendica into pull
Diffstat (limited to 'view/theme/dispy/default.php')
| -rw-r--r-- | view/theme/dispy/default.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/view/theme/dispy/default.php b/view/theme/dispy/default.php index e74ec1a4f..24df92a72 100644 --- a/view/theme/dispy/default.php +++ b/view/theme/dispy/default.php @@ -7,13 +7,18 @@ </head> <body> <?php if(x($page,'nav')) echo $page['nav']; ?> - <aside> + <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']; ?> + <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> </body> </html> |