diff options
| -rw-r--r-- | templates/misc.tmpl | 6 | ||||
| -rw-r--r-- | templates/page.tmpl | 16 |
2 files changed, 20 insertions, 2 deletions
diff --git a/templates/misc.tmpl b/templates/misc.tmpl index 0de56edeb..18cf5eeba 100644 --- a/templates/misc.tmpl +++ b/templates/misc.tmpl @@ -17,6 +17,8 @@ </head> <body> +<div id="container"> + <div class="pageheader"> <div class="header"> <span> @@ -25,13 +27,17 @@ </div> </div> <!-- .pageheader --> +<div id="contentwrapper"> <div id="content"> <TMPL_VAR PAGEBODY> </div> +</div> <div id="footer"> <!-- from <TMPL_VAR NAME=WIKINAME> --> </div> +</div><!-- #container --> + </body> </html> diff --git a/templates/page.tmpl b/templates/page.tmpl index 8622d1a01..037e29e74 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -18,6 +18,8 @@ </head> <body> +<div id="container"> + <div class="pageheader"> <div class="header"> <span> @@ -83,15 +85,23 @@ </div> <!-- .pageheader --> +<div id="contentwrapper"> +<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> <TMPL_IF COMMENTS> <div id="comments"> @@ -160,5 +170,7 @@ Last edited <TMPL_VAR MTIME> <!-- from <TMPL_VAR WIKINAME> --> </div><!-- .pagefooter #footer --> +</div><!-- #container --> + </body> </html> |