From 85f17b4ac4af437e3e4c5188e870b665ac9f1895 Mon Sep 17 00:00:00 2001
From: Nate Wright <natew@notthisway.com>
Date: Wed, 14 Dec 2022 15:17:27 +0000
Subject: [PATCH 1/2] pkp/pkp-lib#8051 Improve default author guidelines and
 submission checklist

---
 schemas/context.json                     |  1 +
 templates/frontend/pages/submissions.tpl | 23 +++++++++++------------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/schemas/context.json b/schemas/context.json
index 7addb8978f0..ad63ef19037 100644
--- a/schemas/context.json
+++ b/schemas/context.json
@@ -57,6 +57,7 @@
 		"authorGuidelines": {
 			"type": "string",
 			"multilingual": true,
+			"defaultLocaleKey": "default.contextSettings.authorGuidelines",
 			"validation": [
 				"nullable"
 			]
diff --git a/templates/frontend/pages/submissions.tpl b/templates/frontend/pages/submissions.tpl
index 319345a3b91..45af3fbfe59 100644
--- a/templates/frontend/pages/submissions.tpl
+++ b/templates/frontend/pages/submissions.tpl
@@ -34,27 +34,26 @@
 		{/if}
 	</div>
 
-	{if $submissionChecklist}
-		<div class="submission_checklist">
-			<h2>
-				{translate key="about.submissionPreparationChecklist"}
-				{include file="frontend/components/editLink.tpl" page="management" op="settings" path="workflow" anchor="submission/submissionChecklist" sectionTitleKey="about.submissionPreparationChecklist"}
-			</h2>
-			{translate key="about.submissionPreparationChecklist.description"}
-			{$submissionChecklist}
-		</div>
-	{/if}
-
 	{if $currentContext->getLocalizedData('authorGuidelines')}
 	<div class="author_guidelines" id="authorGuidelines">
 		<h2>
 			{translate key="about.authorGuidelines"}
-			{include file="frontend/components/editLink.tpl" page="management" op="settings" path="workflow" anchor="submission/authorGuidelines" sectionTitleKey="about.authorGuidelines"}
+			{include file="frontend/components/editLink.tpl" page="management" op="settings" path="workflow" anchor="submission/instructions" sectionTitleKey="about.authorGuidelines"}
 		</h2>
 		{$currentContext->getLocalizedData('authorGuidelines')}
 	</div>
 	{/if}
 
+	{if $submissionChecklist}
+		<div class="submission_checklist">
+			<h2>
+				{translate key="about.submissionPreparationChecklist"}
+				{include file="frontend/components/editLink.tpl" page="management" op="settings" path="workflow" anchor="submission/instructions" sectionTitleKey="about.submissionPreparationChecklist"}
+			</h2>
+			{$submissionChecklist}
+		</div>
+	{/if}
+
 	{foreach from=$sections item="section"}
 		{if $section->getLocalizedPolicy()}
 			<div class="section_policy">

From 4cdcee0b939b42a181585c6f8de9d92ae7929d0a Mon Sep 17 00:00:00 2001
From: Nate Wright <natew@notthisway.com>
Date: Thu, 15 Dec 2022 11:32:35 +0000
Subject: [PATCH 2/2] pkp/pkp-lib#8051 Fix race condition in tests when
 assigning participant

---
 cypress/support/commands.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 255824ee585..d8623e03e2c 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -492,6 +492,7 @@ Cypress.Commands.add('assignParticipant', (role, name, recommendOnly) => {
 	cy.get('select[name=filterUserGroupId').select(role);
 	cy.get('input[id^="namegrid-users-userselect-userselectgrid-"]').type(names[1], {delay: 0});
 	cy.get('form[id="searchUserFilter-grid-users-userselect-userselectgrid"]').find('button[id^="submitFormButton-"]').click();
+	cy.waitJQuery();
 	cy.get('td:contains("' + name + '")').parents('tr').find('input[name="userId"]').check();
 	if (recommendOnly) cy.get('input[name="recommendOnly"]').click();
 	cy.flushNotifications();