urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP

master
Joey Hess 2011-06-15 18:37:12 -04:00
parent 00c0677588
commit f77452b7ca
2 changed files with 29 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki/Plugin/attachment.pm
View File

@ -119,7 +119,7 @@ sub formbuilder (@) {
return if ! defined $form->field("do") || ($form->field("do") ne "edit" && $form->field("do") ne "create") ; 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) { if (defined $filename && length $filename) {
attachment_store($filename, $form, $q, $params{session}); attachment_store($filename, $form, $q, $params{session});
} }

69
templates/editpage.tmpl
View File

@ -27,37 +27,24 @@
<TMPL_VAR HELPONFORMATTINGLINK> <TMPL_VAR HELPONFORMATTINGLINK>
<TMPL_IF NAME="FIELD-ATTACHMENT"> <TMPL_IF NAME="FIELD-ATTACHMENT">
<a class="toggle" href="#attachments">Attachments</a> <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 class="<TMPL_VAR ATTACHMENTS-CLASS>" id="attachments">
<div id="fileupload"> <div id="fileupload">
<div class="fileupload-buttonbar"> <script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.min.js"></script>
<label class="fileinput-button"> <script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery-ui.min.js"></script>
<span>Add files...</span> <script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.tmpl.min.js"></script>
<input type="file" name="attachments" multiple> <script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.iframe-transport.js"></script>
</label> <script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.fileupload.js"></script>
<button type="submit" class="start">Start upload</button> <script src="http://localhost/~joey/tmp/blueimp-jQuery-File-Upload-7f89121/jquery.fileupload-ui.js"></script>
<button type="reset" class="cancel">Cancel upload</button> <script>
<TMPL_IF NAME="ATTACHMENT_LIST"> $(function () { $('#fileupload').fileupload(); }); // initialize upload widget
<TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-RENAME><TMPL_VAR FIELD-REMOVE> </script>
</TMPL_IF>
</div>
<script id="template-upload" type="text/x-jquery-tmpl"> <script id="template-upload" type="text/x-jquery-tmpl">
<tr class="template-upload{{if error}} ui-state-error{{/if}}"> <tr class="template-upload{{if error}} ui-state-error{{/if}}">
<td><input type="checkbox" name="dummy" />${name}</td> <td><input type="checkbox" name="attachment_select" value="${name}" />${name}</td>
<td>${sizef}</td>
{{if error}} {{if error}}
<td class="error" colspan="2">Error: <td class="error" colspan="2">failed!</td>
{{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>
{{else}} {{else}}
<td class="progress"><div></div></td> <td class="progress" colspan="2"><div></div></td>
<td class="start"><button>Start</button></td> <td class="start"><button>Start</button></td>
{{/if}} {{/if}}
<td class="cancel"><button>Cancel</button></td> <td class="cancel"><button>Cancel</button></td>
@ -68,37 +55,12 @@
<td><input type="checkbox" name="attachment_select" value="${name}" />${name}</td> <td><input type="checkbox" name="attachment_select" value="${name}" />${name}</td>
<td>${humansize}</td> <td>${humansize}</td>
{{if error}} {{if error}}
<td class="error" colspan="2">Error: <td class="error" colspan="2">failed!</td>
{{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>
{{else}} {{else}}
<td>${stored_msg}</td> <td>${stored_msg}</td>
{{/if}} {{/if}}
</tr> </tr>
</script> </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"> <div class="fileupload-content">
<table class="files"> <table class="files">
<TMPL_LOOP NAME="ATTACHMENT_LIST"> <TMPL_LOOP NAME="ATTACHMENT_LIST">
@ -106,6 +68,11 @@ $(function () { $('#fileupload').fileupload(); }); // initialize upload widget
</TMPL_LOOP> </TMPL_LOOP>
</table> </table>
</div> </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>
</div> </div>
</TMPL_IF> </TMPL_IF>