From ca952f3eaea5227909b8cf574ee2d8fa34aa21b7 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 28 May 2008 23:33:30 +0200 Subject: Sync with ikiwiki 2.47. --- aggregatepost.tmpl | 12 ++++++------ change.tmpl | 15 +++++++++++---- editpage.tmpl | 1 + estseek.conf | 2 +- misc.tmpl | 4 ++++ page.tmpl | 1 + 6 files changed, 24 insertions(+), 11 deletions(-) diff --git a/aggregatepost.tmpl b/aggregatepost.tmpl index 739a576..8b89367 100644 --- a/aggregatepost.tmpl +++ b/aggregatepost.tmpl @@ -1,15 +1,15 @@ -[[tag ]] +[[!tag ]] -[[meta title=""]] +[[!meta title=""]] -[[meta permalink=""]] +[[!meta permalink=""]] -[[meta copyright=""]] +[[!meta copyright=""]] -[[meta author=""]] -[[meta authorurl=""]] +[[!meta author=""]] +[[!meta authorurl=""]] diff --git a/change.tmpl b/change.tmpl index 16ef08a..4a99cf5 100644 --- a/change.tmpl +++ b/change.tmpl @@ -1,13 +1,13 @@ -[[meta author=""""""]] +[[!meta author=""""""]] -[[meta authorurl=""""""]] +[[!meta authorurl=""""""]] -[[meta title="""update of 's """]] +[[!meta title="""change to on """]]

Changed pages: -diff +[[diff|wikiicons/diff.png]] @@ -33,4 +33,11 @@
+ +
+
+
+
+
+ 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. + 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/misc.tmpl b/misc.tmpl index 184920e..7f65217 100644 --- a/misc.tmpl +++ b/misc.tmpl @@ -2,7 +2,11 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + + + + <TMPL_VAR TITLE> diff --git a/page.tmpl b/page.tmpl index 3a1ac9e..249ee2e 100644 --- a/page.tmpl +++ b/page.tmpl @@ -104,6 +104,7 @@ License:
Last edited +
-- cgit v1.2.3 From 2fb8dbca8338e24e7018355295d8248eba6e1132 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 14 Jun 2008 02:22:32 +0200 Subject: Sync with ikiwiki 2.49. --- inlinepage.tmpl | 2 +- page.tmpl | 2 +- passwordmail.tmpl | 13 +++++-- searchform.tmpl | 4 +- searchquery.tmpl | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 124 insertions(+), 9 deletions(-) create mode 100644 searchquery.tmpl diff --git a/inlinepage.tmpl b/inlinepage.tmpl index a736dac..71d57b0 100644 --- a/inlinepage.tmpl +++ b/inlinepage.tmpl @@ -46,7 +46,7 @@ License:
    -
  • Edit
    • +
  • Edit
    •
    • diff --git a/page.tmpl b/page.tmpl index 249ee2e..b903adb 100644 --- a/page.tmpl +++ b/page.tmpl @@ -30,7 +30,7 @@
      -
    • Edit
      • +
    • Edit
      •
    • RecentChanges
      • 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 - on [2]. +Someone[1], possibly you, requested that the password for + on [2] be reset. -The password is: +To change your password, visit the following url, and enter a new password: + + + +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 +[1] Their IP address was [2] Located at diff --git a/searchform.tmpl b/searchform.tmpl index 7c4fdb0..d49cf22 100644 --- a/searchform.tmpl +++ b/searchform.tmpl @@ -1,7 +1,5 @@
      - - - +
      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},, +} +} + +$def{NEXT, +$if{$ne{$last,$msize},, +} +} + +$def{P,} +$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,$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},}} + +$def{PAGE,} + +$def{SPAGE,} + +$def{NEXT,$if{$ne{$last,$msize},}} + +

      + +

      +
      + + +$env{HELPLINK} +
      + +$or{$html{$error}, +$if{$eq{$msize,0}, +$if{$query,No documents match your query, +
      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} +} +
      +
      +$list{$map{$queryterms,$list{$html{$uniq{$unstem{$_}}},,/,}: $nice{$freq{$_}}},Term frequencies: ,$. ,} +
      Search took $time seconds + +$hitlist{ +} +
      +${$percentage%} +
      +
      +
      +
      + +Modified:
      $html{$date{$field{modtime},%Y-%m-%d}}
      +$if{$field{language},Language: $html{$field{language}}
      } +$if{$field{size},Size: $html{$filesize{$field{size}}}
      } +
      +      		$html{$or{$field{caption},$field{title},$field{url},Untitled}}
      +$highlight{$field{sample},$terms}$if{$field{sample},...}
      + +$percentage% relevant$. matching: +$list{$map{$terms,$html{$prettyterm{$_}}},$. , and }${for lynx:}

      + +
      + +${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 +} +}} +

      +$if{$dbname,} +$if{$ne{$topdoc,0},} +$if{$ne{$hitsperpage,10},} +$if{$fmt,} +$if{$cgi{COLLAPSE},} +$if{$queryterms,} + + +$list{$relevants,} +$if{$cgi{THRESHOLD},} +
      +
      -- cgit v1.2.3