Merge pull request pkp#943 from NateWr/i1397_restore_publisher

pkp/pkp-lib#1397 Restore publisherInstitution field that was removed
cjuergen · Jul 25, 2016 · d508cb9 · d508cb9
2 parents 687f30b + 08548b7
commit d508cb9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/controllers/tab/settings/masthead/form/MastheadForm.inc.php b/controllers/tab/settings/masthead/form/MastheadForm.inc.php
@@ -25,6 +25,7 @@ function MastheadForm($wizardMode = false) {
 			'name' => 'string',
 			'acronym' => 'string',
 			'abbreviation' => 'string',
+			'publisherInstitution' => 'string',
 			'printIssn' => 'string',
 			'onlineIssn' => 'string',
 			'description' => 'string',

diff --git a/locale/en_US/manager.xml b/locale/en_US/manager.xml
@@ -280,7 +280,7 @@
 	<message key="manager.setup.publicationScheduling">Publication Scheduling</message>
 	<message key="manager.setup.publicIdentifier">Identification of Journal Content</message>
 	<message key="manager.setup.publisher">Publisher</message>
-	<message key="manager.setup.publisherDescription">The name of the organization publishing the journal will appear in About the Journal.</message>
+	<message key="manager.setup.publisherDescription">The name of the organization publishing the journal may be included in metadata provided to third-party archival bodies.</message>
 	<message key="manager.setup.referenceLinking">Reference Linking</message>
 	<message key="manager.setup.refLinkInstructions.description">Layout Instructions for Reference Linking</message>
 	<message key="manager.setup.restrictArticleAccess">Users must be registered and log in to view open access content.</message>

diff --git a/templates/controllers/tab/settings/masthead/form/mastheadForm.tpl b/templates/controllers/tab/settings/masthead/form/mastheadForm.tpl
@@ -39,6 +39,12 @@
 		{/fbvFormSection}
 	{/fbvFormArea}
 
+	{fbvFormArea id="mastheadPublisher"}
+		{fbvFormSection label="manager.setup.publisher" for="publisherInstitution" description="manager.setup.publisherDescription"}
+			{fbvElement type="text" name="publisherInstitution" id="publisherInstitution" value=$publisherInstitution maxlength="255"}
+		{/fbvFormSection}
+	{/fbvFormArea}
+
 	{fbvFormArea id="mastheadISSNContainer"}
 		{fbvFormSection label="manager.setup.Issn" for="onlineIssn" description="manager.setup.issnDescription"}
 			{fbvElement type="text" name="onlineIssn" id="onlineIssn" value=$onlineIssn label="manager.setup.onlineIssn" size=$fbvStyles.size.SMALL inline=true}