diff options
| -rw-r--r-- | aggregatepost.tmpl | 12 | ||||
| -rw-r--r-- | change.tmpl | 15 | ||||
| -rw-r--r-- | editpage.tmpl | 1 | ||||
| -rw-r--r-- | estseek.conf | 2 | ||||
| -rw-r--r-- | inlinepage.tmpl | 2 | ||||
| -rw-r--r-- | misc.tmpl | 4 | ||||
| -rw-r--r-- | page.tmpl | 3 | ||||
| -rw-r--r-- | passwordmail.tmpl | 13 | ||||
| -rw-r--r-- | searchform.tmpl | 4 | ||||
| -rw-r--r-- | searchquery.tmpl | 112 |
10 files changed, 148 insertions, 20 deletions
diff --git a/aggregatepost.tmpl b/aggregatepost.tmpl index 739a576..8b89367 100644 --- a/aggregatepost.tmpl +++ b/aggregatepost.tmpl @@ -1,15 +1,15 @@ <TMPL_VAR CONTENT> <TMPL_LOOP NAME="TAGS"> -[[tag <TMPL_VAR TAG>]] +[[!tag <TMPL_VAR TAG>]] </TMPL_LOOP> <TMPL_IF NAME="TITLE"> -[[meta title="<TMPL_VAR NAME="TITLE" ESCAPE=HTML>"]] +[[!meta title="<TMPL_VAR NAME="TITLE" ESCAPE=HTML>"]] </TMPL_IF> <TMPL_IF NAME="PERMALINK"> -[[meta permalink="<TMPL_VAR NAME="PERMALINK" ESCAPE=HTML>"]] +[[!meta permalink="<TMPL_VAR NAME="PERMALINK" ESCAPE=HTML>"]] </TMPL_IF> <TMPL_IF NAME="COPYRIGHT"> -[[meta copyright="<TMPL_VAR NAME="COPYRIGHT" ESCAPE=HTML>"]] +[[!meta copyright="<TMPL_VAR NAME="COPYRIGHT" ESCAPE=HTML>"]] </TMPL_IF> -[[meta author="<TMPL_VAR NAME="NAME" ESCAPE=HTML>"]] -[[meta authorurl="<TMPL_VAR NAME="URL" ESCAPE=HTML>"]] +[[!meta author="<TMPL_VAR NAME="NAME" ESCAPE=HTML>"]] +[[!meta authorurl="<TMPL_VAR NAME="URL" ESCAPE=HTML>"]] diff --git a/change.tmpl b/change.tmpl index 16ef08a..4a99cf5 100644 --- a/change.tmpl +++ b/change.tmpl @@ -1,13 +1,13 @@ -[[meta author="""<TMPL_VAR AUTHOR>"""]] +[[!meta author="""<TMPL_VAR AUTHOR>"""]] <TMPL_IF AUTHORURL> -[[meta authorurl="""<TMPL_VAR AUTHORURL>"""]] +[[!meta authorurl="""<TMPL_VAR AUTHORURL>"""]] </TMPL_IF> -[[meta title="""update of <TMPL_VAR WIKINAME>'s<TMPL_LOOP NAME="PAGES"> <TMPL_VAR PAGE></TMPL_LOOP>"""]] +[[!meta title="""change to<TMPL_LOOP NAME="PAGES"> <TMPL_VAR PAGE></TMPL_LOOP> on <TMPL_VAR WIKINAME>"""]] <div class="metadata"> <span class="desc"><br />Changed pages:</span> <span class="pagelinks"> <TMPL_LOOP NAME="PAGES"> -<TMPL_IF NAME="DIFFURL"><a href="<TMPL_VAR DIFFURL>"><img alt="diff" src="<TMPL_VAR BASEURL>wikiicons/diff.png" /></a><TMPL_VAR LINK> +<TMPL_IF NAME="DIFFURL"><a href="<TMPL_VAR DIFFURL>">[[diff|wikiicons/diff.png]]</a><TMPL_VAR LINK> <TMPL_ELSE> <TMPL_VAR LINK> </TMPL_IF> @@ -33,4 +33,11 @@ </TMPL_IF> </TMPL_LOOP> </div> +<TMPL_IF NAME="DIFF"> +<div class=diff> +<pre> +<TMPL_VAR NAME="DIFF" ESCAPE="HTML"> +</pre> +</div> +</TMPL_IF> <!-- <TMPL_VAR REV> --> diff --git a/editpage.tmpl b/editpage.tmpl index cf4950e..b0bb0ec 100644 --- a/editpage.tmpl +++ b/editpage.tmpl @@ -41,6 +41,7 @@ together before saving. </TMPL_IF> <TMPL_VAR FORM-START> <TMPL_VAR FIELD-DO> +<TMPL_VAR FIELD-SID> <TMPL_VAR FIELD-FROM> <TMPL_VAR FIELD-RCSINFO> <TMPL_VAR FIELD-NEWFILE> diff --git a/estseek.conf b/estseek.conf index 43bd303..2abf413 100644 --- a/estseek.conf +++ b/estseek.conf @@ -25,7 +25,7 @@ relkeynum: 0 spcache: wildmax: 256 qxpndcmd: -helpfile: estseek.help +helpfile: /usr/share/hyperestraier/estseek.help deftitle: attrwidth: 80 dispproxy: diff --git a/inlinepage.tmpl b/inlinepage.tmpl index a736dac..71d57b0 100644 --- a/inlinepage.tmpl +++ b/inlinepage.tmpl @@ -46,7 +46,7 @@ License: <TMPL_VAR LICENSE> <div class="actions"> <ul> <TMPL_IF NAME="EDITURL"> -<li><a href="<TMPL_VAR EDITURL>">Edit</a></li> +<li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li> </TMPL_IF> <TMPL_IF NAME="DISCUSSIONLINK"> <li><TMPL_VAR DISCUSSIONLINK></li> @@ -2,7 +2,11 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> +<TMPL_IF NAME="FORCEBASEURL"> +<base href="<TMPL_VAR FORCEBASEURL>" /> +<TMPL_ELSE> <base href="<TMPL_VAR BASEURL>" /> +</TMPL_IF> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title><TMPL_VAR TITLE></title> <link rel="stylesheet" href="<TMPL_VAR BASEURL>nn4.css" type="text/css" media="screen" /> @@ -43,7 +43,7 @@ isn't that nice to know? --> <div class="actions"> <ul> <TMPL_IF NAME="EDITURL"> -<li><a href="<TMPL_VAR EDITURL>">Edit</a></li> +<li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li> </TMPL_IF> <TMPL_IF NAME="RECENTCHANGESURL"> <li><a href="<TMPL_VAR RECENTCHANGESURL>">RecentChanges</a></li> @@ -117,6 +117,7 @@ License: <TMPL_VAR LICENSE> <div class="pagedate"> Last edited <TMPL_VAR NAME=MTIME> +<!-- Created <TMPL_VAR NAME=CTIME> --> </div> </div> diff --git a/passwordmail.tmpl b/passwordmail.tmpl index 8484d39..aa8a68c 100644 --- a/passwordmail.tmpl +++ b/passwordmail.tmpl @@ -1,10 +1,15 @@ -Someone[1], possibly you, requested that you be emailed the password for user -<TMPL_VAR USER_NAME> on <TMPL_VAR WIKINAME>[2]. +Someone[1], possibly you, requested that the password for +<TMPL_VAR USER_NAME> on <TMPL_VAR WIKINAME>[2] be reset. -The password is: <TMPL_VAR USER_PASSWORD> +To change your password, visit the following url, and enter a new password: + +<TMPL_VAR PASSWORDURL> + +This url can only be used once to change your password, and it will also +stop working the next time you successfully log in. -- ikiwiki -[1] The user requesting the password was at IP address <TMPL_VAR REMOTE_ADDR> +[1] Their IP address was <TMPL_VAR REMOTE_ADDR> [2] Located at <TMPL_VAR WIKIURL> diff --git a/searchform.tmpl b/searchform.tmpl index 7c4fdb0..d49cf22 100644 --- a/searchform.tmpl +++ b/searchform.tmpl @@ -1,7 +1,5 @@ <form method="get" action="<TMPL_VAR SEARCHACTION>" id="searchform"> <div> -<input type="text" name="phrase" value="" size="16" /> -<input type="hidden" name="enc" value="UTF-8" /> -<input type="hidden" name="do" value="hyperestraier" /> +<input type="text" name="P" value="" size="16" /> </div> </form> diff --git a/searchquery.tmpl b/searchquery.tmpl new file mode 100644 index 0000000..0d6eb63 --- /dev/null +++ b/searchquery.tmpl @@ -0,0 +1,112 @@ +$setmap{prefix,title,S} +$setmap{prefix,link,LINK} +$set{thousand,$.}$set{decimal,.}$setmap{BN,,Any Country,uk,England,fr,France} +${ +$def{PREV, +$if{$ne{$topdoc,0},<INPUT TYPE=image NAME="<" ALT="<" +SRC="/images/xapian-omega/prev.png" BORDER=0 HEIGHT=30 WIDTH=30>, +<IMG ALT="" SRC="/images/xapian-omega/prevoff.png" HEIGHT=30 WIDTH=30>} +} + +$def{NEXT, +$if{$ne{$last,$msize},<INPUT TYPE=image NAME=">" ALT=">" +SRC="/images/xapian-omega/next.png" BORDER=0 HEIGHT=30 WIDTH=30>, +<IMG ALT="" SRC="/images/xapian-omega/nextoff.png" HEIGHT=30 WIDTH=30>} +} + +$def{P,<INPUT TYPE=image NAME="$1" VALUE="$1" SRC="/images/xapian-omega/page-$2.png" BORDER=0$opt{a} ALT="$1">} +$def{PAGE,$if{$gt{$1,9},$if{$gt{$1,99},$P{$1,$div{$1,100}}}$P{$1,$mod{$div{$1,10},10}}}$P{$1,$mod{$1,10}}} + +$def{S,<IMG SRC="/images/xapian-omega/page-$2s.png"$opt{a} ALT=$1>} +$def{SPAGE,$if{$gt{$1,9},$if{$gt{$1,99},$S{$1,$div{$1,100}}}$S{$1,$mod{$div{$1,10},10}}}$S{$1,$mod{$1,10}}} +} + +$def{PREV,$if{$ne{$topdoc,0},<INPUT TYPE=submit NAME="<" VALUE="Previous">}} + +$def{PAGE,<INPUT TYPE=submit NAME="[" VALUE="$1">} + +$def{SPAGE,<INPUT TYPE=submit NAME="[" VALUE="$1" DISABLED=disabled>} + +$def{NEXT,$if{$ne{$last,$msize},<INPUT TYPE=submit NAME=">" VALUE="Next">}} + +<p> + +<FORM NAME=P METHOD=GET +ACTION="$html{$env{CGIURL}}" TARGET="_top"> +<center> +<INPUT NAME=P VALUE="$html{$query}" SIZE=65> +<INPUT TYPE=SUBMIT VALUE="Search"> +$env{HELPLINK} +<hr> +<SELECT NAME=DEFAULTOP> +<OPTION VALUE=or $if{$eq{$defaultop,or},SELECTED}>Matching any words +<OPTION VALUE=and $if{$eq{$defaultop,and},SELECTED}>Matching all words +</SELECT> +$or{$html{$error}, +$if{$eq{$msize,0}, +$if{$query,No documents match your query, +<hr>Searching $nice{$dbsize} documents +}, +$if{$not{$msizeexact}, + $nice{$add{$topdoc,1}}-$nice{$last} of about $nice{$msize} matches, + $if{$and{$eq{$last,$msize},$eq{$topdoc,0}}, + All $nice{$msize} matches, + $nice{$add{$topdoc,1}}$if{$ne{$add{$topdoc,1},$last},-$nice{$last}} of exactly $nice{$msize} matches} +} +<hr> +</center> +$list{$map{$queryterms,$list{$html{$uniq{$unstem{$_}}},<b>,</b>/<b>,</b>}: $nice{$freq{$_}}},Term frequencies: ,$. ,} +<br><small>Search took $time seconds</small> +<table> +$hitlist{<tr><td valign=top> +${<IMG SRC="/images/xapian-omega/score-$div{$percentage,10}.png" ALT="$percentage%" HEIGHT=16 WIDTH=32>} +<div title="$percentage%" style='float:left;width:60px;height:10px;border:1px solid black;margin-top:4px;'> +<div style='width:$div{$mul{$percentage,6},10}px; height:10px; background-color: red;'> +</div></div> +<div style='float:left;margin-top:2px;font-size:x-small;'> +<span title="$html{$date{$field{modtime},%Y-%m-%d %H:%M:%S}}"> +Modified:<br><b>$html{$date{$field{modtime},%Y-%m-%d}}</b></span><br> +$if{$field{language},Language: <b>$html{$field{language}}</b><br>} +$if{$field{size},<span title="$html{$field{size}} bytes">Size: <b>$html{$filesize{$field{size}}}</b></span><br>} +</div> +</td> +<td><B><A HREF="$field{url}">$html{$or{$field{caption},$field{title},$field{url},Untitled}}</A></B><BR> +<small>$highlight{$field{sample},$terms}$if{$field{sample},...}</small><br> +<small> +$percentage% relevant$. matching: +<i>$list{$map{$terms,$html{$prettyterm{$_}}},$. ,</i> and <i>}</i></small>${for lynx:}<p></td></tr>} +</table> + +<br><center> + +${suppress next, prev, and page links if there's only one page} +$if{$ne{$lastpage,1}, +$set{a,$if{$opt{pagelink_height}, HEIGHT=$opt{pagelink_height}}$if{$opt{pagelink_width}, WIDTH=$opt{pagelink_width}}} + +${1-W ... X-(this)-Y ...} +$set{w,$min{3,$add{$thispage,-1}}} +$set{x,$max{$add{$opt{w},1},$add{$thispage,-3}}} +$set{y,$min{$lastpage,$add{$thispage,8}}} +$PREV +$map{$range{1,$opt{w}},$PAGE{$_}} +$if{$ne{$add{$opt{w},1},$opt{x}},...} +$map{$range{$opt{x},$add{$thispage,-1}},$PAGE{$_}} +$SPAGE{$thispage} +$map{$range{$add{$thispage,1},$opt{y}},$PAGE{$_}} +$if{$ne{$opt{y},$lastpage},...} +$NEXT +} +}} +</center><br> +$if{$dbname,<INPUT TYPE=hidden NAME=DB VALUE="$html{$dbname}">} +$if{$ne{$topdoc,0},<INPUT TYPE=hidden NAME=TOPDOC VALUE=$topdoc>} +$if{$ne{$hitsperpage,10},<INPUT TYPE=hidden NAME=HITSPERPAGE VALUE=$hitsperpage>} +$if{$fmt,<INPUT TYPE=hidden NAME=FMT VALUE="$html{$fmt}">} +$if{$cgi{COLLAPSE},<INPUT TYPE=hidden NAME=COLLAPSE VALUE="$html{$cgi{COLLAPSE}}">} +$if{$queryterms,<INPUT TYPE=hidden NAME=xP VALUE="$html{$queryterms}">} +<INPUT TYPE=hidden NAME=xDB VALUE="$html{$dbname}"> +<INPUT TYPE=hidden NAME=xFILTERS VALUE="$html{$filters}"> +$list{$relevants,<INPUT TYPE=hidden NAME=R VALUE=",.,">} +$if{$cgi{THRESHOLD},<INPUT TYPE=hidden NAME=THRESHOLD VALUE="$html{$cgi{THRESHOLD}}">} +</FORM> +<hr><div align=right><i><small><a href="http://www.xapian.org/">$html{$version}</a></small></i></div> |