Merge pull request #757 from asmecher/i988_single_file_uploader

pkp/pkp-lib#988 Streamline plupload controls
pkp · Feb 23, 2016 · 4e2b1d8 · 4e2b1d8
2 parents 82d7e5d + e9060be
commit 4e2b1d8
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 55 deletions.
diff --git a/lib/pkp b/lib/pkp
diff --git a/plugins/importexport/users/templates/index.tpl b/plugins/importexport/users/templates/index.tpl
@@ -48,7 +48,7 @@
 				<input type="hidden" name="temporaryFileId" id="temporaryFileId" value="" />
 				{fbvFormArea id="file"}
 					{fbvFormSection title="common.file"}
-						<div id="plupload"></div>
+						{include file="controllers/fileUploadContainer.tpl" id="plupload"}
 					{/fbvFormSection}
 				{/fbvFormArea}
 

diff --git a/plugins/viewableFiles/lensGalley b/plugins/viewableFiles/lensGalley
diff --git a/templates/controllers/grid/issueGalleys/form/issueGalleyForm.tpl b/templates/controllers/grid/issueGalleys/form/issueGalleyForm.tpl
@@ -24,20 +24,24 @@
 </script>
 <form class="pkp_form" id="issueGalleyForm" method="post" action="{url op="update" issueId=$issueId issueGalleyId=$issueGalleyId}">
 	{fbvFormArea id="file"}
-		{fbvFormSection title="editor.issues.galley"}
-			<div id="plupload"></div>
+		{fbvFormSection title="editor.issues.galley" required="true"}
+			{include file="controllers/fileUploadContainer.tpl" id="plupload"}
 			<input type="hidden" name="temporaryFileId" id="temporaryFileId" value="" />
 			{if $issueGalley}
 				<a href="{url op="download" issueId=$issueId issueGalleyId=$issueGalleyId}" target="_blank">{$issueGalley->getOriginalFileName()|escape}</a>
 			{/if}
 		{/fbvFormSection}
 
-		{fbvFormSection title="submission.layout.galleyFileData"}
-			{fbvElement type="text" label="submission.layout.galleyLabel" value=$label id="label"}
-			{if $enablePublicGalleyId}
-				{fbvElement type="text" label="submission.layout.publicGalleyId" value=$publicGalleyId id="publicGalleyId" size=$fbvStyles.size.MEDIUM}
-			{/if}
-			{fbvElement type="select" id="galleyLocale" label="common.language" from=$supportedLocales selected=$galleyLocale|default:$formLocale size=$fbvStyles.size.MEDIUM translate=false}
+		{fbvFormSection title="submission.layout.galleyLabel" required="true"}
+			{fbvElement type="text" value=$label id="label"}
+		{/fbvFormSection}
+		{if $enablePublicGalleyId}
+			{fbvFormSection title="submission.layout.publicGalleyId" required="true"}
+				{fbvElement type="text" value=$publicGalleyId id="publicGalleyId"}
+			{/fbvFormSection}
+		{/if}
+		{fbvFormSection title="common.language" required="true"}
+			{fbvElement type="select" id="galleyLocale" from=$supportedLocales selected=$galleyLocale|default:$formLocale translate=false}
 		{/fbvFormSection}
 	{/fbvFormArea}
 

diff --git a/templates/controllers/grid/issues/form/coverForm.tpl b/templates/controllers/grid/issues/form/coverForm.tpl
@@ -16,7 +16,12 @@
 				$uploader: $('#pluploadimage'),
 				uploaderOptions: {ldelim}
 					uploadUrl: {url|json_encode op="uploadFile" escape=false},
-					baseUrl: {$baseUrl|json_encode}
+					baseUrl: {$baseUrl|json_encode},
+					filters: {ldelim}
+						mime_types : [
+							{ldelim} title : "Image files", extensions : "jpg,jpeg,png" {rdelim}
+						]
+					{rdelim}
 				{rdelim}
 			{rdelim}
 		);
@@ -31,11 +36,13 @@
 	{/fbvFormArea}
 	{fbvFormArea id="coverFile"}
 		{fbvFormSection title="editor.issues.coverPage"}
-			<div id="pluploadimage"></div>
+			{include file="controllers/fileUploadContainer.tpl" id="pluploadimage"}
 			<input type="hidden" name="temporaryFileId" id="temporaryFileId" value="" />
 			{if $fileName.$formLocale}
 				<img src="{$publicFilesDir}/{$fileName.$formLocale|escape}?random=$issueId|uniqid}" alt="{$coverPageAltText.$formLocale|escape}"/>
 			{/if}
+		{/fbvFormSection}
+		{fbvFormSection}
 			{fbvElement type="text" id="coverPageAltText" label="common.altText" value=$coverPageAltText multilingual=true size=$fbvStyles.size.MEDIUM}
 		{/fbvFormSection}
 	{/fbvFormArea}

diff --git a/templates/controllers/grid/issues/form/issueForm.tpl b/templates/controllers/grid/issues/form/issueForm.tpl
@@ -16,7 +16,12 @@
 				$uploader: $('#pluploadcss'),
 				uploaderOptions: {ldelim}
 					uploadUrl: {url|json_encode op="uploadFile" escape=false},
-					baseUrl: {$baseUrl|json_encode}
+					baseUrl: {$baseUrl|json_encode},
+					filters: {ldelim}
+						mime_types : [
+							{ldelim} title : "CSS files", extensions : "css" {rdelim}
+						]
+					{rdelim}
 				{rdelim}
 			{rdelim}
 		);
@@ -72,7 +77,9 @@
 
 	{fbvFormArea id="file"}
 		{fbvFormSection title="editor.issues.styleFile"}
-			<div id="pluploadcss"></div>
+			{include file="controllers/fileUploadContainer.tpl" id="pluploadcss"}
+		{/fbvFormSection}
+		{fbvFormSection}
 			{if $styleFileName}
 				{translate key="common.currentStyleSheet"}: <a href="{$publicFilesDir}/{$styleFileName|escape}" target="_blank">{$originalStyleFileName|escape}</a>
 			{/if}

diff --git a/tests/data/60-content/ImportIssueTest.php b/tests/data/60-content/ImportIssueTest.php
@@ -29,6 +29,7 @@ function testImportIssue() {
 		$this->click($selector);
 
 		$this->uploadFile(dirname(__FILE__) . '/issue.xml');
+		$this->waitForElementPresent($selector='//input[@name=\'temporaryFileId\' and string-length(@value)>0]');
 		$this->click('//form[@id=\'importXmlForm\']//button[starts-with(@id,\'submitFormButton-\')]');
 
 		// Ensure that the import was listed as completed.

diff --git a/tests/functional/pages/submission/FunctionalSubmissionTest.php b/tests/functional/pages/submission/FunctionalSubmissionTest.php
+1 −1		classes/controllers/grid/users/reviewer/PKPReviewerGridHandler.inc.php
+0 −1		classes/controllers/tab/settings/SettingsTabHandler.inc.php
+10 −1		classes/mail/MailTemplate.inc.php
+13 −8		classes/mail/SubmissionMailTemplate.inc.php
+29 −50		classes/notification/NotificationManagerDelegate.inc.php
+55 −99		classes/notification/PKPNotificationManager.inc.php
+60 −2		classes/notification/PKPNotificationOperationManager.inc.php
+8 −1		classes/notification/form/PKPNotificationSettingsForm.inc.php
+3 −3		classes/notification/managerDelegate/EditorAssignmentNotificationManager.inc.php
+3 −3		classes/notification/managerDelegate/EditorDecisionNotificationManager.inc.php
+31 −8		classes/notification/managerDelegate/PKPApproveSubmissionNotificationManager.inc.php
+17 −9		classes/notification/managerDelegate/PendingRevisionsNotificationManager.inc.php
+2 −2		classes/notification/managerDelegate/SubmissionNotificationManager.inc.php
+16 −12		classes/notification/managerDelegate/review/AllReviewsInNotificationManager.inc.php
+17 −5		classes/notification/managerDelegate/review/AllRevisionsInNotificationManager.inc.php
+84 −0		classes/notification/managerDelegate/review/ReviewRoundNotificationManager.inc.php
+62 −0		classes/notification/managerDelegate/signoff/SignoffNotificationManager.inc.php
+69 −0		classes/submission/EditDecisionDAO.inc.php
+12 −4		classes/user/PKPUserDAO.inc.php
+2 −0		classes/user/form/PublicProfileForm.inc.php
+70 −62		composer.lock
+1 −1		controllers/grid/users/reviewer/form/ReviewReminderForm.inc.php
+1 −1		controllers/grid/users/reviewer/form/ReviewerForm.inc.php
+4 −4		controllers/grid/users/reviewer/form/ThankReviewerForm.inc.php
+2 −1		controllers/grid/users/reviewer/form/UnassignReviewerForm.inc.php
+1 −1		controllers/grid/users/stageParticipant/PKPStageParticipantGridHandler.inc.php
+1 −0		controllers/tab/settings/appearance/form/PKPAppearanceForm.inc.php
+6 −2		controllers/tab/user/ProfileTabHandler.inc.php
+5 −1		controllers/wizard/fileUpload/PKPFileUploadWizardHandler.inc.php
+138 −38		js/controllers/UploaderHandler.js
+2 −3		js/controllers/form/FileUploadFormHandler.js
+32 −14		js/controllers/wizard/WizardHandler.js
+39 −3		js/controllers/wizard/fileUpload/FileUploadWizardHandler.js
+124 −52		js/controllers/wizard/fileUpload/form/FileUploadFormHandler.js
+5 −0		locale/en_US/common.xml
+1 −0		locale/en_US/grid.xml
+1 −0		locale/en_US/manager.xml
+3 −2		pages/notification/NotificationHandler.inc.php
+0 −76		plugins/importexport/users/templates/index.tpl
+5 −0		styles/controllers/modal.less
+84 −129		styles/controllers/plupload.less
+64 −5		templates/controllers/fileUploadContainer.tpl
+0 −58		templates/controllers/informationCenter/newFileUploadNoteForm.tpl
+0 −1		templates/controllers/notification/inPlaceNotificationContent.tpl
+19 −0		templates/controllers/tab/settings/appearance/form/favicon.tpl
+7 −0		templates/controllers/tab/settings/form/newFileUploadForm.tpl
+6 −1		templates/controllers/tab/settings/form/newImageFileUploadForm.tpl
+1 −1		templates/controllers/wizard/fileUpload/form/fileUploadForm.tpl
+28 −14		templates/user/publicProfileForm.tpl
+1 −0		tests/PKPContentBaseTestCase.inc.php
+2 −4		tests/WebTestCase.inc.php
+0 −123		tests/functional/pages/submission/FunctionalSubmissionBaseTestCase.inc.php
+1 −1		tools/buildjs.sh
+30 −5		tools/closure-externs.js