aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-06-15 18:37:12 -0400
committerJoey Hess <joey@kitenet.net>2011-06-15 18:37:12 -0400
commitf77452b7caa7346625882d20f396b7154cda6a54 (patch)
tree7b83f28899a264940e7255f879e042c9293bc6df
parent00c0677588920832bad40d10f7d0fee5312fb115 (diff)
downloadikiwiki-f77452b7caa7346625882d20f396b7154cda6a54.tar
ikiwiki-f77452b7caa7346625882d20f396b7154cda6a54.tar.gz
WIP
-rw-r--r--IkiWiki/Plugin/attachment.pm2
-rw-r--r--templates/editpage.tmpl73
2 files changed, 21 insertions, 54 deletions
diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index cb4f4dcd6..fdae8d1e0 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -119,7 +119,7 @@ sub formbuilder (@) {
return if ! defined $form->field("do") || ($form->field("do") ne "edit" && $form->field("do") ne "create") ;
- my $filename=Encode::decode_utf8($q->param('attachments'));
+ my $filename=Encode::decode_utf8($q->param('attachment'));
if (defined $filename && length $filename) {
attachment_store($filename, $form, $q, $params{session});
}
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 6fe495aa8..b3098a240 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -27,38 +27,25 @@
<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>
<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 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>
<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>
@@ -68,37 +55,12 @@
<td><input type="checkbox" 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 +68,11 @@ $(function () { $('#fileupload').fileupload(); }); // initialize upload widget
</TMPL_LOOP>
</table>
</div>
+<TMPL_VAR FIELD-ATTACHMENT>
+<noscript><TMPL_VAR FIELD-UPLOAD></noscript>
+<TMPL_IF NAME="ATTACHMENT_LIST">
+<TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-RENAME><TMPL_VAR FIELD-REMOVE>
+</TMPL_IF>
</div>
</div>
</TMPL_IF>