From c2928abe53aebed033a1d68fdf190e624b5d0a95 Mon Sep 17 00:00:00 2001 From: Patricia Stelling Date: Tue, 1 Jun 2021 14:24:13 +0200 Subject: [PATCH 1/5] dev: adding new model for test --- .../MassiveActionsWidget.php | 2 +- .../views/modals/cancel-add.php | 44 +++++++++++++++++++ .../massiveAction/_selector.php | 4 +- 3 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-add.php diff --git a/application/extensions/admin/grid/MassiveActionsWidget/MassiveActionsWidget.php b/application/extensions/admin/grid/MassiveActionsWidget/MassiveActionsWidget.php index 21b014ab092..047ecc0d19b 100644 --- a/application/extensions/admin/grid/MassiveActionsWidget/MassiveActionsWidget.php +++ b/application/extensions/admin/grid/MassiveActionsWidget/MassiveActionsWidget.php @@ -65,6 +65,6 @@ public function run() private function isView($display) { - return in_array($display, array('yes-no', 'empty', 'yes-no-lg', 'empty-lg')); + return in_array($display, array('yes-no', 'empty', 'yes-no-lg', 'empty-lg', 'cancel-add')); } } diff --git a/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-add.php b/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-add.php new file mode 100644 index 00000000000..a6a91a4fc39 --- /dev/null +++ b/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-add.php @@ -0,0 +1,44 @@ + + diff --git a/application/views/userManagement/massiveAction/_selector.php b/application/views/userManagement/massiveAction/_selector.php index 6b8cd737be2..73bfd06849a 100644 --- a/application/views/userManagement/massiveAction/_selector.php +++ b/application/views/userManagement/massiveAction/_selector.php @@ -34,7 +34,7 @@ 'text' => gT('Resend login data'), 'grid-reload' => 'yes', 'actionType' => 'modal', - 'modalType' => 'yes-no', + 'modalType' => 'cancel-add', 'keepopen' => 'yes', 'showSelected' => 'yes', 'selectedUrl' => App()->createUrl('userManagement/renderSelectedItems/'), @@ -74,7 +74,7 @@ 'grid-reload' => 'yes', //modal 'actionType' => 'modal', - 'modalType' => 'yes-no-lg', + 'modalType' => 'cancel-add', 'keepopen' => 'yes', 'showSelected' => 'yes', 'selectedUrl' => App()->createUrl('userManagement/renderSelectedItems/'), From aa786d00b15e8adf277de2b13885567dd68f6b62 Mon Sep 17 00:00:00 2001 From: Patricia Stelling Date: Wed, 2 Jun 2021 12:55:33 +0200 Subject: [PATCH 2/5] dev: created separated footer and header views using it in MassiveActionsWidget.php already as a first test dev: new modal footers, new modal for massiveaction, test changes in Usermanagement list dev: changed all selector data (for the new template views) where easily possible dev: changed selector for massive action in participants grid view dev: changed modal footer buttons for Adding user (admin) dev: changes for modals button and header dev: changes for modals button and header export surveys dev: changing modals header and footer buttons dev: changing modals header and footer buttons dev: changing modals header and footer buttons dev: changes for modals button and header dev: changes for modal views, added delete button dev: changes for modal views dev: changes for modal views dev: changes for modal views dev: changes for modal views dev: all modals changes here --> buttons in footer position below modal-body dev: all modals changes here --> buttons in footer position below modal-body dev: changing cancel bnt class for modal in user groups --- .../views/grouped_select_modal.php | 2 +- .../PreviewModalWidget/views/select_modal.php | 2 +- .../MassiveActionsWidget.php | 20 +- .../views/modals/cancel-add.php | 44 - .../views/modals/cancel-apply.php | 80 + .../views/modals/cancel-delete.php | 80 + .../_export_archive_results.php | 7 + .../views/massive_actions/_selector.php | 30 +- application/models/Box.php | 6 +- application/models/TemplateConfiguration.php | 8 + application/models/TemplateManifest.php | 3 + .../admin/conditions/conditionshead_view.php | 4 +- .../emailtemplates/emailtemplates_view.php | 3 + .../admin/htmleditor/modal_editor_partial.php | 2 +- .../massive_actions/_selector.php | 4 +- .../massive_actions/_selector_attribute.php | 2 +- .../massive_actions/_selector_share.php | 2 +- .../modal_subviews/_addToSurvey.php | 4 +- .../modal_subviews/_deleteParticipant.php | 15 +- .../modal_subviews/_editAttribute.php | 2 +- .../modal_subviews/_editParticipant.php | 18 +- .../modal_subviews/_exportCSV.php | 4 +- .../modal_subviews/_shareParticipant.php | 15 +- .../views/admin/permissiontemplates/index.php | 2 +- .../massiveAction/_selector.php | 2 +- .../permissiontemplates/partials/_form.php | 54 +- .../permissiontemplates/partials/_import.php | 34 +- .../partials/_permissions.php | 37 +- .../permissiontemplates/partials/_view.php | 9 +- application/views/admin/super/footer.php | 4 +- .../Question/massive_actions/_selector.php | 40 +- .../subview/import_ressources_modal.php | 6 +- application/views/admin/surveymenu/_form.php | 15 +- application/views/admin/surveymenu/index.php | 6 +- .../surveymenu/massive_action/_selector.php | 4 +- .../views/admin/surveymenu_entries/_form.php | 15 +- .../views/admin/surveymenu_entries/index.php | 2 +- .../massive_action/_selector.php | 4 +- application/views/admin/token/browse.php | 2 +- .../admin/token/massive_actions/_selector.php | 6 +- .../views/assessment/assessments_delete.php | 24 +- .../views/assessment/assessments_edit.php | 11 +- .../modal_footer_cancelapply.php | 13 + .../modal_footer_canceldelete.php | 14 + .../layouts/partial_modals/modal_header.php | 8 + application/views/themeOptions/_selector.php | 2 +- .../views/themeOptions/import_modal.php | 20 +- application/views/themeOptions/index.php | 16 +- .../views/themeOptions/surveythememenu.php | 2 +- .../views/userGroup/usergroups_view.php | 15 +- application/views/userManagement/index.php | 2 +- .../massiveAction/_selector.php | 14 +- .../userManagement/partial/adddummyuser.php | 24 +- .../userManagement/partial/addedituser.php | 67 +- .../views/userManagement/partial/addrole.php | 46 +- .../partial/confirmuserdelete.php | 21 +- .../partial/editpermissions.php | 27 +- .../partial/edittemplatepermissions.php | 31 +- .../userManagement/partial/importuser.php | 36 +- .../views/userManagement/partial/showuser.php | 20 +- .../views/userManagement/partial/success.php | 11 +- .../adminbasics/build/adminbasics.css | 362 +- .../packages/adminbasics/build/adminbasics.js | 80722 ++++++++-------- .../adminbasics/build/adminbasics.min.css | 2 +- .../adminbasics/build/adminbasics.min.js | 2 +- .../adminbasics/build/adminbasics.rtl.css | 376 +- .../adminbasics/build/adminbasics.rtl.min.css | 2 +- .../src/components/confirmdeletemodal.js | 5 +- 68 files changed, 41267 insertions(+), 41227 deletions(-) delete mode 100644 application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-add.php create mode 100644 application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-apply.php create mode 100644 application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-delete.php create mode 100644 application/views/layouts/partial_modals/modal_footer_cancelapply.php create mode 100644 application/views/layouts/partial_modals/modal_footer_canceldelete.php create mode 100644 application/views/layouts/partial_modals/modal_header.php diff --git a/application/extensions/admin/PreviewModalWidget/views/grouped_select_modal.php b/application/extensions/admin/PreviewModalWidget/views/grouped_select_modal.php index a7bd0e6a784..a3a7e14aacb 100644 --- a/application/extensions/admin/PreviewModalWidget/views/grouped_select_modal.php +++ b/application/extensions/admin/PreviewModalWidget/views/grouped_select_modal.php @@ -76,7 +76,7 @@ class="list-group-item selector__Item--select-widgetsJsName?>
-
- -
-
-
-
- - -
- - - - - -
-
- - -   - - -
- - - - diff --git a/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-apply.php b/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-apply.php new file mode 100644 index 00000000000..535df63bec1 --- /dev/null +++ b/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-apply.php @@ -0,0 +1,80 @@ + + + + + diff --git a/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-delete.php b/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-delete.php new file mode 100644 index 00000000000..e88be17929a --- /dev/null +++ b/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-delete.php @@ -0,0 +1,80 @@ + + + + + diff --git a/application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_export_archive_results.php b/application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_export_archive_results.php index d130e7e1ad1..61aaea95e6e 100644 --- a/application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_export_archive_results.php +++ b/application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_export_archive_results.php @@ -37,8 +37,15 @@ +
+ +
diff --git a/application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php b/application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php index 59e76c40fcf..7b21ddd29d4 100644 --- a/application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php +++ b/application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php @@ -27,7 +27,7 @@ // modal 'actionType' => 'modal', - 'modalType' => 'yes-no', + 'modalType' => 'cancel-delete', 'keepopen' => 'yes', 'showSelected' => 'yes', 'selectedUrl' => App()->createUrl('/surveyAdministration/renderItemsSelected/'), @@ -53,12 +53,12 @@ 'grid-reload' => 'no', // modal 'actionType' => 'modal', - 'modalType' => 'yes-no', - 'showSelected' => 'yes', + 'modalType' => 'cancel-apply', + 'showSelected' => 'yes', 'selectedUrl' => App()->createUrl('/surveyAdministration/renderItemsSelected/'), 'keepopen' => 'yes', 'sModalTitle' => gT('Set survey theme'), - 'htmlModalBody' => $this->controller->renderFile(__DIR__.'/_select_survey_theme.php',array(),true), + 'htmlModalBody' => $this->controller->renderFile(__DIR__.'/_select_survey_theme.php', array(), true), ), // Change survey group selector @@ -72,9 +72,9 @@ 'grid-reload' => 'yes', // modal 'actionType' => 'modal', - 'modalType' => 'yes-no', + 'modalType' => 'cancel-apply', 'keepopen' => 'yes', - 'showSelected' => 'yes', + 'showSelected' => 'yes', 'selectedUrl' => App()->createUrl('/surveyAdministration/renderItemsSelected/'), 'sModalTitle' => gT('Change survey group'), 'htmlModalBody' => $this->controller->renderFile(__DIR__.'/_change_survey_group.php',array(),true), @@ -106,9 +106,9 @@ // modal 'actionType' => 'modal', - 'modalType' => 'yes-no', + 'modalType' => 'cancel-apply', 'keepopen' => 'yes', - 'showSelected' => 'yes', + 'showSelected' => 'yes', 'selectedUrl' => App()->createUrl('/surveyAdministration/renderItemsSelected/'), 'sModalTitle' => gT('Export survey archive'), 'htmlModalBody' => gT('This will export the survey archive (.lsa) for all selected active surveys. They will be provided in a single ZIP archive.').' '.gT('Continue?'), @@ -126,9 +126,9 @@ // modal 'actionType' => 'modal', - 'modalType' => 'yes-no', + 'modalType' => 'cancel-apply', 'keepopen' => 'yes', - 'showSelected' => 'yes', + 'showSelected' => 'yes', 'selectedUrl' => App()->createUrl('/surveyAdministration/renderItemsSelected/'), 'sModalTitle' => gT('Export survey structure'), 'htmlModalBody' => gT('This will export the survey structure (.lss) for all selected active surveys. They will be provided in a single ZIP archive.').' '.gT('Continue?'), @@ -144,9 +144,9 @@ 'text' => gT("Printable survey (*.html)"), // modal 'actionType' => 'modal', - 'modalType' => 'yes-no', + 'modalType' => 'cancel-apply', 'keepopen' => 'yes', - 'showSelected' => 'yes', + 'showSelected' => 'yes', 'selectedUrl' => App()->createUrl('/surveyAdministration/renderItemsSelected/'), 'sModalTitle' => gT('Export printable survey'), 'htmlModalBody' => gT('This will export a printable version of your survey.').' '.gT('Continue?'), @@ -162,12 +162,12 @@ 'grid-reload' => 'yes', // modal 'actionType' => 'modal', - 'modalType' => 'yes-no', - 'showSelected' => 'yes', + 'modalType' => 'cancel-apply', + 'showSelected' => 'yes', 'selectedUrl' => App()->createUrl('/surveyAdministration/renderItemsSelected/'), 'keepopen' => 'yes', 'sModalTitle' => gT('Set expiry date'), - 'htmlModalBody' => $this->controller->renderFile(__DIR__.'/_expiry_dialog.php',array(),true), + 'htmlModalBody' => $this->controller->renderFile(__DIR__.'/_expiry_dialog.php', array(), true), ), ), diff --git a/application/models/Box.php b/application/models/Box.php index e6d58a11301..f5d57cae3e5 100644 --- a/application/models/Box.php +++ b/application/models/Box.php @@ -142,10 +142,10 @@ public function getbuttons() $url = Yii::app()->createUrl("/homepageSettings/deleteBox"); //$url .= '/'.$this->id; $button .= ' $this->id]) . '\'' . ' data-text="' . gT('Are you sure you want to delete this box ?') . '"' . '>'; diff --git a/application/models/TemplateConfiguration.php b/application/models/TemplateConfiguration.php index e3a9857b747..ba25edc530c 100755 --- a/application/models/TemplateConfiguration.php +++ b/application/models/TemplateConfiguration.php @@ -767,6 +767,8 @@ class='btn btn-default btn-block'> ]) . '\' data-text="' . gT('Please type in the new theme name above.') . '" + data-button-no="' . gt('Cancel') . '" + data-button-yes="' . gt('Apply') . '" title="' . sprintf(gT('Type in the new name to extend %s'), $this->template_name) . '" class="btn btn-primary btn-block selector--ConfirmModal"> @@ -778,6 +780,9 @@ class="btn btn-primary btn-block selector--ConfirmModal"> href="' . $sUninstallUrl . '" data-post=\'{ "templatename": "' . $this->template_name . '" }\' data-text="' . gT('This will reset all the specific configurations of this theme.') . '
' . gT('Do you want to continue?') . '" + data-button-no="' . gt('Cancel') . '" + data-button-yes="' . gt('Uninstall') . '" + data-button-type="btn-danger" title="' . gT('Uninstall this theme') . '" class="btn btn-danger btn-block selector--ConfirmModal"> @@ -789,6 +794,9 @@ class="btn btn-danger btn-block selector--ConfirmModal"> href="' . $sResetUrl . '" data-post=\'{ "templatename": "' . $this->template_name . '" }\' data-text="' . gT('This will reload the configuration file of this theme.') . '
' . gT('Do you want to continue?') . '" + data-button-no="' . gt('Cancel') . '" + data-button-yes="' . gt('Reset') . '" + data-button-type="btn-warning" title="' . gT('Reset this theme') . '" class="btn btn-warning btn-block selector--ConfirmModal"> diff --git a/application/models/TemplateManifest.php b/application/models/TemplateManifest.php index 833794041c7..7b4de5a648a 100755 --- a/application/models/TemplateManifest.php +++ b/application/models/TemplateManifest.php @@ -668,6 +668,9 @@ class='btn btn-default btn-block'> href="' . $sDeleteUrl . '" data-post=\'{ "templatename": "' . $this->sTemplateName . '" }\' data-text="' . gT('Are you sure you want to delete this theme? ') . '" + data-button-no="' . gt('Cancel') . '" + data-button-yes="' . gt('Delete') . '" + data-button-type="btn-danger" title="' . gT('Delete') . '" class="btn btn-danger btn-block selector--ConfirmModal"> diff --git a/application/views/admin/conditions/conditionshead_view.php b/application/views/admin/conditions/conditionshead_view.php index 8b75f265a75..5ccafd15da3 100644 --- a/application/views/admin/conditions/conditionshead_view.php +++ b/application/views/admin/conditions/conditionshead_view.php @@ -69,9 +69,9 @@ class='btn btn-default pull-right condition-header-button'
+ - - +
diff --git a/application/views/admin/emailtemplates/emailtemplates_view.php b/application/views/admin/emailtemplates/emailtemplates_view.php index 16f0478e585..d0f59ccc786 100644 --- a/application/views/admin/emailtemplates/emailtemplates_view.php +++ b/application/views/admin/emailtemplates/emailtemplates_view.php @@ -80,6 +80,9 @@
+
+ +
diff --git a/application/views/admin/htmleditor/modal_editor_partial.php b/application/views/admin/htmleditor/modal_editor_partial.php index d256dacb448..2dd8d10e08a 100644 --- a/application/views/admin/htmleditor/modal_editor_partial.php +++ b/application/views/admin/htmleditor/modal_editor_partial.php @@ -10,7 +10,7 @@
- +
diff --git a/application/views/admin/participants/massive_actions/_selector.php b/application/views/admin/participants/massive_actions/_selector.php index 244124db177..f129a6dfab7 100644 --- a/application/views/admin/participants/massive_actions/_selector.php +++ b/application/views/admin/participants/massive_actions/_selector.php @@ -21,7 +21,7 @@ // Modal 'actionType' => 'modal', - 'modalType' => 'empty', + 'modalType' => 'cancel-delete', 'keepopen' => 'no', 'sModalTitle' => gT('Delete one or more participants...'), 'htmlModalBody' => @@ -51,7 +51,7 @@ 'grid-reload' => 'yes', //modal 'actionType' => 'modal', - 'modalType' => 'yes-no', + 'modalType' => 'cancel-apply', 'keepopen' => 'yes', 'yes' => gT('Apply'), 'no' => gT('Cancel'), diff --git a/application/views/admin/participants/massive_actions/_selector_attribute.php b/application/views/admin/participants/massive_actions/_selector_attribute.php index fbd73e02364..a2e1756987e 100644 --- a/application/views/admin/participants/massive_actions/_selector_attribute.php +++ b/application/views/admin/participants/massive_actions/_selector_attribute.php @@ -21,7 +21,7 @@ // Modal 'actionType' => 'modal', - 'modalType' => 'yes-no', + 'modalType' => 'cancel-delete', 'keepopen' => 'no', 'sModalTitle' => gT('Confirm'), 'htmlModalBody' => gT('Are you sure?'), diff --git a/application/views/admin/participants/massive_actions/_selector_share.php b/application/views/admin/participants/massive_actions/_selector_share.php index 9ed26817110..9d0d1eab1f2 100644 --- a/application/views/admin/participants/massive_actions/_selector_share.php +++ b/application/views/admin/participants/massive_actions/_selector_share.php @@ -21,7 +21,7 @@ // Modal 'actionType' => 'modal', - 'modalType' => 'yes-no', + 'modalType' => 'cancel-delete', 'keepopen' => 'no', 'sModalTitle' => gT('Confirm'), 'htmlModalBody' => gT('Are you sure?'), diff --git a/application/views/admin/participants/modal_subviews/_addToSurvey.php b/application/views/admin/participants/modal_subviews/_addToSurvey.php index 9e77d16cdf7..4f7f905c388 100644 --- a/application/views/admin/participants/modal_subviews/_addToSurvey.php +++ b/application/views/admin/participants/modal_subviews/_addToSurvey.php @@ -46,7 +46,7 @@
- - ' /> + + ' />
endWidget('CActiveForm'); ?> diff --git a/application/views/admin/participants/modal_subviews/_deleteParticipant.php b/application/views/admin/participants/modal_subviews/_deleteParticipant.php index b722a5cd723..2e65d012a92 100644 --- a/application/views/admin/participants/modal_subviews/_deleteParticipant.php +++ b/application/views/admin/participants/modal_subviews/_deleteParticipant.php @@ -1,7 +1,10 @@ -
- - -
+getController()->renderPartial( + '/layouts/partial_modals/modal_header', + ['modalTitle' => gT('Delete participant')] +); +?> +
beginWidget( @@ -23,8 +26,8 @@
- - + +
endWidget(); diff --git a/application/views/admin/participants/modal_subviews/_editAttribute.php b/application/views/admin/participants/modal_subviews/_editAttribute.php index 969fc4c5472..71adcf01cf7 100644 --- a/application/views/admin/participants/modal_subviews/_editAttribute.php +++ b/application/views/admin/participants/modal_subviews/_editAttribute.php @@ -243,7 +243,7 @@
- +
- - - +getController()->renderPartial( + '/layouts/partial_modals/modal_header', + ['modalTitle' => $modalTitle] +); +?>
beginWidget( @@ -132,7 +140,7 @@
- +