From 9d1aa560a0f8c64a5e0e273f17ff2b0b6e8fc70f Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Mon, 7 Oct 2024 23:44:28 +0800 Subject: [PATCH] pkp/pkp-lib#10444 Define modalStyle when using dialog component --- .../grid/articleGalleys/ArticleGalleyGridHandler.php | 2 +- .../grid/articleGalleys/ArticleGalleyGridRow.php | 4 ++-- .../grid/issueGalleys/IssueGalleyGridHandler.php | 2 +- controllers/grid/issueGalleys/IssueGalleyGridRow.php | 4 ++-- controllers/grid/issues/FutureIssueGridHandler.php | 2 +- controllers/grid/issues/IssueGridCellProvider.php | 2 +- controllers/grid/issues/IssueGridRow.php | 10 +++++----- controllers/grid/issues/form/IssueForm.php | 2 +- .../grid/settings/sections/SectionGridHandler.php | 2 +- controllers/grid/settings/sections/SectionGridRow.php | 4 ++-- .../subscriptions/SubscriptionTypesGridHandler.php | 2 +- .../grid/subscriptions/SubscriptionTypesGridRow.php | 4 ++-- .../grid/subscriptions/SubscriptionsGridHandler.php | 2 +- .../grid/subscriptions/SubscriptionsGridRow.php | 6 +++--- controllers/grid/toc/TocGridRow.php | 2 +- 15 files changed, 25 insertions(+), 25 deletions(-) diff --git a/controllers/grid/articleGalleys/ArticleGalleyGridHandler.php b/controllers/grid/articleGalleys/ArticleGalleyGridHandler.php index 756e85ca692..56fb4e2c1cc 100644 --- a/controllers/grid/articleGalleys/ArticleGalleyGridHandler.php +++ b/controllers/grid/articleGalleys/ArticleGalleyGridHandler.php @@ -162,7 +162,7 @@ public function initialize($request, $args = null) new AjaxModal( $request->getRouter()->url($request, null, null, 'addGalley', null, $this->getRequestArgs()), __('submission.layout.newGalley'), - 'modal_add_item' + 'side-modal' ), __('grid.action.addGalley'), 'add_item' diff --git a/controllers/grid/articleGalleys/ArticleGalleyGridRow.php b/controllers/grid/articleGalleys/ArticleGalleyGridRow.php index 56797328fe4..df1396be5c3 100644 --- a/controllers/grid/articleGalleys/ArticleGalleyGridRow.php +++ b/controllers/grid/articleGalleys/ArticleGalleyGridRow.php @@ -80,7 +80,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editGalley', null, $actionArgs), ($this->_isEditable) ? __('submission.layout.editGalley') : __('submission.layout.viewGalley'), - 'modal_edit' + 'side-modal' ), ($this->_isEditable) ? __('grid.action.edit') : __('grid.action.view'), 'edit' @@ -108,7 +108,7 @@ public function initialize($request, $template = null) __('common.confirmDelete'), __('grid.action.delete'), $router->url($request, null, null, 'deleteGalley', null, $actionArgs), - 'modal_delete' + 'negative' ), __('grid.action.delete'), 'delete' diff --git a/controllers/grid/issueGalleys/IssueGalleyGridHandler.php b/controllers/grid/issueGalleys/IssueGalleyGridHandler.php index 64ec88a3bb0..5fee6d0d06f 100644 --- a/controllers/grid/issueGalleys/IssueGalleyGridHandler.php +++ b/controllers/grid/issueGalleys/IssueGalleyGridHandler.php @@ -138,7 +138,7 @@ public function initialize($request, $args = null) array_merge($this->getRequestArgs(), ['gridId' => $this->getId()]) ), __('grid.action.addIssueGalley'), - 'modal_add' + 'side-modal' ), __('grid.action.addIssueGalley'), 'add_category' diff --git a/controllers/grid/issueGalleys/IssueGalleyGridRow.php b/controllers/grid/issueGalleys/IssueGalleyGridRow.php index 977f0717933..d494661cdae 100644 --- a/controllers/grid/issueGalleys/IssueGalleyGridRow.php +++ b/controllers/grid/issueGalleys/IssueGalleyGridRow.php @@ -71,7 +71,7 @@ public function initialize($request, $template = null) array_merge($this->getRequestArgs(), ['issueGalleyId' => $issueGalleyId]) ), __('editor.issues.editIssueGalley'), - 'modal_edit', + 'side-modal', true ), __('grid.action.edit'), @@ -94,7 +94,7 @@ public function initialize($request, $template = null) null, array_merge($this->getRequestArgs(), ['issueGalleyId' => $issueGalleyId]) ), - 'modal_delete' + 'negative' ), __('grid.action.delete'), 'delete' diff --git a/controllers/grid/issues/FutureIssueGridHandler.php b/controllers/grid/issues/FutureIssueGridHandler.php index 946e4c3691f..878b06a4407 100644 --- a/controllers/grid/issues/FutureIssueGridHandler.php +++ b/controllers/grid/issues/FutureIssueGridHandler.php @@ -46,7 +46,7 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addIssue', null, ['gridId' => $this->getId()]), __('grid.action.addIssue'), - 'modal_manage' + 'side-modal' ), __('grid.action.addIssue'), 'add_category' diff --git a/controllers/grid/issues/IssueGridCellProvider.php b/controllers/grid/issues/IssueGridCellProvider.php index 7ff75755b03..36e2185ab53 100644 --- a/controllers/grid/issues/IssueGridCellProvider.php +++ b/controllers/grid/issues/IssueGridCellProvider.php @@ -60,7 +60,7 @@ public function getCellActions($request, $row, $column, $position = GridHandler: new AjaxModal( $router->url($request, null, null, 'editIssue', null, ['issueId' => $issue->getId()]), __('editor.issues.editIssue', ['issueIdentification' => htmlspecialchars($issue->getIssueIdentification())]), - 'modal_edit', + 'side-modal', true ), $issue->getIssueIdentification() diff --git a/controllers/grid/issues/IssueGridRow.php b/controllers/grid/issues/IssueGridRow.php index 2e87da1dcf8..b74c52e273f 100644 --- a/controllers/grid/issues/IssueGridRow.php +++ b/controllers/grid/issues/IssueGridRow.php @@ -52,7 +52,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editIssue', null, ['issueId' => $issueId]), __('editor.issues.editIssue', ['issueIdentification' => htmlspecialchars($issue->getIssueIdentification())]), - 'modal_edit', + 'side-modal', true ), __('grid.action.edit'), @@ -81,7 +81,7 @@ public function initialize($request, $template = null) __('editor.issues.confirmUnpublish'), __('editor.issues.unpublishIssue'), $router->url($request, null, null, 'unpublishIssue', null, ['issueId' => $issueId]), - 'modal_delete' + 'negative' ), __('editor.issues.unpublishIssue'), 'delete' @@ -101,7 +101,7 @@ public function initialize($request, $template = null) ['issueId' => $issueId] ), __('editor.issues.publishIssue'), - 'modal_confirm' + 'primary' ), __('editor.issues.publishIssue'), 'advance' @@ -120,7 +120,7 @@ public function initialize($request, $template = null) __('editor.issues.confirmSetCurrentIssue'), __('editor.issues.currentIssue'), $router->url($request, null, null, 'setCurrentIssue', null, ['issueId' => $issueId]), - 'modal_delete' + 'primary' ), __('editor.issues.currentIssue'), 'delete' @@ -136,7 +136,7 @@ public function initialize($request, $template = null) __('common.confirmDelete'), __('grid.action.delete'), $router->url($request, null, null, 'deleteIssue', null, ['issueId' => $issueId]), - 'modal_delete' + 'negative' ), __('grid.action.delete'), 'delete' diff --git a/controllers/grid/issues/form/IssueForm.php b/controllers/grid/issues/form/IssueForm.php index 1ce4a07f9aa..5dc7836a5c3 100644 --- a/controllers/grid/issues/form/IssueForm.php +++ b/controllers/grid/issues/form/IssueForm.php @@ -100,7 +100,7 @@ public function fetch($request, $template = null, $display = false) 'issueId' => $this->issue->getId(), ] ), - 'modal_delete' + 'negative' ), __('common.delete'), null diff --git a/controllers/grid/settings/sections/SectionGridHandler.php b/controllers/grid/settings/sections/SectionGridHandler.php index 58bc07a5d4e..3d9f87af1d5 100644 --- a/controllers/grid/settings/sections/SectionGridHandler.php +++ b/controllers/grid/settings/sections/SectionGridHandler.php @@ -105,7 +105,7 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addSection', null, ['gridId' => $this->getId()]), __('manager.sections.create'), - 'modal_manage' + 'side-modal' ), __('manager.sections.create'), 'add_section' diff --git a/controllers/grid/settings/sections/SectionGridRow.php b/controllers/grid/settings/sections/SectionGridRow.php index 1fcce017643..75202dcb02b 100644 --- a/controllers/grid/settings/sections/SectionGridRow.php +++ b/controllers/grid/settings/sections/SectionGridRow.php @@ -46,7 +46,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editSection', null, ['sectionId' => $sectionId]), __('grid.action.edit'), - 'modal_edit', + 'side-modal', true ), __('grid.action.edit'), @@ -62,7 +62,7 @@ public function initialize($request, $template = null) __('manager.sections.confirmDelete'), __('grid.action.delete'), $router->url($request, null, null, 'deleteSection', null, ['sectionId' => $sectionId]), - 'modal_delete' + 'negative' ), __('grid.action.delete'), 'delete' diff --git a/controllers/grid/subscriptions/SubscriptionTypesGridHandler.php b/controllers/grid/subscriptions/SubscriptionTypesGridHandler.php index 56796fc3fb7..6629b714f75 100644 --- a/controllers/grid/subscriptions/SubscriptionTypesGridHandler.php +++ b/controllers/grid/subscriptions/SubscriptionTypesGridHandler.php @@ -80,7 +80,7 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addSubscriptionType', null, null), __('manager.subscriptionTypes.create'), - 'modal_add_subscription_type', + 'side-modal', true ), __('manager.subscriptionTypes.create'), diff --git a/controllers/grid/subscriptions/SubscriptionTypesGridRow.php b/controllers/grid/subscriptions/SubscriptionTypesGridRow.php index a94f175c9b2..24563b57891 100644 --- a/controllers/grid/subscriptions/SubscriptionTypesGridRow.php +++ b/controllers/grid/subscriptions/SubscriptionTypesGridRow.php @@ -57,7 +57,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editSubscriptionType', null, $actionArgs), __('manager.subscriptionTypes.edit'), - 'modal_edit', + 'side-modal', true ), __('common.edit'), @@ -72,7 +72,7 @@ public function initialize($request, $template = null) __('manager.subscriptionTypes.confirmDelete'), __('common.delete'), $router->url($request, null, null, 'deleteSubscriptionType', null, $actionArgs), - 'modal_delete' + 'negative' ), __('grid.action.delete'), 'delete' diff --git a/controllers/grid/subscriptions/SubscriptionsGridHandler.php b/controllers/grid/subscriptions/SubscriptionsGridHandler.php index 7959b5361dd..8d43dfaecd7 100644 --- a/controllers/grid/subscriptions/SubscriptionsGridHandler.php +++ b/controllers/grid/subscriptions/SubscriptionsGridHandler.php @@ -74,7 +74,7 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addSubscription', null, null), __('manager.subscriptions.create'), - 'modal_add_subscription', + 'side-modal', true ), __('manager.subscriptions.create'), diff --git a/controllers/grid/subscriptions/SubscriptionsGridRow.php b/controllers/grid/subscriptions/SubscriptionsGridRow.php index a423bc03876..95588437ad7 100644 --- a/controllers/grid/subscriptions/SubscriptionsGridRow.php +++ b/controllers/grid/subscriptions/SubscriptionsGridRow.php @@ -58,7 +58,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editSubscription', null, $actionArgs), __('manager.subscriptions.edit'), - 'modal_edit', + 'side-modal', true ), __('common.edit'), @@ -81,7 +81,7 @@ public function initialize($request, $template = null) 'institutional' => $element instanceof InstitutionalSubscription ? 1 : 0 ]) ), - 'modal_delete' + 'primary' ), __('manager.subscriptions.renew'), 'renew' @@ -94,7 +94,7 @@ public function initialize($request, $template = null) __('subscriptionManager.subscription.confirmRemove'), __('common.delete'), $router->url($request, null, null, 'deleteSubscription', null, $actionArgs), - 'modal_delete' + 'negative' ), __('grid.action.delete'), 'delete' diff --git a/controllers/grid/toc/TocGridRow.php b/controllers/grid/toc/TocGridRow.php index 65bf4ae826e..7bd1d1426c2 100644 --- a/controllers/grid/toc/TocGridRow.php +++ b/controllers/grid/toc/TocGridRow.php @@ -71,7 +71,7 @@ public function initialize($request, $template = null) __('editor.article.remove.confirm'), __('grid.action.removeArticle'), $router->url($request, null, null, 'removeArticle', null, ['articleId' => $this->getId(), 'issueId' => $this->issueId]), - 'modal_delete' + 'negative' ), __('editor.article.remove'), 'delete'