X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/18d24036477223794e8319428cd7ba971129c29c..d3c15aed18ef9e67c3e785ac3cc0426c56e59ac7:/templates/editpage.tmpl?ds=sidebyside diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index aa9436173..4736c95d0 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> +<br /> <TMPL_VAR FORM-START> <TMPL_VAR FIELD-DO> <TMPL_VAR FIELD-SID> @@ -48,36 +8,69 @@ together before saving. <TMPL_VAR FIELD-RCSINFO> <TMPL_VAR FIELD-NEWFILE> <TMPL_IF NAME="PAGE_SELECT"> -Page location: <TMPL_VAR FIELD-PAGE> -Page type: <TMPL_VAR FIELD-TYPE> +<label for="page" class="inline">Page location:</label><TMPL_VAR FIELD-PAGE> +<label for="type" class="inline">Page type:</label><TMPL_VAR FIELD-TYPE> <TMPL_ELSE> -<br /> <TMPL_VAR FIELD-PAGE> <TMPL_VAR FIELD-TYPE> </TMPL_IF> +<div class="editcontentdiv"> <TMPL_VAR FIELD-EDITCONTENT><br /> +</div> <TMPL_IF NAME="CAN_COMMIT"> -Optional comment about this change:<br /> -<TMPL_VAR FIELD-COMMENTS><br /> +<label for="editmessage" class="block">Optional description of this change:</label> +<TMPL_VAR FIELD-EDITMESSAGE><br /> </TMPL_IF> <TMPL_VAR FORM-SUBMIT> <TMPL_VAR HELPONFORMATTINGLINK> <TMPL_IF NAME="FIELD-ATTACHMENT"> <a class="toggle" href="#attachments">Attachments</a> +</TMPL_IF> +<TMPL_VAR FIELD-SUBSCRIBE> +<TMPL_IF NAME="FIELD-ATTACHMENT"> <div class="<TMPL_VAR ATTACHMENTS-CLASS>" id="attachments"> -<table> -<tr><td colspan="5"><TMPL_VAR FIELD-ATTACHMENT><TMPL_VAR FIELD-UPLOAD></td></tr> +<div id="fileupload"> +<script> +$(function () { $('#fileupload').fileupload(); }); // initialize upload widget +</script> +<script id="template-upload" type="text/x-jquery-tmpl"> + <tr class="template-upload{{if error}} ui-state-error{{/if}}"> + <td><input type="checkbox" name="attachment_select" value="${name}" />${name}</td> + {{if error}} + <td class="error" colspan="2">failed!</td> + {{else}} + <td class="progress" colspan="2"><div></div></td> + <td class="start"><button>Start</button></td> + {{/if}} + <td class="cancel"><button>Cancel</button></td> + </tr> +</script> +<script id="template-download" type="text/x-jquery-tmpl"> + <tr class="template-download{{if error}} ui-state-error{{/if}}"> + <td><input type="checkbox" checked name="attachment_select" value="${name}" />${name}</td> + <td>${humansize}</td> + {{if error}} + <td class="error" colspan="2">failed!</td> + {{else}} + <td>${stored_msg}</td> + {{/if}} + </tr> +</script> +<div class="fileupload-content"> +<table class="files"> <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> +<tr><td><input type="checkbox" name="attachment_select" value="<TMPL_VAR NAME ESCAPE="HTML">" /><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-REMOVE><TMPL_VAR FIELD-RENAME></td></tr> -</TMPL_IF> </table> </div> +<TMPL_VAR FIELD-ATTACHMENT> +<noscript><TMPL_VAR FIELD-UPLOAD></noscript> +<TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-RENAME><TMPL_VAR FIELD-REMOVE> +</div> +</div> </TMPL_IF> <TMPL_VAR FORM-END> - +<TMPL_VAR WMD_PREVIEW> <TMPL_IF NAME="PAGE_PREVIEW"> <hr /> <div class="header"> @@ -87,3 +80,12 @@ Optional comment about this change:<br /> <TMPL_VAR PAGE_PREVIEW> </div> </TMPL_IF> +<TMPL_IF NAME="PAGE_DIFF"> +<hr /> +<div class="header"> +<span>Diff:</span> +</div> +<div id="diff"> +<TMPL_VAR PAGE_DIFF> +</div> +</TMPL_IF>