diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/editconflict.tmpl | 7 | ||||
| -rw-r--r-- | templates/editcreationconflict.tmpl | 9 | ||||
| -rw-r--r-- | templates/editfailedsave.tmpl | 10 | ||||
| -rw-r--r-- | templates/editpage.tmpl | 42 | ||||
| -rw-r--r-- | templates/editpagegone.tmpl | 7 |
5 files changed, 34 insertions, 41 deletions
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 @@ +<p class="error"> +<b>Your changes conflict with other changes made to the page.</b> +</p> +<p> +Conflict markers have been inserted into the page content. Reconcile the +conflict and commit again to save your changes. +</p> 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 @@ +<p class="error"> +<b>While you were creating this page, someone else independently created a page +with the same name.</b> +</p> +<p> +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. +</p> 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 @@ +<p class="error"> +<b>Failed to save your changes.</b> +</p> +<p> +Your changes were not able to be saved to disk. The system gave the error: +<blockquote> +<TMPL_VAR ERROR_MESSAGE> +</blockquote> +Your changes are preserved below, and you can try again to save them. +</p> 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 @@ <br /> <TMPL_VAR JAVASCRIPT> -<TMPL_IF NAME="PAGE_CONFLICT"> -<p> -<b>Your changes conflict with other changes made to the page.</b> -</p> -<p> -Conflict markers have been inserted into the page content. Reconcile the -conflict and commit again to save your changes. -</p> -</TMPL_IF> -<TMPL_IF NAME="FAILED_SAVE"> -<p> -<b>Failed to save your changes.</b> -</p> -<p> -Your changes were not able to be saved to disk. The system gave the error: -<blockquote> -<TMPL_VAR ERROR_MESSAGE> -</blockquote> -Your changes are preserved below, and you can try again to save them. -</p> -</TMPL_IF> -<TMPL_IF NAME="PAGE_GONE"> -<p> -<b>The page you were editing has disappeared.</b> -</p> -<p> -Perhaps someone else has deleted it or moved it. If you want to recreate -this page with your text, click "Save Page" again. -</p> -</TMPL_IF> -<TMPL_IF NAME="CREATION_CONFLICT"> -<p> -<b>While you were creating this page, someone else independently created a page -with the same name.</b> -</p> -<p> -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. -</p> -</TMPL_IF> +<TMPL_VAR MESSAGE> <TMPL_VAR FORM-START> <TMPL_VAR FIELD-DO> <TMPL_VAR FIELD-SID> 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 @@ +<p class="error"> +<b>The page you were editing has disappeared.</b> +</p> +<p> +Perhaps someone else has deleted it or moved it. If you want to recreate +this page with your text, click "Save Page" again. +</p> |