From d69f6057d1e1787fa3c19cc13c40eb3e9b822283 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 2 May 2010 15:09:33 -0400 Subject: [PATCH] use html5 semantic markup in page.tmpl This is a first pass, it avoids needing to change style.css except where it refers to tag types. This goes a bit off the rails at the pageheader with its nested header. Semantically, there should be an article around the whole page header, content, and footer. Just as there will be an article around a whole comment or inlined page header, content, and footer. But that will mean changing the css that currently refers to pageheader to refer to the enclosing article instead. --- debian/changelog | 3 +++ doc/style.css | 5 +---- templates/page.tmpl | 49 +++++++++++++++++++++++---------------------- 3 files changed, 29 insertions(+), 28 deletions(-) diff --git a/debian/changelog b/debian/changelog index c9fc2e657..789fda1ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ ikiwiki (3.20100502) UNRELEASED; urgency=low * Add parameter to displaytime to specify that it is a pubdate, and in html5 mode, use time tag. * Add placeholder text in search form (in html5 mode only). + * In html5 mode, use all the nice new semantic tags. Care was taken + to not change the id/class named used in the CSS, so only CSS + that refers to tag types needed to be changed. -- Joey Hess Sun, 02 May 2010 13:22:50 -0400 diff --git a/doc/style.css b/doc/style.css index 7ffcf9fe2..69c7f80d8 100644 --- a/doc/style.css +++ b/doc/style.css @@ -60,15 +60,12 @@ div.inlinecontent { clear: both; } -.tags { -} - #pageinfo { margin: 1em 0; border-top: 1px solid #000; } -div.tags { +.tags { margin-top: 1em; } diff --git a/templates/page.tmpl b/templates/page.tmpl index 661d4a515..0176b0116 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -5,7 +5,7 @@ - + <TMPL_VAR TITLE> @@ -26,8 +26,8 @@ - - -
+
-
-
+
-
+ +
+ - +
-- 2.26.2