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-=$this->widgetsJsName?> =@$aIt
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 @@