diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2015-01-22 16:11:06 +0100 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2015-01-22 16:11:06 +0100 |
| commit | 7d34028b5eed40b316ee237572b529b6d93d94ee (patch) | |
| tree | af87bec83ddfd5c7bde8d4ec1c4e76aee5c3f7e5 | |
| parent | bbcbfc73b93614ea620b552a545fd889e6d45379 (diff) | |
| parent | 676037fd99d9e6a4dc071fc962f05cf20d8c7341 (diff) | |
Merge branch 'ikiwiki' into barsbars
Conflicts (manually resolved):
page.tmpl
| -rw-r--r-- | aggregatepost.tmpl | 2 | ||||
| -rw-r--r-- | googleform.tmpl | 2 | ||||
| -rw-r--r-- | page.tmpl | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/aggregatepost.tmpl b/aggregatepost.tmpl index a89ccfc..5a0f6e7 100644 --- a/aggregatepost.tmpl +++ b/aggregatepost.tmpl @@ -12,7 +12,7 @@ [[!meta copyright="<TMPL_VAR COPYRIGHT ESCAPE=HTML>"]] </TMPL_IF> <TMPL_IF AUTHOR> -[[!meta author="<TMPL_VAR NAME ESCAPE=HTML>: <TMPL_VAR AUTHOR ESCAPE=HTML>"]] +[[!meta author="<TMPL_VAR AUTHOR ESCAPE=HTML> (<TMPL_VAR NAME ESCAPE=HTML>)"]] <TMPL_ELSE> [[!meta author="<TMPL_VAR NAME ESCAPE=HTML>"]] </TMPL_IF> diff --git a/googleform.tmpl b/googleform.tmpl index 9468e06..b1c3078 100644 --- a/googleform.tmpl +++ b/googleform.tmpl @@ -1,5 +1,5 @@ -<form method="get" action="http://www.google.com/search" id="searchform"> +<form method="get" action="https://www.google.com/search" id="searchform"> <div> <input name="sitesearch" value="<TMPL_VAR URL>" type="hidden" /> <input name="q" value="" id="searchbox" size="16" maxlength="255" type="text" @@ -141,7 +141,7 @@ <div id="pagebody"> -<TMPL_IF HTML5><section id="content"><TMPL_ELSE><div id="content"></TMPL_IF> +<TMPL_IF HTML5><section id="content" role="main"><TMPL_ELSE><div id="content"></TMPL_IF> <TMPL_VAR CONTENT> <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> @@ -153,7 +153,7 @@ <TMPL_UNLESS DYNAMIC> <TMPL_IF COMMENTS> -<TMPL_IF HTML5><section id="comments"><TMPL_ELSE><div id="comments"></TMPL_IF> +<TMPL_IF HTML5><section id="comments" role="complementary"><TMPL_ELSE><div id="comments"></TMPL_IF> <TMPL_VAR COMMENTS> <TMPL_IF ADDCOMMENTURL> <div class="addcomment"> @@ -182,7 +182,7 @@ </TMPL_IF> </TMPL_UNLESS> -<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" role="contentinfo"><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> |