diff --git a/classes/controllers/grid/plugins/PluginGridHandler.php b/classes/controllers/grid/plugins/PluginGridHandler.php index c60f97fd4ee..22dd730caf6 100644 --- a/classes/controllers/grid/plugins/PluginGridHandler.php +++ b/classes/controllers/grid/plugins/PluginGridHandler.php @@ -129,7 +129,7 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'uploadPlugin'), __('manager.plugins.upload'), - 'modal_add_file' + 'side-modal' ), __('manager.plugins.upload'), 'add' diff --git a/classes/controllers/grid/users/reviewer/PKPReviewerGridHandler.php b/classes/controllers/grid/users/reviewer/PKPReviewerGridHandler.php index d9c0da20ed4..e4756a18aae 100644 --- a/classes/controllers/grid/users/reviewer/PKPReviewerGridHandler.php +++ b/classes/controllers/grid/users/reviewer/PKPReviewerGridHandler.php @@ -238,7 +238,7 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'showReviewerForm', null, $actionArgs), __('editor.submission.addReviewer'), - 'modal_add_user' + 'side-modal' ), __('editor.submission.addReviewer'), 'add_user' diff --git a/classes/form/FormBuilderVocabulary.php b/classes/form/FormBuilderVocabulary.php index e13b7420976..aa936f9a0de 100644 --- a/classes/form/FormBuilderVocabulary.php +++ b/classes/form/FormBuilderVocabulary.php @@ -41,6 +41,7 @@ * hideCancel (optional): Whether the submit button should be disabled * cancelAction (optional): A LinkAction object to execute when cancel is clicked * cancelUrl (optional): URL to redirect to when cancel is clicked + * modalStyle (optional): The modal state/style that should be used. (default is 'default') * Form elements are created with {fbvElement type="type"} plus any additional parameters. * Each specific element type may have other additional attributes (see their method comments) * Parameters: @@ -239,6 +240,7 @@ public function smartyFBVFormButtons($params, $smarty) 'FBV_cancelUrlTarget' => $params['cancelUrlTarget'] ?? '', 'FBV_translate' => $params['translate'] ?? true, 'FBV_saveText' => $params['saveText'] ?? null, + 'FBV_modalStyle' => $params['modalStyle'] ?? null, ]); return $smarty->fetch('form/formButtons.tpl'); } diff --git a/classes/linkAction/request/AjaxModal.php b/classes/linkAction/request/AjaxModal.php index 1b5779c8671..fc403890189 100644 --- a/classes/linkAction/request/AjaxModal.php +++ b/classes/linkAction/request/AjaxModal.php @@ -25,7 +25,7 @@ class AjaxModal extends Modal * * @param string $url The URL of the AJAX resource to load into the modal. * @param string $title (optional) The localized modal title. - * @param string $titleIcon (optional) The icon to be used in the modal title bar. + * @param string $modalStyle (optional) The modal state/style to be used. * @param bool $canClose (optional) Whether the modal will have a close button. * @param string $closeOnFormSuccessId (optional) Close the modal when the * form with this id fires a formSuccess event. @@ -35,12 +35,12 @@ class AjaxModal extends Modal public function __construct( $url, $title = null, - $titleIcon = null, + $modalStyle = 'default', $canClose = true, $closeOnFormSuccessId = null, $closeCleanVueInstances = [] ) { - parent::__construct($title, $titleIcon, $canClose, $closeOnFormSuccessId, $closeCleanVueInstances); + parent::__construct($title, $modalStyle, $canClose, $closeOnFormSuccessId, $closeCleanVueInstances); $this->_url = $url; } diff --git a/classes/linkAction/request/ConfirmationModal.php b/classes/linkAction/request/ConfirmationModal.php index 056335431a6..e5da007b65a 100644 --- a/classes/linkAction/request/ConfirmationModal.php +++ b/classes/linkAction/request/ConfirmationModal.php @@ -41,8 +41,7 @@ class ConfirmationModal extends Modal * @param string $dialogText The localized text to appear * in the dialog modal. * @param string $title (optional) The localized modal title. - * @param string $titleIcon (optional) The icon to be used - * in the modal title bar. + * @param string $modalStyle (optional) The modal state/style to be used. * @param string $okButton (optional) The localized text to * appear on the confirmation button. * @param string $cancelButton (optional) The localized text to @@ -50,10 +49,10 @@ class ConfirmationModal extends Modal * @param bool $canClose (optional) Whether the modal will * have a close button. */ - public function __construct($dialogText, $title = null, $titleIcon = 'modal_confirm', $okButton = null, $cancelButton = null, $canClose = true) + public function __construct($dialogText, $title = null, $modalStyle = 'default', $okButton = null, $cancelButton = null, $canClose = true) { $title = (is_null($title) ? __('common.confirm') : $title); - parent::__construct($title, $titleIcon, $canClose); + parent::__construct($title, $modalStyle, $canClose); $this->_okButton = (is_null($okButton) ? __('common.ok') : $okButton); $this->_cancelButton = (is_null($cancelButton) ? __('common.cancel') : $cancelButton); diff --git a/classes/linkAction/request/JsEventConfirmationModal.php b/classes/linkAction/request/JsEventConfirmationModal.php index 6581268d0f4..2776be30d2e 100644 --- a/classes/linkAction/request/JsEventConfirmationModal.php +++ b/classes/linkAction/request/JsEventConfirmationModal.php @@ -33,8 +33,7 @@ class JsEventConfirmationModal extends ConfirmationModal * @param string $event the name of the JS event. * @param array $extraArguments (optional) extra information to be passed as JSON data with the event. * @param string $title (optional) The localized modal title. - * @param string $titleIcon (optional) The icon to be used - * in the modal title bar. + * @param string $modalStyle (optional) The modal state/style to be used. * @param string $okButton (optional) The localized text to * appear on the confirmation button. * @param string $cancelButton (optional) The localized text to @@ -42,9 +41,9 @@ class JsEventConfirmationModal extends ConfirmationModal * @param bool $canClose (optional) Whether the modal will * have a close button. */ - public function __construct($dialogText, $event = 'confirmationModalConfirmed', $extraArguments = null, $title = null, $titleIcon = null, $okButton = null, $cancelButton = null, $canClose = true) + public function __construct($dialogText, $event = 'confirmationModalConfirmed', $extraArguments = null, $title = null, $modalStyle = null, $okButton = null, $cancelButton = null, $canClose = true) { - parent::__construct($dialogText, $title, $titleIcon, $okButton, $cancelButton, $canClose); + parent::__construct($dialogText, $title, $modalStyle, $okButton, $cancelButton, $canClose); $this->_event = $event; $this->_extraArguments = $extraArguments; diff --git a/classes/linkAction/request/Modal.php b/classes/linkAction/request/Modal.php index 7c1e98c7040..51566cfef56 100644 --- a/classes/linkAction/request/Modal.php +++ b/classes/linkAction/request/Modal.php @@ -25,7 +25,7 @@ class Modal extends LinkActionRequest public $_title; /** @var string The icon to be displayed in the title bar. */ - public $_titleIcon; + public $_modalStyle; /** @var bool Whether the modal has a close icon in the title bar. */ public $_canClose; @@ -43,7 +43,7 @@ class Modal extends LinkActionRequest * Constructor * * @param string $title (optional) The localized modal title. - * @param string $titleIcon (optional) The icon to be used in the modal title bar. + * @param string $modalStyle (optional) The modal state/style to be used. * @param bool $canClose (optional) Whether the modal will have a close button. * @param string $closeOnFormSuccessId (optional) Close the modal when the * form with this id fires a formSuccess event. @@ -52,14 +52,14 @@ class Modal extends LinkActionRequest */ public function __construct( $title = null, - $titleIcon = null, + $modalStyle = null, $canClose = true, $closeOnFormSuccessId = null, $closeCleanVueInstances = [] ) { parent::__construct(); $this->_title = $title; - $this->_titleIcon = $titleIcon; + $this->_modalStyle = $modalStyle; $this->_canClose = $canClose; $this->_closeOnFormSuccessId = $closeOnFormSuccessId; $this->_closeCleanVueInstances = $closeCleanVueInstances; @@ -82,13 +82,13 @@ public function getTitle() } /** - * Get the title bar icon. + * Get the modal style. * * @return string */ - public function getTitleIcon() + public function getModalStyle() { - return $this->_titleIcon; + return $this->_modalStyle; } /** @@ -128,7 +128,7 @@ public function getLocalizedOptions() { return [ 'title' => $this->getTitle(), - 'titleIcon' => $this->getTitleIcon(), + 'modalStyle' => $this->getModalStyle(), 'canClose' => ($this->getCanClose() ? '1' : '0'), 'closeOnFormSuccessId' => $this->_closeOnFormSuccessId, 'closeCleanVueInstances' => $this->_closeCleanVueInstances, diff --git a/classes/linkAction/request/RedirectConfirmationModal.php b/classes/linkAction/request/RedirectConfirmationModal.php index 601478c8aec..4fff6e71214 100644 --- a/classes/linkAction/request/RedirectConfirmationModal.php +++ b/classes/linkAction/request/RedirectConfirmationModal.php @@ -28,8 +28,7 @@ class RedirectConfirmationModal extends ConfirmationModal * @param string $title (optional) The localized modal title. * @param string $remoteUrl (optional) A URL to be * redirected to when the confirmation button is clicked. - * @param string $titleIcon (optional) The icon to be used - * in the modal title bar. + * @param string $modalStyle (optional) The modal state/style to be used. * @param string $okButton (optional) The localized text to * appear on the confirmation button. * @param string $cancelButton (optional) The localized text to @@ -37,9 +36,9 @@ class RedirectConfirmationModal extends ConfirmationModal * @param bool $canClose (optional) Whether the modal will * have a close button. */ - public function __construct($dialogText, $title = null, $remoteUrl = null, $titleIcon = null, $okButton = null, $cancelButton = null, $canClose = true) + public function __construct($dialogText, $title = null, $remoteUrl = null, $modalStyle = null, $okButton = null, $cancelButton = null, $canClose = true) { - parent::__construct($dialogText, $title, $titleIcon, $okButton, $cancelButton, $canClose); + parent::__construct($dialogText, $title, $modalStyle, $okButton, $cancelButton, $canClose); $this->_remoteUrl = $remoteUrl; } diff --git a/classes/linkAction/request/RemoteActionConfirmationModal.php b/classes/linkAction/request/RemoteActionConfirmationModal.php index 2504cc42fa4..17038dc01a6 100644 --- a/classes/linkAction/request/RemoteActionConfirmationModal.php +++ b/classes/linkAction/request/RemoteActionConfirmationModal.php @@ -32,7 +32,7 @@ class RemoteActionConfirmationModal extends ConfirmationModal * @param string $title (optional) The localized modal title. * @param string $remoteAction (optional) A URL to be * called when the confirmation button is clicked. - * @param string $titleIcon (optional) The icon to be used + * @param string $modalStyle (optional) The modal state/style to be used. * in the modal title bar. * @param string $okButton (optional) The localized text to * appear on the confirmation button. @@ -41,9 +41,9 @@ class RemoteActionConfirmationModal extends ConfirmationModal * @param bool $canClose (optional) Whether the modal will * have a close button. */ - public function __construct($session, $dialogText, $title = null, $remoteAction = null, $titleIcon = null, $okButton = null, $cancelButton = null, $canClose = true) + public function __construct($session, $dialogText, $title = null, $remoteAction = null, $modalStyle = null, $okButton = null, $cancelButton = null, $canClose = true) { - parent::__construct($dialogText, $title, $titleIcon, $okButton, $cancelButton, $canClose); + parent::__construct($dialogText, $title, $modalStyle, $okButton, $cancelButton, $canClose); $this->_remoteAction = $remoteAction; $this->_csrfToken = $session->token(); diff --git a/classes/plugins/PKPPubIdPlugin.php b/classes/plugins/PKPPubIdPlugin.php index e1c3003c125..6d97a0e8c0b 100644 --- a/classes/plugins/PKPPubIdPlugin.php +++ b/classes/plugins/PKPPubIdPlugin.php @@ -77,7 +77,8 @@ public function getActions($request, $actionArgs) 'settings', new AjaxModal( $router->url($request, null, null, 'manage', null, $actionArgs), - $this->getDisplayName() + $this->getDisplayName(), + 'side-modal' ), __('manager.plugins.settings'), null diff --git a/classes/submission/reviewer/form/PKPReviewerReviewStep1Form.php b/classes/submission/reviewer/form/PKPReviewerReviewStep1Form.php index a1d071e1ce9..58a43c751df 100644 --- a/classes/submission/reviewer/form/PKPReviewerReviewStep1Form.php +++ b/classes/submission/reviewer/form/PKPReviewerReviewStep1Form.php @@ -90,7 +90,7 @@ public function fetch($request, $template = null, $display = false) new ConfirmationModal( __('reviewer.aboutDueDates.text'), __('reviewer.aboutDueDates'), - 'modal_information', + 'primary', null, '', false @@ -104,7 +104,8 @@ public function fetch($request, $template = null, $display = false) 'declineReview', new AjaxModal( $request->url(null, null, 'showDeclineReview', [$reviewAssignment->getSubmissionId()]), - __('reviewer.submission.declineReview') + __('reviewer.submission.declineReview'), + 'side-modal' ) ); $templateMgr->assign('declineReviewAction', $declineReviewLinkAction); diff --git a/controllers/api/file/linkAction/BaseAddFileLinkAction.php b/controllers/api/file/linkAction/BaseAddFileLinkAction.php index ef373b995cc..e4f2479acf4 100644 --- a/controllers/api/file/linkAction/BaseAddFileLinkAction.php +++ b/controllers/api/file/linkAction/BaseAddFileLinkAction.php @@ -71,7 +71,7 @@ public function __construct( $actionArgs ), $wizardTitle, - 'modal_add_file' + 'side-modal' ); // Configure the link action. diff --git a/controllers/api/file/linkAction/DeleteFileLinkAction.php b/controllers/api/file/linkAction/DeleteFileLinkAction.php index 082e0b421ea..c8e149d9828 100644 --- a/controllers/api/file/linkAction/DeleteFileLinkAction.php +++ b/controllers/api/file/linkAction/DeleteFileLinkAction.php @@ -47,7 +47,7 @@ public function __construct($request, $submissionFile, $stageId, $localeKey = 'g null, $this->getActionArgs($submissionFile, $stageId) ), - 'modal_delete' + 'negative' ), __($localeKey), 'delete' diff --git a/controllers/api/file/linkAction/EditFileLinkAction.php b/controllers/api/file/linkAction/EditFileLinkAction.php index b85103abd3e..641a093b44d 100644 --- a/controllers/api/file/linkAction/EditFileLinkAction.php +++ b/controllers/api/file/linkAction/EditFileLinkAction.php @@ -45,7 +45,7 @@ public function __construct($request, $submissionFile, $stageId) $this->getActionArgs($submissionFile, $stageId) ), __('grid.action.editFile'), - 'modal_information' + 'side-modal' ); // Configure the file link action. diff --git a/controllers/api/task/SendReminderLinkAction.php b/controllers/api/task/SendReminderLinkAction.php index e1048b28739..fe215643f2e 100644 --- a/controllers/api/task/SendReminderLinkAction.php +++ b/controllers/api/task/SendReminderLinkAction.php @@ -36,7 +36,7 @@ public function __construct($request, $modalTitle, $actionArgs) $ajaxModal = new AjaxModal( $router->url($request, null, null, 'editReminder', null, $actionArgs), __($modalTitle), - 'review_reminder' + 'side-modal' ); // Configure the link action. diff --git a/controllers/api/task/SendThankYouLinkAction.php b/controllers/api/task/SendThankYouLinkAction.php index ccf8a4c1da8..ac272bb971e 100644 --- a/controllers/api/task/SendThankYouLinkAction.php +++ b/controllers/api/task/SendThankYouLinkAction.php @@ -36,7 +36,7 @@ public function __construct($request, $modalTitle, $actionArgs) $ajaxModal = new AjaxModal( $router->url($request, null, null, 'editThankReviewer', null, $actionArgs), __($modalTitle), - 'modal_email' + 'side-modal' ); // Configure the link action. diff --git a/controllers/confirmationModal/linkAction/ViewCompetingInterestGuidelinesLinkAction.php b/controllers/confirmationModal/linkAction/ViewCompetingInterestGuidelinesLinkAction.php index cb0e69f0980..c6575309a0e 100644 --- a/controllers/confirmationModal/linkAction/ViewCompetingInterestGuidelinesLinkAction.php +++ b/controllers/confirmationModal/linkAction/ViewCompetingInterestGuidelinesLinkAction.php @@ -34,7 +34,7 @@ public function __construct($request) $viewCompetingInterestsModal = new ConfirmationModal( $context->getLocalizedData('competingInterests'), __('reviewer.submission.competingInterests'), - null, + 'primary', null, false, false diff --git a/controllers/confirmationModal/linkAction/ViewReviewGuidelinesLinkAction.php b/controllers/confirmationModal/linkAction/ViewReviewGuidelinesLinkAction.php index 8f074774619..71f591f6363 100644 --- a/controllers/confirmationModal/linkAction/ViewReviewGuidelinesLinkAction.php +++ b/controllers/confirmationModal/linkAction/ViewReviewGuidelinesLinkAction.php @@ -46,7 +46,7 @@ public function __construct($request, $stageId) $viewGuidelinesModal = new ConfirmationModal( $this->getGuidelines(), __('reviewer.submission.guidelines'), - null, + 'primary', null, false ); diff --git a/controllers/grid/admin/context/ContextGridHandler.php b/controllers/grid/admin/context/ContextGridHandler.php index ea887473ca7..1807450a7e8 100644 --- a/controllers/grid/admin/context/ContextGridHandler.php +++ b/controllers/grid/admin/context/ContextGridHandler.php @@ -86,7 +86,7 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'createContext', null, null), __('admin.contexts.create'), - 'modal_add_item', + 'side-modal', true, 'context', ['editContext'] diff --git a/controllers/grid/admin/context/ContextGridRow.php b/controllers/grid/admin/context/ContextGridRow.php index 4716602ab8e..b85dfbcc056 100644 --- a/controllers/grid/admin/context/ContextGridRow.php +++ b/controllers/grid/admin/context/ContextGridRow.php @@ -51,7 +51,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editContext', null, ['rowId' => $rowId]), __('grid.action.edit'), - 'modal_edit', + 'side-modal', true, 'context', ['editContext'] @@ -67,7 +67,8 @@ public function initialize($request, $template = null) $request->getSession(), __('admin.contexts.confirmDelete', ['contextName' => $element->getLocalizedName()]), null, - $router->url($request, null, null, 'deleteContext', null, ['rowId' => $rowId]) + $router->url($request, null, null, 'deleteContext', null, ['rowId' => $rowId]), + 'negative' ), __('grid.action.remove'), 'delete' @@ -88,7 +89,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, $element->getPath(), null, 'users', null), __('manager.users'), - 'modal_edit', + 'side-modal', true ), __('manager.users'), diff --git a/controllers/grid/admin/languages/AdminLanguageGridHandler.php b/controllers/grid/admin/languages/AdminLanguageGridHandler.php index 02a5390f53f..56d0758bd66 100644 --- a/controllers/grid/admin/languages/AdminLanguageGridHandler.php +++ b/controllers/grid/admin/languages/AdminLanguageGridHandler.php @@ -94,7 +94,7 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'installLocale', null, null), __('admin.languages.installLocale'), - null, + 'side-modal', true ), __('admin.languages.installLocale'), diff --git a/controllers/grid/announcements/AnnouncementTypeGridCellProvider.php b/controllers/grid/announcements/AnnouncementTypeGridCellProvider.php index f33ca7d771e..a016b46b3bc 100644 --- a/controllers/grid/announcements/AnnouncementTypeGridCellProvider.php +++ b/controllers/grid/announcements/AnnouncementTypeGridCellProvider.php @@ -40,7 +40,7 @@ public function getCellActions($request, $row, $column, $position = GridHandler: new AjaxModal( $router->url($request, null, null, 'editAnnouncementType', null, $actionArgs), __('grid.action.edit'), - null, + 'side-modal', true ), htmlspecialchars($announcementType->getLocalizedTypeName()) diff --git a/controllers/grid/announcements/AnnouncementTypeGridHandler.php b/controllers/grid/announcements/AnnouncementTypeGridHandler.php index 28c15e7ac69..1436b6282ce 100644 --- a/controllers/grid/announcements/AnnouncementTypeGridHandler.php +++ b/controllers/grid/announcements/AnnouncementTypeGridHandler.php @@ -115,7 +115,7 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addAnnouncementType', null, null), __('grid.action.addAnnouncementType'), - 'modal_add_item', + 'side-modal', true ), __('grid.action.addAnnouncementType'), diff --git a/controllers/grid/announcements/AnnouncementTypeGridRow.php b/controllers/grid/announcements/AnnouncementTypeGridRow.php index 89c37744b1e..a66639a9a36 100644 --- a/controllers/grid/announcements/AnnouncementTypeGridRow.php +++ b/controllers/grid/announcements/AnnouncementTypeGridRow.php @@ -53,7 +53,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editAnnouncementType', null, $actionArgs), __('grid.action.edit'), - 'modal_edit', + 'side-modal', true ), __('grid.action.edit'), @@ -68,7 +68,7 @@ public function initialize($request, $template = null) __('common.confirmDelete'), __('common.remove'), $router->url($request, null, null, 'deleteAnnouncementType', null, $actionArgs), - 'modal_delete' + 'negative' ), __('grid.action.remove'), 'delete' diff --git a/controllers/grid/eventLog/linkAction/EmailLinkAction.php b/controllers/grid/eventLog/linkAction/EmailLinkAction.php index bd401985e08..fc9cda8907e 100644 --- a/controllers/grid/eventLog/linkAction/EmailLinkAction.php +++ b/controllers/grid/eventLog/linkAction/EmailLinkAction.php @@ -37,7 +37,7 @@ public function __construct($request, $modalTitle, $actionArgs) $ajaxModal = new AjaxModal( $router->url($request, null, null, 'viewEmail', null, $actionArgs), $modalTitle, - 'modal_email' + 'side-modal' ); // Configure the link action. diff --git a/controllers/grid/files/LibraryFileGridHandler.php b/controllers/grid/files/LibraryFileGridHandler.php index 801b32778bc..ceb8a81fa43 100644 --- a/controllers/grid/files/LibraryFileGridHandler.php +++ b/controllers/grid/files/LibraryFileGridHandler.php @@ -120,7 +120,7 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addFile', null, $this->getActionArgs()), __('grid.action.addFile'), - 'modal_add_file' + 'side-modal' ), __('grid.action.addFile'), 'add' diff --git a/controllers/grid/files/LibraryFileGridRow.php b/controllers/grid/files/LibraryFileGridRow.php index 19b7b9354ae..a2eae36b4ec 100644 --- a/controllers/grid/files/LibraryFileGridRow.php +++ b/controllers/grid/files/LibraryFileGridRow.php @@ -97,7 +97,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editFile', null, $actionArgs), __('grid.action.edit'), - 'modal_edit' + 'side-modal' ), __('grid.action.edit'), 'edit' @@ -111,7 +111,7 @@ public function initialize($request, $template = null) __('common.confirmDelete'), __('common.delete'), $router->url($request, null, null, 'deleteFile', null, $actionArgs), - 'modal_delete' + 'negative' ), __('grid.action.delete'), 'delete' diff --git a/controllers/grid/files/fileList/linkAction/SelectFilesLinkAction.php b/controllers/grid/files/fileList/linkAction/SelectFilesLinkAction.php index c8cdab34d72..5788b4cc34f 100644 --- a/controllers/grid/files/fileList/linkAction/SelectFilesLinkAction.php +++ b/controllers/grid/files/fileList/linkAction/SelectFilesLinkAction.php @@ -40,7 +40,7 @@ public function __construct($request, $actionArgs, $actionLabel, $modalTitle = n $ajaxModal = new AjaxModal( $router->url($request, null, null, 'selectFiles', null, $actionArgs), $modalTitle, - 'modal_add_file' + 'side-modal' ); // Configure the link action. diff --git a/controllers/grid/files/submissionDocuments/SubmissionDocumentsFilesGridHandler.php b/controllers/grid/files/submissionDocuments/SubmissionDocumentsFilesGridHandler.php index f1a50aa9948..77d4ab5c626 100644 --- a/controllers/grid/files/submissionDocuments/SubmissionDocumentsFilesGridHandler.php +++ b/controllers/grid/files/submissionDocuments/SubmissionDocumentsFilesGridHandler.php @@ -76,7 +76,7 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addFile', null, $this->getActionArgs()), __('grid.action.addFile'), - 'modal_add_file' + 'side-modal' ), __('grid.action.addFile'), 'add' @@ -90,7 +90,7 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'viewLibrary', null, $this->getActionArgs()), __('grid.action.viewLibrary'), - 'modal_information' + 'side-modal' ), __('grid.action.viewLibrary'), 'more_info' diff --git a/controllers/grid/languages/LanguageGridCellProvider.php b/controllers/grid/languages/LanguageGridCellProvider.php index 4ddcc1c3f07..165360c231c 100644 --- a/controllers/grid/languages/LanguageGridCellProvider.php +++ b/controllers/grid/languages/LanguageGridCellProvider.php @@ -96,7 +96,8 @@ public function getCellActions($request, $row, $column, $position = GridHandler: $request->getSession(), __('admin.languages.confirmDisable'), __('common.disable'), - $router->url($request, null, null, 'disableLocale', null, $actionArgs) + $router->url($request, null, null, 'disableLocale', null, $actionArgs), + 'negative' ); } else { $action = 'enable-' . $row->getId(); @@ -111,7 +112,8 @@ public function getCellActions($request, $row, $column, $position = GridHandler: $request->getSession(), __('admin.languages.confirmSitePrimaryLocaleChange'), __('locale.primary'), - $router->url($request, null, null, 'setPrimaryLocale', null, $actionArgs) + $router->url($request, null, null, 'setPrimaryLocale', null, $actionArgs), + 'primary' ); } break; diff --git a/controllers/grid/languages/LanguageGridRow.php b/controllers/grid/languages/LanguageGridRow.php index 6fd178d0d9c..95787874781 100644 --- a/controllers/grid/languages/LanguageGridRow.php +++ b/controllers/grid/languages/LanguageGridRow.php @@ -56,7 +56,8 @@ public function initialize($request, $template = null) $request->getSession(), __('admin.languages.confirmUninstall'), __('grid.action.remove'), - $router->url($request, null, null, 'uninstallLocale', null, $actionArgs) + $router->url($request, null, null, 'uninstallLocale', null, $actionArgs), + 'negative' ), __('grid.action.remove'), 'delete' @@ -71,7 +72,8 @@ public function initialize($request, $template = null) $request->getSession(), __('manager.language.confirmDefaultSettingsOverwrite'), __('manager.language.reloadLocalizedDefaultSettings'), - $router->url($request, null, null, 'reloadLocale', null, $actionArgs) + $router->url($request, null, null, 'reloadLocale', null, $actionArgs), + 'primary' ), __('manager.language.reloadLocalizedDefaultSettings') ) diff --git a/controllers/grid/navigationMenus/NavigationMenuItemsGridHandler.php b/controllers/grid/navigationMenus/NavigationMenuItemsGridHandler.php index 205610a6bad..e791df7446d 100644 --- a/controllers/grid/navigationMenus/NavigationMenuItemsGridHandler.php +++ b/controllers/grid/navigationMenus/NavigationMenuItemsGridHandler.php @@ -117,7 +117,7 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addNavigationMenuItem', null, null), __('grid.action.addNavigationMenuItem'), - 'modal_add_item', + 'side-modal', true ), __('grid.action.addNavigationMenuItem'), diff --git a/controllers/grid/navigationMenus/NavigationMenuItemsGridRow.php b/controllers/grid/navigationMenus/NavigationMenuItemsGridRow.php index fbccb8e5584..b7af522e852 100644 --- a/controllers/grid/navigationMenus/NavigationMenuItemsGridRow.php +++ b/controllers/grid/navigationMenus/NavigationMenuItemsGridRow.php @@ -54,7 +54,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editNavigationMenuItem', null, $actionArgs), __('grid.action.edit'), - 'modal_edit', + 'side-modal', true ), __('grid.action.edit'), @@ -70,7 +70,7 @@ public function initialize($request, $template = null) __('common.confirmDelete'), __('common.remove'), $router->url($request, null, null, 'deleteNavigationMenuItem', null, $actionArgs), - 'modal_delete' + 'negative' ), __('grid.action.remove'), 'delete' diff --git a/controllers/grid/navigationMenus/NavigationMenusGridCellProvider.php b/controllers/grid/navigationMenus/NavigationMenusGridCellProvider.php index 39c69749d13..09ecee0d86e 100644 --- a/controllers/grid/navigationMenus/NavigationMenusGridCellProvider.php +++ b/controllers/grid/navigationMenus/NavigationMenusGridCellProvider.php @@ -44,7 +44,7 @@ public function getCellActions($request, $row, $column, $position = GridHandler: new AjaxModal( $router->url($request, null, null, 'editNavigationMenu', null, $actionArgs), __('grid.action.edit'), - null, + 'side-modal', true ), htmlspecialchars($navigationMenu->getTitle()) diff --git a/controllers/grid/navigationMenus/NavigationMenusGridHandler.php b/controllers/grid/navigationMenus/NavigationMenusGridHandler.php index 2dfe5a551aa..faa04762d31 100644 --- a/controllers/grid/navigationMenus/NavigationMenusGridHandler.php +++ b/controllers/grid/navigationMenus/NavigationMenusGridHandler.php @@ -129,7 +129,7 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addNavigationMenu', null, null), __('grid.action.addNavigationMenu'), - 'modal_add_item', + 'side-modal', true ), __('grid.action.addNavigationMenu'), diff --git a/controllers/grid/navigationMenus/NavigationMenusGridRow.php b/controllers/grid/navigationMenus/NavigationMenusGridRow.php index b1bb4727f5a..491b3b9666d 100644 --- a/controllers/grid/navigationMenus/NavigationMenusGridRow.php +++ b/controllers/grid/navigationMenus/NavigationMenusGridRow.php @@ -53,7 +53,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editNavigationMenu', null, $actionArgs), __('grid.action.edit'), - 'modal_edit', + 'side-modal', true ), __('grid.action.edit'), @@ -69,7 +69,7 @@ public function initialize($request, $template = null) __('common.confirmDelete'), __('common.remove'), $router->url($request, null, null, 'deleteNavigationMenu', null, $actionArgs), - 'modal_delete' + 'negative' ), __('grid.action.remove'), 'delete' diff --git a/controllers/grid/plugins/PluginGalleryGridCellProvider.php b/controllers/grid/plugins/PluginGalleryGridCellProvider.php index bc1a050466b..7f92cf8b2af 100644 --- a/controllers/grid/plugins/PluginGalleryGridCellProvider.php +++ b/controllers/grid/plugins/PluginGalleryGridCellProvider.php @@ -74,7 +74,7 @@ public function getCellActions($request, $row, $column, $position = GridHandler: new AjaxModal( $router->url($request, null, null, 'viewPlugin', null, ['rowId' => $row->getId() + 1]), htmlspecialchars($element->getLocalizedName()), - 'modal_information', + 'side-modal', true ), htmlspecialchars($element->getLocalizedName()), diff --git a/controllers/grid/plugins/PluginGalleryGridHandler.php b/controllers/grid/plugins/PluginGalleryGridHandler.php index 72a636037c7..5b001715e49 100644 --- a/controllers/grid/plugins/PluginGalleryGridHandler.php +++ b/controllers/grid/plugins/PluginGalleryGridHandler.php @@ -259,7 +259,7 @@ public function viewPlugin(array $args, PKPRequest $request): JSONMessage __($installConfirmKey), __($installActionKey), $router->url($request, null, null, $installOp, null, ['rowId' => $request->getUserVar('rowId')]), - 'modal_information' + 'side-modal' ), __($installActionKey), null diff --git a/controllers/grid/plugins/PluginGridCellProvider.php b/controllers/grid/plugins/PluginGridCellProvider.php index 99f0fecbcfd..8a6a89070f0 100644 --- a/controllers/grid/plugins/PluginGridCellProvider.php +++ b/controllers/grid/plugins/PluginGridCellProvider.php @@ -82,7 +82,8 @@ public function getCellActions($request, $row, $column, $position = GridHandler: $request->getSession(), __('grid.plugin.disable'), __('common.disable'), - $request->url(null, null, 'disable', null, $requestArgs) + $request->url(null, null, 'disable', null, $requestArgs), + 'negative' ), __('manager.plugins.disable'), null diff --git a/controllers/grid/plugins/PluginGridRow.php b/controllers/grid/plugins/PluginGridRow.php index 02643c7f326..eda6299ec09 100644 --- a/controllers/grid/plugins/PluginGridRow.php +++ b/controllers/grid/plugins/PluginGridRow.php @@ -83,7 +83,7 @@ public function initialize($request, $template = null) __('manager.plugins.deleteConfirm'), __('common.delete'), $router->url($request, null, null, 'deletePlugin', null, $actionArgs), - 'modal_delete' + 'negative' ), __('common.delete'), 'delete' @@ -94,7 +94,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'upgradePlugin', null, $actionArgs), __('manager.plugins.upgrade'), - 'modal_upgrade' + 'side-modal' ), __('grid.action.upgrade'), 'upgrade' diff --git a/controllers/grid/queries/QueriesGridHandler.php b/controllers/grid/queries/QueriesGridHandler.php index c7c8bb55efe..b44a2b4d2d3 100644 --- a/controllers/grid/queries/QueriesGridHandler.php +++ b/controllers/grid/queries/QueriesGridHandler.php @@ -237,7 +237,7 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addQuery', null, $this->getRequestArgs()), __('grid.action.addQuery'), - 'modal_add_item' + 'side-modal' ), __('grid.action.addQuery'), 'add_item' @@ -473,7 +473,7 @@ public function readQuery($args, $request) new AjaxModal( $router->url($request, null, null, 'editQuery', null, $actionArgs), __('grid.action.updateQuery'), - 'modal_edit' + 'side-modal' ), __('grid.action.edit'), 'edit' @@ -489,7 +489,7 @@ public function readQuery($args, $request) __('submission.query.leaveQuery.confirm'), __('submission.query.leaveQuery'), $router->url($request, null, null, 'leaveQuery', null, $actionArgs), - 'modal_delete' + 'negative' ), __('submission.query.leaveQuery'), 'leaveQuery' diff --git a/controllers/grid/queries/QueriesGridRow.php b/controllers/grid/queries/QueriesGridRow.php index 3ed0612795a..2c8093de51a 100644 --- a/controllers/grid/queries/QueriesGridRow.php +++ b/controllers/grid/queries/QueriesGridRow.php @@ -81,7 +81,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editQuery', null, $actionArgs), __('grid.action.updateQuery'), - 'modal_edit' + 'side-modal' ), __('grid.action.edit'), 'edit' @@ -98,7 +98,7 @@ public function initialize($request, $template = null) __('common.confirmDelete'), __('grid.action.delete'), $router->url($request, null, null, 'deleteQuery', null, $actionArgs), - 'modal_delete' + 'negative' ), __('grid.action.delete'), 'delete' diff --git a/controllers/grid/queries/QueryNotesGridRow.php b/controllers/grid/queries/QueryNotesGridRow.php index 759ea80ad83..48e9a66ffb7 100644 --- a/controllers/grid/queries/QueryNotesGridRow.php +++ b/controllers/grid/queries/QueryNotesGridRow.php @@ -83,7 +83,7 @@ public function initialize($request, $template = null) __('common.confirmDelete'), __('grid.action.delete'), $router->url($request, null, null, 'deleteNote', null, $actionArgs), - 'modal_delete' + 'negative' ), __('grid.action.delete'), 'delete' diff --git a/controllers/grid/queries/QueryTitleGridColumn.php b/controllers/grid/queries/QueryTitleGridColumn.php index c38073f113a..35fbf645832 100644 --- a/controllers/grid/queries/QueryTitleGridColumn.php +++ b/controllers/grid/queries/QueryTitleGridColumn.php @@ -95,7 +95,7 @@ public function getCellActions($request, $row, $position = GridHandler::GRID_ACT new AjaxModal( $router->url($request, null, null, 'readQuery', null, $actionArgs), $headNote ? htmlspecialchars($headNote->title) : '—', - 'modal_edit' + 'side-modal' ), ($headNote?->title != '') ? htmlspecialchars($headNote->title) : '—', null diff --git a/controllers/grid/settings/category/CategoryCategoryGridHandler.php b/controllers/grid/settings/category/CategoryCategoryGridHandler.php index 06f4a6e8742..ec6f555e87b 100644 --- a/controllers/grid/settings/category/CategoryCategoryGridHandler.php +++ b/controllers/grid/settings/category/CategoryCategoryGridHandler.php @@ -94,7 +94,7 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addCategory'), __('grid.category.add'), - 'modal_manage' + 'side-modal' ), __('grid.category.add'), 'add_category' diff --git a/controllers/grid/settings/category/CategoryGridCategoryRow.php b/controllers/grid/settings/category/CategoryGridCategoryRow.php index 42505ae0882..58418cbc6f4 100644 --- a/controllers/grid/settings/category/CategoryGridCategoryRow.php +++ b/controllers/grid/settings/category/CategoryGridCategoryRow.php @@ -58,7 +58,7 @@ public function initialize($request, $template = null) __('common.confirmDelete'), __('common.delete'), $router->url($request, null, null, 'deleteCategory', null, ['categoryId' => $categoryId]), - 'modal_delete' + 'negative' ), __('grid.action.remove'), 'delete' @@ -71,7 +71,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editCategory', null, ['categoryId' => $categoryId]), __('grid.category.edit'), - 'modal_edit' + 'side-modal' ), $category->getLocalizedTitle() ), GridRow::GRID_ACTION_POSITION_ROW_CLICK); diff --git a/controllers/grid/settings/category/CategoryGridRow.php b/controllers/grid/settings/category/CategoryGridRow.php index 44f0760f778..9c5e9b2acb3 100644 --- a/controllers/grid/settings/category/CategoryGridRow.php +++ b/controllers/grid/settings/category/CategoryGridRow.php @@ -52,7 +52,8 @@ public function initialize($request, $template = null) 'editCategory', new AjaxModal( $router->url($request, null, null, 'editCategory', null, $actionArgs), - __('grid.category.edit') + __('grid.category.edit'), + 'side-modal' ), __('grid.action.edit'), 'edit' @@ -64,7 +65,8 @@ public function initialize($request, $template = null) $request->getSession(), __('grid.category.removeText'), null, - $router->url($request, null, null, 'deleteCategory', null, $actionArgs) + $router->url($request, null, null, 'deleteCategory', null, $actionArgs), + 'negative' ), __('grid.action.remove'), 'delete' diff --git a/controllers/grid/settings/genre/GenreGridHandler.php b/controllers/grid/settings/genre/GenreGridHandler.php index 1bb31532282..c188a0c2b46 100644 --- a/controllers/grid/settings/genre/GenreGridHandler.php +++ b/controllers/grid/settings/genre/GenreGridHandler.php @@ -76,7 +76,7 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addGenre', null, $actionArgs), __('grid.action.addGenre'), - 'modal_add_item', + 'side-modal', true ), __('grid.action.addGenre'), @@ -92,7 +92,7 @@ public function initialize($request, $args = null) __('grid.action.restoreDefaults.confirm'), null, $router->url($request, null, null, 'restoreGenres', null, $actionArgs), - 'modal_delete' + 'primary' ), __('grid.action.restoreDefaults'), 'reset_default' diff --git a/controllers/grid/settings/genre/GenreGridRow.php b/controllers/grid/settings/genre/GenreGridRow.php index 70903055404..8822a1db034 100644 --- a/controllers/grid/settings/genre/GenreGridRow.php +++ b/controllers/grid/settings/genre/GenreGridRow.php @@ -50,7 +50,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editGenre', null, $actionArgs), __('grid.action.edit'), - 'modal_edit', + 'side-modal', true ), __('grid.action.edit'), @@ -66,7 +66,7 @@ public function initialize($request, $template = null) __('common.confirmDelete'), __('grid.action.delete'), $router->url($request, null, null, 'deleteGenre', null, $actionArgs), - 'modal_delete' + 'negative' ), __('grid.action.delete'), 'delete' diff --git a/controllers/grid/settings/languages/SubmissionLanguageGridHandler.php b/controllers/grid/settings/languages/SubmissionLanguageGridHandler.php index 91f10fdffb5..c6712079ad7 100644 --- a/controllers/grid/settings/languages/SubmissionLanguageGridHandler.php +++ b/controllers/grid/settings/languages/SubmissionLanguageGridHandler.php @@ -105,7 +105,7 @@ public function initialize($request, $args = null): void new AjaxModal( ($request->getRouter())->url($request, null, null, 'addLanguageModal', null, null), __('manager.language.gridAction.addLangauage'), - null, + 'side-modal', true, 'addLanguageForm' ), diff --git a/controllers/grid/settings/reviewForms/ReviewFormElementGridRow.php b/controllers/grid/settings/reviewForms/ReviewFormElementGridRow.php index ca001b1853a..de81168e718 100644 --- a/controllers/grid/settings/reviewForms/ReviewFormElementGridRow.php +++ b/controllers/grid/settings/reviewForms/ReviewFormElementGridRow.php @@ -49,7 +49,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editReviewFormElement', null, ['rowId' => $rowId, 'reviewFormId' => $element->getReviewFormId()]), __('grid.action.edit'), - 'modal_edit', + 'side-modal', true ), __('grid.action.edit'), @@ -64,7 +64,8 @@ public function initialize($request, $template = null) $request->getSession(), __('manager.reviewFormElements.confirmDelete'), null, - $router->url($request, null, null, 'deleteReviewFormElement', null, ['rowId' => $rowId, 'reviewFormId' => $element->getReviewFormId()]) + $router->url($request, null, null, 'deleteReviewFormElement', null, ['rowId' => $rowId, 'reviewFormId' => $element->getReviewFormId()]), + 'negative' ), __('grid.action.delete'), 'delete' diff --git a/controllers/grid/settings/reviewForms/ReviewFormElementsGridHandler.php b/controllers/grid/settings/reviewForms/ReviewFormElementsGridHandler.php index ae8edfa22b1..8828e24500b 100644 --- a/controllers/grid/settings/reviewForms/ReviewFormElementsGridHandler.php +++ b/controllers/grid/settings/reviewForms/ReviewFormElementsGridHandler.php @@ -95,7 +95,7 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'createReviewFormElement', null, ['reviewFormId' => $this->reviewFormId]), __('manager.reviewFormElements.create'), - 'modal_add_item', + 'side-modal', true ), __('manager.reviewFormElements.create'), diff --git a/controllers/grid/settings/reviewForms/ReviewFormGridCellProvider.php b/controllers/grid/settings/reviewForms/ReviewFormGridCellProvider.php index 9f7b8a832a2..cb00c7c6336 100644 --- a/controllers/grid/settings/reviewForms/ReviewFormGridCellProvider.php +++ b/controllers/grid/settings/reviewForms/ReviewFormGridCellProvider.php @@ -77,7 +77,8 @@ public function getCellActions($request, $row, $column, $position = GridHandler: 'deactivateReviewForm', null, ['reviewFormKey' => $element->getId()] - ) + ), + 'negative' ) )]; } else { @@ -94,7 +95,8 @@ public function getCellActions($request, $row, $column, $position = GridHandler: 'activateReviewForm', null, ['reviewFormKey' => $element->getId()] - ) + ), + 'primary' ) )]; } diff --git a/controllers/grid/settings/reviewForms/ReviewFormGridHandler.php b/controllers/grid/settings/reviewForms/ReviewFormGridHandler.php index 0154fd93132..5919fc5a9f6 100644 --- a/controllers/grid/settings/reviewForms/ReviewFormGridHandler.php +++ b/controllers/grid/settings/reviewForms/ReviewFormGridHandler.php @@ -79,7 +79,7 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'createReviewForm', null, null), __('manager.reviewForms.create'), - 'modal_add_item', + 'side-modal', true ), __('manager.reviewForms.create'), diff --git a/controllers/grid/settings/reviewForms/ReviewFormGridRow.php b/controllers/grid/settings/reviewForms/ReviewFormGridRow.php index 5ee28b80105..b0e26e7ddc0 100644 --- a/controllers/grid/settings/reviewForms/ReviewFormGridRow.php +++ b/controllers/grid/settings/reviewForms/ReviewFormGridRow.php @@ -56,7 +56,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editReviewForm', null, ['rowId' => $rowId]), __('grid.action.edit'), - 'modal_edit', + 'side-modal', true ), __('grid.action.edit'), @@ -73,7 +73,8 @@ public function initialize($request, $template = null) $request->getSession(), __('manager.reviewForms.confirmCopy'), null, - $router->url($request, null, null, 'copyReviewForm', null, ['rowId' => $rowId]) + $router->url($request, null, null, 'copyReviewForm', null, ['rowId' => $rowId]), + 'primary' ), __('grid.action.copy'), 'copy' @@ -87,7 +88,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editReviewForm', null, ['rowId' => $rowId, 'preview' => 1]), __('grid.action.preview'), - 'preview', + 'side-modal', true ), __('grid.action.preview'), @@ -104,7 +105,8 @@ public function initialize($request, $template = null) $request->getSession(), __('manager.reviewForms.confirmDelete'), null, - $router->url($request, null, null, 'deleteReviewForm', null, ['rowId' => $rowId]) + $router->url($request, null, null, 'deleteReviewForm', null, ['rowId' => $rowId]), + 'negative' ), __('grid.action.delete'), 'delete' diff --git a/controllers/grid/settings/roles/UserGroupGridHandler.php b/controllers/grid/settings/roles/UserGroupGridHandler.php index 77d7568149e..d6f18d08617 100644 --- a/controllers/grid/settings/roles/UserGroupGridHandler.php +++ b/controllers/grid/settings/roles/UserGroupGridHandler.php @@ -126,7 +126,7 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addUserGroup'), __('grid.roles.add'), - 'modal_add_role' + 'side-modal' ), __('grid.roles.add'), 'add_role' diff --git a/controllers/grid/settings/roles/UserGroupGridRow.php b/controllers/grid/settings/roles/UserGroupGridRow.php index 3e901abf924..e5c284475a6 100644 --- a/controllers/grid/settings/roles/UserGroupGridRow.php +++ b/controllers/grid/settings/roles/UserGroupGridRow.php @@ -53,7 +53,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editUserGroup', null, $actionArgs), __('grid.action.edit'), - 'modal_edit' + 'side-modal' ), __('grid.action.edit'), 'edit' @@ -65,7 +65,8 @@ public function initialize($request, $template = null) $request->getSession(), __('settings.roles.removeText'), null, - $router->url($request, null, null, 'removeUserGroup', null, $actionArgs) + $router->url($request, null, null, 'removeUserGroup', null, $actionArgs), + 'negative' ), __('grid.action.remove'), 'delete' diff --git a/controllers/grid/settings/user/UserGridHandler.php b/controllers/grid/settings/user/UserGridHandler.php index 6817b1f208c..38953afcb36 100644 --- a/controllers/grid/settings/user/UserGridHandler.php +++ b/controllers/grid/settings/user/UserGridHandler.php @@ -98,7 +98,7 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addUser', null, null), __('grid.user.add'), - 'modal_add_user', + 'side-modal', true ), __('grid.user.add'), diff --git a/controllers/grid/settings/user/UserGridRow.php b/controllers/grid/settings/user/UserGridRow.php index 435b99ca03f..ba2736d7a73 100644 --- a/controllers/grid/settings/user/UserGridRow.php +++ b/controllers/grid/settings/user/UserGridRow.php @@ -90,7 +90,7 @@ public function initialize($request, $template = null) __('grid.user.mergeUsers.confirm', ['oldUsername' => $oldUser->getUsername(), 'newUsername' => $element->getUsername()]), null, $router->url($request, null, null, 'mergeUsers', null, $actionArgs), - 'modal_merge_users' + 'negative' ), __('grid.user.mergeUsers.mergeIntoUser'), 'merge_users' @@ -106,7 +106,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editEmail', null, $actionArgs), __('grid.user.email'), - 'modal_email', + 'side-modal', true ), __('grid.user.email'), @@ -119,7 +119,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editUser', null, $actionArgs), __('grid.user.edit'), - 'modal_edit', + 'side-modal', true ), __('grid.user.edit'), @@ -134,7 +134,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editDisableUser', null, $actionArgs), __('common.enable'), - 'enable', + 'side-modal', true ), __('common.enable'), @@ -149,7 +149,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editDisableUser', null, $actionArgs), __('grid.user.disable'), - 'disable', + 'side-modal', true ), __('grid.user.disable'), @@ -165,7 +165,7 @@ public function initialize($request, $template = null) __('manager.people.confirmRemove'), __('common.remove'), $router->url($request, null, null, 'removeUser', null, $actionArgs), - 'modal_delete' + 'negative' ), __('grid.action.remove'), 'delete' @@ -185,7 +185,8 @@ public function initialize($request, $template = null) new RedirectConfirmationModal( __('grid.user.confirmLogInAs'), __('grid.action.logInAs'), - $dispatcher->url($request, PKPApplication::ROUTE_PAGE, null, 'login', 'signInAsUser', [$this->getId()]) + $dispatcher->url($request, PKPApplication::ROUTE_PAGE, null, 'login', 'signInAsUser', [$this->getId()]), + 'primary' ), __('grid.action.logInAs'), 'enroll_user' @@ -204,7 +205,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'mergeUsers', null, ['oldUserId' => $rowId]), __('grid.user.mergeUsers.mergeUser'), - 'modal_merge_users', + 'side-modal', true ), __('grid.user.mergeUsers.mergeUser'), diff --git a/controllers/grid/users/exportableUsers/ExportableUsersGridHandler.php b/controllers/grid/users/exportableUsers/ExportableUsersGridHandler.php index 2cda973f726..c854cddb515 100644 --- a/controllers/grid/users/exportableUsers/ExportableUsersGridHandler.php +++ b/controllers/grid/users/exportableUsers/ExportableUsersGridHandler.php @@ -85,7 +85,8 @@ public function initialize($request, $args = null) new RedirectConfirmationModal( __('grid.users.confirmExportAllUsers'), null, - $url + $url, + 'primary' ), __('grid.action.exportAllUsers'), 'export_users' diff --git a/controllers/grid/users/reviewer/ReviewerGridRow.php b/controllers/grid/users/reviewer/ReviewerGridRow.php index 060618b7fd5..7e77cd9e23b 100644 --- a/controllers/grid/users/reviewer/ReviewerGridRow.php +++ b/controllers/grid/users/reviewer/ReviewerGridRow.php @@ -90,7 +90,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'readReview', null, $actionArgs), __('editor.review.reviewDetails') . ': ' . $submission->getCurrentPublication()->getLocalizedTitle(null, 'html'), - 'modal_information' + 'side-modal' ), __('editor.review.reviewDetails'), 'more_info' @@ -104,7 +104,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'sendEmail', null, $actionArgs), __('editor.review.emailReviewer'), - 'modal_email' + 'side-modal' ), __('editor.review.emailReviewer'), 'notify' @@ -119,7 +119,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'resendRequestReviewer', null, $actionArgs), __('editor.review.resendRequestReviewer'), - 'modal_add' + 'side-modal' ), __('editor.review.resendRequestReviewer'), 'add' @@ -133,7 +133,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editReview', null, $actionArgs), __('editor.submissionReview.editReview'), - 'modal_add_file' + 'side-modal' ), __('common.edit'), 'edit' @@ -147,7 +147,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'unassignReviewer', null, $actionArgs), $reviewAssignment->getDateConfirmed() ? __('editor.review.cancelReviewer') : __('editor.review.unassignReviewer'), - 'modal_delete' + 'side-modal' ), $reviewAssignment->getDateConfirmed() ? __('editor.review.cancelReviewer') : __('editor.review.unassignReviewer'), 'delete' @@ -160,7 +160,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'reinstateReviewer', null, $actionArgs), __('editor.review.reinstateReviewer'), - 'modal_add' + 'side-modal' ), __('editor.review.reinstateReviewer'), 'add' @@ -175,7 +175,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'reviewHistory', null, $actionArgs), __('submission.history'), - 'modal_information' + 'side-modal' ), __('submission.history'), 'more_info' @@ -196,7 +196,8 @@ public function initialize($request, $template = null) new RedirectConfirmationModal( __('grid.user.confirmLogInAs'), __('grid.action.logInAs'), - $dispatcher->url($request, PKPApplication::ROUTE_PAGE, null, 'login', 'signInAsUser', [$reviewAssignment->getReviewerId()]) + $dispatcher->url($request, PKPApplication::ROUTE_PAGE, null, 'login', 'signInAsUser', [$reviewAssignment->getReviewerId()]), + 'primary' ), __('grid.action.logInAs'), 'enroll_user' @@ -213,7 +214,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'gossip', null, $actionArgs), __('user.gossip'), - 'modal_information' + 'side-modal' ), __('user.gossip'), 'more_info' diff --git a/controllers/grid/users/stageParticipant/StageParticipantGridHandler.php b/controllers/grid/users/stageParticipant/StageParticipantGridHandler.php index c7e058487f7..59421ef642c 100644 --- a/controllers/grid/users/stageParticipant/StageParticipantGridHandler.php +++ b/controllers/grid/users/stageParticipant/StageParticipantGridHandler.php @@ -174,7 +174,7 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addParticipant', null, $this->getRequestArgs()), __('editor.submission.addStageParticipant'), - 'modal_add_user' + 'side-modal' ), __('common.assign'), 'add_user' diff --git a/controllers/grid/users/stageParticipant/StageParticipantGridRow.php b/controllers/grid/users/stageParticipant/StageParticipantGridRow.php index aad852f8cca..0028bf2c50a 100644 --- a/controllers/grid/users/stageParticipant/StageParticipantGridRow.php +++ b/controllers/grid/users/stageParticipant/StageParticipantGridRow.php @@ -79,7 +79,7 @@ public function initialize($request, $template = null) __('editor.submission.removeStageParticipant.description'), __('editor.submission.removeStageParticipant'), $router->url($request, null, null, 'deleteParticipant', null, $this->getRequestArgs()), - 'modal_delete' + 'negative' ), __('grid.action.remove'), 'delete' @@ -92,7 +92,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'addParticipant', null, $this->getRequestArgs()), __('editor.submission.editStageParticipant'), - 'modal_edit_user' + 'side-modal' ), __('common.edit'), 'edit_user' @@ -139,7 +139,8 @@ public function initialize($request, $template = null) new RedirectConfirmationModal( __('grid.user.confirmLogInAs'), __('grid.action.logInAs'), - $dispatcher->url($request, PKPApplication::ROUTE_PAGE, null, 'login', 'signInAsUser', [$userId], ['redirectUrl' => $redirectUrl]) + $dispatcher->url($request, PKPApplication::ROUTE_PAGE, null, 'login', 'signInAsUser', [$userId], ['redirectUrl' => $redirectUrl]), + 'primary' ), __('grid.action.logInAs'), 'enroll_user' diff --git a/controllers/grid/users/stageParticipant/linkAction/NotifyLinkAction.php b/controllers/grid/users/stageParticipant/linkAction/NotifyLinkAction.php index f61d03d4fad..74a501fdeca 100644 --- a/controllers/grid/users/stageParticipant/linkAction/NotifyLinkAction.php +++ b/controllers/grid/users/stageParticipant/linkAction/NotifyLinkAction.php @@ -51,7 +51,7 @@ public function __construct($request, &$submission, $stageId, $userId = null) $requestArgs ), __('submission.stageParticipants.notify'), - 'modal_email' + 'side-modal' ); // Configure the file link action. diff --git a/controllers/informationCenter/linkAction/FileInfoCenterLinkAction.php b/controllers/informationCenter/linkAction/FileInfoCenterLinkAction.php index 11a728acb28..8a5c32f11ca 100644 --- a/controllers/informationCenter/linkAction/FileInfoCenterLinkAction.php +++ b/controllers/informationCenter/linkAction/FileInfoCenterLinkAction.php @@ -70,7 +70,7 @@ public function getModal($request, $submissionFile, $stageId) $this->getActionArgs($submissionFile, $stageId) ), $title, - 'modal_information' + 'side-modal' ); return $ajaxModal; diff --git a/controllers/modals/review/ReviewerViewMetadataLinkAction.php b/controllers/modals/review/ReviewerViewMetadataLinkAction.php index 1611e37cfd3..edae408934d 100644 --- a/controllers/modals/review/ReviewerViewMetadataLinkAction.php +++ b/controllers/modals/review/ReviewerViewMetadataLinkAction.php @@ -47,7 +47,7 @@ public function __construct($request, $submissionId, $reviewAssignmentId) ['submissionId' => $submissionId, 'reviewAssignmentId' => $reviewAssignmentId] ), __('reviewer.step1.viewAllDetails'), - 'modal_information' + 'side-modal' ); // Configure the link action. parent::__construct('viewMetadata', $modal, __('reviewer.step1.viewAllDetails')); diff --git a/controllers/review/linkAction/UnconsiderReviewLinkAction.php b/controllers/review/linkAction/UnconsiderReviewLinkAction.php index 5366e5c2ca2..d0b35fb7662 100644 --- a/controllers/review/linkAction/UnconsiderReviewLinkAction.php +++ b/controllers/review/linkAction/UnconsiderReviewLinkAction.php @@ -55,7 +55,7 @@ public function __construct($request, $reviewAssignment, $submission) 'stageId' => $reviewAssignment->getStageId() ] ), - 'modal_information' + 'negative' ), __('editor.review.revertDecision'), 'unconsider' diff --git a/controllers/wizard/fileUpload/form/PKPSubmissionFilesUploadBaseForm.php b/controllers/wizard/fileUpload/form/PKPSubmissionFilesUploadBaseForm.php index 84487442e69..a0c3998e9a4 100644 --- a/controllers/wizard/fileUpload/form/PKPSubmissionFilesUploadBaseForm.php +++ b/controllers/wizard/fileUpload/form/PKPSubmissionFilesUploadBaseForm.php @@ -365,7 +365,8 @@ public function fetch($request, $template = null, $display = false) 'addUser', new ConfirmationModal( __('review.anonymousPeerReview'), - __('review.anonymousPeerReview.title') + __('review.anonymousPeerReview.title'), + 'primary' ), __('review.anonymousPeerReview.title') ); diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 963de68e3db..1743540f2fb 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -796,7 +796,7 @@ Cypress.Commands.add('checkDoiMarkedStatus', (status, itemId, isValid, expectedS cy.get(`#list-item-${itemType}-${itemId} .pkpBadge`).contains(expectedStatus); if (!isValid) { - cy.get(`div[role=dialog] button:contains('Close')`).click(); + cy.get(`div[role=dialog] button:contains('OK')`).click(); } }); diff --git a/js/controllers/modal/ConfirmationModalHandler.js b/js/controllers/modal/ConfirmationModalHandler.js index 371afc771c0..e50935c63a2 100644 --- a/js/controllers/modal/ConfirmationModalHandler.js +++ b/js/controllers/modal/ConfirmationModalHandler.js @@ -43,12 +43,14 @@ title: options.title, message: options.dialogText, actions: [], - closeLegacyHandler: this.callbackWrapper(this.modalClose) + closeLegacyHandler: this.callbackWrapper(this.modalClose), + modalStyle: options.modalStyle }; if (options.okButton) { this.dialogProps.actions.push({ label: options.okButton, + isWarnable: options.modalStyle === 'negative', callback: this.callbackWrapper(this.modalConfirm) }); } @@ -56,7 +58,7 @@ if (options.cancelButton) { this.dialogProps.actions.push({ label: options.cancelButton, - isWarnable: true, + isWarnable: options.modalStyle !== 'negative', callback: this.callbackWrapper(this.modalClose) }); } diff --git a/templates/authorDashboard/submissionEmails.tpl b/templates/authorDashboard/submissionEmails.tpl index 9c916eb1079..6bb16ef555e 100644 --- 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: 'side-modal', 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 index 29786d46e4c..dc2073ab831 100644 --- a/templates/controllers/informationCenter/note.tpl +++ b/templates/controllers/informationCenter/note.tpl @@ -37,7 +37,7 @@
{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"}
{/if} diff --git a/templates/form/formButtons.tpl b/templates/form/formButtons.tpl index 19d04b4c16a..d8dec32234e 100644 --- a/templates/form/formButtons.tpl +++ b/templates/form/formButtons.tpl @@ -14,6 +14,7 @@ * FBV_confirmSubmit string Text to be used in a confirmation modal before submiting the form. * FBV_submitText string The label to go on the submit button. * FBV_submitDisabled bool disables the submit button. + * FBV_modalStyle string The modal state/style that should be used. *} {fbvFormSection class="formButtons form_buttons"} @@ -44,7 +45,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 index c2326c0985a..44f1a5f3b80 100644 --- 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}