summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2017-03-20 21:00:24 +0100
committerJonas Smedegaard <dr@jones.dk>2017-03-20 21:00:24 +0100
commit9f7788296f30cc375fd6bec65daefe91dfccc781 (patch)
treec9aec608289758e92ab99cd129ec91dfc8a8c961
parent079bca1f1728dc4c44e84c3c001f08a5ca7fb599 (diff)
Merge (manually) branches 'bars', 'h5bp' and 'langsbottom' into masterHEADmaster
-rw-r--r--aggregatepost.tmpl2
-rw-r--r--googleform.tmpl2
-rw-r--r--page.tmpl7
3 files changed, 5 insertions, 6 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"
diff --git a/page.tmpl b/page.tmpl
index bd341dc..105f975 100644
--- a/page.tmpl
+++ b/page.tmpl
@@ -129,8 +129,7 @@
<div id="pagebody">
-<TMPL_IF HTML5><section id="content"><TMPL_ELSE><div id="content"></TMPL_IF>
-<h1><TMPL_VAR TITLE></h1>
+<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>
@@ -142,7 +141,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">
@@ -171,7 +170,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>