From 6137005a40de0efbae16f4b5e810bb6af3abe59e Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 20 Jan 2008 20:43:20 +0100 Subject: Sync with upstream commit 405e8a703126cc5de426063dedbd2394b747782a (Wed Jan 9, release 2.20). --- aggregatepost.tmpl | 3 +++ atomitem.tmpl | 43 +++++++++++++++++++++++++++++++------------ atompage.tmpl | 26 +++++++++++++++++++++++++- misc.tmpl | 2 +- page.tmpl | 2 +- recentchanges.tmpl | 2 +- 6 files changed, 62 insertions(+), 16 deletions(-) diff --git a/aggregatepost.tmpl b/aggregatepost.tmpl index 5b0f2f4..739a576 100644 --- a/aggregatepost.tmpl +++ b/aggregatepost.tmpl @@ -8,5 +8,8 @@ [[meta permalink=""]] + +[[meta copyright=""]] + [[meta author=""]] [[meta authorurl=""]] diff --git a/atomitem.tmpl b/atomitem.tmpl index 4dc2d07..1b1d686 100644 --- a/atomitem.tmpl +++ b/atomitem.tmpl @@ -1,25 +1,44 @@ <TMPL_VAR TITLE> + + - + + + + +
+ + + + + + +
+ + + +
+ +
+ + - - - - - + + + - + - -
- -
- + +
+ +
+ diff --git a/atompage.tmpl b/atompage.tmpl index 1bca3e7..acc4737 100644 --- a/atompage.tmpl +++ b/atompage.tmpl @@ -5,8 +5,32 @@ - + + + + + + + +
+ + + + + + +
+ + + + +
+ +
+ + + ikiwiki diff --git a/misc.tmpl b/misc.tmpl index 32e2c93..184920e 100644 --- a/misc.tmpl +++ b/misc.tmpl @@ -1,6 +1,6 @@ - + diff --git a/page.tmpl b/page.tmpl index a02345f..3a1ac9e 100644 --- a/page.tmpl +++ b/page.tmpl @@ -1,6 +1,6 @@ - + <TMPL_VAR TITLE> diff --git a/recentchanges.tmpl b/recentchanges.tmpl index e954503..e03482f 100644 --- a/recentchanges.tmpl +++ b/recentchanges.tmpl @@ -1,6 +1,6 @@ - + -- cgit v1.2.3 From e39521bb357bf6f996b6c775e5b3d5cd6a5eb0a7 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Fri, 8 Feb 2008 04:01:13 +0100 Subject: Sync with ikiwiki 2.30. --- change.tmpl | 36 ++++++++++++++++++++++++++ notifymail.tmpl | 4 --- recentchanges.tmpl | 74 ++++-------------------------------------------------- 3 files changed, 41 insertions(+), 73 deletions(-) create mode 100644 change.tmpl delete mode 100644 notifymail.tmpl diff --git a/change.tmpl b/change.tmpl new file mode 100644 index 0000000..16ef08a --- /dev/null +++ b/change.tmpl @@ -0,0 +1,36 @@ +[[meta author=""""""]] + +[[meta authorurl=""""""]] + +[[meta title="""update of 's """]] +
+
Changed pages: + + +diff + + + + + +
Changed by: + + + + + + + +
Commit type: + +
Date: + +
+
+ + +
+ + +
+ diff --git a/notifymail.tmpl b/notifymail.tmpl deleted file mode 100644 index e3a1dd3..0000000 --- a/notifymail.tmpl +++ /dev/null @@ -1,4 +0,0 @@ -The following change was made by : - - - diff --git a/recentchanges.tmpl b/recentchanges.tmpl index e03482f..340a157 100644 --- a/recentchanges.tmpl +++ b/recentchanges.tmpl @@ -1,71 +1,7 @@ - - - - - -<TMPL_VAR TITLE> - - - - + +
- - - -
- -/ - + +
- -
-
- - - - - - - - - - - - - - - - - - - - - - -
usertimechanges
- - - "> - diff - - - - - - -
- - -
- - -
-
- - - - - + -- cgit v1.2.3 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