aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2013-11-27 18:01:18 -0800
committerCesar G <prototech91@gmail.com>2014-01-17 19:20:37 -0800
commit020b7a31bf2c92af274d701e7dbbc875ff88c7c4 (patch)
treed09849884fbb55ef36ebc2d35bdc25b155f314ce /phpBB
parent1fedad5e078d6c47913c881bc30704941e3a21d1 (diff)
downloadforums-020b7a31bf2c92af274d701e7dbbc875ff88c7c4.tar
forums-020b7a31bf2c92af274d701e7dbbc875ff88c7c4.tar.gz
forums-020b7a31bf2c92af274d701e7dbbc875ff88c7c4.tar.bz2
forums-020b7a31bf2c92af274d701e7dbbc875ff88c7c4.tar.xz
forums-020b7a31bf2c92af274d701e7dbbc875ff88c7c4.zip
[ticket/11915] Make the user aware of the drag-and-drop zone.
PHPBB3-11915
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/assets/javascript/plupload.js5
-rw-r--r--phpBB/language/en/plupload.php1
-rw-r--r--phpBB/styles/prosilver/template/posting_attach_body.html2
3 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/assets/javascript/plupload.js b/phpBB/assets/javascript/plupload.js
index 44e385f9d5..47c17b4dfa 100644
--- a/phpBB/assets/javascript/plupload.js
+++ b/phpBB/assets/javascript/plupload.js
@@ -26,6 +26,11 @@ phpbb.plupload.initialize = function() {
// Initialize the Plupload uploader.
uploader.init();
+
+ // Point out the drag-and-drop zone if it's supported.
+ if (!uploader.features.dragdrop) {
+ $('#drag-n-drop-message').show();
+ }
};
/**
diff --git a/phpBB/language/en/plupload.php b/phpBB/language/en/plupload.php
index 74ae8b7c78..0615a673d1 100644
--- a/phpBB/language/en/plupload.php
+++ b/phpBB/language/en/plupload.php
@@ -42,6 +42,7 @@ $lang = array_merge($lang, array(
'PLUPLOAD_CLOSE' => 'Close',
'PLUPLOAD_DRAG' => 'Drag files here.',
'PLUPLOAD_DUPLICATE_ERROR' => 'Duplicate file error.',
+ 'PLUPLOAD_DRAG_TEXTAREA' => 'You may also attach files by dragging and dropping them in the message box.',
'PLUPLOAD_ERR_INPUT' => 'Failed to open input stream.',
'PLUPLOAD_ERR_MOVE_UPLOADED' => 'Failed to move uploaded file.',
'PLUPLOAD_ERR_OUTPUT' => 'Failed to open output stream.',
diff --git a/phpBB/styles/prosilver/template/posting_attach_body.html b/phpBB/styles/prosilver/template/posting_attach_body.html
index 711a26e25c..348aded5c1 100644
--- a/phpBB/styles/prosilver/template/posting_attach_body.html
+++ b/phpBB/styles/prosilver/template/posting_attach_body.html
@@ -1,7 +1,7 @@
<div class="panel bg3 panel-container" id="attach-panel">
<div class="inner">
- <p>{L_ADD_ATTACHMENT_EXPLAIN}</p>
+ <p>{L_ADD_ATTACHMENT_EXPLAIN} <span class="hidden" id="drag-n-drop-message">{L_PLUPLOAD_DRAG_TEXTAREA}</span></p>
<fieldset class="fields2" id="attach-panel-basic">
<dl>