From 88b362cc476eb04b7b4471908ea84c67815f6085 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 30 Aug 2008 04:31:05 +0200
Subject: Sync with ikiwiki 2.62.1.

---
 renamesummary.tmpl | 2 ++
 rssitem.tmpl       | 2 +-
 searchform.tmpl    | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/renamesummary.tmpl b/renamesummary.tmpl
index 2676082..e165e81 100644
--- a/renamesummary.tmpl
+++ b/renamesummary.tmpl
@@ -8,6 +8,7 @@ The following pages have been automatically modified to update their links to <T
 <TMPL_LOOP NAME=FIXEDLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>
 </ul>
 </TMPL_IF>
+<TMPL_IF BROKENLINKS_CHECKED>
 <TMPL_IF BROKENLINKS>
 The following pages still link to <TMPL_VAR SRC>:
 <ul>
@@ -16,4 +17,5 @@ The following pages still link to <TMPL_VAR SRC>:
 <TMPL_ELSE>
 No pages have broken links to <TMPL_VAR SRC>.
 </TMPL_IF>
+</TMPL_IF>
 </p>
diff --git a/rssitem.tmpl b/rssitem.tmpl
index 1144cd5..42936a6 100644
--- a/rssitem.tmpl
+++ b/rssitem.tmpl
@@ -21,6 +21,6 @@
 	<TMPL_IF NAME="ENCLOSURE">
 	<enclosure url="<TMPL_VAR ENCLOSURE>" type="<TMPL_VAR TYPE>" length="<TMPL_VAR LENGTH>" />
 	<TMPL_ELSE>
-	<description><![CDATA[<TMPL_VAR CONTENT>]]></description>
+	<description><TMPL_VAR CONTENT ESCAPE=HTML></description>
 	</TMPL_IF>
 </item>
diff --git a/searchform.tmpl b/searchform.tmpl
index d49cf22..afae2eb 100644
--- a/searchform.tmpl
+++ b/searchform.tmpl
@@ -1,5 +1,5 @@
 <form method="get" action="<TMPL_VAR SEARCHACTION>" id="searchform">
 <div>
-<input type="text" name="P" value="" size="16" />
+<input type="text" id="searchbox" name="P" value="" size="16" />
 </div>
 </form>
-- 
cgit v1.2.3


From 03cdb15da3f28c109a1a176d6c3f53cf5e1a18f3 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Wed, 22 Oct 2008 20:59:21 +0200
Subject: Sync with ikiwiki 2.67.

---
 googleform.tmpl    | 6 ++++++
 renamesummary.tmpl | 9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 googleform.tmpl

diff --git a/googleform.tmpl b/googleform.tmpl
new file mode 100644
index 0000000..523cff0
--- /dev/null
+++ b/googleform.tmpl
@@ -0,0 +1,6 @@
+<form method="get" action="http://www.google.com/search" id="searchform">
+ <div>
+  <input name="sitesearch" value="<TMPL_VAR SITEFQDN>" type="hidden">
+  <input name="q" value="" id="searchbox" size="16" maxlength="255" type="text">
+ </div>
+</form>
diff --git a/renamesummary.tmpl b/renamesummary.tmpl
index e165e81..60f81b3 100644
--- a/renamesummary.tmpl
+++ b/renamesummary.tmpl
@@ -1,3 +1,9 @@
+<TMPL_IF ERROR>
+<p>
+<b>Failed to rename <TMPL_VAR SRC> to <TMPL_VAR DEST>: </b>
+<TMPL_VAR ERROR>
+</p>
+<TMPL_ELSE>
 <p>
 <b>Successfully renamed <TMPL_VAR SRC> to <TMPL_VAR DEST>.</b>
 </p>
@@ -14,8 +20,7 @@ The following pages still link to <TMPL_VAR SRC>:
 <ul>
 <TMPL_LOOP NAME=BROKENLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>
 </ul>
-<TMPL_ELSE>
-No pages have broken links to <TMPL_VAR SRC>.
 </TMPL_IF>
 </TMPL_IF>
 </p>
+</TMPL_IF>
-- 
cgit v1.2.3