From 54ec46f9a5d7f5a160f804f2b7b4e8271c25eef9 Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Fri, 11 Oct 2024 20:33:24 +0800 Subject: [PATCH 1/4] pkp/pkp-lib#10444 Add modalStyle when using AjaxModal modal --- controllers/grid/preprintGalleys/PreprintGalleyGridHandler.php | 2 +- controllers/grid/preprintGalleys/PreprintGalleyGridRow.php | 2 +- controllers/grid/settings/sections/SectionGridHandler.php | 2 +- controllers/grid/settings/sections/SectionGridRow.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/controllers/grid/preprintGalleys/PreprintGalleyGridHandler.php b/controllers/grid/preprintGalleys/PreprintGalleyGridHandler.php index 41a082364c..d0518e1eda 100644 --- a/controllers/grid/preprintGalleys/PreprintGalleyGridHandler.php +++ b/controllers/grid/preprintGalleys/PreprintGalleyGridHandler.php @@ -157,7 +157,7 @@ public function initialize($request, $args = null) new AjaxModal( $request->getRouter()->url($request, null, null, 'addGalley', null, $this->getRequestArgs()), __('common.addFile'), - 'modal_add_item' + 'side-modal' ), __('common.addFile'), 'add_item' diff --git a/controllers/grid/preprintGalleys/PreprintGalleyGridRow.php b/controllers/grid/preprintGalleys/PreprintGalleyGridRow.php index 0bdb1bdd21..21b161d6f6 100644 --- a/controllers/grid/preprintGalleys/PreprintGalleyGridRow.php +++ b/controllers/grid/preprintGalleys/PreprintGalleyGridRow.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' diff --git a/controllers/grid/settings/sections/SectionGridHandler.php b/controllers/grid/settings/sections/SectionGridHandler.php index c5b4af0dd6..aaf4b5611d 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 1fcce01764..9861492558 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'), From 024118236c631aadab02a7669c64e46d339220ba Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Fri, 11 Oct 2024 20:40:16 +0800 Subject: [PATCH 2/4] pkp/pkp-lib#10444 Add modalStyle when using RemoteActionConfirmationModal modal --- controllers/grid/preprintGalleys/PreprintGalleyGridRow.php | 2 +- .../grid/settings/sections/SectionGridCellProvider.php | 6 ++++-- controllers/grid/settings/sections/SectionGridRow.php | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/controllers/grid/preprintGalleys/PreprintGalleyGridRow.php b/controllers/grid/preprintGalleys/PreprintGalleyGridRow.php index 21b161d6f6..327e3772ce 100644 --- a/controllers/grid/preprintGalleys/PreprintGalleyGridRow.php +++ b/controllers/grid/preprintGalleys/PreprintGalleyGridRow.php @@ -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/settings/sections/SectionGridCellProvider.php b/controllers/grid/settings/sections/SectionGridCellProvider.php index dc4c65e134..4325426b47 100644 --- a/controllers/grid/settings/sections/SectionGridCellProvider.php +++ b/controllers/grid/settings/sections/SectionGridCellProvider.php @@ -69,7 +69,8 @@ public function getCellActions($request, $row, $column, $position = GridHandler: 'activateSection', null, ['sectionKey' => $row->getId()] - ) + ), + 'primary' ) )]; } else { @@ -86,7 +87,8 @@ public function getCellActions($request, $row, $column, $position = GridHandler: 'deactivateSection', null, ['sectionKey' => $row->getId()] - ) + ), + 'negative' ) )]; } diff --git a/controllers/grid/settings/sections/SectionGridRow.php b/controllers/grid/settings/sections/SectionGridRow.php index 9861492558..75202dcb02 100644 --- a/controllers/grid/settings/sections/SectionGridRow.php +++ b/controllers/grid/settings/sections/SectionGridRow.php @@ -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' From ccb1de1ccbd0a8c76c48a96e911480d4c546e8fd Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Mon, 21 Oct 2024 19:12:49 +0800 Subject: [PATCH 3/4] pkp/pkp-lib#10444 Remove modalStyle param value when using AjaxModal --- controllers/grid/preprintGalleys/PreprintGalleyGridHandler.php | 1 - controllers/grid/preprintGalleys/PreprintGalleyGridRow.php | 1 - controllers/grid/settings/sections/SectionGridHandler.php | 1 - controllers/grid/settings/sections/SectionGridRow.php | 2 +- 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/controllers/grid/preprintGalleys/PreprintGalleyGridHandler.php b/controllers/grid/preprintGalleys/PreprintGalleyGridHandler.php index d0518e1eda..793ca6c5cf 100644 --- a/controllers/grid/preprintGalleys/PreprintGalleyGridHandler.php +++ b/controllers/grid/preprintGalleys/PreprintGalleyGridHandler.php @@ -157,7 +157,6 @@ public function initialize($request, $args = null) new AjaxModal( $request->getRouter()->url($request, null, null, 'addGalley', null, $this->getRequestArgs()), __('common.addFile'), - 'side-modal' ), __('common.addFile'), 'add_item' diff --git a/controllers/grid/preprintGalleys/PreprintGalleyGridRow.php b/controllers/grid/preprintGalleys/PreprintGalleyGridRow.php index 327e3772ce..8d9bd216fa 100644 --- a/controllers/grid/preprintGalleys/PreprintGalleyGridRow.php +++ b/controllers/grid/preprintGalleys/PreprintGalleyGridRow.php @@ -80,7 +80,6 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editGalley', null, $actionArgs), ($this->_isEditable) ? __('submission.layout.editGalley') : __('submission.layout.viewGalley'), - 'side-modal' ), ($this->_isEditable) ? __('grid.action.edit') : __('grid.action.view'), 'edit' diff --git a/controllers/grid/settings/sections/SectionGridHandler.php b/controllers/grid/settings/sections/SectionGridHandler.php index aaf4b5611d..6d8cbee88d 100644 --- a/controllers/grid/settings/sections/SectionGridHandler.php +++ b/controllers/grid/settings/sections/SectionGridHandler.php @@ -105,7 +105,6 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addSection', null, ['gridId' => $this->getId()]), __('manager.sections.create'), - 'side-modal' ), __('manager.sections.create'), 'add_section' diff --git a/controllers/grid/settings/sections/SectionGridRow.php b/controllers/grid/settings/sections/SectionGridRow.php index 75202dcb02..b28a76d1f7 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'), - 'side-modal', + null, true ), __('grid.action.edit'), From e3b7cf0f25fd7d776786798683563549c534cc7f Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Sun, 17 Nov 2024 23:08:23 +0800 Subject: [PATCH 4/4] pkp/pkp-lib#10444 Submodule update ##blesildaramirez/i10444## --- lib/pkp | 2 +- lib/ui-library | 2 +- plugins/generic/customBlockManager | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/pkp b/lib/pkp index 72087f4dab..580fe98e72 160000 --- a/lib/pkp +++ b/lib/pkp @@ -1 +1 @@ -Subproject commit 72087f4dabb1e80629b33639e3568501fd309fe2 +Subproject commit 580fe98e723c774a9d26b199ab852fad85938854 diff --git a/lib/ui-library b/lib/ui-library index a0ab8c6ea9..3a1f364948 160000 --- a/lib/ui-library +++ b/lib/ui-library @@ -1 +1 @@ -Subproject commit a0ab8c6ea9394b58a0afdd20bea03cc0a4058664 +Subproject commit 3a1f3649489dcca4c37133a1f4622e01ed736dc3 diff --git a/plugins/generic/customBlockManager b/plugins/generic/customBlockManager index 8222089b14..ceef23a370 160000 --- a/plugins/generic/customBlockManager +++ b/plugins/generic/customBlockManager @@ -1 +1 @@ -Subproject commit 8222089b14c55e89dabdb562a0e063b7e553b1dd +Subproject commit ceef23a3701e7b89e6eef35c6c2c52597e002c6d