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