summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--misc.tmpl23
-rw-r--r--page.tmpl40
2 files changed, 61 insertions, 2 deletions
diff --git a/misc.tmpl b/misc.tmpl
index fab39b3..f902c81 100644
--- a/misc.tmpl
+++ b/misc.tmpl
@@ -30,19 +30,42 @@ isn't that nice to know? -->
</head>
<body>
+<div id="container">
+
+<TMPL_IF NAME="BRANDING_LOGO_TEXT">
+<div id="branding">
+<div id="branding-logo">
+<TMPL_IF NAME="BRANDING_LOGO">
+<a href="<TMPL_VAR BASEURL>"><img src="<TMPL_VAR BASEURL><TMPL_VAR NAME=BRANDING_LOGO>" alt="<TMPL_VAR NAME=BRANDING_LOGO_TEXT>" /></a>
+<TMPL_ELSE>
+<a href="<TMPL_VAR BASEURL>"><TMPL_VAR NAME=BRANDING_LOGO_TEXT></a>
+</TMPL_IF>
+</div>
+<TMPL_IF NAME="BRANDING_LOGO_TAGLINE">
+<div id="branding-tagline">
+<a href="<TMPL_VAR BASEURL>"><TMPL_VAR NAME=BRANDING_LOGO_TAGLINE></a>
+</div>
+</TMPL_IF>
+</div>
+</TMPL_IF>
+
<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 43cfd76..a994b6a 100644
--- a/page.tmpl
+++ b/page.tmpl
@@ -30,7 +30,27 @@ isn't that nice to know? -->
</head>
<body>
+<div id="container">
+
<div class="pageheader">
+
+<TMPL_IF NAME="BRANDING_LOGO_TEXT">
+<div id="branding">
+<div id="branding-logo">
+<TMPL_IF NAME="BRANDING_LOGO">
+<a href="<TMPL_VAR BASEURL>"><img src="<TMPL_VAR BASEURL><TMPL_VAR NAME=BRANDING_LOGO>" alt="<TMPL_VAR NAME=BRANDING_LOGO_TEXT>" /></a>
+<TMPL_ELSE>
+<a href="<TMPL_VAR BASEURL>"><TMPL_VAR NAME=BRANDING_LOGO_TEXT></a>
+</TMPL_IF>
+</div>
+<TMPL_IF NAME="BRANDING_LOGO_TAGLINE">
+<div id="branding-tagline">
+<a href="<TMPL_VAR BASEURL>"><TMPL_VAR NAME=BRANDING_LOGO_TAGLINE></a>
+</div>
+</TMPL_IF>
+</div>
+</TMPL_IF>
+
<div class="header">
<span>
<span class="parentlinks">
@@ -64,15 +84,29 @@ isn't that nice to know? -->
</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">
@@ -128,5 +162,7 @@ Senest redigeret <TMPL_VAR NAME=MTIME>
<!-- from <TMPL_VAR NAME=WIKINAME> -->
</div><!-- .pagefooter #footer -->
+</div><!-- #container -->
+
</body>
</html>