summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--misc.tmpl6
-rw-r--r--page.tmpl22
2 files changed, 26 insertions, 2 deletions
diff --git a/misc.tmpl b/misc.tmpl
index 7f65217..76a3f3e 100644
--- a/misc.tmpl
+++ b/misc.tmpl
@@ -17,19 +17,25 @@
</head>
<body>
+<div id="container">
+
<div class="header">
<span>
<TMPL_VAR INDEXLINK>/ <TMPL_VAR TITLE>
</span>
</div>
+<div id="wrapper">
<div id="content">
<TMPL_VAR PAGEBODY>
</div>
+</div>
<div id="footer">
<!-- from <TMPL_VAR NAME=WIKINAME> -->
</div>
+</div><!-- #container -->
+
</body>
</html>
diff --git a/page.tmpl b/page.tmpl
index f2f9c34..82f6b73 100644
--- a/page.tmpl
+++ b/page.tmpl
@@ -17,6 +17,8 @@
</head>
<body>
+<div id="container">
+
<div class="pageheader">
<div class="header">
<span>
@@ -57,15 +59,29 @@
</TMPL_IF>
</div> <!-- .pageheader -->
+<TMPL_IF TOPBAR>
+<div id="topbar">
+<TMPL_VAR TOPBAR>
+</div>
+</TMPL_IF>
+
+<div id="wrapper">
+<div id="content">
+<TMPL_VAR CONTENT>
+</div>
+</div>
+
<TMPL_IF SIDEBAR>
<div id="sidebar">
<TMPL_VAR SIDEBAR>
</div>
</TMPL_IF>
-<div id="content">
-<TMPL_VAR CONTENT>
+<TMPL_IF FARBAR>
+<div id="farbar">
+<TMPL_VAR FARBAR>
</div>
+</TMPL_IF>
<div id="footer" class="pagefooter">
<div id="pageinfo">
@@ -121,5 +137,7 @@ Last edited <TMPL_VAR NAME=MTIME>
<!-- from <TMPL_VAR NAME=WIKINAME> -->
</div><!-- .pagefooter #footer -->
+</div><!-- #container -->
+
</body>
</html>