diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-02 09:14:14 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-02 09:23:10 +0200 |
| commit | 03dddc72f595befbd6322dd32da6b4fcc3b2d1f1 (patch) | |
| tree | b8c1ab3dd780c6bd53ca57e98fb5e870cde571cc | |
| parent | be3fe912791f7332374ca231422d3a06b05778e9 (diff) | |
Sync with ikiwiki 2.56.
| -rw-r--r-- | atomitem.tmpl | 22 | ||||
| -rw-r--r-- | atompage.tmpl | 14 | ||||
| -rw-r--r-- | autoindex.tmpl | 1 | ||||
| -rw-r--r-- | estseek.conf | 31 |
4 files changed, 14 insertions, 54 deletions
diff --git a/atomitem.tmpl b/atomitem.tmpl index 19c557f..1ff7f4f 100644 --- a/atomitem.tmpl +++ b/atomitem.tmpl @@ -10,22 +10,18 @@ <author><name><TMPL_VAR AUTHOR ESCAPE=HTML></name></author> </TMPL_IF> <TMPL_IF NAME="COPYRIGHT"> - <rights type="xhtml" xml:lang="en"> - <div xmlns="http://www.w3.org/1999/xhtml"> + <rights type="html" xml:lang="en"> <TMPL_IF NAME="LICENSE"> - <TMPL_VAR LICENSE> - <TMPL_VAR COPYRIGHT> + <TMPL_VAR LICENSE ESCAPE=HTML> + <TMPL_VAR COPYRIGHT ESCAPE=HTML> <TMPL_ELSE> - <TMPL_VAR COPYRIGHT> + <TMPL_VAR COPYRIGHT ESCAPE=HTML> </TMPL_IF> - </div> </rights> <TMPL_ELSE> <TMPL_IF NAME="LICENSE"> - <rights type="xhtml" xml:lang="en"> - <div xmlns="http://www.w3.org/1999/xhtml"> - <TMPL_VAR LICENSE> - </div> + <rights type="html" xml:lang="en"> + <TMPL_VAR LICENSE ESCAPE=HTML> </rights> </TMPL_IF> </TMPL_IF> @@ -39,10 +35,8 @@ <TMPL_IF NAME="ENCLOSURE"> <link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" /> <TMPL_ELSE> - <content type="xhtml" xml:lang="en"> - <div xmlns="http://www.w3.org/1999/xhtml"> - <TMPL_VAR CONTENT> - </div> + <content type="html" xml:lang="en"> + <TMPL_VAR CONTENT ESCAPE=HTML> </content> </TMPL_IF> </entry> diff --git a/atompage.tmpl b/atompage.tmpl index e834d76..dcb89ab 100644 --- a/atompage.tmpl +++ b/atompage.tmpl @@ -12,22 +12,18 @@ </TMPL_IF> </author> <TMPL_IF NAME="COPYRIGHT"> - <rights type="xhtml" xml:lang="en"> - <div xmlns="http://www.w3.org/1999/xhtml"> + <rights type="html" xml:lang="en"> <TMPL_IF NAME="LICENSE"> <TMPL_VAR LICENSE> - <TMPL_VAR COPYRIGHT> + <TMPL_VAR COPYRIGHT ESCAPE=HTML> <TMPL_ELSE> - <TMPL_VAR COPYRIGHT> + <TMPL_VAR COPYRIGHT ESCAPE=HTML> </TMPL_IF> - </div> </rights> <TMPL_ELSE> <TMPL_IF NAME="LICENSE"> - <rights type="xhtml" xml:lang="en"> - <div xmlns="http://www.w3.org/1999/xhtml"> - <TMPL_VAR LICENSE> - </div> + <rights type="html"> + <TMPL_VAR LICENSE ESCAPE=HTML> </rights> </TMPL_IF> </TMPL_IF> diff --git a/autoindex.tmpl b/autoindex.tmpl new file mode 100644 index 0000000..d5ec3b8 --- /dev/null +++ b/autoindex.tmpl @@ -0,0 +1 @@ +[[!map pages="<TMPL_VAR PAGE>/* and ! <TMPL_VAR PAGE>/*/*"]] diff --git a/estseek.conf b/estseek.conf deleted file mode 100644 index 2abf413..0000000 --- a/estseek.conf +++ /dev/null @@ -1,31 +0,0 @@ -indexname: <TMPL_VAR INDEX> -tmplfile: <TMPL_VAR TMPLFILE> -topfile: /dev/null -logfile: -logformat: -replace: ^file://<TMPL_VAR DESTDIR>{{!}}<TMPL_VAR URL> -showreal: false -perpage: 10,20,30,40,50,100 -attrselect: false -showscore: false -extattr: date|Date -snipwwidth: 480 -sniphwidth: 96 -snipawidth: 96 -condgstep: 2 -dotfidf: true -scancheck: false -smplphrase: true -phraseform: 2 -candetail: true -smlrvnum: 0 -smlrtune: 16 1024 4096 -clipview: 2 -relkeynum: 0 -spcache: -wildmax: 256 -qxpndcmd: -helpfile: /usr/share/hyperestraier/estseek.help -deftitle: -attrwidth: 80 -dispproxy: |