summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2015-01-22 16:13:31 +0100
committerJonas Smedegaard <dr@jones.dk>2015-01-22 16:13:31 +0100
commit2426488f90fbadb4e3567d97d8c4990bd1d7eb2c (patch)
tree6d5c92b03c906e6eeb6a42f9fcf95130d339bd5c
parentccc9866cc6e4f35386a654d5eb66a71029b238b6 (diff)
parent3840019b1b04d8e072bb9a0673aa495c67571a54 (diff)
Merge branch 'da' into h1title-dah1title-da
Conflicts (manually resolved): page.tmpl
-rw-r--r--aggregatepost.tmpl2
-rw-r--r--googleform.tmpl2
-rw-r--r--page.tmpl6
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 561bf5c..e6827c4 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"
diff --git a/page.tmpl b/page.tmpl
index 3a16b11..d288263 100644
--- a/page.tmpl
+++ b/page.tmpl
@@ -134,7 +134,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>
<h1><TMPL_VAR TITLE></h1>
<TMPL_VAR CONTENT>
<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
@@ -147,7 +147,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">
@@ -162,7 +162,7 @@
</div>
-<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>