From 5df058b2b3dc6e565ad3b3604263f487ef65f2af Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 14 Jul 2010 20:34:13 +0200 Subject: Sync with ikiwiki 3.20100704. --- aggregatepost.tmpl | 18 +++--- archivepage.tmpl | 14 ++++- atomitem.tmpl | 78 +++++++++++++----------- atompage.tmpl | 40 ++++++------ autotag.tmpl | 4 ++ blogpost.tmpl | 8 +-- calendarmonth.tmpl | 5 ++ calendaryear.tmpl | 1 + change.tmpl | 29 +++++---- comment.tmpl | 61 +++++++++++++++++++ commentmoderation.tmpl | 32 ++++++++++ editcomment.tmpl | 39 ++++++++++++ editpage.tmpl | 23 +++++-- feedlink.tmpl | 8 +-- googleform.tmpl | 6 +- inlinepage.tmpl | 56 ++++++++--------- microblog.tmpl | 22 +++++++ misc.tmpl | 35 ----------- openid-selector.tmpl | 43 +++++++++++++ page.tmpl | 162 +++++++++++++++++++++++++++++++++++-------------- pocreatepage.tmpl | 3 + renamesummary.tmpl | 4 +- rssitem.tmpl | 33 +++++----- searchform.tmpl | 3 +- searchquery.tmpl | 9 +-- titlepage.tmpl | 8 ++- 26 files changed, 518 insertions(+), 226 deletions(-) create mode 100644 autotag.tmpl create mode 100644 calendarmonth.tmpl create mode 100644 calendaryear.tmpl create mode 100644 comment.tmpl create mode 100644 commentmoderation.tmpl create mode 100644 editcomment.tmpl create mode 100644 microblog.tmpl delete mode 100644 misc.tmpl create mode 100644 openid-selector.tmpl create mode 100644 pocreatepage.tmpl diff --git a/aggregatepost.tmpl b/aggregatepost.tmpl index 8b89367..4e89efe 100644 --- a/aggregatepost.tmpl +++ b/aggregatepost.tmpl @@ -1,15 +1,15 @@ - + [[!tag ]] - -[[!meta title=""]] + +[[!meta title=""]] - -[[!meta permalink=""]] + +[[!meta permalink=""]] - -[[!meta copyright=""]] + +[[!meta copyright=""]] -[[!meta author=""]] -[[!meta authorurl=""]] +[[!meta author=""]] +[[!meta authorurl=""]] diff --git a/archivepage.tmpl b/archivepage.tmpl index 6bc789d..93bdd9c 100644 --- a/archivepage.tmpl +++ b/archivepage.tmpl @@ -1,7 +1,19 @@

+ +
+
+ Posted + +by + + + + + + + -

diff --git a/atomitem.tmpl b/atomitem.tmpl index 1ff7f4f..4ed17bc 100644 --- a/atomitem.tmpl +++ b/atomitem.tmpl @@ -1,42 +1,48 @@ <TMPL_VAR TITLE> - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + diff --git a/atompage.tmpl b/atompage.tmpl index dcb89ab..e82b598 100644 --- a/atompage.tmpl +++ b/atompage.tmpl @@ -5,32 +5,32 @@ - - + + - + - - - - - - - - - + + + + + - - - - - + - - + - + + + + + + + + + + ikiwiki 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 index 7eeede6..5a31e3f 100644 --- a/blogpost.tmpl +++ b/blogpost.tmpl @@ -1,10 +1,10 @@
- -RSS + +RSS - -Atom + +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 index 4a99cf5..671b9e4 100644 --- a/change.tmpl +++ b/change.tmpl @@ -2,12 +2,15 @@ [[!meta authorurl=""""""]] -[[!meta title="""change to on """]] -
+[[!meta title="""change to on """]] + +[[!meta permalink=""]] + +

Changed pages: - -[[diff|wikiicons/diff.png]] + +[[diff|wikiicons/diff.png]] @@ -15,8 +18,8 @@
Changed by: - - + + @@ -26,17 +29,17 @@
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/editpage.tmpl b/editpage.tmpl index 4b54db2..d6ad806 100644 --- a/editpage.tmpl +++ b/editpage.tmpl @@ -1,6 +1,6 @@ -
+
@@ -8,17 +8,18 @@ -Page location: -Page type: + + -
 +

+
-Optional comment about this change:
-
+ +
 @@ -37,6 +38,7 @@ Optional comment about this change:
 +
@@ -47,3 +49,12 @@ Optional comment about this change:
 + +
+
+Diff: +
+
+ +
+ diff --git a/feedlink.tmpl b/feedlink.tmpl index 2963156..be8637f 100644 --- a/feedlink.tmpl +++ b/feedlink.tmpl @@ -1,8 +1,8 @@ diff --git a/googleform.tmpl b/googleform.tmpl index 523cff0..9468e06 100644 --- a/googleform.tmpl +++ b/googleform.tmpl @@ -1,6 +1,8 @@ +
- - + + placeholder="search" />
diff --git a/inlinepage.tmpl b/inlinepage.tmpl index ffcb897..b0b53d0 100644 --- a/inlinepage.tmpl +++ b/inlinepage.tmpl @@ -1,43 +1,41 @@ -
+
-
- - +
+ - - + + - + - - +
+ - - -
+ +
-
+
-
+
-
+
Posted - - + + @@ -52,19 +50,23 @@ 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/misc.tmpl b/misc.tmpl deleted file mode 100644 index 7f65217..0000000 --- a/misc.tmpl +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - -<TMPL_VAR TITLE> - - - - - - - - -
- -/ - -
- -
- -
- - - - - 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 index f2f9c34..da8c294 100644 --- a/page.tmpl +++ b/page.tmpl @@ -1,100 +1,167 @@ - + + + - + + + + + + + <TMPL_VAR TITLE> - + + + + - + + - - + + + -
-
+
+ + +
 - -
+
+ +
+
+ + +
+ + +
+Add a comment
+ +
Comments on this page are closed.
+ +
 + - + + + + + 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/renamesummary.tmpl b/renamesummary.tmpl index 60f81b3..7a8dc92 100644 --- a/renamesummary.tmpl +++ b/renamesummary.tmpl @@ -11,14 +11,14 @@ 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 index 42936a6..a64a4eb 100644 --- a/rssitem.tmpl +++ b/rssitem.tmpl @@ -1,26 +1,29 @@ - + <TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE> - + <TMPL_VAR TITLE> - - - - - - + + + + + + - - + + - - + + - + - + - + + + + diff --git a/searchform.tmpl b/searchform.tmpl index afae2eb..cb65d12 100644 --- a/searchform.tmpl +++ b/searchform.tmpl @@ -1,5 +1,6 @@
- +placeholder="search" />
diff --git a/searchquery.tmpl b/searchquery.tmpl index 782b12c..5b9fbbf 100644 --- a/searchquery.tmpl +++ b/searchquery.tmpl @@ -33,7 +33,7 @@ $def{NEXT,$if{$ne{$last,$msize},}}
-
+
$env{HELPLINK} @@ -54,7 +54,7 @@ $if{$not{$msizeexact}, $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 @@ -77,8 +77,9 @@ $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}}} @@ -97,7 +98,7 @@ $if{$ne{$opt{y},$lastpage},...} $NEXT } }} -

+
$if{$dbname,} $if{$ne{$topdoc,0},} $if{$ne{$hitsperpage,10},} diff --git a/titlepage.tmpl b/titlepage.tmpl index f5cd5bc..6326bab 100644 --- a/titlepage.tmpl +++ b/titlepage.tmpl @@ -1 +1,7 @@ -

+

+ + + + + +

-- cgit v1.2.3