summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--autotag.tmpl2
-rw-r--r--branding.tmpl12
-rw-r--r--page.tmpl70
3 files changed, 62 insertions, 22 deletions
diff --git a/autotag.tmpl b/autotag.tmpl
index cf07d26..237ee79 100644
--- a/autotag.tmpl
+++ b/autotag.tmpl
@@ -1,4 +1,4 @@
-[[!meta title="sider med mærkat <TMPL_VAR TAGNAME>"]]
+# sider med mærkat <TMPL_VAR TAGNAME>
[[!inline pages="tagged(<TMPL_VAR TAG>)" actions="no" archive="yes"
feedshow=10]]
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 f8aa39d..e0fdc09 100644
--- a/page.tmpl
+++ b/page.tmpl
@@ -51,6 +51,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">
@@ -106,23 +113,6 @@
<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
</TMPL_IF>
-<TMPL_IF OTHERLANGUAGES>
-<TMPL_IF HTML5><nav id="otherlanguages"><TMPL_ELSE><div id="otherlanguages"></TMPL_IF>
-<ul>
-<TMPL_LOOP OTHERLANGUAGES>
-<li>
-<a href="<TMPL_VAR URL>"><TMPL_VAR LANGUAGE></a>
-<TMPL_IF MASTER>
-(master)
-<TMPL_ELSE>
-&nbsp;(<TMPL_VAR PERCENT>%)
-</TMPL_IF>
-</li>
-</TMPL_LOOP>
-</ul>
-<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
-</TMPL_IF>
-
<TMPL_UNLESS DYNAMIC>
<TMPL_VAR TRAILS>
</TMPL_UNLESS>
@@ -130,16 +120,17 @@
<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>
<div id="pagebody">
<TMPL_IF HTML5><section id="content"><TMPL_ELSE><div id="content"></TMPL_IF>
+<h1><TMPL_VAR TITLE></h1>
<TMPL_VAR CONTENT>
<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
@@ -166,6 +157,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"><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>
@@ -199,6 +204,23 @@ Henvisninger:
<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
</TMPL_IF>
+<TMPL_IF OTHERLANGUAGES>
+<TMPL_IF HTML5><nav id="otherlanguages"><TMPL_ELSE><div id="otherlanguages"></TMPL_IF>
+<ul>
+<TMPL_LOOP OTHERLANGUAGES>
+<li>
+<a href="<TMPL_VAR URL>"><TMPL_VAR LANGUAGE></a>
+<TMPL_IF MASTER>
+(master)
+<TMPL_ELSE>
+&nbsp;(<TMPL_VAR PERCENT>%)
+</TMPL_IF>
+</li>
+</TMPL_LOOP>
+</ul>
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
+</TMPL_IF>
+
<TMPL_IF COPYRIGHT>
<div class="pagecopyright">
<a name="pagecopyright"></a>
@@ -213,6 +235,12 @@ Licens: <TMPL_VAR LICENSE>
</div>
</TMPL_IF>
+<TMPL_IF FOOTER>
+<div class="footer">
+<TMPL_VAR FOOTER>
+</div>
+</TMPL_IF>
+
<div class="pagedate">
Senest redigeret <TMPL_VAR MTIME>
<!-- Oprettet <TMPL_VAR CTIME> -->