urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
master
Joey Hess 2010-05-02 15:41:12 -04:00
parent d69f6057d1
commit 0aad1794ad
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
templates/page.tmpl
View File

@ -26,7 +26,9 @@
</head> </head>
<body> <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> <TMPL_IF HTML5><header class="header"><TMPL_ELSE><div class="header"></TMPL_IF>
<span> <span>
<span class="parentlinks"> <span class="parentlinks">
@ -92,7 +94,7 @@
<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF> <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
</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 SIDEBAR>
<TMPL_IF HTML5><aside class="sidebar"><TMPL_ELSE><div class="sidebar"></TMPL_IF> <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 HTML5></aside><TMPL_ELSE></div></TMPL_IF>
</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_VAR CONTENT>
<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
<TMPL_IF COMMENTS> <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_VAR COMMENTS>
<TMPL_IF ADDCOMMENTURL> <TMPL_IF ADDCOMMENTURL>
<div class="addcomment"> <div class="addcomment">
@ -113,11 +116,9 @@
<TMPL_ELSE> <TMPL_ELSE>
<div class="addcomment">Comments on this page are closed.</div> <div class="addcomment">Comments on this page are closed.</div>
</TMPL_IF> </TMPL_IF>
<TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF> <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
</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><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> <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> --> <!-- from <TMPL_VAR WIKINAME> -->
<TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF> <TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>
<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>
</body> </body>
</html> </html>