From 84b24bb78093106008157c05a7e4cfe0bb6f5fd1 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 14 Oct 2010 13:37:33 +0200 Subject: Sync with ikiwiki 3.20100926. --- aggregatepost.tmpl | 15 ++++ archivepage.tmpl | 19 +++++ atomitem.tmpl | 48 ++++++++++++ atompage.tmpl | 39 +++++++++ autoindex.tmpl | 1 + autotag.tmpl | 4 + blogpost.tmpl | 16 ++++ calendarmonth.tmpl | 5 ++ calendaryear.tmpl | 1 + change.tmpl | 46 +++++++++++ comment.tmpl | 61 +++++++++++++++ commentmoderation.tmpl | 32 ++++++++ editcomment.tmpl | 39 +++++++++ editconflict.tmpl | 7 ++ editcreationconflict.tmpl | 9 +++ editfailedsave.tmpl | 10 +++ editpage.tmpl | 60 ++++++++++++++ editpagegone.tmpl | 7 ++ feedlink.tmpl | 8 ++ googleform.tmpl | 8 ++ inlinepage.tmpl | 72 +++++++++++++++++ microblog.tmpl | 22 ++++++ openid-selector.tmpl | 43 ++++++++++ page.tmpl | 196 ++++++++++++++++++++++++++++++++++++++++++++++ passwordmail.tmpl | 15 ++++ pocreatepage.tmpl | 3 + recentchanges.tmpl | 7 ++ renamesummary.tmpl | 26 ++++++ rssitem.tmpl | 29 +++++++ rsspage.tmpl | 11 +++ searchform.tmpl | 6 ++ searchquery.tmpl | 113 ++++++++++++++++++++++++++ titlepage.tmpl | 7 ++ 33 files changed, 985 insertions(+) create mode 100644 aggregatepost.tmpl create mode 100644 archivepage.tmpl create mode 100644 atomitem.tmpl create mode 100644 atompage.tmpl create mode 100644 autoindex.tmpl create mode 100644 autotag.tmpl create mode 100644 blogpost.tmpl create mode 100644 calendarmonth.tmpl create mode 100644 calendaryear.tmpl create mode 100644 change.tmpl create mode 100644 comment.tmpl create mode 100644 commentmoderation.tmpl create mode 100644 editcomment.tmpl create mode 100644 editconflict.tmpl create mode 100644 editcreationconflict.tmpl create mode 100644 editfailedsave.tmpl create mode 100644 editpage.tmpl create mode 100644 editpagegone.tmpl create mode 100644 feedlink.tmpl create mode 100644 googleform.tmpl create mode 100644 inlinepage.tmpl create mode 100644 microblog.tmpl create mode 100644 openid-selector.tmpl create mode 100644 page.tmpl create mode 100644 passwordmail.tmpl create mode 100644 pocreatepage.tmpl create mode 100644 recentchanges.tmpl create mode 100644 renamesummary.tmpl create mode 100644 rssitem.tmpl create mode 100644 rsspage.tmpl create mode 100644 searchform.tmpl create mode 100644 searchquery.tmpl create mode 100644 titlepage.tmpl diff --git a/aggregatepost.tmpl b/aggregatepost.tmpl new file mode 100644 index 0000000..4e89efe --- /dev/null +++ b/aggregatepost.tmpl @@ -0,0 +1,15 @@ + + +[[!tag ]] + + +[[!meta title=""]] + + +[[!meta permalink=""]] + + +[[!meta copyright=""]] + +[[!meta author=""]] +[[!meta authorurl=""]] diff --git a/archivepage.tmpl b/archivepage.tmpl new file mode 100644 index 0000000..93bdd9c --- /dev/null +++ b/archivepage.tmpl @@ -0,0 +1,19 @@ +

+ +
+ +
+ + +Posted + +by + + + + + + + + +

diff --git a/atomitem.tmpl b/atomitem.tmpl new file mode 100644 index 0000000..4ed17bc --- /dev/null +++ b/atomitem.tmpl @@ -0,0 +1,48 @@ + + <TMPL_VAR TITLE> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/atompage.tmpl b/atompage.tmpl new file mode 100644 index 0000000..e82b598 --- /dev/null +++ b/atompage.tmpl @@ -0,0 +1,39 @@ + + + +<TMPL_VAR TITLE> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +ikiwiki + + + 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="/* and ! /*/*"]] diff --git a/autotag.tmpl b/autotag.tmpl new file mode 100644 index 0000000..9162e9e --- /dev/null +++ b/autotag.tmpl @@ -0,0 +1,4 @@ +[[!meta title="pages tagged "]] + +[[!inline pages="tagged()" actions="no" archive="yes" +feedshow=10]] diff --git a/blogpost.tmpl b/blogpost.tmpl new file mode 100644 index 0000000..5a31e3f --- /dev/null +++ b/blogpost.tmpl @@ -0,0 +1,16 @@ +
+
+ +RSS + + +Atom + + + + + + + +
+
diff --git a/calendarmonth.tmpl b/calendarmonth.tmpl new file mode 100644 index 0000000..23cd954 --- /dev/null +++ b/calendarmonth.tmpl @@ -0,0 +1,5 @@ +[[!sidebar content=""" +[[!calendar type=month month= year= pages=""]] +"""]] + +[[!inline pages="creation_month() and creation_year() and " show=0 feeds=no reverse=yes]] diff --git a/calendaryear.tmpl b/calendaryear.tmpl new file mode 100644 index 0000000..714bd6d --- /dev/null +++ b/calendaryear.tmpl @@ -0,0 +1 @@ +[[!calendar type=year year= pages=""]] diff --git a/change.tmpl b/change.tmpl new file mode 100644 index 0000000..671b9e4 --- /dev/null +++ b/change.tmpl @@ -0,0 +1,46 @@ +[[!meta author=""""""]] + +[[!meta authorurl=""""""]] + +[[!meta title="""change to on """]] + +[[!meta permalink=""]] + +
+
Changed pages: + + +[[diff|wikiicons/diff.png]] + + + + + +
Changed by: + + + + + + + +
Commit type: + +
Date: + +
+
+ + +
+ + +
+ +
+
+
+
+
+ + diff --git a/comment.tmpl b/comment.tmpl new file mode 100644 index 0000000..c2ee5a3 --- /dev/null +++ b/comment.tmpl @@ -0,0 +1,61 @@ +
+
+ +
+ + + + + +
+ +
+ +
 + +
+ +Comment by + + + + + + + + + + + + + + + +Comment by + + + + + + + + + + + + + +— +
 + + + + + +
 diff --git a/commentmoderation.tmpl b/commentmoderation.tmpl new file mode 100644 index 0000000..dfa63c2 --- /dev/null +++ b/commentmoderation.tmpl @@ -0,0 +1,32 @@ + +
+
+ + + + + +
+ +
+
+ +
+ + + + + + +
+
+ + + + +
+ +

+No comments need moderation at this time. +

+ diff --git a/editcomment.tmpl b/editcomment.tmpl new file mode 100644 index 0000000..a2edc69 --- /dev/null +++ b/editcomment.tmpl @@ -0,0 +1,39 @@ +
+ +
+ + + + + + + + (optional, or signin) +
+ + (optional) +
+ +(You might want to Signin first?) +
+ + + +
+ +
+
+ + + + +
+
+Comment preview: +
+
+ +
+ + +
diff --git a/editconflict.tmpl b/editconflict.tmpl new file mode 100644 index 0000000..1252033 --- /dev/null +++ b/editconflict.tmpl @@ -0,0 +1,7 @@ +

+Your changes conflict with other changes made to the page. +

+

+Conflict markers have been inserted into the page content. Reconcile the +conflict and commit again to save your changes. +

diff --git a/editcreationconflict.tmpl b/editcreationconflict.tmpl new file mode 100644 index 0000000..c99102f --- /dev/null +++ b/editcreationconflict.tmpl @@ -0,0 +1,9 @@ +

+While you were creating this page, someone else independently created a page +with the same name. +

+

+The edit box below contains the page's current content, followed by the +content you entered previously, to allow you to merge the two +together before saving. +

diff --git a/editfailedsave.tmpl b/editfailedsave.tmpl new file mode 100644 index 0000000..5184f7d --- /dev/null +++ b/editfailedsave.tmpl @@ -0,0 +1,10 @@ +

+Failed to save your changes. +

+

+Your changes were not able to be saved to disk. The system gave the error: +

+ +
+Your changes are preserved below, and you can try again to save them. +

diff --git a/editpage.tmpl b/editpage.tmpl new file mode 100644 index 0000000..d6ad806 --- /dev/null +++ b/editpage.tmpl @@ -0,0 +1,60 @@ + + +
+ + + + + + + + + + + + + +
+
+
+ + +
+ + + + +Attachments +
+ + + + + + + + +
+
+ + + + + +
+
+Page preview: +
+
+ +
+ + +
+
+Diff: +
+
+ +
+ diff --git a/editpagegone.tmpl b/editpagegone.tmpl new file mode 100644 index 0000000..2eed03a --- /dev/null +++ b/editpagegone.tmpl @@ -0,0 +1,7 @@ +

+The page you were editing has disappeared. +

+

+Perhaps someone else has deleted it or moved it. If you want to recreate +this page with your text, click "Save Page" again. +

diff --git a/feedlink.tmpl b/feedlink.tmpl new file mode 100644 index 0000000..be8637f --- /dev/null +++ b/feedlink.tmpl @@ -0,0 +1,8 @@ + diff --git a/googleform.tmpl b/googleform.tmpl new file mode 100644 index 0000000..9468e06 --- /dev/null +++ b/googleform.tmpl @@ -0,0 +1,8 @@ + +
+
+ + placeholder="search" /> +
+
diff --git a/inlinepage.tmpl b/inlinepage.tmpl new file mode 100644 index 0000000..b0b53d0 --- /dev/null +++ b/inlinepage.tmpl @@ -0,0 +1,72 @@ +
+ +
+ + + + + + + + + +
+ + + + + +
 +
+ +
+ +
 + +
+ + +Posted + + + + + + + +
+ +
+ + + +
+License: +
+ + + +
+ + +
 + +
 diff --git a/microblog.tmpl b/microblog.tmpl new file mode 100644 index 0000000..e22d65c --- /dev/null +++ b/microblog.tmpl @@ -0,0 +1,22 @@ +
+ +
+ +
+ +
+ + + + + + + + + + + +— + +
+
diff --git a/openid-selector.tmpl b/openid-selector.tmpl new file mode 100644 index 0000000..0659ee5 --- /dev/null +++ b/openid-selector.tmpl @@ -0,0 +1,43 @@ + + + + + + +
+
+ + + + +
+
+
+
+ + + +
+ +
+ +
+
+ +
+ +
+ + + +
diff --git a/page.tmpl b/page.tmpl new file mode 100644 index 0000000..8659018 --- /dev/null +++ b/page.tmpl @@ -0,0 +1,196 @@ + + + + + + + + + + + + +<TMPL_VAR TITLE> + + + + + + + + + + + + + + + + + + +
+ +
+
+ + + +/ + + + + + + (%) + + + + + + +
+ + +
+ + + + + + + + + + + + +
+ +
+ +
+ + + +
+ + +
+Add a comment +
+ +
Comments on this page are closed.
+ +
 + + + + + +
+ + + +
+ + +
+ + + +
+ +License: +
+ + +
+Last edited + +
+ + + + + +
 + +
 + + + diff --git a/passwordmail.tmpl b/passwordmail.tmpl new file mode 100644 index 0000000..aa8a68c --- /dev/null +++ b/passwordmail.tmpl @@ -0,0 +1,15 @@ +Someone[1], possibly you, requested that the password for + on [2] be reset. + +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] Their IP address was +[2] Located at diff --git a/pocreatepage.tmpl b/pocreatepage.tmpl new file mode 100644 index 0000000..f22ee50 --- /dev/null +++ b/pocreatepage.tmpl @@ -0,0 +1,3 @@ +

+WARNING this page must be written in . +

diff --git a/recentchanges.tmpl b/recentchanges.tmpl new file mode 100644 index 0000000..340a157 --- /dev/null +++ b/recentchanges.tmpl @@ -0,0 +1,7 @@ + +
+ + + +
+ diff --git a/renamesummary.tmpl b/renamesummary.tmpl new file mode 100644 index 0000000..7a8dc92 --- /dev/null +++ b/renamesummary.tmpl @@ -0,0 +1,26 @@ + +

+Failed to rename to : + +

+ +

+Successfully renamed to . +

+

+ +The following pages have been automatically modified to update their links to : +

    +
    •  +
+ + + +The following pages still link to : +
    +
    •  +
+ + +

+ diff --git a/rssitem.tmpl b/rssitem.tmpl new file mode 100644 index 0000000..272b340 --- /dev/null +++ b/rssitem.tmpl @@ -0,0 +1,29 @@ + + + <TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE> + + + <TMPL_VAR TITLE> + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rsspage.tmpl b/rsspage.tmpl new file mode 100644 index 0000000..e54094a --- /dev/null +++ b/rsspage.tmpl @@ -0,0 +1,11 @@ + + + +<TMPL_VAR TITLE> + + + + + diff --git a/searchform.tmpl b/searchform.tmpl new file mode 100644 index 0000000..cb65d12 --- /dev/null +++ b/searchform.tmpl @@ -0,0 +1,6 @@ +
+
+placeholder="search" /> +
+
diff --git a/searchquery.tmpl b/searchquery.tmpl new file mode 100644 index 0000000..5b9fbbf --- /dev/null +++ b/searchquery.tmpl @@ -0,0 +1,113 @@ +$setmap{prefix,title,S} +$setmap{prefix,link,XLINK} +$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},} +
+
diff --git a/titlepage.tmpl b/titlepage.tmpl new file mode 100644 index 0000000..6326bab --- /dev/null +++ b/titlepage.tmpl @@ -0,0 +1,7 @@ +

+ + + + + +

-- cgit v1.2.3