summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-05-02 15:41:12 -0400
committerJoey Hess <joey@kitenet.net>2010-05-02 15:41:12 -0400
commit0aad1794ad27da6ab41001e335eba952c2e0ac88 (patch)
tree1ad091e65e670660dc9f5a5a32620bfe0914779f /templates
parentd69f6057d1e1787fa3c19cc13c40eb3e9b822283 (diff)
improve semantic markup
Now the toplevel layout is: <article> <section><header><nav></section> <aside>sidebar</aside> <section>content</section> <section>comments</section> <footer> </article> And I managed to preserve all CSS ids and names in their prior structure, so CSS should not need changed.
Diffstat (limited to 'templates')
-rw-r--r--templates/page.tmpl17
1 files changed, 10 insertions, 7 deletions
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 0176b0116..195ce7886 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -26,7 +26,9 @@
</head>
<body>
-<TMPL_IF HTML5><article class="pageheader"><TMPL_ELSE><div class="pageheader"></TMPL_IF>
+<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 HTML5><header class="header"><TMPL_ELSE><div class="header"></TMPL_IF>
<span>
<span class="parentlinks">
@@ -92,7 +94,7 @@
<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
</TMPL_IF>
-<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
<TMPL_IF SIDEBAR>
<TMPL_IF HTML5><aside class="sidebar"><TMPL_ELSE><div class="sidebar"></TMPL_IF>
@@ -100,11 +102,12 @@
<TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
</TMPL_IF>
-<TMPL_IF HTML5><article id="content"><TMPL_ELSE><div id="content"></TMPL_IF>
+<TMPL_IF HTML5><section id="content"><TMPL_ELSE><div id="content"></TMPL_IF>
<TMPL_VAR CONTENT>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
<TMPL_IF COMMENTS>
-<TMPL_IF HTML5><aside id="comments"><TMPL_ELSE><div id="comments"></TMPL_IF>
+<TMPL_IF HTML5><section id="comments"><TMPL_ELSE><div id="comments"></TMPL_IF>
<TMPL_VAR COMMENTS>
<TMPL_IF ADDCOMMENTURL>
<div class="addcomment">
@@ -113,11 +116,9 @@
<TMPL_ELSE>
<div class="addcomment">Comments on this page are closed.</div>
</TMPL_IF>
-<TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
</TMPL_IF>
-<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>
-
<TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF>
<TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
@@ -172,5 +173,7 @@ Last edited <TMPL_VAR MTIME>
<!-- from <TMPL_VAR WIKINAME> -->
<TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>
+<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>
+
</body>
</html>