From 193673fa4ca986a8503dded44019f3b0eac30084 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Fri, 27 Nov 2020 11:20:59 +0200 Subject: add local copies of ikiwiki templates --- ikiwiki.setup | 1 + templates/aggregatepost.tmpl | 19 +++ templates/archivepage.tmpl | 19 +++ templates/atomitem.tmpl | 49 ++++++++ templates/atompage.tmpl | 39 +++++++ templates/autoindex.tmpl | 1 + templates/autotag.tmpl | 4 + templates/blogpost.tmpl | 16 +++ templates/calendarmonth.tmpl | 5 + templates/calendaryear.tmpl | 1 + templates/change.tmpl | 57 +++++++++ templates/comment.tmpl | 66 +++++++++++ templates/commentmoderation.tmpl | 32 ++++++ templates/editcomment.tmpl | 43 +++++++ templates/editconflict.tmpl | 7 ++ templates/editcreationconflict.tmpl | 9 ++ templates/editfailedsave.tmpl | 10 ++ templates/editpage.tmpl | 91 +++++++++++++++ templates/editpagegone.tmpl | 7 ++ templates/emailauth.tmpl | 10 ++ templates/feedlink.tmpl | 8 ++ templates/googleform.tmpl | 8 ++ templates/inlinepage.tmpl | 78 +++++++++++++ templates/login-selector.tmpl | 65 +++++++++++ templates/microblog.tmpl | 22 ++++ templates/notifyemail.tmpl | 9 ++ templates/page.tmpl | 222 ++++++++++++++++++++++++++++++++++++ templates/passwordmail.tmpl | 15 +++ templates/pocreatepage.tmpl | 3 + templates/recentchanges.tmpl | 7 ++ templates/renamesummary.tmpl | 26 +++++ templates/revert.tmpl | 22 ++++ templates/rssitem.tmpl | 28 +++++ templates/rsspage.tmpl | 18 +++ templates/searchform.tmpl | 6 + templates/searchquery.tmpl | 113 ++++++++++++++++++ templates/titlepage.tmpl | 7 ++ templates/trails.tmpl | 23 ++++ 38 files changed, 1166 insertions(+) create mode 100644 templates/aggregatepost.tmpl create mode 100644 templates/archivepage.tmpl create mode 100644 templates/atomitem.tmpl create mode 100644 templates/atompage.tmpl create mode 100644 templates/autoindex.tmpl create mode 100644 templates/autotag.tmpl create mode 100644 templates/blogpost.tmpl create mode 100644 templates/calendarmonth.tmpl create mode 100644 templates/calendaryear.tmpl create mode 100644 templates/change.tmpl create mode 100644 templates/comment.tmpl create mode 100644 templates/commentmoderation.tmpl create mode 100644 templates/editcomment.tmpl create mode 100644 templates/editconflict.tmpl create mode 100644 templates/editcreationconflict.tmpl create mode 100644 templates/editfailedsave.tmpl create mode 100644 templates/editpage.tmpl create mode 100644 templates/editpagegone.tmpl create mode 100644 templates/emailauth.tmpl create mode 100644 templates/feedlink.tmpl create mode 100644 templates/googleform.tmpl create mode 100644 templates/inlinepage.tmpl create mode 100644 templates/login-selector.tmpl create mode 100644 templates/microblog.tmpl create mode 100644 templates/notifyemail.tmpl create mode 100644 templates/page.tmpl create mode 100644 templates/passwordmail.tmpl create mode 100644 templates/pocreatepage.tmpl create mode 100644 templates/recentchanges.tmpl create mode 100644 templates/renamesummary.tmpl create mode 100644 templates/revert.tmpl create mode 100644 templates/rssitem.tmpl create mode 100644 templates/rsspage.tmpl create mode 100644 templates/searchform.tmpl create mode 100644 templates/searchquery.tmpl create mode 100644 templates/titlepage.tmpl create mode 100644 templates/trails.tmpl diff --git a/ikiwiki.setup b/ikiwiki.setup index 682647a..d3dd2d5 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -36,3 +36,4 @@ allowatom: yes rss: yes atom: yes pandoc_filters: "sp-filter" +templatedir: templates \ No newline at end of file diff --git a/templates/aggregatepost.tmpl b/templates/aggregatepost.tmpl new file mode 100644 index 0000000..5a0f6e7 --- /dev/null +++ b/templates/aggregatepost.tmpl @@ -0,0 +1,19 @@ + + +[[!tag ]] + + +[[!meta title=""]] + + +[[!meta permalink=""]] + + +[[!meta copyright=""]] + + +[[!meta author=" ()"]] + +[[!meta author=""]] + +[[!meta authorurl=""]] diff --git a/templates/archivepage.tmpl b/templates/archivepage.tmpl new file mode 100644 index 0000000..3e0bd9b --- /dev/null +++ b/templates/archivepage.tmpl @@ -0,0 +1,19 @@ +
+ +
+ +
+ + +Posted + +by + + + + + + + + +
diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl new file mode 100644 index 0000000..9b056e0 --- /dev/null +++ b/templates/atomitem.tmpl @@ -0,0 +1,49 @@ + + <TMPL_VAR TITLE> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl new file mode 100644 index 0000000..3cdd71d --- /dev/null +++ b/templates/atompage.tmpl @@ -0,0 +1,39 @@ + + + +<TMPL_VAR TITLE> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +ikiwiki + + + diff --git a/templates/autoindex.tmpl b/templates/autoindex.tmpl new file mode 100644 index 0000000..d5ec3b8 --- /dev/null +++ b/templates/autoindex.tmpl @@ -0,0 +1 @@ +[[!map pages="/* and ! /*/*"]] diff --git a/templates/autotag.tmpl b/templates/autotag.tmpl new file mode 100644 index 0000000..9162e9e --- /dev/null +++ b/templates/autotag.tmpl @@ -0,0 +1,4 @@ +[[!meta title="pages tagged "]] + +[[!inline pages="tagged()" actions="no" archive="yes" +feedshow=10]] diff --git a/templates/blogpost.tmpl b/templates/blogpost.tmpl new file mode 100644 index 0000000..9e49c47 --- /dev/null +++ b/templates/blogpost.tmpl @@ -0,0 +1,16 @@ +
id="" action="" method="get"> +
+ +RSS + + +Atom + + + + + + + +
+ diff --git a/templates/calendarmonth.tmpl b/templates/calendarmonth.tmpl new file mode 100644 index 0000000..23cd954 --- /dev/null +++ b/templates/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/templates/calendaryear.tmpl b/templates/calendaryear.tmpl new file mode 100644 index 0000000..714bd6d --- /dev/null +++ b/templates/calendaryear.tmpl @@ -0,0 +1 @@ +[[!calendar type=year year= pages=""]] diff --git a/templates/change.tmpl b/templates/change.tmpl new file mode 100644 index 0000000..cb02222 --- /dev/null +++ b/templates/change.tmpl @@ -0,0 +1,57 @@ +[[!meta author=""""""]] + +[[!meta authorurl=""""""]] + +[[!meta title="""change to on """]] + +[[!meta permalink=""]] + +
+
Changed pages: + + + +[[diff|wikiicons/diff.png]] + + + +[[diff|wikiicons/diff.png]] + + + +
Changed by: + + + + + + + +
Commit type: + +
Date: + +
 + +[[revert|wikiicons/revert.png]] + +
+
+ + +
+ + +
+ + +
+ +
+ +
+
+
+
+ + diff --git a/templates/comment.tmpl b/templates/comment.tmpl new file mode 100644 index 0000000..e292440 --- /dev/null +++ b/templates/comment.tmpl @@ -0,0 +1,66 @@ +
+
+ +
+ +
 + +
+ + + + + +
+ +
+ +
 + +
+ +Comment by + + + + + + + + + + + + + + + +Comment by + + + + + + + + + + + + + +— +
 + + + + + +
+ diff --git a/templates/commentmoderation.tmpl b/templates/commentmoderation.tmpl new file mode 100644 index 0000000..dfa63c2 --- /dev/null +++ b/templates/commentmoderation.tmpl @@ -0,0 +1,32 @@ + +
+
+ + + + + +
+ +
+
+ +
+ + + + + + +
+
+ + + + +
+ +

+No comments need moderation at this time. +

+ diff --git a/templates/editcomment.tmpl b/templates/editcomment.tmpl new file mode 100644 index 0000000..703564e --- /dev/null +++ b/templates/editcomment.tmpl @@ -0,0 +1,43 @@ +
+ +
+ + + + + + + + (optional, or signin) +
+ + (optional) +
+ + +
+ +(You might want to Signin first?) +
+ + + +
+ +
+ +
+ + + + +
+
+Comment preview: +
+
+ +
+ + +
diff --git a/templates/editconflict.tmpl b/templates/editconflict.tmpl new file mode 100644 index 0000000..1252033 --- /dev/null +++ b/templates/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/templates/editcreationconflict.tmpl b/templates/editcreationconflict.tmpl new file mode 100644 index 0000000..c99102f --- /dev/null +++ b/templates/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/templates/editfailedsave.tmpl b/templates/editfailedsave.tmpl new file mode 100644 index 0000000..5184f7d --- /dev/null +++ b/templates/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/templates/editpage.tmpl b/templates/editpage.tmpl new file mode 100644 index 0000000..4736c95 --- /dev/null +++ b/templates/editpage.tmpl @@ -0,0 +1,91 @@ + + +
+ + + + + + + + + + + + + +
+
+
+ + +
+ + + + +Attachments + + + +
+
+ + + +
+ + + + +
" />
+
+ + + +
+
+ + + + +
+
+Page preview: +
+
+ +
+ + +
+
+Diff: +
+
+ +
+ diff --git a/templates/editpagegone.tmpl b/templates/editpagegone.tmpl new file mode 100644 index 0000000..2eed03a --- /dev/null +++ b/templates/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/templates/emailauth.tmpl b/templates/emailauth.tmpl new file mode 100644 index 0000000..5561406 --- /dev/null +++ b/templates/emailauth.tmpl @@ -0,0 +1,10 @@ +To log into , just open the following link: + + + +This link can only be used once to log in, and will expire in one day. + +(Please disregard this email if you were not trying to log in.) + +-- +ikiwiki diff --git a/templates/feedlink.tmpl b/templates/feedlink.tmpl new file mode 100644 index 0000000..c67ad9c --- /dev/null +++ b/templates/feedlink.tmpl @@ -0,0 +1,8 @@ +
id="" class="feedlink"> + +RSS + + +Atom + +
diff --git a/templates/googleform.tmpl b/templates/googleform.tmpl new file mode 100644 index 0000000..155a081 --- /dev/null +++ b/templates/googleform.tmpl @@ -0,0 +1,8 @@ + +
+
+ + +
+
diff --git a/templates/inlinepage.tmpl b/templates/inlinepage.tmpl new file mode 100644 index 0000000..37d7e48 --- /dev/null +++ b/templates/inlinepage.tmpl @@ -0,0 +1,78 @@ +
+ +
+ + + + + + + + + +
+ + + + + +
 +
+ +
+ +
 + + +
 + + +
+ + +Posted + + + + + + + +
+ +
+ + + +
+License: +
+ + + +
+ + +
 + +
 diff --git a/templates/login-selector.tmpl b/templates/login-selector.tmpl new file mode 100644 index 0000000..3e7045c --- /dev/null +++ b/templates/login-selector.tmpl @@ -0,0 +1,65 @@ + + + + +
+
+ + + + +
+
+
+ +
+ +
+

OpenId login:

+ + + +
+ + +
+

Email login:

+ + + +
+ +
+ + +
+ + + + +
+
+ +
+ +
+ + + +
diff --git a/templates/microblog.tmpl b/templates/microblog.tmpl new file mode 100644 index 0000000..e22d65c --- /dev/null +++ b/templates/microblog.tmpl @@ -0,0 +1,22 @@ +
+ +
+ +
+ +
+ + + + + + + + + + + +— + +
+
diff --git a/templates/notifyemail.tmpl b/templates/notifyemail.tmpl new file mode 100644 index 0000000..5087668 --- /dev/null +++ b/templates/notifyemail.tmpl @@ -0,0 +1,9 @@ +A comment has been posted atchange has been made to + +---- + + + +---- + +To stop these notifications, visit diff --git a/templates/page.tmpl b/templates/page.tmpl new file mode 100644 index 0000000..a1991f6 --- /dev/null +++ b/templates/page.tmpl @@ -0,0 +1,222 @@ + + + + + + + + + +<TMPL_VAR TITLE> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ + + +/ + + + + + + (%) + + + + + + + + +
+ + +
+ + + + + + + + + + + + + + + + + + +
+ + id="content" role="main"> + +
+ + +
 + + + + + id="comments" role="complementary"> + + +
+Add a comment +
+ +
Comments on this page are closed.
+ + + + + + + + id="footer" class="pagefooter" role="contentinfo"> + + + + + + + +
 + + + diff --git a/templates/passwordmail.tmpl b/templates/passwordmail.tmpl new file mode 100644 index 0000000..aa8a68c --- /dev/null +++ b/templates/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/templates/pocreatepage.tmpl b/templates/pocreatepage.tmpl new file mode 100644 index 0000000..f22ee50 --- /dev/null +++ b/templates/pocreatepage.tmpl @@ -0,0 +1,3 @@ +

+WARNING this page must be written in . +

diff --git a/templates/recentchanges.tmpl b/templates/recentchanges.tmpl new file mode 100644 index 0000000..340a157 --- /dev/null +++ b/templates/recentchanges.tmpl @@ -0,0 +1,7 @@ + +
+ + + +
+ diff --git a/templates/renamesummary.tmpl b/templates/renamesummary.tmpl new file mode 100644 index 0000000..7a8dc92 --- /dev/null +++ b/templates/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/templates/revert.tmpl b/templates/revert.tmpl new file mode 100644 index 0000000..b5122b1 --- /dev/null +++ b/templates/revert.tmpl @@ -0,0 +1,22 @@ + +
+ + + + + +
+
+ + +
+ +
+
+Diff being reverted: +
+
+
+
+
+
diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl new file mode 100644 index 0000000..bb03ca5 --- /dev/null +++ b/templates/rssitem.tmpl @@ -0,0 +1,28 @@ + + <TMPL_VAR TITLE> + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/rsspage.tmpl b/templates/rsspage.tmpl new file mode 100644 index 0000000..d07ecef --- /dev/null +++ b/templates/rsspage.tmpl @@ -0,0 +1,18 @@ + + + +<TMPL_VAR TITLE> + + + + + + +ikiwiki + + + + diff --git a/templates/searchform.tmpl b/templates/searchform.tmpl new file mode 100644 index 0000000..8cdf745 --- /dev/null +++ b/templates/searchform.tmpl @@ -0,0 +1,6 @@ +
+
+ +
+
diff --git a/templates/searchquery.tmpl b/templates/searchquery.tmpl new file mode 100644 index 0000000..6277266 --- /dev/null +++ b/templates/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/templates/titlepage.tmpl b/templates/titlepage.tmpl new file mode 100644 index 0000000..6326bab --- /dev/null +++ b/templates/titlepage.tmpl @@ -0,0 +1,7 @@ +

+ + + + + +

diff --git a/templates/trails.tmpl b/templates/trails.tmpl new file mode 100644 index 0000000..54c0460 --- /dev/null +++ b/templates/trails.tmpl @@ -0,0 +1,23 @@ + + + -- cgit v1.2.1 From 92d8aadbadb5767f41342cd2958b8662ef0b8d96 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Fri, 27 Nov 2020 11:29:41 +0200 Subject: page.tmpl: simplify lots Drop unnecessary parts. Alwys choose html5. --- ikiwiki.setup | 1 + templates/aggregatepost.tmpl | 19 --- templates/autoindex.tmpl | 1 - templates/autotag.tmpl | 4 - templates/blogpost.tmpl | 16 --- templates/calendarmonth.tmpl | 5 - templates/calendaryear.tmpl | 1 - templates/change.tmpl | 57 -------- templates/comment.tmpl | 66 ---------- templates/commentmoderation.tmpl | 32 ----- templates/editcomment.tmpl | 43 ------ templates/editconflict.tmpl | 7 - templates/editcreationconflict.tmpl | 9 -- templates/editfailedsave.tmpl | 10 -- templates/editpage.tmpl | 91 ------------- templates/editpagegone.tmpl | 7 - templates/emailauth.tmpl | 10 -- templates/googleform.tmpl | 8 -- templates/login-selector.tmpl | 65 ---------- templates/microblog.tmpl | 22 ---- templates/notifyemail.tmpl | 9 -- templates/page.tmpl | 252 ++++++------------------------------ templates/passwordmail.tmpl | 15 --- templates/pocreatepage.tmpl | 3 - templates/recentchanges.tmpl | 7 - templates/renamesummary.tmpl | 26 ---- templates/revert.tmpl | 22 ---- templates/searchform.tmpl | 6 - templates/searchquery.tmpl | 113 ---------------- templates/trails.tmpl | 23 ---- 30 files changed, 38 insertions(+), 912 deletions(-) delete mode 100644 templates/aggregatepost.tmpl delete mode 100644 templates/autoindex.tmpl delete mode 100644 templates/autotag.tmpl delete mode 100644 templates/blogpost.tmpl delete mode 100644 templates/calendarmonth.tmpl delete mode 100644 templates/calendaryear.tmpl delete mode 100644 templates/change.tmpl delete mode 100644 templates/comment.tmpl delete mode 100644 templates/commentmoderation.tmpl delete mode 100644 templates/editcomment.tmpl delete mode 100644 templates/editconflict.tmpl delete mode 100644 templates/editcreationconflict.tmpl delete mode 100644 templates/editfailedsave.tmpl delete mode 100644 templates/editpage.tmpl delete mode 100644 templates/editpagegone.tmpl delete mode 100644 templates/emailauth.tmpl delete mode 100644 templates/googleform.tmpl delete mode 100644 templates/login-selector.tmpl delete mode 100644 templates/microblog.tmpl delete mode 100644 templates/notifyemail.tmpl delete mode 100644 templates/passwordmail.tmpl delete mode 100644 templates/pocreatepage.tmpl delete mode 100644 templates/recentchanges.tmpl delete mode 100644 templates/renamesummary.tmpl delete mode 100644 templates/revert.tmpl delete mode 100644 templates/searchform.tmpl delete mode 100644 templates/searchquery.tmpl delete mode 100644 templates/trails.tmpl diff --git a/ikiwiki.setup b/ikiwiki.setup index d3dd2d5..ad5e7fe 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -25,6 +25,7 @@ disable_plugins: - table - toggle - repolist +- recentchanges html5: yes timeformat: '%Y-%m-%d %H:%M' exclude: 'favicon\.ico' diff --git a/templates/aggregatepost.tmpl b/templates/aggregatepost.tmpl deleted file mode 100644 index 5a0f6e7..0000000 --- a/templates/aggregatepost.tmpl +++ /dev/null @@ -1,19 +0,0 @@ - - -[[!tag ]] - - -[[!meta title=""]] - - -[[!meta permalink=""]] - - -[[!meta copyright=""]] - - -[[!meta author=" ()"]] - -[[!meta author=""]] - -[[!meta authorurl=""]] diff --git a/templates/autoindex.tmpl b/templates/autoindex.tmpl deleted file mode 100644 index d5ec3b8..0000000 --- a/templates/autoindex.tmpl +++ /dev/null @@ -1 +0,0 @@ -[[!map pages="/* and ! /*/*"]] diff --git a/templates/autotag.tmpl b/templates/autotag.tmpl deleted file mode 100644 index 9162e9e..0000000 --- a/templates/autotag.tmpl +++ /dev/null @@ -1,4 +0,0 @@ -[[!meta title="pages tagged "]] - -[[!inline pages="tagged()" actions="no" archive="yes" -feedshow=10]] diff --git a/templates/blogpost.tmpl b/templates/blogpost.tmpl deleted file mode 100644 index 9e49c47..0000000 --- a/templates/blogpost.tmpl +++ /dev/null @@ -1,16 +0,0 @@ -
id="" action="" method="get"> -
- -RSS - - -Atom - - - - - - - -
- diff --git a/templates/calendarmonth.tmpl b/templates/calendarmonth.tmpl deleted file mode 100644 index 23cd954..0000000 --- a/templates/calendarmonth.tmpl +++ /dev/null @@ -1,5 +0,0 @@ -[[!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/templates/calendaryear.tmpl b/templates/calendaryear.tmpl deleted file mode 100644 index 714bd6d..0000000 --- a/templates/calendaryear.tmpl +++ /dev/null @@ -1 +0,0 @@ -[[!calendar type=year year= pages=""]] diff --git a/templates/change.tmpl b/templates/change.tmpl deleted file mode 100644 index cb02222..0000000 --- a/templates/change.tmpl +++ /dev/null @@ -1,57 +0,0 @@ -[[!meta author=""""""]] - -[[!meta authorurl=""""""]] - -[[!meta title="""change to on """]] - -[[!meta permalink=""]] - -
-
Changed pages: - - - -[[diff|wikiicons/diff.png]] - - - -[[diff|wikiicons/diff.png]] - - - -
Changed by: - - - - - - - -
Commit type: - -
Date: - -
 - -[[revert|wikiicons/revert.png]] - -
-
- - -
- - -
- - -
- -
- -
-
-
-
- - diff --git a/templates/comment.tmpl b/templates/comment.tmpl deleted file mode 100644 index e292440..0000000 --- a/templates/comment.tmpl +++ /dev/null @@ -1,66 +0,0 @@ -
-
- -
- -
 - -
- - - - - -
- -
- -
 - -
- -Comment by - - - - - - - - - - - - - - - -Comment by - - - - - - - - - - - - - -— -
 - - - - - -
- diff --git a/templates/commentmoderation.tmpl b/templates/commentmoderation.tmpl deleted file mode 100644 index dfa63c2..0000000 --- a/templates/commentmoderation.tmpl +++ /dev/null @@ -1,32 +0,0 @@ - -
-
- - - - - -
- -
-
- -
- - - - - - -
-
- - - - -
- -

-No comments need moderation at this time. -

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

-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/templates/editcreationconflict.tmpl b/templates/editcreationconflict.tmpl deleted file mode 100644 index c99102f..0000000 --- a/templates/editcreationconflict.tmpl +++ /dev/null @@ -1,9 +0,0 @@ -

-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/templates/editfailedsave.tmpl b/templates/editfailedsave.tmpl deleted file mode 100644 index 5184f7d..0000000 --- a/templates/editfailedsave.tmpl +++ /dev/null @@ -1,10 +0,0 @@ -

-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/templates/editpage.tmpl b/templates/editpage.tmpl deleted file mode 100644 index 4736c95..0000000 --- a/templates/editpage.tmpl +++ /dev/null @@ -1,91 +0,0 @@ - - -
- - - - - - - - - - - - - -
-
-
- - -
- - - - -Attachments - - - -
-
- - - -
- - - - -
" />
-
- - - -
-
- - - - -
-
-Page preview: -
-
- -
- - -
-
-Diff: -
-
- -
- diff --git a/templates/editpagegone.tmpl b/templates/editpagegone.tmpl deleted file mode 100644 index 2eed03a..0000000 --- a/templates/editpagegone.tmpl +++ /dev/null @@ -1,7 +0,0 @@ -

-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/templates/emailauth.tmpl b/templates/emailauth.tmpl deleted file mode 100644 index 5561406..0000000 --- a/templates/emailauth.tmpl +++ /dev/null @@ -1,10 +0,0 @@ -To log into , just open the following link: - - - -This link can only be used once to log in, and will expire in one day. - -(Please disregard this email if you were not trying to log in.) - --- -ikiwiki diff --git a/templates/googleform.tmpl b/templates/googleform.tmpl deleted file mode 100644 index 155a081..0000000 --- a/templates/googleform.tmpl +++ /dev/null @@ -1,8 +0,0 @@ - -
-
- - -
-
diff --git a/templates/login-selector.tmpl b/templates/login-selector.tmpl deleted file mode 100644 index 3e7045c..0000000 --- a/templates/login-selector.tmpl +++ /dev/null @@ -1,65 +0,0 @@ - - - - -
-
- - - - -
-
-
- -
- -
-

OpenId login:

- - - -
- - -
-

Email login:

- - - -
- -
- - -
- - - - -
-
- -
- -
- - - -
diff --git a/templates/microblog.tmpl b/templates/microblog.tmpl deleted file mode 100644 index e22d65c..0000000 --- a/templates/microblog.tmpl +++ /dev/null @@ -1,22 +0,0 @@ -
- -
- -
- -
- - - - - - - - - - - -— - -
-
diff --git a/templates/notifyemail.tmpl b/templates/notifyemail.tmpl deleted file mode 100644 index 5087668..0000000 --- a/templates/notifyemail.tmpl +++ /dev/null @@ -1,9 +0,0 @@ -A comment has been posted atchange has been made to - ----- - - - ----- - -To stop these notifications, visit diff --git a/templates/page.tmpl b/templates/page.tmpl index a1991f6..3f39ba7 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -1,222 +1,44 @@ - - - - - - -<TMPL_VAR TITLE> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + <TMPL_VAR TITLE> + + + - -
- -
-
- - - -/ - - - - - - (%) - - - - - - - - -
- - -
- - - - - - - - - - - - - - - - - - -
- - id="content" role="main"> - -
- - -
 - - - - - id="comments" role="complementary"> - - -
-Add a comment -
- -
Comments on this page are closed.
- - - - - - - - id="footer" class="pagefooter" role="contentinfo"> - - - - - - - -
 - +
+
+
+ + + + / + + + + + + +
+
+ + + + + +
+
+ +
+
+ +
+ +
+
diff --git a/templates/passwordmail.tmpl b/templates/passwordmail.tmpl deleted file mode 100644 index aa8a68c..0000000 --- a/templates/passwordmail.tmpl +++ /dev/null @@ -1,15 +0,0 @@ -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/templates/pocreatepage.tmpl b/templates/pocreatepage.tmpl deleted file mode 100644 index f22ee50..0000000 --- a/templates/pocreatepage.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -

-WARNING this page must be written in . -

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

-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/templates/revert.tmpl b/templates/revert.tmpl deleted file mode 100644 index b5122b1..0000000 --- a/templates/revert.tmpl +++ /dev/null @@ -1,22 +0,0 @@ - -
- - - - - -
-
- - -
- -
-
-Diff being reverted: -
-
-
-
-
-
diff --git a/templates/searchform.tmpl b/templates/searchform.tmpl deleted file mode 100644 index 8cdf745..0000000 --- a/templates/searchform.tmpl +++ /dev/null @@ -1,6 +0,0 @@ -
-
- -
-
diff --git a/templates/searchquery.tmpl b/templates/searchquery.tmpl deleted file mode 100644 index 6277266..0000000 --- a/templates/searchquery.tmpl +++ /dev/null @@ -1,113 +0,0 @@ -$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/templates/trails.tmpl b/templates/trails.tmpl deleted file mode 100644 index 54c0460..0000000 --- a/templates/trails.tmpl +++ /dev/null @@ -1,23 +0,0 @@ - - - -- cgit v1.2.1 From 595dae709a0cf204d096c563f63af5ac2eb20006 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Fri, 27 Nov 2020 12:28:39 +0200 Subject: combine, simplify CSS style sheets --- local.css | 7 --- style.css | 125 ++++++++-------------------------------------------- templates/page.tmpl | 1 - 3 files changed, 18 insertions(+), 115 deletions(-) delete mode 100644 local.css diff --git a/local.css b/local.css deleted file mode 100644 index 838348e..0000000 --- a/local.css +++ /dev/null @@ -1,7 +0,0 @@ -img.sticker { - float: right; -} -img.bytemark { - float: right; - height: 40px; -} diff --git a/style.css b/style.css index 8371363..06e4efe 100644 --- a/style.css +++ b/style.css @@ -6,18 +6,27 @@ html { margin-top: 2em; } -form#searchform { - font-family: monospace; - text-align: right; +h1, h2, h3, h4, h5, h6 { + font-family: sans-serif; + font-weight: bold; + margin-top: 2em; } -div.actions { - font-family: monospace; - text-align: right; +h1 { + font-size: 150%; } -div.actions ul, div.actions li { - display: inline; +h2 { + font-size: 120%; +} + +h3 { + font-size: 100%; +} + +ul li, ol li { + margin-top: 0.5em; + margin-bottom: 0.5em; } div.pageheader { @@ -41,9 +50,6 @@ div.pagefooter { margin-top: 3em; } -div#pagebody { -} - span.date { font-family: monospace; } @@ -74,107 +80,12 @@ div.sidebar { margin-left: 1em; } -.float_right, .floatTR { +.float_right { float: right; margin-left: 1em; margin-bottom: 1em; } -h1, h2, h3, h4, h5, h6 { - font-family: sans-serif; - font-weight: bold; - margin-top: 2em; -} - -h1 { - font-size: 150%; -} - -h2 { - font-size: 120%; -} - -h3 { - font-size: 100%; -} - -ul li, ol li { - margin-top: 0.5em; - margin-bottom: 0.5em; -} - -div#comments div.feedlink { - margin-top: 2em; -} - -div.comment { - margin-top: 2em; -} - -div.comment-subject { - margin-bottom: 1em; - font-size: 120%; - font-family: sans-serif; -} - -div.comment-header { - margin-top: 1em; -} - -div.archivepage { - margin-top: 0.5em; - margin-bottom: 0.5em; -} - span.archivepagedate { font-family: monospace; } - - - -/* The following are for openid logins in Ikiwiki. Copied from - ikiwiki. */ - -input#openid_identifier { - background: url(wikiicons/openidlogin-bg.gif) no-repeat; - background-color: #fff; - background-position: 0 50%; - color: #000; - padding-left: 18px; -} -/* openid selector */ -#openid_choice { - display: none; -} -#openid_input_area { - clear: both; - padding: 10px; -} -#openid_btns, #openid_btns br { - clear: both; -} -#openid_highlight { - background-color: black; - float: left; -} -.openid_large_btn { - padding: 1em 1.5em; - border: 1px solid #DDD; - margin: 3px; - float: left; -} -.openid_small_btn { - padding: 4px 4px; - border: 1px solid #DDD; - margin: 3px; - float: left; -} -a.openid_large_btn:focus { - outline: none; -} -a.openid_large_btn:focus { - outline-style: none; -} -.openid_selected { - border: 4px solid #DDD; -} diff --git a/templates/page.tmpl b/templates/page.tmpl index 3f39ba7..1c5407a 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -5,7 +5,6 @@ <TMPL_VAR TITLE> -
-- cgit v1.2.1 From 1cfc510ed82e1223d8930af646e69032267e2c11 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Fri, 27 Nov 2020 12:40:51 +0200 Subject: fix: selector for page title --- style.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/style.css b/style.css index 06e4efe..c6bd649 100644 --- a/style.css +++ b/style.css @@ -34,8 +34,7 @@ div.pageheader { margin-bottom: 2em; } -div.pageheader span.title { - display: block; +.pageheader span.title { font-size: 200%; font-weight: bold; font-family: sans-serif; -- cgit v1.2.1 From d8e8ca1e7b9f301db94937331d1dbd6d2540e824 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Fri, 27 Nov 2020 12:41:04 +0200 Subject: use -> instead / to separate path elements --- templates/page.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/page.tmpl b/templates/page.tmpl index 1c5407a..c6e2c85 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -13,7 +13,7 @@ - / + → -- cgit v1.2.1 From 9fbbc68083f43f1b63964b5128008b245216a9dc Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Fri, 27 Nov 2020 12:41:57 +0200 Subject: drop h1 for roadmap Duplicate with page title. --- roadmap.mdwn | 2 -- 1 file changed, 2 deletions(-) diff --git a/roadmap.mdwn b/roadmap.mdwn index a519d70..aeb00f3 100644 --- a/roadmap.mdwn +++ b/roadmap.mdwn @@ -1,7 +1,5 @@ [[!meta title="Road map"]] -# Roadmap - The current goal of Obnam development to get the software to a state where its author uses it for real, for at least a subset of their live data, and is ready to ask others to try the software. -- cgit v1.2.1