4 files changed, 48 insertions, 28 deletions
diff --git a/view/php/choklet.php b/view/php/choklet.php
new file mode 100644
index 000000000..fcfaf7804
--- /dev/null
+++ b/view/php/choklet.php
@@ -0,0 +1,24 @@
+<!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>
+	<div id="blog-margin">
+		<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>
+		<div id="blog-banner"><?php if(x($page,'banner')) echo $page['banner']; ?></div>
+		<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>
+		<div class="clear"></div>
+		<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
+	</div>
+</body>
+</html>
+
diff --git a/view/php/default.php b/view/php/default.php
index 3573bf829..01cd8a0d4 100644
--- a/view/php/default.php
+++ b/view/php/default.php
@@ -1,19 +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>
-	<?php if(x($page,'nav')) echo $page['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"><?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>
diff --git a/view/php/full.php b/view/php/full.php
index d8643d5a1..99653c06d 100644
--- a/view/php/full.php
+++ b/view/php/full.php
@@ -6,7 +6,8 @@
   <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
 </head>
 <body>
-	<nav><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
+	<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>
 	<section><?php if(x($page,'content')) echo $page['content']; ?>
 		<div id="page-footer"></div>
 	</section>
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index b6aa5de0f..45eb2fc1d 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -2,8 +2,6 @@
 
 require_once('include/plugin.php');
 
-head_add_css('library/bootstrap/css/bootstrap-theme.min.css');
-head_add_css('library/bootstrap/css/bootstrap.min.css'); 
 head_add_css('library/fancybox/jquery.fancybox-1.3.4.css');
 head_add_css('library/tiptip/tipTip.css');
 head_add_css('library/jgrowl/jquery.jgrowl.css');
@@ -11,13 +9,10 @@ head_add_css('library/jslider/css/jslider.css');
 head_add_css('library/colorbox/colorbox.css');
 
 head_add_css('view/css/conversation.css');
-head_add_css('view/css/bootstrap-red.css');
 head_add_css('view/css/widgets.css');
-head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css');
+
 
 head_add_js('jquery.js');
-head_add_js('library/bootstrap/js/bootstrap.min.js');
-head_add_js('library/bootstrap/js/bootbox.min.js');
 head_add_js('jquery-migrate-1.1.1.js');
 //head_add_js('jquery-compat.js');
 head_add_js('spin.js');
@@ -42,8 +37,6 @@ head_add_js('crypto.js');
 head_add_js('library/jslider/bin/jquery.slider.min.js');
 head_add_js('docready.js');
 head_add_js('library/colorbox/jquery.colorbox-min.js');
-head_add_js('library/bootstrap-datetimepicker/js/moment.js');
-head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js');
 
 /**
  * Those who require this feature will know what to do with it.