From 688ca7fadef6c8890a10b709b8f4c7615d33fff0 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Sun, 10 Nov 2013 18:54:07 -0800
Subject: [ticket/11915] Add the new uploader.

PHPBB3-11915
---
 phpBB/styles/prosilver/template/plupload.html       |  8 ++++----
 phpBB/styles/prosilver/template/posting_editor.html | 10 +++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'phpBB/styles/prosilver/template')

diff --git a/phpBB/styles/prosilver/template/plupload.html b/phpBB/styles/prosilver/template/plupload.html
index dbcea32455..c689ef8427 100644
--- a/phpBB/styles/prosilver/template/plupload.html
+++ b/phpBB/styles/prosilver/template/plupload.html
@@ -56,16 +56,16 @@ phpbb.plupload = {
 		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'
-	}
-};
+		form_hook: '#postform',
+		browse_button: 'add_files',
+		drop_element : 'message',
 	},
 	lang: {
 		ERROR: '{LA_ERROR}',
 		TOO_MANY_ATTACHMENTS: '{LA_TOO_MANY_ATTACHMENTS}',
 	},
 	order: '{ATTACH_ORDER}',
-	max_files: {MAX_ATTACHMENTS},
+	maxFiles: {MAX_ATTACHMENTS},
 }
 //]]>
 </script>
diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index cac82baf91..2ae224bc3a 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -170,7 +170,15 @@
 		<div id="tabs" class="sub-panels" data-show-panel="options-panel">
 			<ul>
 				<li id="options-panel-tab" class="activetab"><a href="#tabs" data-subpanel="options-panel"><span>{L_OPTIONS}</span></a></li>
-				<!-- IF S_SHOW_ATTACH_BOX --><li id="attach-panel-tab"><a href="#tabs" data-subpanel="attach-panel"><span>{L_ATTACHMENTS}</span></a></li><!-- ENDIF -->
+				<!-- IF S_SHOW_ATTACH_BOX -->
+					<li id="attach-panel-tab">
+						<a href="#tabs" data-subpanel="attach-panel">
+							<span>
+								{L_ATTACHMENTS} <strong id="file-total-progress"><strong id="file-total-progress-bar"></strong></strong>
+							</span>
+						</a>
+					</li>				
+				<!-- ENDIF -->
 				<!-- IF S_SHOW_POLL_BOX || S_POLL_DELETE --><li id="poll-panel-tab"><a href="#tabs" data-subpanel="poll-panel"><span>{L_ADD_POLL}</span></a></li><!-- ENDIF -->
 			</ul>
 		</div>
-- 
cgit v1.2.1