diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-10-13 16:01:00 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-10-13 16:01:00 -0700 |
| commit | 40932c26eaa7cddd0731b136a77c9bad704b69e0 (patch) | |
| tree | 35dc039190cbb9cc20bbc6577a303cd3ddc1d328 /phpBB/styles | |
| parent | 5927f0dbf2cd6bfe2db19f5703703af43cea64c8 (diff) | |
| parent | 9f1c6279882e34df5b328680029d16b7e91ec126 (diff) | |
| download | forums-40932c26eaa7cddd0731b136a77c9bad704b69e0.tar forums-40932c26eaa7cddd0731b136a77c9bad704b69e0.tar.gz forums-40932c26eaa7cddd0731b136a77c9bad704b69e0.tar.bz2 forums-40932c26eaa7cddd0731b136a77c9bad704b69e0.tar.xz forums-40932c26eaa7cddd0731b136a77c9bad704b69e0.zip | |
Merge pull request #1772 from bantu/feature/plupload/integration
[ticket/10929] Integration of Plupload
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_footer.html | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_header.html | 5 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/plupload.html | 48 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/plupload.css | 11 |
4 files changed, 65 insertions, 0 deletions
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index e26c94f367..b26a4c1610 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -65,6 +65,7 @@ <!-- EVENT overall_footer_after --> {$SCRIPTS} +<!-- IF S_PLUPLOAD --><!-- INCLUDE plupload.html --><!-- ENDIF --> </body> </html> diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 6ca5c86fa4..92baf6ee51 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -33,6 +33,11 @@ <link href="{T_THEME_PATH}/bidi.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" /> <!-- ENDIF --> +<!-- IF S_PLUPLOAD --> + <link href="{T_ASSETS_PATH}/plupload/jquery.plupload.queue/css/jquery.plupload.queue.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" /> + <link href="{T_THEME_PATH}/plupload.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" /> +<!-- ENDIF --> + <!--[if lte IE 8]> <link href="{T_THEME_PATH}/tweaks.css?assets_version={T_ASSETS_VERSION}" rel="stylesheet" type="text/css" media="screen, projection" /> <![endif]--> diff --git a/phpBB/styles/prosilver/template/plupload.html b/phpBB/styles/prosilver/template/plupload.html new file mode 100644 index 0000000000..564c1b5c36 --- /dev/null +++ b/phpBB/styles/prosilver/template/plupload.html @@ -0,0 +1,48 @@ +<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/plupload.js"></script> +<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/plupload.html5.js"></script> +<script type="text/javascript" src="{T_ASSETS_PATH}/plupload/jquery.plupload.queue/jquery.plupload.queue.js"></script> +<script type="text/javascript"> +//<![CDATA[ +phpbb.plupload = { + i18n: { + 'Select files': '{LA_PLUPLOAD_SELECT_FILES}', + 'Add files to the upload queue and click the start button.': '{LA_PLUPLOAD_ADD_FILES_TO_QUEUE}', + 'Filename': '{LA_PLUPLOAD_FILENAME}', + 'Status': '{LA_PLUPLOAD_STATUS}', + 'Size': '{LA_PLUPLOAD_SIZE}', + 'Add files': '{LA_PLUPLOAD_ADD_FILES}', + 'Stop current upload': '{LA_PLUPLOAD_STOP_CURRENT_UPLOAD}', + 'Start uploading queue': '{LA_PLUPLOAD_START_CURRENT_UPLOAD}', + 'Uploaded %d/%d files': '{LA_PLUPLOAD_UPLOADED}', + 'N/A': '{LA_PLUPLOAD_NOT_APPLICABLE}', + 'Drag files here.': '{LA_PLUPLOAD_DRAG}', + 'File extension error.': '{LA_PLUPLOAD_EXTENSION_ERROR}', + 'File size error.': '{LA_PLUPLOAD_SIZE_ERROR}', + 'Init error.': '{LA_PLUPLOAD_INIT_ERROR}', + 'HTTP Error.': '{LA_PLUPLOAD_HTTP_ERROR}', + 'Security error.': '{LA_PLUPLOAD_SECURITY_ERROR}', + 'Generic error.': '{LA_PLUPLOAD_GENERIC_ERROR}', + 'IO error.': '{LA_PLUPLOAD_IO_ERROR}', + 'Stop Upload': '{LA_PLUPLOAD_STOP_UPLOAD}', + 'Start upload': '{LA_PLUPLOAD_START_UPLOAD}', + '%d files queued': '{LA_PLUPLOAD_FILES_QUEUED}' + }, + config: { + runtimes: 'html5', + url: '{S_PLUPLOAD_URL}', + max_file_size: '{FILESIZE}b', + chunk_size: '{CHUNK_SIZE}b', + unique_names: true, + filters: [{FILTERS}], + {S_RESIZE} + headers: {'X-PHPBB-USING-PLUPLOAD': '1'}, + file_data_name: 'fileupload', + multipart_params: {'add_file': '{LA_ADD_FILE}'}, + img_path: '{T_ASSETS_PATH}/plupload/jquery.plupload.queue/img', + element_hook: '#attach-panel .inner', + form_hook: '#postform' + } +}; +//]]> +</script> +<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/plupload.js"></script> diff --git a/phpBB/styles/prosilver/theme/plupload.css b/phpBB/styles/prosilver/theme/plupload.css new file mode 100644 index 0000000000..16c26822b5 --- /dev/null +++ b/phpBB/styles/prosilver/theme/plupload.css @@ -0,0 +1,11 @@ +.plupload_filelist li.can_delete:hover { + cursor: pointer; +} + +.plupload_filelist li.can_delete:hover a { + background: url('../../../assets/plupload/jquery.plupload.queue/img/delete.gif'); +} + +.plupload_filelist li a.working { + background: url('../../../assets/plupload/jquery.plupload.queue/img/throbber.gif'); +} |