pkp/pkp-lib#988 Support the new single file upload component

asmecher · Feb 22, 2016 · c06f070 · c06f070
1 parent 44a9264
commit c06f070
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 13 deletions.
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/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}