*8087* Get rid of last legacy settings tab/form

pkp · May 30, 2013 · b7635a7 · b7635a7
1 parent 26c5295
commit b7635a7
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 117 deletions.
diff --git a/controllers/tab/settings/JournalSettingsTabHandler.inc.php b/controllers/tab/settings/JournalSettingsTabHandler.inc.php
@@ -23,9 +23,8 @@ function JournalSettingsTabHandler() {
 		$this->setPageTabs(array(
 			'masthead' => 'controllers.tab.settings.masthead.form.MastheadForm',
 			'contact' => 'lib.pkp.controllers.tab.settings.contact.form.ContactForm',
-			'policies' => 'lib.pkp.controllers.tab.settings.policies.form.PoliciesForm',
+			'policies' => 'controllers.tab.settings.policies.form.OJSPoliciesForm',
 			'citations' => 'controllers.tab.settings.citations.form.CitationsForm',
-			'submissions' => 'controllers.tab.settings.submissions.form.SubmissionsForm',
 			'sections' => 'controllers/tab/settings/journal/sections.tpl',
 			'guidelines' => 'lib.pkp.controllers.tab.settings.guidelines.form.GuidelinesForm',
 			'affiliationAndSupport' => 'lib.pkp.controllers.tab.settings.affiliation.form.AffiliationForm',

diff --git a/controllers/tab/settings/policies/form/OJSPoliciesForm.inc.php b/controllers/tab/settings/policies/form/OJSPoliciesForm.inc.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @file controllers/tab/settings/policies/form/OJSPoliciesForm.inc.php
+ *
+ * Copyright (c) 2003-2013 John Willinsky
+ * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+ *
+ * @class OJSPoliciesForm
+ * @ingroup controllers_tab_settings_policies_form
+ *
+ * @brief Form to edit policy information. (OJS-specific extensions.)
+ */
+
+import('lib.pkp.controllers.tab.settings.policies.form.PoliciesForm');
+
+class OJSPoliciesForm extends PoliciesForm {
+
+	/**
+	 * Constructor.
+	 */
+	function OJSPoliciesForm($wizardMode = false) {
+		$settings = array(
+			'requireAuthorCompetingInterests' => 'bool',
+			'requireReviewerCompetingInterests' => 'bool',
+			'pubFreqPolicy' => 'string',
+		);
+
+		parent::PoliciesForm($wizardMode, $settings);
+	}
+
+
+	//
+	// Implement template methods from Form.
+	//
+	/**
+	 * @see Form::getLocaleFieldNames()
+	 */
+	function getLocaleFieldNames() {
+		return array_merge(parent::getLocaleFieldNames(), array(
+			'pubFreqPolicy',
+		));
+	}
+}
+
+?>
diff --git a/controllers/tab/settings/submissions/form/SubmissionsForm.inc.php b/controllers/tab/settings/submissions/form/SubmissionsForm.inc.php
diff --git a/templates/controllers/tab/settings/policies/form/policiesForm.tpl b/templates/controllers/tab/settings/policies/form/policiesForm.tpl
@@ -0,0 +1,20 @@
+{**
+ * controllers/tab/settings/policies/form/policiesForm.tpl
+ *
+ * Copyright (c) 2003-2013 John Willinsky
+ * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+ *
+ * Policies management form (extends the built-in one).
+ *
+ *}
+{capture assign="additionalFormContent"}
+	{fbvFormSection list=true}
+		{fbvElement type="checkbox" id="requireAuthorCompetingInterests" name="requireAuthorCompetingInterests" checked=$requireAuthorCompetingInterests label="manager.setup.competingInterests.requireAuthors" inline=true}
+		{fbvElement type="checkbox" id="requireReviewerCompetingInterests" name="requireReviewerCompetingInterests" checked=$requireReviewerCompetingInterests label="manager.setup.competingInterests.requireReviewers" inline=true}
+	{/fbvFormSection}
+
+	{fbvFormSection label="manager.setup.publicationScheduling" description="manager.setup.publicationScheduleDescription"}
+		{fbvElement type="textarea" multilingual=true name="pubFreqPolicy" id="pubFreqPolicy" value=$pubFreqPolicy rich=true}
+	{/fbvFormSection}
+{/capture}
+{include file="core:controllers/tab/settings/policies/form/policiesForm.tpl additionalFormContent=$additionalFormContent}
diff --git a/templates/controllers/tab/settings/submissions/form/submissionsForm.tpl b/templates/controllers/tab/settings/submissions/form/submissionsForm.tpl
diff --git a/templates/management/settings/journal.tpl b/templates/management/settings/journal.tpl
@@ -25,7 +25,6 @@
 		<li><a href="{url router=$smarty.const.ROUTE_COMPONENT component="tab.settings.JournalSettingsTabHandler" op="showTab" tab="contact"}">{translate key="about.contact"}</a></li>
 		<li><a href="{url router=$smarty.const.ROUTE_COMPONENT component="tab.settings.JournalSettingsTabHandler" op="showTab" tab="citations"}">{translate key="manager.setup.citations"}</a></li>
 		<li><a href="{url router=$smarty.const.ROUTE_COMPONENT component="tab.settings.JournalSettingsTabHandler" op="showTab" tab="sections"}">{translate key="section.sections"}</a></li>
-		<li><a href="{url router=$smarty.const.ROUTE_COMPONENT component="tab.settings.JournalSettingsTabHandler" op="showTab" tab="submissions"}">{translate key="OLD SETUP"}</a></li>
 		<li><a href="{url router=$smarty.const.ROUTE_COMPONENT component="tab.settings.JournalSettingsTabHandler" op="showTab" tab="policies"}">{translate key="manager.setup.policies"}</a></li>
 		<li><a href="{url router=$smarty.const.ROUTE_COMPONENT component="tab.settings.JournalSettingsTabHandler" op="showTab" tab="guidelines"}">{translate key="about.guidelines"}</a></li>
 		<li><a href="{url router=$smarty.const.ROUTE_COMPONENT component="tab.settings.JournalSettingsTabHandler" op="showTab" tab="affiliationAndSupport"}">{translate key="manager.affiliationAndSupport"}</a></li>