From 239b95f3b323bbd91e2333d3aca5cfefc421d663 Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Mon, 7 Oct 2024 23:44:28 +0800 Subject: [PATCH 1/5] 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' From 596be90660fd95d8c8cbb14163beb5f966bfe2dd Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Tue, 8 Oct 2024 17:19:00 +0800 Subject: [PATCH 2/5] pkp/pkp-lib#10444 Add modalStyle when using AjaxModal --- .../ExportPublishedSubmissionsListGridCellProvider.php | 3 ++- plugins/generic/announcementFeed/AnnouncementFeedPlugin.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/controllers/grid/submissions/ExportPublishedSubmissionsListGridCellProvider.php b/controllers/grid/submissions/ExportPublishedSubmissionsListGridCellProvider.php index 027dc8020a1..789c2b1ddaa 100644 --- a/controllers/grid/submissions/ExportPublishedSubmissionsListGridCellProvider.php +++ b/controllers/grid/submissions/ExportPublishedSubmissionsListGridCellProvider.php @@ -97,7 +97,8 @@ public function getCellActions($request, $row, $column, $position = GridHandler: 'edit', new AjaxModal( $dispatcher->url($request, PKPApplication::ROUTE_COMPONENT, null, 'grid.issues.BackIssueGridHandler', 'editIssue', null, ['issueId' => $issue->getId()]), - __('plugins.importexport.common.settings.DOIPluginSettings') + __('plugins.importexport.common.settings.DOIPluginSettings'), + 'side-modal' ), $issue->getIssueIdentification(), null diff --git a/plugins/generic/announcementFeed/AnnouncementFeedPlugin.php b/plugins/generic/announcementFeed/AnnouncementFeedPlugin.php index a953e2d0fd5..9c5de150624 100644 --- a/plugins/generic/announcementFeed/AnnouncementFeedPlugin.php +++ b/plugins/generic/announcementFeed/AnnouncementFeedPlugin.php @@ -132,7 +132,8 @@ public function getActions($request, $verb) 'settings', new AjaxModal( $router->url($request, null, null, 'manage', null, ['verb' => 'settings', 'plugin' => $this->getName(), 'category' => 'generic']), - $this->getDisplayName() + $this->getDisplayName(), + 'side-modal' ), __('manager.plugins.settings'), null From d4ab432f0ab3a1e92ce01ed1f7d057c42c2bfd6c Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Tue, 8 Oct 2024 20:06:23 +0800 Subject: [PATCH 3/5] pkp/pkp-lib#10444 Add modalStyle when using RemoteActionConfirmationModal modal --- .../grid/settings/sections/SectionGridCellProvider.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/controllers/grid/settings/sections/SectionGridCellProvider.php b/controllers/grid/settings/sections/SectionGridCellProvider.php index 592077c12b2..7ae745bd508 100644 --- a/controllers/grid/settings/sections/SectionGridCellProvider.php +++ b/controllers/grid/settings/sections/SectionGridCellProvider.php @@ -68,7 +68,8 @@ public function getCellActions($request, $row, $column, $position = GridHandler: 'activateSection', null, ['sectionKey' => $row->getId()] - ) + ), + 'primary' ) )]; } else { @@ -85,7 +86,8 @@ public function getCellActions($request, $row, $column, $position = GridHandler: 'deactivateSection', null, ['sectionKey' => $row->getId()] - ) + ), + 'negative' ) )]; } From 0140c279b407c1b9150df77e86f6ceb5782dd5f0 Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Wed, 9 Oct 2024 01:55:52 +0800 Subject: [PATCH 4/5] pkp/pkp-lib#10444 Add modalStyle to plugins that use modal confirmationns --- plugins/pubIds/urn/URNPubIdPlugin.php | 4 ++-- plugins/pubIds/urn/classes/form/URNSettingsForm.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/pubIds/urn/URNPubIdPlugin.php b/plugins/pubIds/urn/URNPubIdPlugin.php index f79f8e1aef4..b667878cb65 100755 --- a/plugins/pubIds/urn/URNPubIdPlugin.php +++ b/plugins/pubIds/urn/URNPubIdPlugin.php @@ -210,7 +210,7 @@ public function getLinkActions($pubObject) __('plugins.pubIds.urn.editor.clearObjectsURN.confirm'), __('common.delete'), $request->url(null, null, 'clearPubId', null, $userVars), - 'modal_delete' + 'negative' ), __('plugins.pubIds.urn.editor.clearObjectsURN'), 'delete', @@ -226,7 +226,7 @@ public function getLinkActions($pubObject) __('plugins.pubIds.urn.editor.clearIssueObjectsURN.confirm'), __('common.delete'), $request->url(null, null, 'clearIssueObjectsPubIds', null, $userVars), - 'modal_delete' + 'negative' ), __('plugins.pubIds.urn.editor.clearIssueObjectsURN'), 'delete', diff --git a/plugins/pubIds/urn/classes/form/URNSettingsForm.php b/plugins/pubIds/urn/classes/form/URNSettingsForm.php index 5dd6de4de8f..f7e409577a6 100644 --- a/plugins/pubIds/urn/classes/form/URNSettingsForm.php +++ b/plugins/pubIds/urn/classes/form/URNSettingsForm.php @@ -104,7 +104,7 @@ public function __construct($plugin, $contextId) __('plugins.pubIds.urn.manager.settings.urnReassign.confirm'), __('common.delete'), $request->url(null, null, 'manage', null, ['verb' => 'clearPubIds', 'plugin' => $plugin->getName(), 'category' => 'pubIds']), - 'modal_delete' + 'negative' ), __('plugins.pubIds.urn.manager.settings.urnReassign'), 'delete' From 89d5eb286c1b486f25e220633a36385121f5ed61 Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Wed, 9 Oct 2024 22:00:50 +0800 Subject: [PATCH 5/5] pkp/pkp-lib#10444 Submodule update ##blesildaramirez/i10444## --- lib/pkp | 2 +- lib/ui-library | 2 +- plugins/generic/customBlockManager | 2 +- plugins/generic/staticPages | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/pkp b/lib/pkp index a92a27ff2e8..828fadeec25 160000 --- a/lib/pkp +++ b/lib/pkp @@ -1 +1 @@ -Subproject commit a92a27ff2e8acd2bb2e007054cbc710b78aef338 +Subproject commit 828fadeec25018273c10874ee9e9cabee5f810ad diff --git a/lib/ui-library b/lib/ui-library index 9706e18ec89..96f639636be 160000 --- a/lib/ui-library +++ b/lib/ui-library @@ -1 +1 @@ -Subproject commit 9706e18ec894590474c4aa2b27eb49a02f61994b +Subproject commit 96f639636be55ea9434657a1392f2e1d90c0d770 diff --git a/plugins/generic/customBlockManager b/plugins/generic/customBlockManager index 8222089b14c..08c3bfedf76 160000 --- a/plugins/generic/customBlockManager +++ b/plugins/generic/customBlockManager @@ -1 +1 @@ -Subproject commit 8222089b14c55e89dabdb562a0e063b7e553b1dd +Subproject commit 08c3bfedf7645baee041ba3509454b2152c86897 diff --git a/plugins/generic/staticPages b/plugins/generic/staticPages index 17be34c5913..37f6375080a 160000 --- a/plugins/generic/staticPages +++ b/plugins/generic/staticPages @@ -1 +1 @@ -Subproject commit 17be34c5913a643b05f000e3768bf74f36335618 +Subproject commit 37f6375080a50959e58c7e7e29ee143e40a0a82f