From be3fe912791f7332374ca231422d3a06b05778e9 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Fri, 1 Aug 2008 21:13:35 +0200 Subject: Sync with ikiwiki 2.55. --- atomitem.tmpl | 6 ++++- atompage.tmpl | 8 +++++-- editconflict.tmpl | 7 ++++++ editcreationconflict.tmpl | 9 ++++++++ editfailedsave.tmpl | 10 ++++++++ editpage.tmpl | 58 ++++++++++++++--------------------------------- editpagegone.tmpl | 7 ++++++ inlinepage.tmpl | 16 +++++++++++-- page.tmpl | 17 ++++++++++---- renamesummary.tmpl | 19 ++++++++++++++++ rssitem.tmpl | 6 ++++- searchquery.tmpl | 2 +- 12 files changed, 113 insertions(+), 52 deletions(-) create mode 100644 editconflict.tmpl create mode 100644 editcreationconflict.tmpl create mode 100644 editfailedsave.tmpl create mode 100644 editpagegone.tmpl create mode 100644 renamesummary.tmpl diff --git a/atomitem.tmpl b/atomitem.tmpl index 1b1d686..19c557f 100644 --- a/atomitem.tmpl +++ b/atomitem.tmpl @@ -1,6 +1,10 @@ <TMPL_VAR TITLE> - + + + + + diff --git a/atompage.tmpl b/atompage.tmpl index acc4737..e834d76 100644 --- a/atompage.tmpl +++ b/atompage.tmpl @@ -3,7 +3,7 @@ <TMPL_VAR TITLE> - + @@ -31,7 +31,11 @@ - + + + + + ikiwiki 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 index b0bb0ec..4b54db2 100644 --- a/editpage.tmpl +++ b/editpage.tmpl @@ -1,44 +1,6 @@ - -

-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. -

- - -

-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. -

- - -

-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. -

- - -

-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. -

- +
+ + @@ -60,6 +22,20 @@ Optional comment about this change:
+ +Attachments +
+ + + + + + + + +
+
+ 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/inlinepage.tmpl b/inlinepage.tmpl index 71d57b0..ffcb897 100644 --- a/inlinepage.tmpl +++ b/inlinepage.tmpl @@ -1,4 +1,7 @@
+ +
+ @@ -15,7 +18,14 @@ + +
+ +
+
+ +
Posted @@ -52,7 +62,9 @@ License:
    • -
    +
     - + + + diff --git a/page.tmpl b/page.tmpl index b903adb..f2f9c34 100644 --- a/page.tmpl +++ b/page.tmpl @@ -9,18 +9,26 @@ + + + +
    + / + + + @@ -47,6 +55,7 @@
    +
    - - + - + diff --git a/renamesummary.tmpl b/renamesummary.tmpl new file mode 100644 index 0000000..2676082 --- /dev/null +++ b/renamesummary.tmpl @@ -0,0 +1,19 @@ +

    +Successfully renamed to . +

    +

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

      +
      •  +
    +     + +The following pages still link to : +
      +
      •  +
    + +No pages have broken links to . +     +

    diff --git a/rssitem.tmpl b/rssitem.tmpl index f22e5e3..1144cd5 100644 --- a/rssitem.tmpl +++ b/rssitem.tmpl @@ -5,7 +5,11 @@ <TMPL_VAR TITLE> - + + + + + diff --git a/searchquery.tmpl b/searchquery.tmpl index 0d6eb63..782b12c 100644 --- a/searchquery.tmpl +++ b/searchquery.tmpl @@ -1,5 +1,5 @@ $setmap{prefix,title,S} -$setmap{prefix,link,LINK} +$setmap{prefix,link,XLINK} $set{thousand,$.}$set{decimal,.}$setmap{BN,,Any Country,uk,England,fr,France} ${ $def{PREV, -- cgit v1.2.3