pkp#10444 Add modalStyle to template files that use dialog component

blesildaramirez · Oct 14, 2024 · e767bde · e767bde
1 parent e6c73ad
commit e767bde
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/templates/authorDashboard/submissionEmails.tpl b/templates/authorDashboard/submissionEmails.tpl
@@ -26,7 +26,7 @@
 								{* Parameters for parent LinkActionHandler *}
 								actionRequest: '$.pkp.classes.linkAction.ModalRequest',
 								actionRequestOptions: {ldelim}
-									titleIcon: 'modal_information',
+									modalStyle: 'modal_information',
 									title: {translate|json_encode key="notification.notifications"},
 									modalHandler: '$.pkp.controllers.modal.AjaxModalHandler',
 									url: {url|json_encode router=PKP\core\PKPApplication::ROUTE_PAGE page="authorDashboard" op="readSubmissionEmail" submissionId=$submission->getId() stageId=$stageId reviewRoundId=$reviewRoundId submissionEmailId=$submissionEmail->id escape=false}

diff --git a/templates/controllers/informationCenter/note.tpl b/templates/controllers/informationCenter/note.tpl
@@ -37,7 +37,7 @@
 					<form class="pkp_form" id="{$formId}" action="{url op="deleteNote" noteId=$noteId params=$linkParams}">
 						{csrf}
 						{assign var=deleteNoteButtonId value="deleteNote-$noteId"}
-						{include file="linkAction/buttonConfirmationLinkAction.tpl" titleIcon="modal_delete" buttonSelector="#$deleteNoteButtonId" dialogText="informationCenter.deleteConfirm"}
+						{include file="linkAction/buttonConfirmationLinkAction.tpl" modalStyle="negative" buttonSelector="#$deleteNoteButtonId" dialogText="informationCenter.deleteConfirm"}
 						<button type="submit" id="{$deleteNoteButtonId}" class="pkp_button pkp_button_offset">{translate key='common.delete'}</button>
 					</form>
 				{/if}

diff --git a/templates/form/formButtons.tpl b/templates/form/formButtons.tpl
@@ -44,7 +44,8 @@
 	{if $FBV_confirmSubmit}
 		{include file="linkAction/buttonConfirmationLinkAction.tpl"
 				buttonSelector="#"|concat:$submitButtonId
-				dialogText="$FBV_confirmSubmit"}
+				dialogText="$FBV_confirmSubmit"
+				modalStyle="$FBV_modalStyle"}
 	{/if}
 
 	{fbvElement type="submit" class="{if $FBV_saveText}pkp_button_primary{/if} submitFormButton" name="submitFormButton" id=$submitButtonId label=$FBV_submitText translate=$FBV_translate disabled=$FBV_submitDisabled}

diff --git a/templates/linkAction/buttonConfirmationLinkAction.tpl b/templates/linkAction/buttonConfirmationLinkAction.tpl
@@ -13,7 +13,7 @@
  *   link action to.
  *  dialogText: A translation key for the message to be displayed in the dialog.
  *}
-{if !$titleIcon}{assign var="titleIcon" value="modal_confirm"}{/if}
+{if !$modalStyle}{assign var="modalStyle" value="default"}{/if}
 <script>
 	$(function() {ldelim}
 		$('{$buttonSelector|escape:javascript}').pkpHandler(
@@ -27,7 +27,7 @@
 					cancelButton: {translate|json_encode key="common.cancel"},
 					dialogText: {translate|json_encode key=$dialogText},
 					$button: $({$buttonSelector|json_encode}),
-					titleIcon: {$titleIcon|json_encode},
+					modalStyle: {$modalStyle|json_encode},
 					width: 'auto'
 				{rdelim},
 		{rdelim});

diff --git a/templates/reviewer/review/step3.tpl b/templates/reviewer/review/step3.tpl
@@ -64,7 +64,7 @@
 	{$additionalFormFields}
 
 	{capture assign="cancelUrl"}{url page="reviewer" op="submission" path=$submission->getId() step=2 escape=false}{/capture}
-	{fbvFormButtons submitText="reviewer.submission.submitReview" confirmSubmit="reviewer.confirmSubmit" saveText="reviewer.submission.saveReviewForLater" cancelText="navigation.goBack" cancelUrl=$cancelUrl cancelUrlTarget="_self" submitDisabled=$reviewIsClosed}
+	{fbvFormButtons submitText="reviewer.submission.submitReview" confirmSubmit="reviewer.confirmSubmit" modalStyle="primary" saveText="reviewer.submission.saveReviewForLater" cancelText="navigation.goBack" cancelUrl=$cancelUrl cancelUrlTarget="_self" submitDisabled=$reviewIsClosed}
 {/fbvFormArea}
 
 <p><span class="formRequired">{translate key="common.requiredField"}</span></p>

diff --git a/templates/user/identityForm.tpl b/templates/user/identityForm.tpl
@@ -59,7 +59,7 @@
 
 		{include file="form/orcidProfile.tpl"}
 		{if $orcid && $orcidAuthenticated}
-			{include file="linkAction/buttonConfirmationLinkAction.tpl" titleIcon="modal_delete" buttonSelector="#deleteOrcidButton" dialogText="orcid.field.deleteOrcidModal.message"}
+			{include file="linkAction/buttonConfirmationLinkAction.tpl" modalStyle="negative" buttonSelector="#deleteOrcidButton" dialogText="orcid.field.deleteOrcidModal.message"}
 			<button id="deleteOrcidButton" type="button"  class="pkp_button pkp_button_offset" style="margin-left: 1rem">{translate key='common.delete'}</button>
 		{/if}
 		{/fbvFormSection}