aboutsummaryrefslogtreecommitdiffstats
path: root/view/php/default.php
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2014-03-07 21:31:07 +0000
committerThomas Willingham <founder@kakste.com>2014-03-07 21:31:07 +0000
commit9f111324616269f61560cf8097737ebd408eea94 (patch)
tree2b72ea5fd29873fb090a280ff1d39c029f5c8065 /view/php/default.php
parent93000ebad6520018712128833bd8f4fbab4a1f68 (diff)
parenta06c09cdf3eac9da55453661d316a683b08455bd (diff)
downloadvolse-hubzilla-9f111324616269f61560cf8097737ebd408eea94.tar.gz
volse-hubzilla-9f111324616269f61560cf8097737ebd408eea94.tar.bz2
volse-hubzilla-9f111324616269f61560cf8097737ebd408eea94.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/php/default.php')
-rw-r--r--view/php/default.php41
1 files changed, 21 insertions, 20 deletions
diff --git a/view/php/default.php b/view/php/default.php
index fd29ef3db..87b92161b 100644
--- a/view/php/default.php
+++ b/view/php/default.php
@@ -1,20 +1,21 @@
-<!DOCTYPE html >
-<html>
-<head>
- <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'] ?>
-</head>
-<body>
- <header><?php if(x($page,'header')) echo $page['header']; ?></header>
- <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
- <aside id="region_1"><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
- <section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
- <div id="page-footer"></div>
- <div id="pause"></div>
- </section>
- <aside id="region_3"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside>
- <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
-</body>
-</html>
-
+<!DOCTYPE html >
+<html>
+<head>
+ <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'] ?>
+</head>
+<body>
+ <header><?php if(x($page,'header')) echo $page['header']; ?></header>
+ <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
+ <main>
+ <aside id="region_1" class="hidden-xs"><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
+ <section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
+ <div id="page-footer"></div>
+ <div id="pause"></div>
+ </section>
+ <aside id="region_3"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside>
+ </main>
+ <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
+</body>
+</html>