2 files changed, 43 insertions, 4 deletions
diff --git a/branding.tmpl b/branding.tmpl
new file mode 100644
index 0000000..86b8550
--- /dev/null
+++ b/branding.tmpl
@@ -0,0 +1,12 @@
+<div class="branding-logo">
+<TMPL_IF NAME="LOGO">
+<a href="<TMPL_VAR BASEURL>"><img src="<TMPL_VAR BASEURL><TMPL_VAR NAME=LOGO>" alt="<TMPL_VAR NAME=TEXT>" /></a>
+<TMPL_ELSE>
+<a href="<TMPL_VAR BASEURL>"><TMPL_VAR NAME=TEXT></a>
+</TMPL_IF>
+</div>
+<TMPL_IF NAME="TAGLINE">
+<div class="branding-tagline">
+<a href="<TMPL_VAR BASEURL>"><TMPL_VAR NAME=TAGLINE></a>
+</div>
+</TMPL_IF>
diff --git a/page.tmpl b/page.tmpl
index c709c4f..580849f 100644
--- a/page.tmpl
+++ b/page.tmpl
@@ -46,6 +46,13 @@
 <TMPL_IF HTML5><article class="page"><TMPL_ELSE><div class="page"></TMPL_IF>
 
 <TMPL_IF HTML5><section class="pageheader"><TMPL_ELSE><div class="pageheader"></TMPL_IF>
+
+<TMPL_IF BRANDING>
+<div class="branding">
+<TMPL_VAR BRANDING>
+</div>
+</TMPL_IF>
+
 <TMPL_IF HTML5><header class="header"><TMPL_ELSE><div class="header"></TMPL_IF>
 <span>
 <span class="parentlinks">
@@ -125,10 +132,10 @@
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
 <TMPL_UNLESS DYNAMIC>
-<TMPL_IF SIDEBAR>
-<TMPL_IF HTML5><aside class="sidebar"><TMPL_ELSE><div class="sidebar"></TMPL_IF>
-<TMPL_VAR SIDEBAR>
-<TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
+<TMPL_IF TOPBAR>
+<div class="topbar">
+<TMPL_VAR TOPBAR>
+</div>
 </TMPL_IF>
 </TMPL_UNLESS>
 
@@ -161,6 +168,20 @@
 
 </div>
 
+<TMPL_UNLESS DYNAMIC>
+<TMPL_IF SIDEBAR>
+<TMPL_IF HTML5><aside class="sidebar"><TMPL_ELSE><div class="sidebar"></TMPL_IF>
+<TMPL_VAR SIDEBAR>
+<TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
+</TMPL_IF>
+
+<TMPL_IF FARBAR>
+<TMPL_IF HTML5><aside class="farbar"><TMPL_ELSE><div class="farbar"></TMPL_IF>
+<TMPL_VAR FARBAR>
+<TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
+</TMPL_IF>
+</TMPL_UNLESS>
+
 <TMPL_IF HTML5><footer id="footer" class="pagefooter" role="contentinfo"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF>
 <TMPL_UNLESS DYNAMIC>
 <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
@@ -208,6 +229,12 @@ License: <TMPL_VAR LICENSE>
 </div>
 </TMPL_IF>
 
+<TMPL_IF FOOTER>
+<div class="footer">
+<TMPL_VAR FOOTER>
+</div>
+</TMPL_IF>
+
 <div class="pagedate">
 Last edited <TMPL_VAR MTIME>
 <!-- Created <TMPL_VAR CTIME> -->