From 2ea528dc889892215493ace22846195038d493b3 Mon Sep 17 00:00:00 2001 From: Blesilda Ramirez Date: Thu, 17 Oct 2024 03:40:29 +0800 Subject: [PATCH] pkp/pkp-lib#10444 Remove modalStyle param when using AjaxModal class --- classes/controllers/grid/plugins/PluginGridHandler.php | 1 - .../grid/users/reviewer/PKPReviewerGridHandler.php | 1 - classes/plugins/PKPPubIdPlugin.php | 1 - .../reviewer/form/PKPReviewerReviewStep1Form.php | 1 - .../api/file/linkAction/BaseAddFileLinkAction.php | 1 - controllers/api/file/linkAction/EditFileLinkAction.php | 1 - controllers/api/task/SendReminderLinkAction.php | 1 - controllers/api/task/SendThankYouLinkAction.php | 1 - controllers/grid/admin/context/ContextGridHandler.php | 2 +- controllers/grid/admin/context/ContextGridRow.php | 4 ++-- .../grid/admin/languages/AdminLanguageGridHandler.php | 2 +- .../announcements/AnnouncementTypeGridCellProvider.php | 2 +- .../grid/announcements/AnnouncementTypeGridHandler.php | 2 +- .../grid/announcements/AnnouncementTypeGridRow.php | 2 +- .../grid/eventLog/linkAction/EmailLinkAction.php | 1 - controllers/grid/files/LibraryFileGridHandler.php | 1 - controllers/grid/files/LibraryFileGridRow.php | 1 - .../fileList/linkAction/SelectFilesLinkAction.php | 1 - .../SubmissionDocumentsFilesGridHandler.php | 2 -- .../navigationMenus/NavigationMenuItemsGridHandler.php | 2 +- .../navigationMenus/NavigationMenuItemsGridRow.php | 2 +- .../NavigationMenusGridCellProvider.php | 2 +- .../navigationMenus/NavigationMenusGridHandler.php | 2 +- .../grid/navigationMenus/NavigationMenusGridRow.php | 2 +- .../grid/plugins/PluginGalleryGridCellProvider.php | 2 +- controllers/grid/plugins/PluginGridRow.php | 1 - controllers/grid/queries/QueriesGridHandler.php | 2 -- controllers/grid/queries/QueriesGridRow.php | 1 - controllers/grid/queries/QueryTitleGridColumn.php | 1 - .../settings/category/CategoryCategoryGridHandler.php | 1 - .../grid/settings/category/CategoryGridCategoryRow.php | 1 - controllers/grid/settings/category/CategoryGridRow.php | 1 - controllers/grid/settings/genre/GenreGridHandler.php | 2 +- controllers/grid/settings/genre/GenreGridRow.php | 2 +- .../languages/SubmissionLanguageGridHandler.php | 2 +- .../settings/reviewForms/ReviewFormElementGridRow.php | 2 +- .../reviewForms/ReviewFormElementsGridHandler.php | 2 +- .../settings/reviewForms/ReviewFormGridHandler.php | 2 +- .../grid/settings/reviewForms/ReviewFormGridRow.php | 4 ++-- .../grid/settings/roles/UserGroupGridHandler.php | 1 - controllers/grid/settings/roles/UserGroupGridRow.php | 1 - controllers/grid/settings/user/UserGridHandler.php | 2 +- controllers/grid/settings/user/UserGridRow.php | 10 +++++----- controllers/grid/users/author/AuthorGridHandler.php | 1 - controllers/grid/users/author/AuthorGridRow.php | 5 ++--- controllers/grid/users/reviewer/ReviewerGridRow.php | 8 -------- .../stageParticipant/StageParticipantGridHandler.php | 1 - .../users/stageParticipant/StageParticipantGridRow.php | 1 - .../stageParticipant/linkAction/NotifyLinkAction.php | 1 - .../linkAction/FileInfoCenterLinkAction.php | 1 - .../modals/review/ReviewerViewMetadataLinkAction.php | 1 - .../review/linkAction/ReviewNotesLinkAction.php | 1 - 52 files changed, 29 insertions(+), 69 deletions(-) diff --git a/classes/controllers/grid/plugins/PluginGridHandler.php b/classes/controllers/grid/plugins/PluginGridHandler.php index 22dd730caf6..b1e02b1fd9b 100644 --- a/classes/controllers/grid/plugins/PluginGridHandler.php +++ b/classes/controllers/grid/plugins/PluginGridHandler.php @@ -129,7 +129,6 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'uploadPlugin'), __('manager.plugins.upload'), - '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 4820c07fc5a..05d7a5fa585 100644 --- a/classes/controllers/grid/users/reviewer/PKPReviewerGridHandler.php +++ b/classes/controllers/grid/users/reviewer/PKPReviewerGridHandler.php @@ -238,7 +238,6 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'showReviewerForm', null, $actionArgs), __('editor.submission.addReviewer'), - 'side-modal' ), __('editor.submission.addReviewer'), 'add_user' diff --git a/classes/plugins/PKPPubIdPlugin.php b/classes/plugins/PKPPubIdPlugin.php index 6d97a0e8c0b..2b83c3e4b4f 100644 --- a/classes/plugins/PKPPubIdPlugin.php +++ b/classes/plugins/PKPPubIdPlugin.php @@ -78,7 +78,6 @@ public function getActions($request, $actionArgs) new AjaxModal( $router->url($request, null, null, 'manage', null, $actionArgs), $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 58a43c751df..e1cbffa0e85 100644 --- a/classes/submission/reviewer/form/PKPReviewerReviewStep1Form.php +++ b/classes/submission/reviewer/form/PKPReviewerReviewStep1Form.php @@ -105,7 +105,6 @@ public function fetch($request, $template = null, $display = false) new AjaxModal( $request->url(null, null, 'showDeclineReview', [$reviewAssignment->getSubmissionId()]), __('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 e4f2479acf4..2545804e31c 100644 --- a/controllers/api/file/linkAction/BaseAddFileLinkAction.php +++ b/controllers/api/file/linkAction/BaseAddFileLinkAction.php @@ -71,7 +71,6 @@ public function __construct( $actionArgs ), $wizardTitle, - 'side-modal' ); // Configure the link action. diff --git a/controllers/api/file/linkAction/EditFileLinkAction.php b/controllers/api/file/linkAction/EditFileLinkAction.php index 641a093b44d..8ef78bbde97 100644 --- a/controllers/api/file/linkAction/EditFileLinkAction.php +++ b/controllers/api/file/linkAction/EditFileLinkAction.php @@ -45,7 +45,6 @@ public function __construct($request, $submissionFile, $stageId) $this->getActionArgs($submissionFile, $stageId) ), __('grid.action.editFile'), - 'side-modal' ); // Configure the file link action. diff --git a/controllers/api/task/SendReminderLinkAction.php b/controllers/api/task/SendReminderLinkAction.php index fe215643f2e..7d450c0b263 100644 --- a/controllers/api/task/SendReminderLinkAction.php +++ b/controllers/api/task/SendReminderLinkAction.php @@ -36,7 +36,6 @@ public function __construct($request, $modalTitle, $actionArgs) $ajaxModal = new AjaxModal( $router->url($request, null, null, 'editReminder', null, $actionArgs), __($modalTitle), - 'side-modal' ); // Configure the link action. diff --git a/controllers/api/task/SendThankYouLinkAction.php b/controllers/api/task/SendThankYouLinkAction.php index ac272bb971e..9db7f1a309f 100644 --- a/controllers/api/task/SendThankYouLinkAction.php +++ b/controllers/api/task/SendThankYouLinkAction.php @@ -36,7 +36,6 @@ public function __construct($request, $modalTitle, $actionArgs) $ajaxModal = new AjaxModal( $router->url($request, null, null, 'editThankReviewer', null, $actionArgs), __($modalTitle), - 'side-modal' ); // Configure the link action. diff --git a/controllers/grid/admin/context/ContextGridHandler.php b/controllers/grid/admin/context/ContextGridHandler.php index 1807450a7e8..d410f881b3c 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'), - 'side-modal', + null, true, 'context', ['editContext'] diff --git a/controllers/grid/admin/context/ContextGridRow.php b/controllers/grid/admin/context/ContextGridRow.php index b85dfbcc056..ecce39d7b93 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'), - 'side-modal', + null, true, 'context', ['editContext'] @@ -89,7 +89,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, $element->getPath(), null, 'users', null), __('manager.users'), - 'side-modal', + null, true ), __('manager.users'), diff --git a/controllers/grid/admin/languages/AdminLanguageGridHandler.php b/controllers/grid/admin/languages/AdminLanguageGridHandler.php index 56d0758bd66..02a5390f53f 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'), - 'side-modal', + null, true ), __('admin.languages.installLocale'), diff --git a/controllers/grid/announcements/AnnouncementTypeGridCellProvider.php b/controllers/grid/announcements/AnnouncementTypeGridCellProvider.php index a016b46b3bc..f33ca7d771e 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'), - 'side-modal', + null, true ), htmlspecialchars($announcementType->getLocalizedTypeName()) diff --git a/controllers/grid/announcements/AnnouncementTypeGridHandler.php b/controllers/grid/announcements/AnnouncementTypeGridHandler.php index 1436b6282ce..5d74dfabd72 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'), - 'side-modal', + null, true ), __('grid.action.addAnnouncementType'), diff --git a/controllers/grid/announcements/AnnouncementTypeGridRow.php b/controllers/grid/announcements/AnnouncementTypeGridRow.php index a66639a9a36..762270c8995 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'), - 'side-modal', + null, true ), __('grid.action.edit'), diff --git a/controllers/grid/eventLog/linkAction/EmailLinkAction.php b/controllers/grid/eventLog/linkAction/EmailLinkAction.php index fc9cda8907e..d96fdfae3d7 100644 --- a/controllers/grid/eventLog/linkAction/EmailLinkAction.php +++ b/controllers/grid/eventLog/linkAction/EmailLinkAction.php @@ -37,7 +37,6 @@ public function __construct($request, $modalTitle, $actionArgs) $ajaxModal = new AjaxModal( $router->url($request, null, null, 'viewEmail', null, $actionArgs), $modalTitle, - 'side-modal' ); // Configure the link action. diff --git a/controllers/grid/files/LibraryFileGridHandler.php b/controllers/grid/files/LibraryFileGridHandler.php index ceb8a81fa43..5f0b35a7bdd 100644 --- a/controllers/grid/files/LibraryFileGridHandler.php +++ b/controllers/grid/files/LibraryFileGridHandler.php @@ -120,7 +120,6 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addFile', null, $this->getActionArgs()), __('grid.action.addFile'), - 'side-modal' ), __('grid.action.addFile'), 'add' diff --git a/controllers/grid/files/LibraryFileGridRow.php b/controllers/grid/files/LibraryFileGridRow.php index a2eae36b4ec..b0cd6c7b8e4 100644 --- a/controllers/grid/files/LibraryFileGridRow.php +++ b/controllers/grid/files/LibraryFileGridRow.php @@ -97,7 +97,6 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editFile', null, $actionArgs), __('grid.action.edit'), - 'side-modal' ), __('grid.action.edit'), 'edit' diff --git a/controllers/grid/files/fileList/linkAction/SelectFilesLinkAction.php b/controllers/grid/files/fileList/linkAction/SelectFilesLinkAction.php index 5788b4cc34f..39bd30cfcd8 100644 --- a/controllers/grid/files/fileList/linkAction/SelectFilesLinkAction.php +++ b/controllers/grid/files/fileList/linkAction/SelectFilesLinkAction.php @@ -40,7 +40,6 @@ public function __construct($request, $actionArgs, $actionLabel, $modalTitle = n $ajaxModal = new AjaxModal( $router->url($request, null, null, 'selectFiles', null, $actionArgs), $modalTitle, - 'side-modal' ); // Configure the link action. diff --git a/controllers/grid/files/submissionDocuments/SubmissionDocumentsFilesGridHandler.php b/controllers/grid/files/submissionDocuments/SubmissionDocumentsFilesGridHandler.php index 77d4ab5c626..74e0f2f6f95 100644 --- a/controllers/grid/files/submissionDocuments/SubmissionDocumentsFilesGridHandler.php +++ b/controllers/grid/files/submissionDocuments/SubmissionDocumentsFilesGridHandler.php @@ -76,7 +76,6 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addFile', null, $this->getActionArgs()), __('grid.action.addFile'), - 'side-modal' ), __('grid.action.addFile'), 'add' @@ -90,7 +89,6 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'viewLibrary', null, $this->getActionArgs()), __('grid.action.viewLibrary'), - 'side-modal' ), __('grid.action.viewLibrary'), 'more_info' diff --git a/controllers/grid/navigationMenus/NavigationMenuItemsGridHandler.php b/controllers/grid/navigationMenus/NavigationMenuItemsGridHandler.php index e791df7446d..2348d90815d 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'), - 'side-modal', + null, true ), __('grid.action.addNavigationMenuItem'), diff --git a/controllers/grid/navigationMenus/NavigationMenuItemsGridRow.php b/controllers/grid/navigationMenus/NavigationMenuItemsGridRow.php index b7af522e852..396c5273bc0 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'), - 'side-modal', + null, true ), __('grid.action.edit'), diff --git a/controllers/grid/navigationMenus/NavigationMenusGridCellProvider.php b/controllers/grid/navigationMenus/NavigationMenusGridCellProvider.php index 09ecee0d86e..39c69749d13 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'), - 'side-modal', + null, true ), htmlspecialchars($navigationMenu->getTitle()) diff --git a/controllers/grid/navigationMenus/NavigationMenusGridHandler.php b/controllers/grid/navigationMenus/NavigationMenusGridHandler.php index faa04762d31..23663485c05 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'), - 'side-modal', + null, true ), __('grid.action.addNavigationMenu'), diff --git a/controllers/grid/navigationMenus/NavigationMenusGridRow.php b/controllers/grid/navigationMenus/NavigationMenusGridRow.php index 491b3b9666d..6eba997ebb0 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'), - 'side-modal', + null, true ), __('grid.action.edit'), diff --git a/controllers/grid/plugins/PluginGalleryGridCellProvider.php b/controllers/grid/plugins/PluginGalleryGridCellProvider.php index 7f92cf8b2af..965544627d6 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()), - 'side-modal', + null, true ), htmlspecialchars($element->getLocalizedName()), diff --git a/controllers/grid/plugins/PluginGridRow.php b/controllers/grid/plugins/PluginGridRow.php index eda6299ec09..628a4210164 100644 --- a/controllers/grid/plugins/PluginGridRow.php +++ b/controllers/grid/plugins/PluginGridRow.php @@ -94,7 +94,6 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'upgradePlugin', null, $actionArgs), __('manager.plugins.upgrade'), - 'side-modal' ), __('grid.action.upgrade'), 'upgrade' diff --git a/controllers/grid/queries/QueriesGridHandler.php b/controllers/grid/queries/QueriesGridHandler.php index b44a2b4d2d3..37d2c15f2bf 100644 --- a/controllers/grid/queries/QueriesGridHandler.php +++ b/controllers/grid/queries/QueriesGridHandler.php @@ -237,7 +237,6 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addQuery', null, $this->getRequestArgs()), __('grid.action.addQuery'), - 'side-modal' ), __('grid.action.addQuery'), 'add_item' @@ -473,7 +472,6 @@ public function readQuery($args, $request) new AjaxModal( $router->url($request, null, null, 'editQuery', null, $actionArgs), __('grid.action.updateQuery'), - 'side-modal' ), __('grid.action.edit'), 'edit' diff --git a/controllers/grid/queries/QueriesGridRow.php b/controllers/grid/queries/QueriesGridRow.php index 2c8093de51a..13916989c43 100644 --- a/controllers/grid/queries/QueriesGridRow.php +++ b/controllers/grid/queries/QueriesGridRow.php @@ -81,7 +81,6 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editQuery', null, $actionArgs), __('grid.action.updateQuery'), - 'side-modal' ), __('grid.action.edit'), 'edit' diff --git a/controllers/grid/queries/QueryTitleGridColumn.php b/controllers/grid/queries/QueryTitleGridColumn.php index 35fbf645832..2b58c48ed28 100644 --- a/controllers/grid/queries/QueryTitleGridColumn.php +++ b/controllers/grid/queries/QueryTitleGridColumn.php @@ -95,7 +95,6 @@ public function getCellActions($request, $row, $position = GridHandler::GRID_ACT new AjaxModal( $router->url($request, null, null, 'readQuery', null, $actionArgs), $headNote ? htmlspecialchars($headNote->title) : '—', - '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 ec6f555e87b..e77b9cf0841 100644 --- a/controllers/grid/settings/category/CategoryCategoryGridHandler.php +++ b/controllers/grid/settings/category/CategoryCategoryGridHandler.php @@ -94,7 +94,6 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addCategory'), __('grid.category.add'), - 'side-modal' ), __('grid.category.add'), 'add_category' diff --git a/controllers/grid/settings/category/CategoryGridCategoryRow.php b/controllers/grid/settings/category/CategoryGridCategoryRow.php index 58418cbc6f4..bf2d0f7546a 100644 --- a/controllers/grid/settings/category/CategoryGridCategoryRow.php +++ b/controllers/grid/settings/category/CategoryGridCategoryRow.php @@ -71,7 +71,6 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editCategory', null, ['categoryId' => $categoryId]), __('grid.category.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 9c5e9b2acb3..9aa61f5526e 100644 --- a/controllers/grid/settings/category/CategoryGridRow.php +++ b/controllers/grid/settings/category/CategoryGridRow.php @@ -53,7 +53,6 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editCategory', null, $actionArgs), __('grid.category.edit'), - 'side-modal' ), __('grid.action.edit'), 'edit' diff --git a/controllers/grid/settings/genre/GenreGridHandler.php b/controllers/grid/settings/genre/GenreGridHandler.php index c188a0c2b46..e4bb4f80ba3 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'), - 'side-modal', + null, true ), __('grid.action.addGenre'), diff --git a/controllers/grid/settings/genre/GenreGridRow.php b/controllers/grid/settings/genre/GenreGridRow.php index 8822a1db034..87ba315ad12 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'), - 'side-modal', + null, true ), __('grid.action.edit'), diff --git a/controllers/grid/settings/languages/SubmissionLanguageGridHandler.php b/controllers/grid/settings/languages/SubmissionLanguageGridHandler.php index c6712079ad7..91f10fdffb5 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'), - 'side-modal', + null, true, 'addLanguageForm' ), diff --git a/controllers/grid/settings/reviewForms/ReviewFormElementGridRow.php b/controllers/grid/settings/reviewForms/ReviewFormElementGridRow.php index de81168e718..cc0313820c3 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'), - 'side-modal', + null, true ), __('grid.action.edit'), diff --git a/controllers/grid/settings/reviewForms/ReviewFormElementsGridHandler.php b/controllers/grid/settings/reviewForms/ReviewFormElementsGridHandler.php index 8828e24500b..9be8b49132c 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'), - 'side-modal', + null, true ), __('manager.reviewFormElements.create'), diff --git a/controllers/grid/settings/reviewForms/ReviewFormGridHandler.php b/controllers/grid/settings/reviewForms/ReviewFormGridHandler.php index 5919fc5a9f6..0aa2ae0de0b 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'), - 'side-modal', + null, true ), __('manager.reviewForms.create'), diff --git a/controllers/grid/settings/reviewForms/ReviewFormGridRow.php b/controllers/grid/settings/reviewForms/ReviewFormGridRow.php index b0e26e7ddc0..b3303a8c135 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'), - 'side-modal', + null, true ), __('grid.action.edit'), @@ -88,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'), - 'side-modal', + null, true ), __('grid.action.preview'), diff --git a/controllers/grid/settings/roles/UserGroupGridHandler.php b/controllers/grid/settings/roles/UserGroupGridHandler.php index d6f18d08617..04b25a7db71 100644 --- a/controllers/grid/settings/roles/UserGroupGridHandler.php +++ b/controllers/grid/settings/roles/UserGroupGridHandler.php @@ -126,7 +126,6 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addUserGroup'), __('grid.roles.add'), - 'side-modal' ), __('grid.roles.add'), 'add_role' diff --git a/controllers/grid/settings/roles/UserGroupGridRow.php b/controllers/grid/settings/roles/UserGroupGridRow.php index e5c284475a6..04c3ae14f05 100644 --- a/controllers/grid/settings/roles/UserGroupGridRow.php +++ b/controllers/grid/settings/roles/UserGroupGridRow.php @@ -53,7 +53,6 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editUserGroup', null, $actionArgs), __('grid.action.edit'), - 'side-modal' ), __('grid.action.edit'), 'edit' diff --git a/controllers/grid/settings/user/UserGridHandler.php b/controllers/grid/settings/user/UserGridHandler.php index 38953afcb36..5db4be97cd0 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'), - 'side-modal', + null, true ), __('grid.user.add'), diff --git a/controllers/grid/settings/user/UserGridRow.php b/controllers/grid/settings/user/UserGridRow.php index ba2736d7a73..c2dc548ef15 100644 --- a/controllers/grid/settings/user/UserGridRow.php +++ b/controllers/grid/settings/user/UserGridRow.php @@ -106,7 +106,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editEmail', null, $actionArgs), __('grid.user.email'), - 'side-modal', + null, 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'), - 'side-modal', + null, 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'), - 'side-modal', + null, 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'), - 'side-modal', + null, true ), __('grid.user.disable'), @@ -205,7 +205,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'mergeUsers', null, ['oldUserId' => $rowId]), __('grid.user.mergeUsers.mergeUser'), - 'side-modal', + null, true ), __('grid.user.mergeUsers.mergeUser'), diff --git a/controllers/grid/users/author/AuthorGridHandler.php b/controllers/grid/users/author/AuthorGridHandler.php index e0384848c70..e3191b842b5 100644 --- a/controllers/grid/users/author/AuthorGridHandler.php +++ b/controllers/grid/users/author/AuthorGridHandler.php @@ -139,7 +139,6 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addAuthor', null, $actionArgs), __('grid.action.addContributor'), - 'modal_add_user' ), __('grid.action.addContributor'), 'add_user' diff --git a/controllers/grid/users/author/AuthorGridRow.php b/controllers/grid/users/author/AuthorGridRow.php index 9375f01da0f..c8ea6433f93 100644 --- a/controllers/grid/users/author/AuthorGridRow.php +++ b/controllers/grid/users/author/AuthorGridRow.php @@ -81,7 +81,6 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editAuthor', null, $actionArgs), __('grid.action.editContributor'), - 'modal_edit' ), __('grid.action.edit'), 'edit' @@ -96,7 +95,7 @@ public function initialize($request, $template = null) __('common.confirmDelete'), __('common.delete'), $router->url($request, null, null, 'deleteAuthor', null, $actionArgs), - 'modal_delete' + 'negative' ), __('grid.action.delete'), 'delete' @@ -112,7 +111,7 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'addUser', null, $actionArgs), __('grid.user.add'), - 'modal_add_user', + null, true ), __('grid.user.add'), diff --git a/controllers/grid/users/reviewer/ReviewerGridRow.php b/controllers/grid/users/reviewer/ReviewerGridRow.php index 7e77cd9e23b..aee0470cc19 100644 --- a/controllers/grid/users/reviewer/ReviewerGridRow.php +++ b/controllers/grid/users/reviewer/ReviewerGridRow.php @@ -90,7 +90,6 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'readReview', null, $actionArgs), __('editor.review.reviewDetails') . ': ' . $submission->getCurrentPublication()->getLocalizedTitle(null, 'html'), - 'side-modal' ), __('editor.review.reviewDetails'), 'more_info' @@ -104,7 +103,6 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'sendEmail', null, $actionArgs), __('editor.review.emailReviewer'), - 'side-modal' ), __('editor.review.emailReviewer'), 'notify' @@ -119,7 +117,6 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'resendRequestReviewer', null, $actionArgs), __('editor.review.resendRequestReviewer'), - 'side-modal' ), __('editor.review.resendRequestReviewer'), 'add' @@ -133,7 +130,6 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'editReview', null, $actionArgs), __('editor.submissionReview.editReview'), - 'side-modal' ), __('common.edit'), 'edit' @@ -147,7 +143,6 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'unassignReviewer', null, $actionArgs), $reviewAssignment->getDateConfirmed() ? __('editor.review.cancelReviewer') : __('editor.review.unassignReviewer'), - 'side-modal' ), $reviewAssignment->getDateConfirmed() ? __('editor.review.cancelReviewer') : __('editor.review.unassignReviewer'), 'delete' @@ -160,7 +155,6 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'reinstateReviewer', null, $actionArgs), __('editor.review.reinstateReviewer'), - 'side-modal' ), __('editor.review.reinstateReviewer'), 'add' @@ -175,7 +169,6 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'reviewHistory', null, $actionArgs), __('submission.history'), - 'side-modal' ), __('submission.history'), 'more_info' @@ -214,7 +207,6 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'gossip', null, $actionArgs), __('user.gossip'), - 'side-modal' ), __('user.gossip'), 'more_info' diff --git a/controllers/grid/users/stageParticipant/StageParticipantGridHandler.php b/controllers/grid/users/stageParticipant/StageParticipantGridHandler.php index 59421ef642c..5f026a935c3 100644 --- a/controllers/grid/users/stageParticipant/StageParticipantGridHandler.php +++ b/controllers/grid/users/stageParticipant/StageParticipantGridHandler.php @@ -174,7 +174,6 @@ public function initialize($request, $args = null) new AjaxModal( $router->url($request, null, null, 'addParticipant', null, $this->getRequestArgs()), __('editor.submission.addStageParticipant'), - 'side-modal' ), __('common.assign'), 'add_user' diff --git a/controllers/grid/users/stageParticipant/StageParticipantGridRow.php b/controllers/grid/users/stageParticipant/StageParticipantGridRow.php index 0028bf2c50a..4b84bf762ff 100644 --- a/controllers/grid/users/stageParticipant/StageParticipantGridRow.php +++ b/controllers/grid/users/stageParticipant/StageParticipantGridRow.php @@ -92,7 +92,6 @@ public function initialize($request, $template = null) new AjaxModal( $router->url($request, null, null, 'addParticipant', null, $this->getRequestArgs()), __('editor.submission.editStageParticipant'), - 'side-modal' ), __('common.edit'), 'edit_user' diff --git a/controllers/grid/users/stageParticipant/linkAction/NotifyLinkAction.php b/controllers/grid/users/stageParticipant/linkAction/NotifyLinkAction.php index 74a501fdeca..0e490664abf 100644 --- a/controllers/grid/users/stageParticipant/linkAction/NotifyLinkAction.php +++ b/controllers/grid/users/stageParticipant/linkAction/NotifyLinkAction.php @@ -51,7 +51,6 @@ public function __construct($request, &$submission, $stageId, $userId = null) $requestArgs ), __('submission.stageParticipants.notify'), - 'side-modal' ); // Configure the file link action. diff --git a/controllers/informationCenter/linkAction/FileInfoCenterLinkAction.php b/controllers/informationCenter/linkAction/FileInfoCenterLinkAction.php index 8a5c32f11ca..10694f4ea1a 100644 --- a/controllers/informationCenter/linkAction/FileInfoCenterLinkAction.php +++ b/controllers/informationCenter/linkAction/FileInfoCenterLinkAction.php @@ -70,7 +70,6 @@ public function getModal($request, $submissionFile, $stageId) $this->getActionArgs($submissionFile, $stageId) ), $title, - 'side-modal' ); return $ajaxModal; diff --git a/controllers/modals/review/ReviewerViewMetadataLinkAction.php b/controllers/modals/review/ReviewerViewMetadataLinkAction.php index edae408934d..b8da84e82f7 100644 --- a/controllers/modals/review/ReviewerViewMetadataLinkAction.php +++ b/controllers/modals/review/ReviewerViewMetadataLinkAction.php @@ -47,7 +47,6 @@ public function __construct($request, $submissionId, $reviewAssignmentId) ['submissionId' => $submissionId, 'reviewAssignmentId' => $reviewAssignmentId] ), __('reviewer.step1.viewAllDetails'), - 'side-modal' ); // Configure the link action. parent::__construct('viewMetadata', $modal, __('reviewer.step1.viewAllDetails')); diff --git a/controllers/review/linkAction/ReviewNotesLinkAction.php b/controllers/review/linkAction/ReviewNotesLinkAction.php index a3a8f6f7b50..30c72649122 100644 --- a/controllers/review/linkAction/ReviewNotesLinkAction.php +++ b/controllers/review/linkAction/ReviewNotesLinkAction.php @@ -56,7 +56,6 @@ public function __construct($request, $reviewAssignment, $submission, $user, $ha $actionArgs ), __('editor.review') . ': ' . htmlspecialchars($submission->getCurrentPublication()->getLocalizedTitle(null, 'html')), - 'modal_information' ); $icon = match ($reviewAssignment->getConsidered()) {