diff options
| author | Thomas Schwinge <tschwinge@gnu.org> | 2009-03-14 15:07:35 +0100 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gnu.org> | 2009-03-14 17:57:05 +0100 |
| commit | bd7ffaec11a01272faad8b5d182beb4cb3f836db (patch) | |
| tree | e886529c0bc8431852b4f379cb28e0f94a5936ae | |
| parent | 48e2896d3def0946e9bde3c0eaf3c4c2ce950b9f (diff) | |
Update to ikiwiki's 7ca39f49db67de756795ad419791082e115fbd98.
| -rw-r--r-- | .templates/editpage.tmpl | 61 |
1 files changed, 19 insertions, 42 deletions
diff --git a/.templates/editpage.tmpl b/.templates/editpage.tmpl index 906f39ce..45060ffe 100644 --- a/.templates/editpage.tmpl +++ b/.templates/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> @@ -71,14 +33,29 @@ rights to copy, modify, and redistribute your contributions.</p> <p>We're requiring these copyright assignments, so that we'll easily be able to include your contributions in official GNU documentation, such as the GNU Hurd manual, etc. Send email to <a -href="mailto:hurd-maintainers@gnu.org"><hurd-maintainers@gnu.org></a> +href="mailto:hurd-maintainers@gnu.org">hurd-maintainers@gnu.org</a> if there are questions.</p> </div> <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_VAR WMD_PREVIEW> <TMPL_IF NAME="PAGE_PREVIEW"> <hr /> |