diff options
| -rw-r--r-- | phpBB/assets/javascript/plupload.js | 35 | ||||
| -rw-r--r-- | phpBB/phpbb/permissions.php | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/posting_smilies.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/viewtopic_print.html | 4 |
5 files changed, 23 insertions, 21 deletions
diff --git a/phpBB/assets/javascript/plupload.js b/phpBB/assets/javascript/plupload.js index 6b37b009a4..a90757d487 100644 --- a/phpBB/assets/javascript/plupload.js +++ b/phpBB/assets/javascript/plupload.js @@ -11,25 +11,30 @@ phpbb.plupload.ids = []; * @return undefined */ phpbb.plupload.initialize = function() { - phpbb.plupload.form = $(phpbb.plupload.config.form_hook)[0], - phpbb.plupload.rowTpl = $('#attach-row-tpl')[0].outerHTML; - - // Hide the basic upload panel and remove the attach row template. - $('#attach-row-tpl, #attach-panel-basic').remove(); - // Show multi-file upload options. - $('#attach-panel-multi').show(); + // Initialize the Plupload uploader. + uploader.init(); // Set attachment data. phpbb.plupload.setData(phpbb.plupload.data); phpbb.plupload.updateMultipartParams(phpbb.plupload.getSerializedData()); - // Initialize the Plupload uploader. - uploader.init(); + // Only execute if Plupload initialized successfully. + uploader.bind('Init', function() { + phpbb.plupload.form = $(phpbb.plupload.config.form_hook)[0], + phpbb.plupload.rowTpl = $('#attach-row-tpl')[0].outerHTML; - // Point out the drag-and-drop zone if it's supported. - if (!uploader.features.dragdrop) { - $('#drag-n-drop-message').show(); - } + // Hide the basic upload panel and remove the attach row template. + $('#attach-row-tpl, #attach-panel-basic').remove(); + // Show multi-file upload options. + $('#attach-panel-multi').show(); + }); + + uploader.bind('PostInit', function() { + // Point out the drag-and-drop zone if it's supported. + if (uploader.features.dragdrop) { + $('#drag-n-drop-message').show(); + } + }); }; /** @@ -92,7 +97,7 @@ phpbb.plupload.getSerializedData = function() { * @return int Returns the index of the file if it exists. */ phpbb.plupload.getIndex = function(attach_id) { - var index = phpbb.plupload.ids.indexOf(Number(attach_id)); + var index = $.inArray(Number(attach_id), phpbb.plupload.ids); return (index !== -1) ? index : false; }; @@ -308,7 +313,7 @@ phpbb.plupload.hideEmptyList = function() { * @return undefined */ phpbb.plupload.updateBbcode = function(action, index) { - var textarea = $(phpbb.plupload.form).find('textarea[name="message"]'), + var textarea = $('#message', phpbb.plupload.form), text = textarea.val(), removal = (action === 'removal'); diff --git a/phpBB/phpbb/permissions.php b/phpBB/phpbb/permissions.php index 8319e6d123..a3fddb0b9e 100644 --- a/phpBB/phpbb/permissions.php +++ b/phpBB/phpbb/permissions.php @@ -251,6 +251,7 @@ class permissions 'f_reply' => array('lang' => 'ACL_F_REPLY', 'cat' => 'post'), 'f_edit' => array('lang' => 'ACL_F_EDIT', 'cat' => 'post'), 'f_delete' => array('lang' => 'ACL_F_DELETE', 'cat' => 'post'), + 'f_softdelete' => array('lang' => 'ACL_F_SOFTDELETE', 'cat' => 'post'), 'f_ignoreflood' => array('lang' => 'ACL_F_IGNOREFLOOD', 'cat' => 'post'), 'f_postcount' => array('lang' => 'ACL_F_POSTCOUNT', 'cat' => 'post'), 'f_noapprove' => array('lang' => 'ACL_F_NOAPPROVE', 'cat' => 'post'), diff --git a/phpBB/styles/prosilver/template/posting_smilies.html b/phpBB/styles/prosilver/template/posting_smilies.html index cb542c1a8c..c5371b9b6a 100644 --- a/phpBB/styles/prosilver/template/posting_smilies.html +++ b/phpBB/styles/prosilver/template/posting_smilies.html @@ -13,7 +13,7 @@ <div class="inner"> <!-- BEGIN smiley --> <a href="#" onclick="initInsertions(); insert_text('{smiley.A_SMILEY_CODE}', true, true); return false;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" /></a> - <!-- END smiley --> + <!-- END smiley --> </div> </div> diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html index 4a8d3da08a..4d7346fda8 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html @@ -2,8 +2,6 @@ <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> <meta charset="utf-8"> -<meta name="keywords" content="" /> -<meta name="description" content="" /> <meta name="robots" content="noindex" /> {META} <title>{SITENAME} • {PAGE_TITLE}</title> diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html index fd0b2dc3e6..6c4dcfadf1 100644 --- a/phpBB/styles/prosilver/template/viewtopic_print.html +++ b/phpBB/styles/prosilver/template/viewtopic_print.html @@ -2,8 +2,6 @@ <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> <meta charset="utf-8"> -<meta name="keywords" content="" /> -<meta name="description" content="" /> <meta name="robots" content="noindex" /> {META} <title>{SITENAME} • {PAGE_TITLE}</title> @@ -28,7 +26,7 @@ <!-- BEGIN postrow --> <div class="post"> <h3>{postrow.POST_SUBJECT}</h3> - <div class="date">{postrow.MINI_POST_IMG}{L_POSTED}{L_COLON} <strong>{postrow.POST_DATE}</strong></div> + <div class="date">{L_POSTED}{L_COLON} <strong>{postrow.POST_DATE}</strong></div> <div class="author">{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR}</strong></div> <div class="content">{postrow.MESSAGE}</div> </div> |