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/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 016be995db8..d5b883d4edd 100755 --- a/application/models/TemplateManifest.php +++ b/application/models/TemplateManifest.php @@ -664,6 +664,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')] +); +?> + 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] +); +?>