diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-01 21:13:35 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-01 21:13:35 +0200 |
| commit | be3fe912791f7332374ca231422d3a06b05778e9 (patch) | |
| tree | 5295c217ac8424a895370d956037a650d6445435 /editpage.tmpl | |
| parent | 2fb8dbca8338e24e7018355295d8248eba6e1132 (diff) | |
Sync with ikiwiki 2.55.
Diffstat (limited to 'editpage.tmpl')
| -rw-r--r-- | editpage.tmpl | 58 |
1 files changed, 17 insertions, 41 deletions
diff --git a/editpage.tmpl b/editpage.tmpl index b0bb0ec..4b54db2 100644 --- a/editpage.tmpl +++ b/editpage.tmpl @@ -1,44 +1,6 @@ -<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> +<br /> +<TMPL_VAR JAVASCRIPT> +<TMPL_VAR MESSAGE> <TMPL_VAR FORM-START> <TMPL_VAR FIELD-DO> <TMPL_VAR FIELD-SID> @@ -60,6 +22,20 @@ Optional comment about this change:<br /> </TMPL_IF> <TMPL_VAR FORM-SUBMIT> <TMPL_VAR HELPONFORMATTINGLINK> +<TMPL_IF NAME="FIELD-ATTACHMENT"> +<a class="toggle" href="#attachments">Attachments</a> +<div class="<TMPL_VAR ATTACHMENTS-CLASS>" id="attachments"> +<table> +<tr><td colspan="5"><TMPL_VAR FIELD-ATTACHMENT><TMPL_VAR FIELD-UPLOAD></td></tr> +<TMPL_LOOP NAME="ATTACHMENT_LIST"> +<tr><td><TMPL_VAR FIELD-SELECT><TMPL_VAR LINK></td><td><TMPL_VAR SIZE></td><td><TMPL_VAR MTIME></td></tr> +</TMPL_LOOP> +<TMPL_IF NAME="ATTACHMENT_LIST"> +<tr><td colspan="2"><TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-RENAME><TMPL_VAR FIELD-REMOVE></td></tr> +</TMPL_IF> +</table> +</div> +</TMPL_IF> <TMPL_VAR FORM-END> <TMPL_IF NAME="PAGE_PREVIEW"> |