summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2021-03-24 11:39:15 +0100
committerJonas Smedegaard <dr@jones.dk>2021-03-24 11:39:15 +0100
commit553e19ff881cc34703d0f56ed36db27f202c45d7 (patch)
tree6639d1735aa53108da8d696dff6cce39f2acb168
parentd78ee45783c3867a6bae4f872ad95c4e2a4acca1 (diff)
parentb00a42882ddbdc30834d8ea04e01cbfc68cb83b0 (diff)
Merge branch 'couchdesign/bullseye-h1title' into couchdesign/bullseye-h1title-da
-rw-r--r--autotag.tmpl2
-rw-r--r--branding.tmpl12
-rw-r--r--page.tmpl75
3 files changed, 65 insertions, 24 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 9516ce3..aa95702 100644
--- a/page.tmpl
+++ b/page.tmpl
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<TMPL_IF HTML_LANG_CODE><html lang="<TMPL_VAR HTML_LANG_CODE>" dir="<TMPL_VAR HTML_LANG_DIR>" xmlns="http://www.w3.org/1999/xhtml"><TMPL_ELSE><html xmlns="http://www.w3.org/1999/xhtml"></TMPL_IF>
+<TMPL_IF HTML_LANG_CODE><html class="no-js" lang="<TMPL_VAR HTML_LANG_CODE>" dir="<TMPL_VAR HTML_LANG_DIR>" xmlns="http://www.w3.org/1999/xhtml"><TMPL_ELSE><html class="no-js" xmlns="http://www.w3.org/1999/xhtml"></TMPL_IF>
<head>
<TMPL_IF DYNAMIC>
<TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
@@ -25,7 +25,6 @@
</TMPL_IF>
<TMPL_IF FEEDLINKS><TMPL_VAR FEEDLINKS></TMPL_IF>
<TMPL_IF RELVCS><TMPL_VAR RELVCS></TMPL_IF>
-<TMPL_IF META><TMPL_VAR META></TMPL_IF>
<TMPL_LOOP TRAILLOOP>
<TMPL_IF PREVPAGE>
<link rel="prev" href="<TMPL_VAR PREVURL>" title="<TMPL_VAR PREVTITLE>" />
@@ -37,12 +36,21 @@
</TMPL_LOOP>
</TMPL_UNLESS>
+<script src="<TMPL_VAR BASEURL>modernizr.js"></script>
+<TMPL_IF META><TMPL_VAR META></TMPL_IF>
</head>
<body>
<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">
@@ -98,23 +106,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>
@@ -122,16 +113,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<TMPL_ELSE><div</TMPL_IF> id="content" role="main">
+<h1><TMPL_VAR TITLE></h1>
<TMPL_VAR CONTENT>
<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
@@ -158,6 +150,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<TMPL_ELSE><div</TMPL_IF> id="footer" class="pagefooter" role="contentinfo">
<TMPL_UNLESS DYNAMIC>
<TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
@@ -191,6 +197,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>
@@ -205,6 +228,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> -->