diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 14:03:03 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 14:03:03 +0200 |
| commit | 67acb77d38849b83b4520e824acd06d1fcdf3c52 (patch) | |
| tree | 5d7dc10af510fbbaae470dd1722da41fe3c06b94 | |
| parent | d8840de84a43bcb272e7ff694e02f9febec86a30 (diff) | |
| parent | 03cdb15da3f28c109a1a176d6c3f53cf5e1a18f3 (diff) | |
Merge branch 'master' into master-da + translate
Conflicts (replaced with updated PO-based translation):
renamesummary.tmpl
| -rw-r--r-- | googleform.tmpl | 6 | ||||
| -rw-r--r-- | renamesummary.tmpl | 11 | ||||
| -rw-r--r-- | rssitem.tmpl | 2 | ||||
| -rw-r--r-- | searchform.tmpl | 2 |
4 files changed, 17 insertions, 4 deletions
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 e9e5532..e8a0b00 100644 --- a/renamesummary.tmpl +++ b/renamesummary.tmpl @@ -1,3 +1,9 @@ +<TMPL_IF ERROR> +<p> +<b>Omdøbning af <TMPL_VAR SRC> til <TMPL_VAR DEST> mislykkedes: </b> +<TMPL_VAR ERROR> +</p> +<TMPL_ELSE> <p> <b>Succesfuldt omdøbt <TMPL_VAR SRC> til <TMPL_VAR DEST>.</b> </p> @@ -8,12 +14,13 @@ De følgende sider er blevet automatisk ændret for at opdatere deres henvisning <TMPL_LOOP NAME=FIXEDLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP> </ul> </TMPL_IF> +<TMPL_IF BROKENLINKS_CHECKED> <TMPL_IF BROKENLINKS> De følgende sider henviser fortsat til <TMPL_VAR SRC>: <ul> <TMPL_LOOP NAME=BROKENLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP> </ul> -<TMPL_ELSE> -Ingen sider har brudte henvisninger til <TMPL_VAR SRC>. +</TMPL_IF> </TMPL_IF> </p> +</TMPL_IF> 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> |