From 8f720406b58bbdc068ee988bc9453c669bc807a4 Mon Sep 17 00:00:00 2001 From: Loz Calver Date: Mon, 11 Nov 2013 12:31:32 +0000 Subject: [PATCH] Implement History.js logic for "Cancel" action --- code/controllers/CMSPageAddController.php | 2 +- javascript/CMSMain.AddForm.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/controllers/CMSPageAddController.php b/code/controllers/CMSPageAddController.php index 496052f4..bace5550 100644 --- a/code/controllers/CMSPageAddController.php +++ b/code/controllers/CMSPageAddController.php @@ -113,7 +113,7 @@ class CMSPageAddController extends CMSPageEditController { ->addExtraClass('ss-ui-action-constructive')->setAttribute('data-icon', 'accept') ->setUseButtonTag(true), FormAction::create("doCancel", _t('CMSMain.Cancel',"Cancel")) - ->addExtraClass('ss-ui-action-destructive') + ->addExtraClass('ss-ui-action-destructive ss-ui-action-cancel') ->setUseButtonTag(true) ); diff --git a/javascript/CMSMain.AddForm.js b/javascript/CMSMain.AddForm.js index 08e62d6b..e76055f4 100644 --- a/javascript/CMSMain.AddForm.js +++ b/javascript/CMSMain.AddForm.js @@ -84,7 +84,7 @@ else $(this).find('input').removeAttr('disabled'); } }); - + $(".cms-page-add-button").entwine({ onclick: function(e) { var tree = $('.cms-tree'), list = $('.cms-list'), parentId = 0;