View | Details | Raw Unified | Return to bug 1709 | Differences between
and this patch

Collapse All | Expand All

(-)classes/issue/IssueAction.inc.php (-1 / +1 lines)
 Lines 61-67    Link Here 
61
			$journal =& $currentJournal;
61
			$journal =& $currentJournal;
62
		}
62
		}
63
63
64
		$result = $journal->getSetting('enableSubscriptions') &&
64
		$result = $journal->getSetting('publishingMode') == PUBLISHING_MODE_SUBSCRIPTION &&
65
			$issue->getAccessStatus() != ISSUE_ACCESS_OPEN &&
65
			$issue->getAccessStatus() != ISSUE_ACCESS_OPEN &&
66
			$issue->getOpenAccessDate() &&
66
			$issue->getOpenAccessDate() &&
67
			strtotime($issue->getOpenAccessDate()) > time();
67
			strtotime($issue->getOpenAccessDate()) > time();
(-)classes/issue/form/IssueForm.inc.php (-21 / +9 lines)
 Lines 50-56    Link Here 
50
		$journal =& Request::getJournal();
50
		$journal =& Request::getJournal();
51
51
52
		// set up the accessibility options pulldown
52
		// set up the accessibility options pulldown
53
		$templateMgr->assign('enableSubscriptions', $journal->getSetting('enableSubscriptions'));
54
		$templateMgr->assign('enableDelayedOpenAccess', $journal->getSetting('enableDelayedOpenAccess'));
53
		$templateMgr->assign('enableDelayedOpenAccess', $journal->getSetting('enableDelayedOpenAccess'));
55
54
56
		$templateMgr->assign('accessOptions', array(
55
		$templateMgr->assign('accessOptions', array(
 Lines 93-109    Link Here 
93
			$this->addErrorField('publicIssueId');
92
			$this->addErrorField('publicIssueId');
94
		}
93
		}
95
94
96
		// check if date open access date is correct if subscription is selected and enabled
97
		// and delayed open access is not set
98
		$subscription = $journal->getSetting('enableSubscriptions');
99
		$delayedOpenAccess = $journal->getSetting('enableDelayedOpenAccess');
100
		if (!empty($issueId)) {
101
			$issue =& $issueDao->getIssueById($issueId);
102
			$issuePublished = $issue->getPublished();
103
		} else {
104
			$issuePublished = 0;
105
		}
106
107
		import('file.PublicFileManager');
95
		import('file.PublicFileManager');
108
		$publicFileManager = new PublicFileManager();
96
		$publicFileManager = new PublicFileManager();
109
97
 Lines 216-237    Link Here 
216
				} else {
204
				} else {
217
					$year = $volume = $number = 0;
205
					$year = $volume = $number = 0;
218
				}
206
				}
219
220
221
			} else {
207
			} else {
222
				$volume = $journal->getSetting('initialVolume');
208
				$volume = $journal->getSetting('initialVolume');
223
				$number = $journal->getSetting('initialNumber');
209
				$number = $journal->getSetting('initialNumber');
224
				$year = $journal->getSetting('initialYear');
210
				$year = $journal->getSetting('initialYear');
225
			}
211
			}
226
212
227
213
			switch ($journal->getSetting('publishingMode')) {
228
			if ($journal->getSetting('enableSubscriptions')) {
214
				case PUBLISHING_MODE_SUBSCRIPTION:
229
				$accessStatus = SUBSCRIPTION;
215
				case PUBLISHING_MODE_NONE:
230
			} else {
216
					$accessStatus = ISSUE_ACCESS_SUBSCRIPTION;
231
				$accessStatus = OPEN_ACCESS;
217
					break;
218
				case PUBLISHING_MODE_OPEN:
219
				default:
220
					$accessStatus = ISSUE_ACCESS_OPEN;
221
					break;
232
			}
222
			}
233
223
234
235
			$this->_data = array(
224
			$this->_data = array(
236
				'showVolume' => $showVolume,
225
				'showVolume' => $showVolume,
237
				'showNumber' => $showNumber,
226
				'showNumber' => $showNumber,
 Lines 242-248    Link Here 
242
				'year' => $year,
231
				'year' => $year,
243
				'accessStatus' => $accessStatus
232
				'accessStatus' => $accessStatus
244
			);
233
			);
245
246
		}
234
		}
247
	}
235
	}
248
236
(-)classes/journal/Journal.inc.php (+4 lines)
 Lines 20-25    Link Here 
20
// $Id: Journal.inc.php,v 1.31 2009/05/12 16:57:20 asmecher Exp $
20
// $Id: Journal.inc.php,v 1.31 2009/05/12 16:57:20 asmecher Exp $
21
21
22
22
23
define('PUBLISHING_MODE_OPEN', 0);
24
define('PUBLISHING_MODE_SUBSCRIPTION', 1);
25
define('PUBLISHING_MODE_NONE', 2);
26
23
class Journal extends DataObject {
27
class Journal extends DataObject {
24
	/**
28
	/**
25
	 * Constructor.
29
	 * Constructor.
(-)classes/manager/form/setup/JournalSetupStep4Form.inc.php (-1 / +1 lines)
 Lines 49-55    Link Here 
49
				'refLinkInstructions' => 'string',
49
				'refLinkInstructions' => 'string',
50
				'useProofreaders' => 'bool',
50
				'useProofreaders' => 'bool',
51
				'proofInstructions' => 'string',
51
				'proofInstructions' => 'string',
52
				'enableSubscriptions' => 'bool',
52
				'publishingMode' => 'int',
53
				'showGalleyLinks' => 'bool',
53
				'showGalleyLinks' => 'bool',
54
				'openAccessPolicy' => 'string',
54
				'openAccessPolicy' => 'string',
55
				'enableAnnouncements' => 'bool',
55
				'enableAnnouncements' => 'bool',
(-)classes/tasks/OpenAccessNotification.inc.php (-1 / +1 lines)
 Lines 74-80    Link Here 
74
	function sendNotifications ($journal, $curDate) {
74
	function sendNotifications ($journal, $curDate) {
75
75
76
		// Only send notifications if subscriptions and open access notifications are enabled
76
		// Only send notifications if subscriptions and open access notifications are enabled
77
		if ($journal->getSetting('enableSubscriptions') && $journal->getSetting('enableOpenAccessNotification')) {
77
		if ($journal->getSetting('publishingMode') == PUBLISHING_MODE_SUBSCRIPTION && $journal->getSetting('enableOpenAccessNotification')) {
78
78
79
			$curYear = $curDate['year'];
79
			$curYear = $curDate['year'];
80
			$curMonth = $curDate['month'];
80
			$curMonth = $curDate['month'];
(-)classes/tasks/SubscriptionExpiryReminder.inc.php (-1 / +1 lines)
 Lines 80-86    Link Here 
80
	function sendJournalReminders ($journal, $curDate) {
80
	function sendJournalReminders ($journal, $curDate) {
81
81
82
		// Only send reminders if subscriptions are enabled
82
		// Only send reminders if subscriptions are enabled
83
		if ($journal->getSetting('enableSubscriptions')) {
83
		if ($journal->getSetting('publishingMode') == PUBLISHING_MODE_SUBSCRIPTION) {
84
84
85
			$curYear = $curDate['year'];
85
			$curYear = $curDate['year'];
86
			$curMonth = $curDate['month'];
86
			$curMonth = $curDate['month'];
(-)classes/user/form/ProfileForm.inc.php (-2 / +2 lines)
 Lines 114-120    Link Here 
114
		$journals =& $journals->toArray();
114
		$journals =& $journals->toArray();
115
115
116
		foreach ($journals as $thisJournal) {
116
		foreach ($journals as $thisJournal) {
117
			if ($thisJournal->getSetting('enableSubscriptions') == true && $thisJournal->getSetting('enableOpenAccessNotification') == true) {
117
			if ($thisJournal->getSetting('publishingMode') == PUBLISHING_MODE_SUBSCRIPTION && $thisJournal->getSetting('enableOpenAccessNotification')) {
118
				$templateMgr->assign('displayOpenAccessNotification', true);
118
				$templateMgr->assign('displayOpenAccessNotification', true);
119
				$templateMgr->assign_by_ref('user', $user);
119
				$templateMgr->assign_by_ref('user', $user);
120
				break;
120
				break;
 Lines 292-298    Link Here 
292
		$journals =& $journals->toArray();
292
		$journals =& $journals->toArray();
293
293
294
		foreach ($journals as $thisJournal) {
294
		foreach ($journals as $thisJournal) {
295
			if (($thisJournal->getSetting('enableSubscriptions') == true) && ($thisJournal->getSetting('enableOpenAccessNotification') == true)) {
295
			if ($thisJournal->getSetting('publishingMode') == PUBLISHING_MODE_SUBSCRIPTION && $thisJournal->getSetting('enableOpenAccessNotification')) {
296
				$currentlyReceives = $user->getSetting('openAccessNotification', $thisJournal->getJournalId());
296
				$currentlyReceives = $user->getSetting('openAccessNotification', $thisJournal->getJournalId());
297
				$shouldReceive = !empty($openAccessNotify) && in_array($thisJournal->getJournalId(), $openAccessNotify);
297
				$shouldReceive = !empty($openAccessNotify) && in_array($thisJournal->getJournalId(), $openAccessNotify);
298
				if ($currentlyReceives != $shouldReceive) {
298
				if ($currentlyReceives != $shouldReceive) {
(-)classes/user/form/RegistrationForm.inc.php (-5 / +4 lines)
 Lines 111-121    Link Here 
111
		$templateMgr->assign_by_ref('countries', $countries);
111
		$templateMgr->assign_by_ref('countries', $countries);
112
112
113
		$templateMgr->assign('privacyStatement', $journal->getLocalizedSetting('privacyStatement'));
113
		$templateMgr->assign('privacyStatement', $journal->getLocalizedSetting('privacyStatement'));
114
		$templateMgr->assign('allowRegReader', $journal->getSetting('allowRegReader')==1?1:0);
114
		$templateMgr->assign('allowRegReader', $journal->getSetting('allowRegReader'));
115
		$templateMgr->assign('enableSubscriptions', $journal->getSetting('enableSubscriptions')==1?1:0);
115
		$templateMgr->assign('enableOpenAccessNotification', $journal->getSetting('enableOpenAccessNotification'));
116
		$templateMgr->assign('enableOpenAccessNotification', $journal->getSetting('enableOpenAccessNotification')==1?1:0);
116
		$templateMgr->assign('allowRegAuthor', $journal->getSetting('allowRegAuthor'));
117
		$templateMgr->assign('allowRegAuthor', $journal->getSetting('allowRegAuthor')==1?1:0);
117
		$templateMgr->assign('allowRegReviewer', $journal->getSetting('allowRegReviewer'));
118
		$templateMgr->assign('allowRegReviewer', $journal->getSetting('allowRegReviewer')==1?1:0);
119
		$templateMgr->assign('source', Request::getUserVar('source'));
118
		$templateMgr->assign('source', Request::getUserVar('source'));
120
119
121
		$site =& Request::getSite();
120
		$site =& Request::getSite();
(-)dbscripts/xml/upgrade/2.3.0_update.xml (+5 lines)
 Lines 57-60    Link Here 
57
		<drop table="layouted_assignments" />
57
		<drop table="layouted_assignments" />
58
		<drop table="proof_assignments" />
58
		<drop table="proof_assignments" />
59
	</sql>
59
	</sql>
60
61
	<!-- Bug #1709: Upgrade enableSubscriptions setting to publishingMode -->
62
	<sql>
63
		<query>UPDATE journal_settings SET setting_name = 'publishingMode', setting_type = 'int' WHERE setting_name = 'enableSubscriptions'</query>
64
	</sql>
60
</data>
65
</data>
(-)locale/en_US/manager.xml (+1 lines)
 Lines 461-466    Link Here 
461
	<message key="manager.setup.submissions.description">Author guidelines, copyright, and indexing (including registration).</message>
461
	<message key="manager.setup.submissions.description">Author guidelines, copyright, and indexing (including registration).</message>
462
	<message key="manager.setup.subscription">The journal will require subscriptions to access some or all of its contents.</message>
462
	<message key="manager.setup.subscription">The journal will require subscriptions to access some or all of its contents.</message>
463
	<message key="manager.setup.subscriptionDescription">This requires the assignment of a Subscription Manager who has access to the subscription module, which includes additional open access, self-archiving, and email notification options.</message>
463
	<message key="manager.setup.subscriptionDescription">This requires the assignment of a Subscription Manager who has access to the subscription module, which includes additional open access, self-archiving, and email notification options.</message>
464
	<message key="manager.setup.noPublishing">OJS will not be used to publish the journal's contents online.</message>
464
	<message key="manager.setup.technicalSupportContact">Technical Support Contact</message>
465
	<message key="manager.setup.technicalSupportContact">Technical Support Contact</message>
465
	<message key="manager.setup.technicalSupportContactDescription">This person will be listed on the journal's Contact page for the use of editors, authors, and reviewers, and should have experience working through the system from the perspective of all of its roles. As this journal system requires very little technical support, this should be seen as a part-time assignment. There may be occasions, for example, when authors and reviewers have difficulties with the instructions or file formats, or there's a need to ensure that the journal is regularly backed up on the server.</message>
466
	<message key="manager.setup.technicalSupportContactDescription">This person will be listed on the journal's Contact page for the use of editors, authors, and reviewers, and should have experience working through the system from the perspective of all of its roles. As this journal system requires very little technical support, this should be seen as a part-time assignment. There may be occasions, for example, when authors and reviewers have difficulties with the instructions or file formats, or there's a need to ensure that the journal is regularly backed up on the server.</message>
466
	<message key="manager.setup.typeExamples">(E.g., Historical Inquiry; Quasi-Experimental; Literary Analysis; Survey/Interview)</message>
467
	<message key="manager.setup.typeExamples">(E.g., Historical Inquiry; Quasi-Experimental; Literary Analysis; Survey/Interview)</message>
(-)pages/about/AboutHandler.inc.php (-5 / +1 lines)
 Lines 323-330    Link Here 
323
		$journal =& Request::getJournal();
323
		$journal =& Request::getJournal();
324
324
325
		$templateMgr =& TemplateManager::getManager();
325
		$templateMgr =& TemplateManager::getManager();
326
		$journalSettings =& $journalSettingsDao->getJournalSettings($journal->getJournalId());
327
		$templateMgr->assign_by_ref('journalSettings', $journalSettings);
328
		$sections =& $sectionDao->getJournalSections($journal->getJournalId());
326
		$sections =& $sectionDao->getJournalSections($journal->getJournalId());
329
		$sections =& $sections->toArray();
327
		$sections =& $sections->toArray();
330
		$templateMgr->assign_by_ref('sections', $sections);
328
		$templateMgr->assign_by_ref('sections', $sections);
 Lines 577-585    Link Here 
577
		$userStatistics = $journalStatisticsDao->getUserStatistics($journal->getJournalId(), $fromDate, $toDate);
575
		$userStatistics = $journalStatisticsDao->getUserStatistics($journal->getJournalId(), $fromDate, $toDate);
578
		$templateMgr->assign('userStatistics', $userStatistics);
576
		$templateMgr->assign('userStatistics', $userStatistics);
579
577
580
		$enableSubscriptions = $journal->getSetting('enableSubscriptions');
578
		if ($journal->getSetting('publishingMode') == PUBLISHING_MODE_SUBSCRIPTION) {
581
		if ($enableSubscriptions) {
582
			$templateMgr->assign('enableSubscriptions', true);
583
			$allSubscriptionStatistics = $journalStatisticsDao->getSubscriptionStatistics($journal->getJournalId(), null, $toDate);
579
			$allSubscriptionStatistics = $journalStatisticsDao->getSubscriptionStatistics($journal->getJournalId(), null, $toDate);
584
			$templateMgr->assign('allSubscriptionStatistics', $allSubscriptionStatistics);
580
			$templateMgr->assign('allSubscriptionStatistics', $allSubscriptionStatistics);
585
581
(-)pages/article/ArticleHandler.inc.php (-1 / +2 lines)
 Lines 36-42    Link Here 
36
	function ArticleHandler() {
36
	function ArticleHandler() {
37
		parent::Handler();
37
		parent::Handler();
38
		
38
		
39
		$this->addCheck(new HandlerValidatorJournal($this));		
39
		$this->addCheck(new HandlerValidatorJournal($this));
40
		$this->addCheck(new HandlerValidatorCustom($this, false, null, null, create_function('$journal', 'return $journal->getSetting(\'publishingMode\') != PUBLISHING_MODE_NONE;'), array(Request::getJournal())));
40
	}
41
	}
41
42
42
	/**
43
	/**
(-)pages/editor/IssueManagementHandler.inc.php (-3 / +1 lines)
 Lines 286-293    Link Here 
286
286
287
		$enablePublicArticleId = $journalSettingsDao->getSetting($journalId,'enablePublicArticleId');
287
		$enablePublicArticleId = $journalSettingsDao->getSetting($journalId,'enablePublicArticleId');
288
		$templateMgr->assign('enablePublicArticleId', $enablePublicArticleId);
288
		$templateMgr->assign('enablePublicArticleId', $enablePublicArticleId);
289
		$enableSubscriptions = $journalSettingsDao->getSetting($journalId,'enableSubscriptions');
290
		$templateMgr->assign('enableSubscriptions', $enableSubscriptions);
291
		$enablePageNumber = $journalSettingsDao->getSetting($journalId, 'enablePageNumber');
289
		$enablePageNumber = $journalSettingsDao->getSetting($journalId, 'enablePageNumber');
292
		$templateMgr->assign('enablePageNumber', $enablePageNumber);
290
		$templateMgr->assign('enablePageNumber', $enablePageNumber);
293
		$templateMgr->assign('customSectionOrderingExists', $customSectionOrderingExists = $sectionDao->customSectionOrderingExists($issueId));
291
		$templateMgr->assign('customSectionOrderingExists', $customSectionOrderingExists = $sectionDao->customSectionOrderingExists($issueId));
 Lines 541-547    Link Here 
541
539
542
		// If subscriptions with delayed open access are enabled then
540
		// If subscriptions with delayed open access are enabled then
543
		// update open access date according to open access delay policy
541
		// update open access date according to open access delay policy
544
		if ($journal->getSetting('enableSubscriptions') && $journal->getSetting('enableDelayedOpenAccess')) {
542
		if ($journal->getSetting('publishingMode') == PUBLISHING_MODE_SUBSCRIPTION && $journal->getSetting('enableDelayedOpenAccess')) {
545
543
546
			$delayDuration = $journal->getSetting('delayedOpenAccessDuration');
544
			$delayDuration = $journal->getSetting('delayedOpenAccessDuration');
547
			$delayYears = (int)floor($delayDuration/12);
545
			$delayYears = (int)floor($delayDuration/12);
(-)pages/issue/IssueHandler.inc.php (+1 lines)
 Lines 26-31    Link Here 
26
		parent::Handler();
26
		parent::Handler();
27
		
27
		
28
		$this->addCheck(new HandlerValidatorJournal($this));
28
		$this->addCheck(new HandlerValidatorJournal($this));
29
		$this->addCheck(new HandlerValidatorCustom($this, false, null, null, create_function('$journal', 'return $journal->getSetting(\'publishingMode\') != PUBLISHING_MODE_NONE;'), array(Request::getJournal())));
29
	}
30
	}
30
31
31
	/**
32
	/**
(-)pages/manager/ManagerHandler.inc.php (-9 / +2 lines)
 Lines 32-49    Link Here 
32
	function index() {
32
	function index() {
33
		$this->validate();
33
		$this->validate();
34
		$this->setupTemplate();
34
		$this->setupTemplate();
35
		
36
		$journal =& Request::getJournal();
35
		$journal =& Request::getJournal();
37
		$journalSettingsDao =& DAORegistry::getDAO('JournalSettingsDAO');
38
 
39
		$templateMgr =& TemplateManager::getManager();
36
		$templateMgr =& TemplateManager::getManager();
40
		$templateMgr->assign_by_ref('roleSettings', $this->retrieveRoleAssignmentPreferences($journal->getJournalId()));
37
		$templateMgr->assign_by_ref('roleSettings', $this->retrieveRoleAssignmentPreferences($journal->getJournalId()));
41
		
38
		$templateMgr->assign('subscriptionsEnabled', $journal->getSetting('subscriptionsEnabled'));
42
		$subscriptionsEnabled = $journalSettingsDao->getSetting($journal->getJournalId(), 'enableSubscriptions');
39
		$templateMgr->assign('announcementsEnabled', $journal->getSetting('announcementsEnabled'));
43
		$templateMgr->assign('subscriptionsEnabled', $subscriptionsEnabled);
44
		$announcementsEnabled = $journalSettingsDao->getSetting($journal->getJournalId(), 'enableAnnouncements'); 
45
		$templateMgr->assign('announcementsEnabled', $announcementsEnabled);
46
47
		$session =& Request::getSession();
40
		$session =& Request::getSession();
48
		$session->unsetSessionVar('enrolmentReferrer');
41
		$session->unsetSessionVar('enrolmentReferrer');
49
42
(-)pages/manager/ManagerPaymentHandler.inc.php (-2 lines)
 Lines 35-41    Link Here 
35
		$journal =& Request::getJournal();
35
		$journal =& Request::getJournal();
36
		$templateMgr =& TemplateManager::getManager();
36
		$templateMgr =& TemplateManager::getManager();
37
		$templateMgr->assign('helpTopicId', 'journal.managementPages.payments');
37
		$templateMgr->assign('helpTopicId', 'journal.managementPages.payments');
38
		$templateMgr->assign('enableSubscriptions', $journal->getSetting('enableSubscriptions'));
39
38
40
		$this->setupTemplate(true);
39
		$this->setupTemplate(true);
41
40
 Lines 59-65    Link Here 
59
		$journal =& Request::getJournal();
58
		$journal =& Request::getJournal();
60
		$templateMgr =& TemplateManager::getManager();
59
		$templateMgr =& TemplateManager::getManager();
61
		$templateMgr->assign('helpTopicId', 'journal.managementPages.payments');
60
		$templateMgr->assign('helpTopicId', 'journal.managementPages.payments');
62
		$templateMgr->assign('enableSubscriptions', $journal->getSetting('enableSubscriptions'));
63
61
64
		$this->setupTemplate(true);
62
		$this->setupTemplate(true);
65
		
63
		
(-)pages/manager/StatisticsHandler.inc.php (-3 / +1 lines)
 Lines 74-82    Link Here 
74
		$userStatistics = $journalStatisticsDao->getUserStatistics($journal->getJournalId(), $fromDate, $toDate);
74
		$userStatistics = $journalStatisticsDao->getUserStatistics($journal->getJournalId(), $fromDate, $toDate);
75
		$templateMgr->assign('userStatistics', $userStatistics);
75
		$templateMgr->assign('userStatistics', $userStatistics);
76
76
77
		$enableSubscriptions = $journal->getSetting('enableSubscriptions');
77
		if ($journal->getSetting('publishingMode') == PUBLISHING_MODE_SUBSCRIPTION) {
78
		if ($enableSubscriptions) {
79
			$templateMgr->assign('enableSubscriptions', true);
80
			$allSubscriptionStatistics = $journalStatisticsDao->getSubscriptionStatistics($journal->getJournalId(), null, $toDate);
78
			$allSubscriptionStatistics = $journalStatisticsDao->getSubscriptionStatistics($journal->getJournalId(), null, $toDate);
81
			$templateMgr->assign('allSubscriptionStatistics', $allSubscriptionStatistics);
79
			$templateMgr->assign('allSubscriptionStatistics', $allSubscriptionStatistics);
82
80
(-)pages/search/SearchHandler.inc.php (+1 lines)
 Lines 24-29    Link Here 
24
	 **/
24
	 **/
25
	function SearchHandler() {
25
	function SearchHandler() {
26
		parent::Handler();
26
		parent::Handler();
27
		$this->addCheck(new HandlerValidatorCustom($this, false, null, null, create_function('$journal', 'return !$journal || $journal->getSetting(\'publishingMode\') != PUBLISHING_MODE_NONE;'), array(Request::getJournal())));
27
	}
28
	}
28
29
29
	/**
30
	/**
(-)plugins/blocks/navigation/block.tpl (+2 lines)
 Lines 8-13    Link Here 
8
 *
8
 *
9
 * $Id: block.tpl,v 1.4 2009/04/08 19:54:35 asmecher Exp $
9
 * $Id: block.tpl,v 1.4 2009/04/08 19:54:35 asmecher Exp $
10
 *}
10
 *}
11
{if !$currentJournal || $currentJournal->getSetting('publishingMode') != $smarty.const.PUBLISHING_MODE_NONE}
11
<div class="block" id="sidebarNavigation">
12
<div class="block" id="sidebarNavigation">
12
	<span class="blockTitle">{translate key="plugins.block.navigation.journalContent"}</span>
13
	<span class="blockTitle">{translate key="plugins.block.navigation.journalContent"}</span>
13
	
14
	
 Lines 42-44    Link Here 
42
	</ul>
43
	</ul>
43
	{/if}
44
	{/if}
44
</div>
45
</div>
46
{/if}
(-)plugins/importexport/doaj/DOAJPlugin.inc.php (-1 / +1 lines)
 Lines 135-141    Link Here 
135
			$paramArray = array(
135
			$paramArray = array(
136
				'username' => $user->getFirstName() . ' ' . $user->getLastName(),
136
				'username' => $user->getFirstName() . ' ' . $user->getLastName(),
137
				'journalName' => $journal->getLocalizedTitle(),
137
				'journalName' => $journal->getLocalizedTitle(),
138
				'isOpenAccess' => $journal->getSetting('enableSubscriptions') ? 'No' : 'Yes',
138
				'isOpenAccess' => $journal->getSetting('enableSubscriptions') == PUBLISHING_MODE_OPEN ? 'Yes' : 'No',
139
				'altTitle' => $journal->getLocalizedSetting('abbreviation'),
139
				'altTitle' => $journal->getLocalizedSetting('abbreviation'),
140
				'journalURL' => $journal->getUrl(),
140
				'journalURL' => $journal->getUrl(),
141
				'hasAuthorFee' => $journal->getSetting('submissionFee') > 0 ? 'Yes' : 'No',
141
				'hasAuthorFee' => $journal->getSetting('submissionFee') > 0 ? 'Yes' : 'No',
(-)plugins/importexport/native/NativeExportDom.inc.php (-1 / +1 lines)
 Lines 73-79    Link Here 
73
73
74
			if ( // Issue flagged as open, or subscriptions disabled
74
			if ( // Issue flagged as open, or subscriptions disabled
75
				$issue->getAccessStatus() == ISSUE_ACCESS_OPEN ||
75
				$issue->getAccessStatus() == ISSUE_ACCESS_OPEN ||
76
				!$journal->getSetting('enableSubscriptions')
76
				$journal->getSetting('publishingMode') == PUBLISHING_MODE_OPEN
77
			) {
77
			) {
78
				$accessNode =& XMLCustomWriter::createElement($doc, 'open_access');
78
				$accessNode =& XMLCustomWriter::createElement($doc, 'open_access');
79
				XMLCustomWriter::appendChild($root, $accessNode);
79
				XMLCustomWriter::appendChild($root, $accessNode);
(-)templates/about/editorialPolicies.tpl (-9 / +9 lines)
 Lines 18-27    Link Here 
18
	<li>&#187; <a href="{url op="editorialPolicies" anchor="sectionPolicies"}">{translate key="about.sectionPolicies"}</a></li>
18
	<li>&#187; <a href="{url op="editorialPolicies" anchor="sectionPolicies"}">{translate key="about.sectionPolicies"}</a></li>
19
	{if $currentJournal->getLocalizedSetting('reviewPolicy') != ''}<li>&#187; <a href="{url op="editorialPolicies" anchor="peerReviewProcess"}">{translate key="about.peerReviewProcess"}</a></li>{/if}
19
	{if $currentJournal->getLocalizedSetting('reviewPolicy') != ''}<li>&#187; <a href="{url op="editorialPolicies" anchor="peerReviewProcess"}">{translate key="about.peerReviewProcess"}</a></li>{/if}
20
	{if $currentJournal->getLocalizedSetting('pubFreqPolicy') != ''}<li>&#187; <a href="{url op="editorialPolicies" anchor="publicationFrequency"}">{translate key="about.publicationFrequency"}</a></li>{/if}
20
	{if $currentJournal->getLocalizedSetting('pubFreqPolicy') != ''}<li>&#187; <a href="{url op="editorialPolicies" anchor="publicationFrequency"}">{translate key="about.publicationFrequency"}</a></li>{/if}
21
	{if empty($journalSettings.enableSubscriptions) && $currentJournal->getLocalizedSetting('openAccessPolicy') != ''}<li>&#187; <a href="{url op="editorialPolicies" anchor="openAccessPolicy"}">{translate key="about.openAccessPolicy"}</a></li>{/if}
21
	{if !$currentJournal->getSetting('enableSubscriptions') && $currentJournal->getLocalizedSetting('openAccessPolicy') != ''}<li>&#187; <a href="{url op="editorialPolicies" anchor="openAccessPolicy"}">{translate key="about.openAccessPolicy"}</a></li>{/if}
22
	{if !empty($journalSettings.enableSubscriptions) && !empty($journalSettings.enableAuthorSelfArchive)}<li>&#187; <a href="{url op="editorialPolicies" anchor="authorSelfArchivePolicy"}">{translate key="about.authorSelfArchive"}</a></li>{/if}
22
	{if $currentJournal->getSetting('enableSubscriptions') && $currentJournal->getSetting('enableAuthorSelfArchive')}<li>&#187; <a href="{url op="editorialPolicies" anchor="authorSelfArchivePolicy"}">{translate key="about.authorSelfArchive"}</a></li>{/if}
23
	{if !empty($journalSettings.enableSubscriptions) && !empty($journalSettings.enableDelayedOpenAccess)}<li>&#187; <a href="{url op="editorialPolicies" anchor="delayedOpenAccessPolicy"}">{translate key="about.delayedOpenAccess"}</a></li>{/if}
23
	{if $currentJournal->getSetting('enableSubscriptions') && $currentJournal->getSetting('enableDelayedOpenAccess')}<li>&#187; <a href="{url op="editorialPolicies" anchor="delayedOpenAccessPolicy"}">{translate key="about.delayedOpenAccess"}</a></li>{/if}
24
	{if $journalSettings.enableLockss && $currentJournal->getLocalizedSetting('lockssLicense') != ''}<li>&#187; <a href="{url op="editorialPolicies" anchor="archiving"}">{translate key="about.archiving"}</a></li>{/if}
24
	{if $currentJournal->getSetting('enableLockss') && $currentJournal->getLocalizedSetting('lockssLicense') != ''}<li>&#187; <a href="{url op="editorialPolicies" anchor="archiving"}">{translate key="about.archiving"}</a></li>{/if}
25
	{foreach key=key from=$currentJournal->getLocalizedSetting('customAboutItems') item=customAboutItem}
25
	{foreach key=key from=$currentJournal->getLocalizedSetting('customAboutItems') item=customAboutItem}
26
		{if !empty($customAboutItem.title)}
26
		{if !empty($customAboutItem.title)}
27
			<li>&#187; <a href="{url op="editorialPolicies" anchor=custom`$key`}">{$customAboutItem.title|escape}</a></li>
27
			<li>&#187; <a href="{url op="editorialPolicies" anchor=custom`$key`}">{$customAboutItem.title|escape}</a></li>
 Lines 86-92    Link Here 
86
</div>
86
</div>
87
{/if}
87
{/if}
88
88
89
{if empty($journalSettings.enableSubscriptions) && $currentJournal->getLocalizedSetting('openAccessPolicy') != ''} 
89
{if !$currentJournal->getSetting('enableSubscriptions') && $currentJournal->getLocalizedSetting('openAccessPolicy') != ''} 
90
<div id="openAccessPolicy"><h3>{translate key="about.openAccessPolicy"}</h3>
90
<div id="openAccessPolicy"><h3>{translate key="about.openAccessPolicy"}</h3>
91
<p>{$currentJournal->getLocalizedSetting('openAccessPolicy')|nl2br}</p>
91
<p>{$currentJournal->getLocalizedSetting('openAccessPolicy')|nl2br}</p>
92
92
 Lines 94-100    Link Here 
94
</div>
94
</div>
95
{/if}
95
{/if}
96
96
97
{if !empty($journalSettings.enableSubscriptions) && !empty($journalSettings.enableAuthorSelfArchive)} 
97
{if $currentJournal->getSetting('enableSubscriptions') && $currentJournal->getSetting('enableAuthorSelfArchive')} 
98
<div id="authorSelfArchivePolicy"><h3>{translate key="about.authorSelfArchive"}</h3> 
98
<div id="authorSelfArchivePolicy"><h3>{translate key="about.authorSelfArchive"}</h3> 
99
<p>{$currentJournal->getLocalizedSetting('authorSelfArchivePolicy')|nl2br}</p>
99
<p>{$currentJournal->getLocalizedSetting('authorSelfArchivePolicy')|nl2br}</p>
100
100
 Lines 102-110    Link Here 
102
</div>
102
</div>
103
{/if}
103
{/if}
104
104
105
{if !empty($journalSettings.enableSubscriptions) && !empty($journalSettings.enableDelayedOpenAccess)}
105
{if $currentJournal->getSetting('enableSubscriptions') && $currentJournal->getSetting('enableDelayedOpenAccess')}
106
<div id="delayedOpenAccessPolicy"><h3>{translate key="about.delayedOpenAccess"}</h3> 
106
<div id="delayedOpenAccessPolicy"><h3>{translate key="about.delayedOpenAccess"}</h3> 
107
<p>{translate key="about.delayedOpenAccessDescription1"} {$journalSettings.delayedOpenAccessDuration} {translate key="about.delayedOpenAccessDescription2"}</p>
107
<p>{translate key="about.delayedOpenAccessDescription1"} {$currentJournal->getSetting('delayedOpenAccessDuration')} {translate key="about.delayedOpenAccessDescription2"}</p>
108
{if $currentJournal->getLocalizedSetting('delayedOpenAccessPolicy') != ''}
108
{if $currentJournal->getLocalizedSetting('delayedOpenAccessPolicy') != ''}
109
	<p>{$currentJournal->getLocalizedSetting('delayedOpenAccessPolicy')|nl2br}</p>
109
	<p>{$currentJournal->getLocalizedSetting('delayedOpenAccessPolicy')|nl2br}</p>
110
{/if}
110
{/if}
 Lines 113-119    Link Here 
113
</div>
113
</div>
114
{/if}
114
{/if}
115
115
116
{if $journalSettings.enableLockss && $currentJournal->getLocalizedSetting('lockssLicense') != ''}
116
{if $currentJournal->getSetting('enableLockss') && $currentJournal->getLocalizedSetting('lockssLicense') != ''}
117
<div id="archiving"><h3>{translate key="about.archiving"}</h3>
117
<div id="archiving"><h3>{translate key="about.archiving"}</h3>
118
<p>{$currentJournal->getLocalizedSetting('lockssLicense')|nl2br}</p>
118
<p>{$currentJournal->getLocalizedSetting('lockssLicense')|nl2br}</p>
119
119
(-)templates/about/index.tpl (-4 / +6 lines)
 Lines 32-43    Link Here 
32
	<li>&#187; <a href="{url op="editorialPolicies" anchor="sectionPolicies"}">{translate key="about.sectionPolicies"}</a></li>
32
	<li>&#187; <a href="{url op="editorialPolicies" anchor="sectionPolicies"}">{translate key="about.sectionPolicies"}</a></li>
33
	{if $currentJournal->getLocalizedSetting('reviewPolicy') != ''}<li>&#187; <a href="{url op="editorialPolicies" anchor="peerReviewProcess"}">{translate key="about.peerReviewProcess"}</a></li>{/if}
33
	{if $currentJournal->getLocalizedSetting('reviewPolicy') != ''}<li>&#187; <a href="{url op="editorialPolicies" anchor="peerReviewProcess"}">{translate key="about.peerReviewProcess"}</a></li>{/if}
34
	{if $currentJournal->getLocalizedSetting('pubFreqPolicy') != ''}<li>&#187; <a href="{url op="editorialPolicies" anchor="publicationFrequency"}">{translate key="about.publicationFrequency"}</a></li>{/if}
34
	{if $currentJournal->getLocalizedSetting('pubFreqPolicy') != ''}<li>&#187; <a href="{url op="editorialPolicies" anchor="publicationFrequency"}">{translate key="about.publicationFrequency"}</a></li>{/if}
35
	{if empty($journalSettings.enableSubscriptions) && $currentJournal->getLocalizedSetting('openAccessPolicy') != ''}<li>&#187; <a href="{url op="editorialPolicies" anchor="openAccessPolicy"}">{translate key="about.openAccessPolicy"}</a></li>{/if}
35
	{if !$currentJournal->getSetting('enableSubscriptions') && $currentJournal->getLocalizedSetting('openAccessPolicy') != ''}<li>&#187; <a href="{url op="editorialPolicies" anchor="openAccessPolicy"}">{translate key="about.openAccessPolicy"}</a></li>{/if}
36
	{if $journalSettings.enableLockss && $currentJournal->getLocalizedSetting('lockssLicense') != ''}<li>&#187; <a href="{url op="editorialPolicies" anchor="archiving"}">{translate key="about.archiving"}</a></li>{/if}
36
	{if $journalSettings.enableLockss && $currentJournal->getLocalizedSetting('lockssLicense') != ''}<li>&#187; <a href="{url op="editorialPolicies" anchor="archiving"}">{translate key="about.archiving"}</a></li>{/if}
37
	{if $journalSettings.journalPaymentsEnabled && $journalSettings.membershipFeeEnabled && $journalSettings.membershipFee > 0}<li>&#187; <a href="{url op="memberships"}">{translate key="about.memberships"}</a></li>{/if}
37
	{if $journalSettings.journalPaymentsEnabled && $journalSettings.membershipFeeEnabled && $journalSettings.membershipFee > 0}<li>&#187; <a href="{url op="memberships"}">{translate key="about.memberships"}</a></li>{/if}
38
	{if !empty($journalSettings.enableSubscriptions)}<li>&#187; <a href="{url op="subscriptions"}">{translate key="about.subscriptions"}</a></li>{/if}
38
	{if $currentJournal->getSetting('enableSubscriptions')}
39
	{if !empty($journalSettings.enableSubscriptions) && !empty($journalSettings.enableAuthorSelfArchive)}<li>&#187; <a href="{url op="editorialPolicies" anchor="authorSelfArchivePolicy"}">{translate key="about.authorSelfArchive"}</a></li>{/if}
39
		<li>&#187; <a href="{url op="subscriptions"}">{translate key="about.subscriptions"}</a></li>
40
	{if !empty($journalSettings.enableSubscriptions) && !empty($journalSettings.enableDelayedOpenAccess)}<li>&#187; <a href="{url op="editorialPolicies" anchor="delayedOpenAccessPolicy"}">{translate key="about.delayedOpenAccess"}</a></li>{/if}
40
		{if !empty($journalSettings.enableAuthorSelfArchive)}<li>&#187; <a href="{url op="editorialPolicies" anchor="authorSelfArchivePolicy"}">{translate key="about.authorSelfArchive"}</a></li>{/if}
41
		{if !empty($journalSettings.enableDelayedOpenAccess)}<li>&#187; <a href="{url op="editorialPolicies" anchor="delayedOpenAccessPolicy"}">{translate key="about.delayedOpenAccess"}</a></li>{/if}
42
	{/if}{* $currentJournal->getSetting('enableSubscriptions') *}
41
	{foreach key=key from=$customAboutItems item=customAboutItem}
43
	{foreach key=key from=$customAboutItems item=customAboutItem}
42
		{if $customAboutItem.title!=''}<li>&#187; <a href="{url op="editorialPolicies" anchor=custom`$key`}">{$customAboutItem.title|escape}</a></li>{/if}
44
		{if $customAboutItem.title!=''}<li>&#187; <a href="{url op="editorialPolicies" anchor=custom`$key`}">{$customAboutItem.title|escape}</a></li>{/if}
43
	{/foreach}
45
	{/foreach}
(-)templates/about/siteMap.tpl (-12 / +14 lines)
 Lines 55-72    Link Here 
55
						</ul>
55
						</ul>
56
					{/if}
56
					{/if}
57
				</li>
57
				</li>
58
				<li><a href="{url journal=`$currentJournal->getPath()` page="search"}">{translate key="navigation.search"}</a><br />
58
				{if $currentJournal->getSetting('publishingMode') != $smarty.const.PUBLISHING_MODE_NONE}
59
					<ul class="plain">
59
					<li><a href="{url journal=`$currentJournal->getPath()` page="search"}">{translate key="navigation.search"}</a><br />
60
						<li><a href="{url journal=`$currentJournal->getPath()` page="search" op="authors"}">{translate key="navigation.browseByAuthor"}</a></li>
60
						<ul class="plain">
61
						<li><a href="{url journal=`$currentJournal->getPath()` page="search" op="titles"}">{translate key="navigation.browseByTitle"}</a></li>
61
							<li><a href="{url journal=`$currentJournal->getPath()` page="search" op="authors"}">{translate key="navigation.browseByAuthor"}</a></li>
62
					</ul>
62
							<li><a href="{url journal=`$currentJournal->getPath()` page="search" op="titles"}">{translate key="navigation.browseByTitle"}</a></li>
63
				</li>
63
						</ul>
64
				<li>{translate key="issue.issues"}<br/>
64
					</li>
65
					<ul class="plain">
65
					<li>{translate key="issue.issues"}<br/>
66
						<li><a href="{url journal=`$currentJournal->getPath()` page="issue" op="current"}">{translate key="journal.currentIssue"}</a></li>
66
						<ul class="plain">
67
						<li><a href="{url journal=`$currentJournal->getPath()` page="issue" op="archive"}">{translate key="navigation.archives"}</a></li>
67
							<li><a href="{url journal=`$currentJournal->getPath()` page="issue" op="current"}">{translate key="journal.currentIssue"}</a></li>
68
					</ul>
68
							<li><a href="{url journal=`$currentJournal->getPath()` page="issue" op="archive"}">{translate key="navigation.archives"}</a></li>
69
				</li>
69
						</ul>
70
					</li>
71
				{/if}{* $currentJournal->getSetting('publishingMode') != $smarty.const.PUBLISHING_MODE_NONE *}
70
				{foreach from=$navMenuItems item=navItem}
72
				{foreach from=$navMenuItems item=navItem}
71
					{if $navItem.url != '' && $navItem.name != ''}<li><a href="{if $navItem.isAbsolute}{$navItem.url|escape}{else}{url page=""}{$navItem.url|escape}{/if}">{if $navItem.isLiteral}{$navItem.name|escape}{else}{translate key=$navItem.name|escape}{/if}</a></li>{/if}
73
					{if $navItem.url != '' && $navItem.name != ''}<li><a href="{if $navItem.isAbsolute}{$navItem.url|escape}{else}{url page=""}{$navItem.url|escape}{/if}">{if $navItem.isLiteral}{$navItem.name|escape}{else}{translate key=$navItem.name|escape}{/if}</a></li>{/if}
72
				{/foreach}
74
				{/foreach}
(-)templates/about/statistics.tpl (-1 / +1 lines)
 Lines 73-79    Link Here 
73
		<td colspan="2" class="value">{translate key="manager.statistics.statistics.totalNewValue" numTotal=$allUserStatistics.reader|default:"0" numNew=$userStatistics.reader|default:"0"}</td>
73
		<td colspan="2" class="value">{translate key="manager.statistics.statistics.totalNewValue" numTotal=$allUserStatistics.reader|default:"0" numNew=$userStatistics.reader|default:"0"}</td>
74
	</tr>{/if}
74
	</tr>{/if}
75
75
76
	{if $enableSubscriptions && $statSubscriptions}
76
	{if $currentJournal->getSetting('publishingMode') == $smarty.const.PUBLISHING_MODE_SUBSCRIPTION && $statSubscriptions}
77
		<tr valign="top">
77
		<tr valign="top">
78
			<td colspan="3" class="label">{translate key="manager.statistics.statistics.subscriptions"}</td>
78
			<td colspan="3" class="label">{translate key="manager.statistics.statistics.subscriptions"}</td>
79
		</tr>
79
		</tr>
(-)templates/article/header.tpl (-3 / +5 lines)
 Lines 55-66    Link Here 
55
			<li><a href="{url page="user" op="register"}" target="_parent">{translate key="navigation.register"}</a></li>
55
			<li><a href="{url page="user" op="register"}" target="_parent">{translate key="navigation.register"}</a></li>
56
		{/if}{* $isUserLoggedIn *}
56
		{/if}{* $isUserLoggedIn *}
57
57
58
		<li><a href="{url page="search"}" target="_parent">{translate key="navigation.search"}</a></li>
58
		{if !$currentJournal || $currentJournal->getSetting('publishingMode') != $smarty.const.PUBLISHING_MODE_NONE}
59
			<li><a href="{url page="search"}" target="_parent">{translate key="navigation.search"}</a></li>
60
		{/if}
59
61
60
		{if $currentJournal}
62
		{if $currentJournal && $currentJournal->getSetting('publishingMode') != $smarty.const.PUBLISHING_MODE_NONE}
61
			<li><a href="{url page="issue" op="current"}" target="_parent">{translate key="navigation.current"}</a></li>
63
			<li><a href="{url page="issue" op="current"}" target="_parent">{translate key="navigation.current"}</a></li>
62
			<li><a href="{url page="issue" op="archive"}" target="_parent">{translate key="navigation.archives"}</a></li>
64
			<li><a href="{url page="issue" op="archive"}" target="_parent">{translate key="navigation.archives"}</a></li>
63
		{/if}{* $currentJournal *}
65
		{/if}
64
66
65
		{if $enableAnnouncements}
67
		{if $enableAnnouncements}
66
			<li><a href="{url page="announcement"}">{translate key="announcement.announcements"}</a></li>
68
			<li><a href="{url page="announcement"}">{translate key="announcement.announcements"}</a></li>
(-)templates/common/navbar.tpl (-4 / +6 lines)
 Lines 19-30    Link Here 
19
			<li id="register"><a href="{url page="user" op="register"}">{translate key="navigation.register"}</a></li>
19
			<li id="register"><a href="{url page="user" op="register"}">{translate key="navigation.register"}</a></li>
20
		{/if}{* $isUserLoggedIn *}
20
		{/if}{* $isUserLoggedIn *}
21
21
22
		<li id="search"><a href="{url page="search"}">{translate key="navigation.search"}</a></li>
22
		{if !$currentJournal || $currentJournal->getSetting('publishingMode') != $smarty.const.PUBLISHING_MODE_NONE}
23
			<li id="search"><a href="{url page="search"}">{translate key="navigation.search"}</a></li>
24
		{/if}
23
25
24
		{if $currentJournal}
26
		{if $currentJournal && $currentJournal->getSetting('publishingMode') != $smarty.const.PUBLISHING_MODE_NONE}
25
			<li id="current"><a href="{url page="issue" op="current"}">{translate key="navigation.current"}</a></li>
27
			<li id="current"><a href="{url page="issue" op="current"}">{translate key="navigation.current"}</a></li>
26
			<li id="archives"><a href="{url page="issue" op="archive"}">{translate key="navigation.archives"}</a></li>
28
			<li id="archives"><a href="{url page="issue" op="archive"}">{translate key="navigation.archives"}</a></li>
27
		{/if}{* $currentJournal *}
29
		{/if}
28
30
29
		{if $enableAnnouncements}
31
		{if $enableAnnouncements}
30
			<li id="announcements"><a href="{url page="announcement"}">{translate key="announcement.announcements"}</a></li>
32
			<li id="announcements"><a href="{url page="announcement"}">{translate key="announcement.announcements"}</a></li>
 Lines 38-41    Link Here 
38
			{/if}
40
			{/if}
39
		{/foreach}
41
		{/foreach}
40
	</ul>
42
	</ul>
41
</div>
43
</div>
(-)templates/editor/issues/createIssue.tpl (-1 / +1 lines)
 Lines 77-83    Link Here 
77
	</tr>
77
	</tr>
78
</table>
78
</table>
79
79
80
{if $enableSubscriptions && !$enableDelayedOpenAccess}
80
{if $currentJournal->getSetting('publishingMode') == PUBLISHING_MODE_SUBSCRIPTION && !$enableDelayedOpenAccess}
81
<div class="separator"></div>
81
<div class="separator"></div>
82
<div id="access">
82
<div id="access">
83
<h3>{translate key="editor.issues.access"}</h3>
83
<h3>{translate key="editor.issues.access"}</h3>
(-)templates/editor/issues/issueData.tpl (-1 / +1 lines)
 Lines 110-116    Link Here 
110
	</tr>
110
	</tr>
111
</table>
111
</table>
112
</div>
112
</div>
113
{if ($enableSubscriptions && !$enableDelayedOpenAccess) || ($enableSubscriptions && $enableDelayedOpenAccess && $issue->getPublished())}
113
{if ($currentJournal->getSetting('publishingMode') == $smarty.const.PUBLISHING_MODE_SUBSCRIPTION && !$enableDelayedOpenAccess) || ($currentJournal->getSetting('publishingMode') == $smarty.const.PUBLISHING_MODE_SUBSCRIPTION && $enableDelayedOpenAccess && $issue->getPublished())}
114
<div class="separator"></div>
114
<div class="separator"></div>
115
<div id="issueAccess">
115
<div id="issueAccess">
116
<h3>{translate key="editor.issues.access"}</h3>
116
<h3>{translate key="editor.issues.access"}</h3>
(-)templates/editor/issues/issueToc.tpl (-3 / +3 lines)
 Lines 48-54    Link Here 
48
<form method="post" action="{url op="updateIssueToc" path=$issueId}" onsubmit="return confirm('{translate|escape:"jsparam" key="editor.issues.saveChanges"}')">
48
<form method="post" action="{url op="updateIssueToc" path=$issueId}" onsubmit="return confirm('{translate|escape:"jsparam" key="editor.issues.saveChanges"}')">
49
49
50
{assign var=numCols value=6}
50
{assign var=numCols value=6}
51
{if $issueAccess == $smarty.const.ISSUE_ACCESS_SUBSCRIPTION && $enableSubscriptions}{assign var=numCols value=$numCols+1}{/if}
51
{if $issueAccess == $smarty.const.ISSUE_ACCESS_SUBSCRIPTION && $currentJournal->getSetting('publishingMode') == $smarty.const.PUBLISHING_MODE_SUBSCRIPTION}{assign var=numCols value=$numCols+1}{/if}
52
{if $enablePublicArticleId}{assign var=numCols value=$numCols+1}{/if}
52
{if $enablePublicArticleId}{assign var=numCols value=$numCols+1}{/if}
53
{if $enablePageNumber}{assign var=numCols value=$numCols+1}{/if}
53
{if $enablePageNumber}{assign var=numCols value=$numCols+1}{/if}
54
54
 Lines 63-69    Link Here 
63
		<td width="10%" colspan="2">{translate key="editor.issues.order"}</td>
63
		<td width="10%" colspan="2">{translate key="editor.issues.order"}</td>
64
		<td width="15%">{translate key="article.authors"}</td>
64
		<td width="15%">{translate key="article.authors"}</td>
65
		<td>{translate key="article.title"}</td>
65
		<td>{translate key="article.title"}</td>
66
		{if $issueAccess == $smarty.const.ISSUE_ACCESS_SUBSCRIPTION && $enableSubscriptions}<td width="10%">{translate key="editor.issues.access"}</td>{/if}
66
		{if $issueAccess == $smarty.const.ISSUE_ACCESS_SUBSCRIPTION && $currentJournal->getSetting('publishingMode') == $smarty.const.PUBLISHING_MODE_SUBSCRIPTION}<td width="10%">{translate key="editor.issues.access"}</td>{/if}
67
		{if $enablePublicArticleId}<td width="7%">{translate key="editor.issues.publicId"}</td>{/if}
67
		{if $enablePublicArticleId}<td width="7%">{translate key="editor.issues.publicId"}</td>{/if}
68
		{if $enablePageNumber}<td width="7%">{translate key="editor.issues.pages"}</td>{/if}
68
		{if $enablePageNumber}<td width="7%">{translate key="editor.issues.pages"}</td>{/if}
69
		<td width="5%">{translate key="common.remove"}</td>
69
		<td width="5%">{translate key="common.remove"}</td>
 Lines 87-93    Link Here 
87
			{/foreach}
87
			{/foreach}
88
		</td>
88
		</td>
89
		<td>{if !$isLayoutEditor}<a href="{url op="submission" path=$articleId}" class="action">{/if}{$article->getLocalizedTitle()|strip_unsafe_html|truncate:60:"..."}{if !$isLayoutEditor}</a>{/if}</td>
89
		<td>{if !$isLayoutEditor}<a href="{url op="submission" path=$articleId}" class="action">{/if}{$article->getLocalizedTitle()|strip_unsafe_html|truncate:60:"..."}{if !$isLayoutEditor}</a>{/if}</td>
90
		{if $issueAccess == $smarty.const.ISSUE_ACCESS_SUBSCRIPTION && $enableSubscriptions}
90
		{if $issueAccess == $smarty.const.ISSUE_ACCESS_SUBSCRIPTION && $currentJournal->getSetting('publishingMode') == $smarty.const.PUBLISHING_MODE_SUBSCRIPTION}
91
		<td><select name="accessStatus[{$article->getPubId()}]" size="1" class="selectMenu">{html_options options=$accessOptions selected=$article->getAccessStatus()}</select></td>
91
		<td><select name="accessStatus[{$article->getPubId()}]" size="1" class="selectMenu">{html_options options=$accessOptions selected=$article->getAccessStatus()}</select></td>
92
		{/if}
92
		{/if}
93
		{if $enablePublicArticleId}
93
		{if $enablePublicArticleId}
(-)templates/manager/setup/step4.tpl (-9 / +25 lines)
 Lines 35-47    Link Here 
35
	<script type="text/javascript">
35
	<script type="text/javascript">
36
		{literal}
36
		{literal}
37
		<!--
37
		<!--
38
			function toggleEnableSubscriptions(form) {
38
			function togglePublishingMode(form) {
39
				if (form.enableSubscriptions[0].checked) {
39
				if (form.publishingMode[0].checked) {
40
					// PUBLISHING_MODE_OPEN
40
					form.openAccessPolicy.disabled = false;
41
					form.openAccessPolicy.disabled = false;
41
					form.showGalleyLinks.disabled = true;
42
					form.showGalleyLinks.disabled = true;
42
				} else {
43
				} elseif (form.publishingMode[1].checked) {
44
					// PUBLISHING_MODE_SUBSCRIPTION
43
					form.openAccessPolicy.disabled = true;
45
					form.openAccessPolicy.disabled = true;
44
					form.showGalleyLinks.disabled = false;
46
					form.showGalleyLinks.disabled = false;
47
				} else {
48
					// PUBLISHING_MODE_NONE
49
					form.openAccessPolicy.disabled = true;
50
					form.showGalleyLinks.disabled = true;
45
				}
51
				}
46
			}
52
			}
47
		// -->
53
		// -->
 Lines 51-63    Link Here 
51
<table width="100%" class="data">
57
<table width="100%" class="data">
52
	<tr valign="top">
58
	<tr valign="top">
53
		<td width="5%" class="label" align="right">
59
		<td width="5%" class="label" align="right">
54
			<input type="radio" name="enableSubscriptions" id="enableSubscriptions-0" value="0" onclick="toggleEnableSubscriptions(this.form)"{if not $enableSubscriptions} checked="checked"{/if} />
60
			<input type="radio" name="publishingMode" id="publishingMode-0" value="{$smarty.const.PUBLISHING_MODE_OPEN}" onclick="togglePublishingMode(this.form)"{if $publishingMode == $smarty.const.PUBLISHING_MODE_OPEN} checked="checked"{/if} />
55
		</td>
61
		</td>
56
		<td width="95%" class="value">
62
		<td width="95%" class="value">
57
			<label for="enableSubscriptions-0">{translate key="manager.setup.openAccess"}</label>
63
			<label for="publishingMode-0">{translate key="manager.setup.openAccess"}</label>
58
			<h4>{translate key="manager.setup.openAccessPolicy"}</h4>
64
			<h4>{translate key="manager.setup.openAccessPolicy"}</h4>
59
			<p><span class="instruct">{translate key="manager.setup.openAccessPolicyDescription"}</span></p>
65
			<p><span class="instruct">{translate key="manager.setup.openAccessPolicyDescription"}</span></p>
60
			<p><textarea name="openAccessPolicy[{$formLocale|escape}]" id="openAccessPolicy" rows="12" cols="60" class="textArea"{if $enableSubscriptions} disabled="disabled"{/if}>{$openAccessPolicy[$formLocale]|escape}</textarea></p>
66
			<p><textarea name="openAccessPolicy[{$formLocale|escape}]" id="openAccessPolicy" rows="12" cols="60" class="textArea"{if $publishingMode != $smarty.const.PUBLISHING_MODE_OPEN} disabled="disabled"{/if}>{$openAccessPolicy[$formLocale]|escape}</textarea></p>
61
		</td>
67
		</td>
62
	</tr>
68
	</tr>
63
	<tr>
69
	<tr>
 Lines 65-74    Link Here 
65
	</tr>
71
	</tr>
66
	<tr valign="top">
72
	<tr valign="top">
67
		<td width="5%" class="label" align="right">
73
		<td width="5%" class="label" align="right">
68
			<input type="radio" name="enableSubscriptions" id="enableSubscriptions-1" value="1" onclick="toggleEnableSubscriptions(this.form)"{if $enableSubscriptions} checked="checked"{/if} />
74
			<input type="radio" name="publishingMode" id="publishingMode-1" value="{$smarty.const.PUBLISHING_MODE_SUBSCRIPTION}" onclick="togglePublishingMode(this.form)"{if $publishingMode == $smarty.const.PUBLISHING_MODE_SUBSCRIPTION} checked="checked"{/if} />
69
		</td>
75
		</td>
70
		<td width="95%" class="value">
76
		<td width="95%" class="value">
71
			<label for="enableSubscriptions-1">{translate key="manager.setup.subscription"}</label>
77
			<label for="publishingMode-1">{translate key="manager.setup.subscription"}</label>
72
			<p><span class="instruct">{translate key="manager.setup.subscriptionDescription"}</span></p>
78
			<p><span class="instruct">{translate key="manager.setup.subscriptionDescription"}</span></p>
73
			<table width="100%">
79
			<table width="100%">
74
				<tr>
80
				<tr>
 Lines 78-84    Link Here 
78
			</table>
84
			</table>
79
		</td>
85
		</td>
80
	</tr>
86
	</tr>
81
87
	<tr>
88
		<td colspan="2" class="separator">&nbsp;</td>
89
	</tr>
90
	<tr valign="top">
91
		<td width="5%" class="label" align="right">
92
			<input type="radio" name="publishingMode" id="publishingMode-2" value="{$smarty.const.PUBLISHING_MODE_NONE}" onclick="togglePublishingMode(this.form)"{if $publishingMode == $smarty.const.PUBLISHING_MODE_NONE} checked="checked"{/if} />
93
		</td>
94
		<td width="95%" class="value">
95
			<label for="publishingMode-2">{translate key="manager.setup.noPublishing"}</label>
96
		</td>
97
	</tr>
82
</table>
98
</table>
83
99
84
100
(-)templates/manager/statistics/statistics.tpl (-1 / +1 lines)
 Lines 84-90    Link Here 
84
		<td colspan="2" class="value">{translate key="manager.statistics.statistics.totalNewValue" numTotal=$allUserStatistics.reader|default:"0" numNew=$userStatistics.reader|default:"0"}</td>
84
		<td colspan="2" class="value">{translate key="manager.statistics.statistics.totalNewValue" numTotal=$allUserStatistics.reader|default:"0" numNew=$userStatistics.reader|default:"0"}</td>
85
	</tr>
85
	</tr>
86
86
87
	{if $enableSubscriptions}
87
	{if $currentJournal->getSetting('publishingMode') == $smarty.const.PUBLISHING_MODE_SUBSCRIPTION}
88
		<tr valign="top">
88
		<tr valign="top">
89
			<td colspan="3" class="label"><input type="checkbox" id="statSubscriptions" name="statSubscriptions" {if $statSubscriptions}checked {/if}/><label for="statSubscriptions">{translate key="manager.statistics.statistics.subscriptions"}</label></td>
89
			<td colspan="3" class="label"><input type="checkbox" id="statSubscriptions" name="statSubscriptions" {if $statSubscriptions}checked {/if}/><label for="statSubscriptions">{translate key="manager.statistics.statistics.subscriptions"}</label></td>
90
		</tr>
90
		</tr>
(-)templates/user/profile.tpl (-2 / +2 lines)
 Lines 143-149    Link Here 
143
	{assign var=notFirstJournal value=0}
143
	{assign var=notFirstJournal value=0}
144
	{foreach from=$journals name=journalOpenAccessNotifications key=thisJournalId item=thisJournal}
144
	{foreach from=$journals name=journalOpenAccessNotifications key=thisJournalId item=thisJournal}
145
		{assign var=thisJournalId value=$thisJournal->getJournalId()}
145
		{assign var=thisJournalId value=$thisJournal->getJournalId()}
146
		{assign var=enableSubscriptions value=$thisJournal->getSetting('enableSubscriptions')}
146
		{assign var=publishingMode value=$thisJournal->getSetting('publishingMode')}
147
		{assign var=enableOpenAccessNotification value=$thisJournal->getSetting('enableOpenAccessNotification')}
147
		{assign var=enableOpenAccessNotification value=$thisJournal->getSetting('enableOpenAccessNotification')}
148
		{assign var=notificationEnabled value=$user->getSetting('openAccessNotification', $thisJournalId)}
148
		{assign var=notificationEnabled value=$user->getSetting('openAccessNotification', $thisJournalId)}
149
		{if !$notFirstJournal}
149
		{if !$notFirstJournal}
 Lines 153-159    Link Here 
153
				<td class="value">
153
				<td class="value">
154
		{/if}
154
		{/if}
155
155
156
		{if $enableSubscriptions && $enableOpenAccessNotification}
156
		{if $publishingMode == $smarty.const.PUBLISHING_MODE_SUBSCRIPTION && $enableOpenAccessNotification}
157
			<input type="checkbox" name="openAccessNotify[]" {if $notificationEnabled}checked="checked" {/if}id="openAccessNotify-{$thisJournalId|escape}" value="{$thisJournalId|escape}" /> <label for="openAccessNotify-{$thisJournalId|escape}">{$thisJournal->getLocalizedTitle()|escape}</label><br/>
157
			<input type="checkbox" name="openAccessNotify[]" {if $notificationEnabled}checked="checked" {/if}id="openAccessNotify-{$thisJournalId|escape}" value="{$thisJournalId|escape}" /> <label for="openAccessNotify-{$thisJournalId|escape}">{$thisJournal->getLocalizedTitle()|escape}</label><br/>
158
		{/if}
158
		{/if}
159
159
(-)templates/user/register.tpl (-2 / +2 lines)
 Lines 188-198    Link Here 
188
	{/if}{* !$existingUser *}
188
	{/if}{* !$existingUser *}
189
{/if}{* !$implicitAuth *}
189
{/if}{* !$implicitAuth *}
190
190
191
{if $allowRegReader || $allowRegReader === null || $allowRegAuthor || $allowRegAuthor === null || $allowRegReviewer || $allowRegReviewer === null || ($enableSubscriptions && $enableOpenAccessNotification)}
191
{if $allowRegReader || $allowRegReader === null || $allowRegAuthor || $allowRegAuthor === null || $allowRegReviewer || $allowRegReviewer === null || ($currentJournal && $currentJournal->getSetting('publishingMode') == $smarty.const.PUBLISHING_MODE_SUBSCRIPTION && $enableOpenAccessNotification)}
192
	<tr valign="top">
192
	<tr valign="top">
193
		<td class="label">{fieldLabel suppressId="true" name="registerAs" key="user.register.registerAs"}</td>
193
		<td class="label">{fieldLabel suppressId="true" name="registerAs" key="user.register.registerAs"}</td>
194
		<td class="value">{if $allowRegReader || $allowRegReader === null}<input type="checkbox" name="registerAsReader" id="registerAsReader" value="1"{if $registerAsReader} checked="checked"{/if} /> <label for="registerAsReader">{translate key="user.role.reader"}</label>: {translate key="user.register.readerDescription"}<br />{/if}
194
		<td class="value">{if $allowRegReader || $allowRegReader === null}<input type="checkbox" name="registerAsReader" id="registerAsReader" value="1"{if $registerAsReader} checked="checked"{/if} /> <label for="registerAsReader">{translate key="user.role.reader"}</label>: {translate key="user.register.readerDescription"}<br />{/if}
195
		{if $enableSubscriptions && $enableOpenAccessNotification}<input type="checkbox" name="openAccessNotification" id="openAccessNotification" value="1"{if $openAccessNotification} checked="checked"{/if} /> <label for="openAccessNotification">{translate key="user.role.reader"}</label>: {translate key="user.register.openAccessNotificationDescription"}<br />{/if}
195
		{if $currentJournal && $currentJournal->getSetting('publishingMode') == $smarty.const.PUBLISHING_MODE_SUBSCRIPTION && $enableOpenAccessNotification}<input type="checkbox" name="openAccessNotification" id="openAccessNotification" value="1"{if $openAccessNotification} checked="checked"{/if} /> <label for="openAccessNotification">{translate key="user.role.reader"}</label>: {translate key="user.register.openAccessNotificationDescription"}<br />{/if}
196
		{if $allowRegAuthor || $allowRegAuthor === null}<input type="checkbox" name="registerAsAuthor" id="registerAsAuthor" value="1"{if $registerAsAuthor} checked="checked"{/if} /> <label for="registerAsAuthor">{translate key="user.role.author"}</label>: {translate key="user.register.authorDescription"}<br />{/if}
196
		{if $allowRegAuthor || $allowRegAuthor === null}<input type="checkbox" name="registerAsAuthor" id="registerAsAuthor" value="1"{if $registerAsAuthor} checked="checked"{/if} /> <label for="registerAsAuthor">{translate key="user.role.author"}</label>: {translate key="user.register.authorDescription"}<br />{/if}
197
		{if $allowRegReviewer || $allowRegReviewer === null}<input type="checkbox" name="registerAsReviewer" id="registerAsReviewer" value="1"{if $registerAsReviewer} checked="checked"{/if} /> <label for="registerAsReviewer">{translate key="user.role.reviewer"}</label>: {if $existingUser}{translate key="user.register.reviewerDescriptionNoInterests"}{else}{translate key="user.register.reviewerDescription"} <input type="text" name="interests[{$formLocale|escape}]" value="{$interests[$formLocale]|escape}" size="20" maxlength="255" class="textField" />{/if}{/if}</td>
197
		{if $allowRegReviewer || $allowRegReviewer === null}<input type="checkbox" name="registerAsReviewer" id="registerAsReviewer" value="1"{if $registerAsReviewer} checked="checked"{/if} /> <label for="registerAsReviewer">{translate key="user.role.reviewer"}</label>: {if $existingUser}{translate key="user.register.reviewerDescriptionNoInterests"}{else}{translate key="user.register.reviewerDescription"} <input type="text" name="interests[{$formLocale|escape}]" value="{$interests[$formLocale]|escape}" size="20" maxlength="255" class="textField" />{/if}{/if}</td>
198
	</tr>
198
	</tr>

Return to bug 1709