pkp#10444 Define modalStyle when using dialog component

blesildaramirez · Oct 7, 2024 · d81d33d · d81d33d
1 parent 7fcf7ca
commit d81d33d
Show file tree

Hide file tree

Showing 45 changed files with 85 additions and 78 deletions.
diff --git 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
@@ -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/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

diff --git 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
@@ -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
@@ -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/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/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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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/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
@@ -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
@@ -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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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) : '&mdash;',
-                        'modal_edit'
+                        'side-modal'
                     ),
                     ($headNote?->title != '') ? htmlspecialchars($headNote->title) : '&mdash;',
                     null

diff --git 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
@@ -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/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'