X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b66261d08bb978a1c5b1fe02ef25b49b4cd9d9e6..efe05d18ae5633d7a186d2cb97377b6e08ea8f4e:/templates/editpage.tmpl?ds=sidebyside

diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 6fe495aa8..4736c95d0 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -1,5 +1,3 @@
-<link rel="stylesheet" href="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery-ui.css" id="theme"> 
-<link rel="stylesheet" href="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.fileupload-ui.css"> 
 <TMPL_VAR JAVASCRIPT>
 <TMPL_VAR MESSAGE>
 <br />
@@ -20,85 +18,44 @@
 <TMPL_VAR FIELD-EDITCONTENT><br />
 </div>
 <TMPL_IF NAME="CAN_COMMIT">
-<label for="editmessage" class="block">Optional comment about this change:</label>
+<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>
-<noscript>
-<tr><td colspan="5"><TMPL_VAR FIELD-ATTACHMENT><TMPL_VAR FIELD-UPLOAD></td></tr>
-</noscript>
+</TMPL_IF>
+<TMPL_VAR FIELD-SUBSCRIBE>
+<TMPL_IF NAME="FIELD-ATTACHMENT">
 <div class="<TMPL_VAR ATTACHMENTS-CLASS>" id="attachments">
 <div id="fileupload"> 
-<div class="fileupload-buttonbar"> 
-<label class="fileinput-button"> 
-<span>Add files...</span> 
-<input type="file" name="attachments" multiple> 
-</label> 
-<button type="submit" class="start">Start upload</button> 
-<button type="reset" class="cancel">Cancel upload</button> 
-<TMPL_IF NAME="ATTACHMENT_LIST">
-<TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-RENAME><TMPL_VAR FIELD-REMOVE>
-</TMPL_IF>
-</div> 
+<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="dummy" />${name}</td>
-        <td>${sizef}</td>
+        <td><input type="checkbox" name="attachment_select" value="${name}" />${name}</td>
         {{if error}}
-            <td class="error" colspan="2">Error:
-                {{if error === 'maxFileSize'}}File is too big
-                {{else error === 'minFileSize'}}File is too small
-                {{else error === 'acceptFileTypes'}}Filetype not allowed
-                {{else error === 'maxNumberOfFiles'}}Max number of files exceeded
-                {{else}}${error}
-                {{/if}}
-            </td>
+        <td class="error" colspan="2">failed!</td>
         {{else}}
-            <td class="progress"><div></div></td>
-            <td class="start"><button>Start</button></td>
+        <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" name="attachment_select" value="${name}" />${name}</td>
+        <td><input type="checkbox" checked name="attachment_select" value="${name}" />${name}</td>
         <td>${humansize}</td>
         {{if error}}
-            <td class="error" colspan="2">Error:
-                {{if error === 1}}File exceeds upload_max_filesize (php.ini directive)
-                {{else error === 2}}File exceeds MAX_FILE_SIZE (HTML form directive)
-                {{else error === 3}}File was only partially uploaded
-                {{else error === 4}}No File was uploaded
-                {{else error === 5}}Missing a temporary folder
-                {{else error === 6}}Failed to write file to disk
-                {{else error === 7}}File upload stopped by extension
-                {{else error === 'maxFileSize'}}File is too big
-                {{else error === 'minFileSize'}}File is too small
-                {{else error === 'acceptFileTypes'}}Filetype not allowed
-                {{else error === 'maxNumberOfFiles'}}Max number of files exceeded
-                {{else error === 'uploadedBytes'}}Uploaded bytes exceed file size
-                {{else error === 'emptyResult'}}Empty file upload result
-                {{else}}${error}
-                {{/if}}
-            </td>
+        <td class="error" colspan="2">failed!</td>
         {{else}}
-            <td>${stored_msg}</td>
+        <td>${stored_msg}</td>
         {{/if}}
     </tr>
 </script> 
-<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.min.js"></script> 
-<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery-ui.min.js"></script> 
-<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.tmpl.min.js"></script> 
-<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.iframe-transport.js"></script> 
-<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.fileupload.js"></script> 
-<script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.fileupload-ui.js"></script> 
-<script>
-$(function () { $('#fileupload').fileupload(); }); // initialize upload widget
-</script>
 <div class="fileupload-content">
 <table class="files">
 <TMPL_LOOP NAME="ATTACHMENT_LIST">
@@ -106,6 +63,9 @@ $(function () { $('#fileupload').fileupload(); }); // initialize upload widget
 </TMPL_LOOP>
 </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>