From d76c10cba24c2bea026facb2a9e5e3215d7f3994 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 22 Jul 2008 19:58:34 -0400 Subject: Split out error messages from editpage.tmpl into several separate templates. --- templates/editconflict.tmpl | 7 +++++++ templates/editcreationconflict.tmpl | 9 ++++++++ templates/editfailedsave.tmpl | 10 +++++++++ templates/editpage.tmpl | 42 +------------------------------------ templates/editpagegone.tmpl | 7 +++++++ 5 files changed, 34 insertions(+), 41 deletions(-) create mode 100644 templates/editconflict.tmpl create mode 100644 templates/editcreationconflict.tmpl create mode 100644 templates/editfailedsave.tmpl create mode 100644 templates/editpagegone.tmpl (limited to 'templates') diff --git a/templates/editconflict.tmpl b/templates/editconflict.tmpl new file mode 100644 index 000000000..125203395 --- /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 000000000..c99102f0d --- /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 000000000..5184f7d4d --- /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 index 1c30d1d85..4b54db2d1 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,46 +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. -

- + diff --git a/templates/editpagegone.tmpl b/templates/editpagegone.tmpl new file mode 100644 index 000000000..2eed03af4 --- /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. +

-- cgit v1.2.3