[TASK] Add missing btn-default class for confirm cancel button 45/44045/3
authorFrans Saris <franssaris@gmail.com>
Wed, 14 Oct 2015 09:11:58 +0000 (11:11 +0200)
committerGeorg Ringer <georg.ringer@gmail.com>
Wed, 14 Oct 2015 10:31:23 +0000 (12:31 +0200)
Cancel button of the confirm modal missed the btn-default class.

Resolves: #70277
Releases: master
Change-Id: I6b23f828524f824184b09948c3ed3216ec4dba7d
Reviewed-on: http://review.typo3.org/44045
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>
Reviewed-by: Daniel Goerz <ervaude@gmail.com>
Tested-by: Daniel Goerz <ervaude@gmail.com>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
typo3/sysext/backend/Resources/Public/JavaScript/AjaxDataHandler.js
typo3/sysext/backend/Resources/Public/JavaScript/DragUploader.js
typo3/sysext/backend/Resources/Public/JavaScript/FormEngine.js
typo3/sysext/backend/Resources/Public/JavaScript/Modal.js
typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js
typo3/sysext/recycler/Resources/Public/JavaScript/Recycler.js

index 71479ae..ae4a861 100644 (file)
@@ -70,6 +70,7 @@ define(['jquery', 'TYPO3/CMS/Backend/Modal', 'TYPO3/CMS/Backend/Notification'],
                                {
                                        text: $(this).data('button-close-text') || TYPO3.lang['button.cancel'] || 'Cancel',
                                        active: true,
+                                       btnClass: 'btn-default',
                                        name: 'cancel'
                                },
                                {
index 24de4bc..c08d710 100644 (file)
@@ -288,6 +288,7 @@ define(['jquery', 'moment', 'nprogress', 'TYPO3/CMS/Backend/Modal', 'TYPO3/CMS/L
                                {
                                        text: $(this).data('button-close-text') || TYPO3.lang['file_upload.button.cancel'] || 'Cancel',
                                        active: true,
+                                       btnClass: 'btn-default',
                                        name: 'cancel'
                                },
                                {
index 47cc40c..49754c2 100644 (file)
@@ -601,6 +601,7 @@ define(['jquery', 'TYPO3/CMS/Backend/Modal'], function ($, Modal) {
                                {
                                        text: TYPO3.lang['buttons.confirm.delete_record.no'] || 'Cancel',
                                        active: true,
+                                       btnClass: 'btn-default',
                                        name: 'no'
                                },
                                {
@@ -628,6 +629,7 @@ define(['jquery', 'TYPO3/CMS/Backend/Modal'], function ($, Modal) {
                                {
                                        text: TYPO3.lang['buttons.confirm.delete_record.no'] || 'Cancel',
                                        active: true,
+                                       btnClass: 'btn-default',
                                        name: 'no'
                                },
                                {
@@ -837,10 +839,11 @@ define(['jquery', 'TYPO3/CMS/Backend/Modal'], function ($, Modal) {
                if ($('.has-change').length > 0) {
                        var title = TYPO3.lang['label.confirm.close_without_save.title'] || 'Do you want to quit without saving?';
                        var content = TYPO3.lang['label.confirm.close_without_save.content'] || 'You have currently unsaved changes. Are you sure that you want to discard all changes?';
-                       $modal = Modal.confirm(title, content, top.TYPO3.Severity.warning, [
+                       var $modal = Modal.confirm(title, content, top.TYPO3.Severity.warning, [
                                {
                                        text: TYPO3.lang['buttons.confirm.close_without_save.no'] || 'No, I will continue editing',
                                        active: true,
+                                       btnClass: 'btn-default',
                                        name: 'no'
                                },
                                {
index c72c9d5..dce9d83 100644 (file)
@@ -104,6 +104,7 @@ define(['jquery', 'TYPO3/CMS/Backend/Notification', 'bootstrap'], function($) {
                                {
                                        text: $(this).data('button-close-text') || TYPO3.lang['button.cancel'] || 'Cancel',
                                        active: true,
+                                       btnClass: 'btn-default',
                                        name: 'cancel'
                                },
                                {
index cbc84f5..a4f652b 100644 (file)
@@ -81,6 +81,7 @@ define(['jquery', 'nprogress', 'TYPO3/CMS/Backend/Modal', 'datatables', 'TYPO3/C
                                                {
                                                        text: TYPO3.lang['button.cancel'],
                                                        active: true,
+                                                       btnClass: 'btn-default',
                                                        trigger: function() {
                                                                Modal.dismiss();
                                                        }
@@ -197,6 +198,7 @@ define(['jquery', 'nprogress', 'TYPO3/CMS/Backend/Modal', 'datatables', 'TYPO3/C
                                {
                                        text: TYPO3.lang['button.cancel'],
                                        active: true,
+                                       btnClass: 'btn-default',
                                        trigger: function() {
                                                Modal.dismiss();
                                        }
@@ -386,6 +388,7 @@ define(['jquery', 'nprogress', 'TYPO3/CMS/Backend/Modal', 'datatables', 'TYPO3/C
                                {
                                        text: TYPO3.lang['button.cancel'],
                                        active: true,
+                                       btnClass: 'btn-default',
                                        trigger: function() {
                                                Modal.dismiss();
                                        }
@@ -423,6 +426,7 @@ define(['jquery', 'nprogress', 'TYPO3/CMS/Backend/Modal', 'datatables', 'TYPO3/C
                                                {
                                                        text: TYPO3.lang['button.cancel'],
                                                        active: true,
+                                                       btnClass: 'btn-default',
                                                        trigger: function() {
                                                                Modal.dismiss();
                                                        }
index f72cefe..90a2cf3 100644 (file)
@@ -349,6 +349,7 @@ define(['jquery', 'nprogress', 'TYPO3/CMS/Backend/Modal', 'TYPO3/CMS/Backend/jqu
                Modal.confirm(TYPO3.lang['modal.delete.header'], message, top.TYPO3.Severity.error, [
                        {
                                text: TYPO3.lang['button.cancel'],
+                               btnClass: 'btn-default',
                                trigger: function() {
                                        Modal.dismiss();
                                }
@@ -397,6 +398,7 @@ define(['jquery', 'nprogress', 'TYPO3/CMS/Backend/Modal', 'TYPO3/CMS/Backend/jqu
                Modal.confirm(TYPO3.lang['modal.undo.header'], $message, top.TYPO3.Severity.ok, [
                        {
                                text: TYPO3.lang['button.cancel'],
+                               btnClass: 'btn-default',
                                trigger: function() {
                                        Modal.dismiss();
                                }