diff --git a/cms/static/cms/js/dist/bundle.toolbar.min.js b/cms/static/cms/js/dist/bundle.toolbar.min.js
index c72e099ba6e..9f1af970dc4 100644
--- a/cms/static/cms/js/dist/bundle.toolbar.min.js
+++ b/cms/static/cms/js/dist/bundle.toolbar.min.js
@@ -48,7 +48,7 @@ window.django=window.django||void 0,window.jQuery=window.django&&window.django.j
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* ======================================================================== */
!function(n){"use strict";function t(){var n=document.createElement("cms"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var i in t)if(void 0!==n.style[i])return{end:t[i]};return!1}n.fn.emulateTransitionEnd=function(t){var i=!1,r=this;n(this).one("cmsTransitionEnd",function(){i=!0});var e=function(){i||n(r).trigger(n.support.transition.end)};return setTimeout(e,t+10),this},n(function(){n.support.transition=t(),n.support.transition&&(n.event.special.cmsTransitionEnd={bindType:n.support.transition.end,delegateType:n.support.transition.end,handle:function(t){return n(t.target).is(this)?t.handleObj.handler.apply(this,arguments):void 0}})})}(CMS.$);
-var CMS=window.CMS||{};!function(i){"use strict";i(function(){CMS.Modal=new CMS.Class({implement:[CMS.API.Helpers],options:{onClose:!1,minHeight:400,minWidth:800,modalDuration:200,newPlugin:!1,resizable:!0,maximizable:!0,minimizable:!0},initialize:function(t){this.options=i.extend(!0,{},this.options,t),this.config=CMS.config,this.settings=CMS.settings,this._setupUI(),this._setupEventEmitter(),this.click="click.cms.modal",this.pointerDown="pointerdown.cms.modal contextmenu.cms.modal",this.pointerUp="pointerup.cms.modal pointercancel.cms.modal",this.pointerMove="pointermove.cms.modal",this.doubleClick="dblclick.cms.modal",this.maximized=!1,this.minimized=!1,this.triggerMaximized=!1,this.saved=!1},_setupEventEmitter:function(){function t(i){return function(){return s[i].apply(s,arguments),e}}var e=this,s=i({});this.trigger=t("trigger"),this.one=t("one"),this.on=t("on"),this.off=t("off")},_setupUI:function(){var t=i(".cms-modal");this.ui={modal:t,body:i("html"),window:i(window),toolbarLeftPart:i(".cms-toolbar-left"),minimizeButton:t.find(".cms-modal-minimize"),maximizeButton:t.find(".cms-modal-maximize"),title:t.find(".cms-modal-title"),titlePrefix:t.find(".cms-modal-title-prefix"),titleSuffix:t.find(".cms-modal-title-suffix"),resize:t.find(".cms-modal-resize"),breadcrumb:t.find(".cms-modal-breadcrumb"),closeAndCancel:t.find(".cms-modal-close, .cms-modal-cancel"),modalButtons:t.find(".cms-modal-buttons"),modalBody:t.find(".cms-modal-body"),frame:t.find(".cms-modal-frame"),shim:t.find(".cms-modal-shim")}},_events:function(){var t=this;this.ui.minimizeButton.off(this.click).on(this.click,function(i){i.preventDefault(),t.minimize()}),this.ui.maximizeButton.off(this.click).on(this.click,function(i){i.preventDefault(),t.maximize()}),this.ui.title.off(this.pointerDown).on(this.pointerDown,function(i){i.preventDefault(),t._startMove(i)}),this.ui.title.off(this.doubleClick).on(this.doubleClick,function(){t.maximize()}),this.ui.resize.off(this.pointerDown).on(this.pointerDown,function(i){i.preventDefault(),t._startResize(i)}),this.ui.closeAndCancel.off(this.click).on(this.click,function(i){t.options.onClose=null,i.preventDefault(),t.close()}),this.ui.breadcrumb.off(this.click,"a").on(this.click,"a",function(e){e.preventDefault(),t._changeIframe(i(this))})},open:function(t){if(!(t&&t.url||t&&t.html))throw new Error('The arguments passed to "open" were invalid.');if(CMS._newPlugin&&!this._deletePlugin())return!1;this._events(),this.trigger("cms.modal.load"),this.ui.modal.trigger("cms.modal.load"),this.ui.resize.toggle(this.options.resizable),this.ui.minimizeButton.toggle(this.options.minimizable),this.ui.maximizeButton.toggle(this.options.maximizable);var e=this._calculateNewPosition(t);return this.ui.maximizeButton.removeClass("cms-modal-maximize-active"),this.maximized=!1,this.options.newPlugin&&(CMS._newPlugin=this.options.newPlugin),this.ui.body.hasClass("cms-modal-minimized")&&(this.minimized=!0,this.minimize()),this.ui.modalButtons.empty(),this.ui.breadcrumb.empty(),this.ui.modal.removeClass("cms-modal-has-breadcrumb"),this.hideTooltip(),t.url?this._loadIframe({url:t.url,title:t.title,breadcrumbs:t.breadcrumbs}):this._loadMarkup({html:t.html,title:t.title,subtitle:t.subtitle}),this.trigger("cms.modal.loaded"),this._show(i.extend({duration:this.options.modalDuration},e)),this},_calculateNewPosition:function(i){var t,e,s=300,o=300,n=this.ui.window.width(),a=this.ui.window.height(),l=i.width||this.options.minWidth,m=i.height||this.options.minHeight,d=n>=l+s,r=a>=m+o,h=d&&!i.width?n-s:l,c=r&&!i.height?a-o:m,u=this.ui.modal.css("left"),f=this.ui.modal.css("top");return"50%"===u&&(u=n/2),"50%"===f&&(f=a/2),f=parseInt(f),u=parseInt(u),(h/2+u>n||c/2+f>a||0>u-h/2||0>f-c/2)&&(t=n/2,e=a/2),(h>=n||c>=a)&&(this.triggerMaximized=!0),{width:h,height:c,top:e,left:t}},_show:function(i){var t=this,e=i.width,s=i.height,o=i.duration,n=i.top,a=i.left;this.ui.modal.hasClass("cms-modal-open")&&this.ui.modal.addClass("cms-modal-morphing"),this.ui.modal.css({display:"block",width:e,height:s,top:n,left:a,"margin-left":-(e/2),"margin-top":-(s/2)}),setTimeout(function(){t.ui.modal.addClass("cms-modal-open")},0),this.ui.modal.one("cmsTransitionEnd",function(){t.ui.modal.removeClass("cms-modal-morphing"),t.ui.modal.css({"margin-left":-(e/2),"margin-top":-(s/2)}),t.triggerMaximized&&t.maximize(),CMS.API.locked=!1,t.trigger("cms.modal.shown")}).emulateTransitionEnd(o),this.ui.body.off("keydown.cms.close").on("keydown.cms.close",function(i){i.keyCode===CMS.KEYS.ESC&&t.close()}),this.ui.modal.focus()},close:function(){this.options.onClose&&this.reloadBrowser(this.options.onClose,!1,!0),CMS._newPlugin?this._deletePlugin({hideAfter:!0}):this._hide({duration:this.options.modalDuration/2})},_hide:function(i){var t=this,e=this.options.modalDuration;i&&i.duration&&(e=i.duration),this.ui.frame.empty(),this.ui.modalBody.removeClass("cms-loader"),this.ui.modal.removeClass("cms-modal-open"),this.ui.modal.one("cmsTransitionEnd",function(){t.ui.modal.css("display","none")}).emulateTransitionEnd(e),setTimeout(function(){t.minimized&&t.minimize(),t.maximized&&t.maximize(),t.trigger("cms.modal.closed")},this.options.duration)},minimize:function(){return this.maximized?!1:void(this.minimized===!1?(CMS.API.Toolbar.open(),this.ui.modal.data("css",this.ui.modal.css(["left","top","margin-left","margin-top"])),this.ui.body.addClass("cms-modal-minimized"),this.ui.modal.css({left:this.ui.toolbarLeftPart.outerWidth(!0)+50}),this.minimized=!0):(this.ui.body.removeClass("cms-modal-minimized"),this.ui.modal.css(this.ui.modal.data("css")),this.minimized=!1))},maximize:function(){return this.minimized?!1:void(this.maximized===!1?(this.ui.modal.data("css",this.ui.modal.css(["left","top","margin-left","margin-top","width","height"])),this.ui.body.addClass("cms-modal-maximized"),this.maximized=!0):(this.ui.body.removeClass("cms-modal-maximized"),this.ui.modal.css(this.ui.modal.data("css")),this.maximized=!1))},_startMove:function(i){if(this.maximized||this.minimized)return!1;var t,e,s=this,o=this.ui.modal.position();this.ui.shim.show(),this.ui.body.on(this.pointerUp,function(i){s._stopMove(i)}),this.ui.body.on(this.pointerMove,function(n){t=o.left-(i.originalEvent.pageX-n.originalEvent.pageX),e=o.top-(i.originalEvent.pageY-n.originalEvent.pageY),s.ui.modal.css({left:t,top:e})}).attr("data-touch-action","none")},_stopMove:function(){this.ui.shim.hide(),this.ui.body.off(this.pointerMove+" "+this.pointerUp).removeAttr("data-touch-action")},_startResize:function(i){if(this.maximized)return!1;var t=this,e=this.ui.modal.width(),s=this.ui.modal.height(),o=this.ui.modal.position().left,n=this.ui.modal.position().top;this.ui.body.on(this.pointerUp,function(i){t._stopResize(i)}),this.ui.shim.show(),this.ui.body.on(this.pointerMove,function(a){var l=i.originalEvent.pageX-a.originalEvent.pageX,m=i.originalEvent.pageY-a.originalEvent.pageY,d=e-2*l,r=s-2*m,h=t.options.minWidth,c=t.options.minHeight;return h>=d||c>=r?!1:void t.ui.modal.css({width:e-2*l,height:s-2*m,left:o+l,top:n+m})}).attr("data-touch-action","none")},_stopResize:function(){this.ui.shim.hide(),this.ui.body.off(this.pointerMove+" "+this.pointerUp).removeAttr("data-touch-action")},_setBreadcrumb:function(t){var e="",s='{3}';return!t||t.length<=1?!1:t[0].title?(this.ui.modal.addClass("cms-modal-has-breadcrumb"),i.each(t,function(i,o){var n=i>=t.length-1?"active":"";e+=s.replace("{1}",o.url).replace("{2}",n).replace("{3}",o.title)}),void this.ui.breadcrumb.html(e)):!1},_setButtons:function(t){var e,s,o=t.contents().find(".suit-columns").length>0,n=this,a=i(''),l=i(''),m=i(''+this.config.lang.cancel+"");e=t.contents().find(o?".save-box:eq(0)":".submit-row:eq(0)");var d=e.find("input, a, button");t.contents().find(".submit-row").hide(),d.length||(e=t.contents().find("body:not(.change-list) #content form:eq(0)"),d=e.find('input[type="submit"], button[type="submit"]'),d.addClass("deletelink").hide()),d.each(function(t,e){if(e=i(e),e.attr("data-rel","_"+t),"hidden"===e.attr("type"))return!1;var s=e.attr("value")||e.text(),o="cms-btn";e.hasClass("default")&&(o="cms-btn cms-btn-action"),e.hasClass("deletelink")&&(o="cms-btn cms-btn-caution");var m=i(''+s+"");m.on(n.click,function(){(e.is("input")||e.is("button"))&&e[0].click(),e.is("a")&&n._loadIframe({url:e.prop("href"),name:s}),(e.hasClass("default")||e.hasClass("deletelink"))&&(e.hasClass("deletelink")&&(n.options.onClose=null),n.ui.frame.find("iframe").hide(),n.saved=!0)}),m.wrap(a),l.append(m.parent())}),m.on(n.click,function(){n.options.onClose=!1,n.close()}),m.wrap(a),l.append(m.parent()),l.find(".cms-btn-group").unwrap(),s=l.find(".cms-btn-group").clone(!0,!0),l.find(".cms-btn-group").remove(),l.append(s.wrapAll(a.clone().addClass("cms-modal-item-buttons-left")).parent()),this.ui.modalButtons.html(l)},_prepareUrl:function(i){return i=i.replace("&","&")},_loadIframe:function(t){var e=this;t.url=this._prepareUrl(t.url),t.title=t.title||"",t.breadcrumbs=t.breadcrumbs||"",CMS.API.Toolbar.showLoader(),this.ui.modal.removeClass("cms-modal-markup"),this.ui.modal.addClass("cms-modal-iframe"),this._setBreadcrumb(t.breadcrumbs);var s=this.ui.frame,o=i(''),n=this.ui.titlePrefix,a=this.ui.titleSuffix;o.css("visibility","hidden"),n.text(t.title||""),a.text(""),s.find("iframe").css("visibility","hidden"),e.ui.modalBody.addClass("cms-loader"),o.on("load",function(){var s,n,l,m,d;try{o.contents()}catch(r){CMS.API.Toolbar.openMessage({message:""+r+"",error:!0}),e.close()}return CMS.API.Toolbar.hideLoader(),s=o.contents().find(".messagelist li"),s.length&&CMS.API.Toolbar.openMessage({message:s.eq(0).text()}),s.remove(),n=o.contents(),l=n.find("body"),l.addClass("cms-admin cms-admin-modal"),s.length&&e.enforceReload&&e.reloadBrowser(),s.length&&e.enforceClose?(e.close(),!1):(n.find(".viewsitelink").attr("target","_top"),e._setButtons(i(this)),(o.contents().find(".errornote").length||o.contents().find(".errorlist").length)&&(e.saved=!1),void(e.saved&&!n.find(".delete-confirmation").length?e.reloadBrowser(window.location.href,!1,!0):(o.show(),m=o.contents().find("#content h1:eq(0)"),void 0===t.title&&""===e.ui.titlePrefix.text()&&(d=o.contents().find(".breadcrumbs").contents(),e.ui.titlePrefix.text(d.eq(d.length-1).text().replace("›","").trim())),a.text(m.text()),m.remove(),o.css("visibility","visible"),o.data("ready",!0),l.on("keydown.cms",function(i){i.keyCode===CMS.KEYS.ESC&&e.close()}),n.find(".object-tools").length&&n.find("#content").css("padding-top",38))))}),s.html(o)},_changeIframe:function(i){if(i.hasClass("active"))return!1;var t=i.parent().find("a");t.removeClass("active"),i.addClass("active"),this._loadIframe({url:i.attr("href")}),this.ui.titlePrefix.text(i.text())},_loadMarkup:function(i){this.ui.modal.removeClass("cms-modal-iframe"),this.ui.modal.addClass("cms-modal-markup"),this.ui.modalBody.removeClass("cms-loader"),this.ui.frame.empty().append(i.html),this.ui.titlePrefix.text(i.title||""),this.ui.titleSuffix.text(i.subtitle||"")},_deletePlugin:function(i){var t=this,e=CMS._newPlugin,s='{ "csrfmiddlewaretoken": "'+this.config.csrf+'" }',o=this.config.lang.confirmEmpty.replace("{1}",CMS._newPlugin.breadcrumb.pop().title);return CMS.API.Toolbar.openAjax({url:e["delete"],post:s,text:o,callback:function(){CMS._newPlugin=!1,i&&i.hideAfter&&t._hide({duration:100})}})}})})}(CMS.$);
+var CMS=window.CMS||{};!function(i){"use strict";i(function(){CMS.Modal=new CMS.Class({implement:[CMS.API.Helpers],options:{onClose:!1,minHeight:400,minWidth:800,modalDuration:200,newPlugin:!1,resizable:!0,maximizable:!0,minimizable:!0},initialize:function(t){this.options=i.extend(!0,{},this.options,t),this.config=CMS.config,this.settings=CMS.settings,this._setupUI(),this._setupEventEmitter(),this.click="click.cms.modal",this.pointerDown="pointerdown.cms.modal contextmenu.cms.modal",this.pointerUp="pointerup.cms.modal pointercancel.cms.modal",this.pointerMove="pointermove.cms.modal",this.doubleClick="dblclick.cms.modal",this.maximized=!1,this.minimized=!1,this.triggerMaximized=!1,this.saved=!1},_setupEventEmitter:function(){function t(i){return function(){return s[i].apply(s,arguments),e}}var e=this,s=i({});this.trigger=t("trigger"),this.one=t("one"),this.on=t("on"),this.off=t("off")},_setupUI:function(){var t=i(".cms-modal");this.ui={modal:t,body:i("html"),window:i(window),toolbarLeftPart:i(".cms-toolbar-left"),minimizeButton:t.find(".cms-modal-minimize"),maximizeButton:t.find(".cms-modal-maximize"),title:t.find(".cms-modal-title"),titlePrefix:t.find(".cms-modal-title-prefix"),titleSuffix:t.find(".cms-modal-title-suffix"),resize:t.find(".cms-modal-resize"),breadcrumb:t.find(".cms-modal-breadcrumb"),closeAndCancel:t.find(".cms-modal-close, .cms-modal-cancel"),modalButtons:t.find(".cms-modal-buttons"),modalBody:t.find(".cms-modal-body"),frame:t.find(".cms-modal-frame"),shim:t.find(".cms-modal-shim")}},_events:function(){var t=this;this.ui.minimizeButton.off(this.click).on(this.click,function(i){i.preventDefault(),t.minimize()}),this.ui.maximizeButton.off(this.click).on(this.click,function(i){i.preventDefault(),t.maximize()}),this.ui.title.off(this.pointerDown).on(this.pointerDown,function(i){i.preventDefault(),t._startMove(i)}),this.ui.title.off(this.doubleClick).on(this.doubleClick,function(){t.maximize()}),this.ui.resize.off(this.pointerDown).on(this.pointerDown,function(i){i.preventDefault(),t._startResize(i)}),this.ui.closeAndCancel.off(this.click).on(this.click,function(i){t.options.onClose=null,i.preventDefault(),t.close()}),this.ui.breadcrumb.off(this.click,"a").on(this.click,"a",function(e){e.preventDefault(),t._changeIframe(i(this))})},open:function(t){if(!(t&&t.url||t&&t.html))throw new Error('The arguments passed to "open" were invalid.');if(CMS._newPlugin&&!this._deletePlugin())return!1;this._events(),this.trigger("cms.modal.load"),this.ui.modal.trigger("cms.modal.load"),this.ui.resize.toggle(this.options.resizable),this.ui.minimizeButton.toggle(this.options.minimizable),this.ui.maximizeButton.toggle(this.options.maximizable);var e=this._calculateNewPosition(t);return this.ui.maximizeButton.removeClass("cms-modal-maximize-active"),this.maximized=!1,this.options.newPlugin&&(CMS._newPlugin=this.options.newPlugin),this.ui.body.hasClass("cms-modal-minimized")&&(this.minimized=!0,this.minimize()),this.ui.modalButtons.empty(),this.ui.breadcrumb.empty(),this.ui.modal.removeClass("cms-modal-has-breadcrumb"),this.hideTooltip(),t.url?this._loadIframe({url:t.url,title:t.title,breadcrumbs:t.breadcrumbs}):this._loadMarkup({html:t.html,title:t.title,subtitle:t.subtitle}),this.trigger("cms.modal.loaded"),this._show(i.extend({duration:this.options.modalDuration},e)),this},_calculateNewPosition:function(i){var t,e,s=300,o=300,n=this.ui.window.width(),a=this.ui.window.height(),l=i.width||this.options.minWidth,m=i.height||this.options.minHeight,d=n>=l+s,r=a>=m+o,h=d&&!i.width?n-s:l,c=r&&!i.height?a-o:m,u=this.ui.modal.css("left"),f=this.ui.modal.css("top");return"50%"===u&&(u=n/2),"50%"===f&&(f=a/2),f=parseInt(f),u=parseInt(u),(h/2+u>n||c/2+f>a||0>u-h/2||0>f-c/2)&&(t=n/2,e=a/2),(h>=n||c>=a)&&(this.triggerMaximized=!0),{width:h,height:c,top:e,left:t}},_show:function(i){var t=this,e=i.width,s=i.height,o=i.duration,n=i.top,a=i.left;this.ui.modal.hasClass("cms-modal-open")&&this.ui.modal.addClass("cms-modal-morphing"),this.ui.modal.css({display:"block",width:e,height:s,top:n,left:a,"margin-left":-(e/2),"margin-top":-(s/2)}),setTimeout(function(){t.ui.modal.addClass("cms-modal-open")},0),this.ui.modal.one("cmsTransitionEnd",function(){t.ui.modal.removeClass("cms-modal-morphing"),t.ui.modal.css({"margin-left":-(e/2),"margin-top":-(s/2)}),t.triggerMaximized&&t.maximize(),CMS.API.locked=!1,t.trigger("cms.modal.shown")}).emulateTransitionEnd(o),this.ui.body.off("keydown.cms.close").on("keydown.cms.close",function(i){i.keyCode===CMS.KEYS.ESC&&t.close()}),this.ui.modal.focus()},close:function(){this.options.onClose&&this.reloadBrowser(this.options.onClose,!1,!0),CMS._newPlugin?this._deletePlugin({hideAfter:!0}):this._hide({duration:this.options.modalDuration/2})},_hide:function(i){var t=this,e=this.options.modalDuration;i&&i.duration&&(e=i.duration),this.ui.frame.empty(),this.ui.modalBody.removeClass("cms-loader"),this.ui.modal.removeClass("cms-modal-open"),this.ui.modal.one("cmsTransitionEnd",function(){t.ui.modal.css("display","none")}).emulateTransitionEnd(e),setTimeout(function(){t.minimized&&t.minimize(),t.maximized&&t.maximize(),t.trigger("cms.modal.closed")},this.options.duration)},minimize:function(){return this.maximized?!1:void(this.minimized===!1?(CMS.API.Toolbar.open(),this.ui.modal.data("css",this.ui.modal.css(["left","top","margin-left","margin-top"])),this.ui.body.addClass("cms-modal-minimized"),this.ui.modal.css({left:this.ui.toolbarLeftPart.outerWidth(!0)+50}),this.minimized=!0):(this.ui.body.removeClass("cms-modal-minimized"),this.ui.modal.css(this.ui.modal.data("css")),this.minimized=!1))},maximize:function(){return this.minimized?!1:void(this.maximized===!1?(this.ui.modal.data("css",this.ui.modal.css(["left","top","margin-left","margin-top","width","height"])),this.ui.body.addClass("cms-modal-maximized"),this.maximized=!0):(this.ui.body.removeClass("cms-modal-maximized"),this.ui.modal.css(this.ui.modal.data("css")),this.maximized=!1))},_startMove:function(i){if(this.maximized||this.minimized)return!1;var t,e,s=this,o=this.ui.modal.position();this.ui.shim.show(),this.ui.body.on(this.pointerUp,function(i){s._stopMove(i)}),this.ui.body.on(this.pointerMove,function(n){t=o.left-(i.originalEvent.pageX-n.originalEvent.pageX),e=o.top-(i.originalEvent.pageY-n.originalEvent.pageY),s.ui.modal.css({left:t,top:e})}).attr("data-touch-action","none")},_stopMove:function(){this.ui.shim.hide(),this.ui.body.off(this.pointerMove+" "+this.pointerUp).removeAttr("data-touch-action")},_startResize:function(i){if(this.maximized)return!1;var t=this,e=this.ui.modal.width(),s=this.ui.modal.height(),o=this.ui.modal.position().left,n=this.ui.modal.position().top;this.ui.body.on(this.pointerUp,function(i){t._stopResize(i)}),this.ui.shim.show(),this.ui.body.on(this.pointerMove,function(a){var l=i.originalEvent.pageX-a.originalEvent.pageX,m=i.originalEvent.pageY-a.originalEvent.pageY,d=e-2*l,r=s-2*m,h=t.options.minWidth,c=t.options.minHeight;return h>=d||c>=r?!1:void t.ui.modal.css({width:e-2*l,height:s-2*m,left:o+l,top:n+m})}).attr("data-touch-action","none")},_stopResize:function(){this.ui.shim.hide(),this.ui.body.off(this.pointerMove+" "+this.pointerUp).removeAttr("data-touch-action")},_setBreadcrumb:function(t){var e="",s='{3}';return!t||t.length<=1?!1:t[0].title?(this.ui.modal.addClass("cms-modal-has-breadcrumb"),i.each(t,function(i,o){var n=i>=t.length-1?"active":"";e+=s.replace("{1}",o.url).replace("{2}",n).replace("{3}",o.title)}),void this.ui.breadcrumb.html(e)):!1},_setButtons:function(t){var e,s,o=t.contents().find(".suit-columns").length>0,n=this,a=i(''),l=i(''),m=i(''+this.config.lang.cancel+"");e=t.contents().find(o?".save-box:eq(0)":".submit-row:eq(0)");var d=t.contents().find("form");d.on("submit",function(){n.hideFrame&&(n.ui.modal.find(".cms-modal-frame iframe").hide(),n.saved=!0)});var r=e.find("input, a, button");t.contents().find(".submit-row").hide(),r.length||(e=t.contents().find("body:not(.change-list) #content form:eq(0)"),r=e.find('input[type="submit"], button[type="submit"]'),r.addClass("deletelink").hide()),r.each(function(t,e){if(e=i(e),e.attr("data-rel","_"+t),"hidden"===e.attr("type"))return!1;var s=e.attr("value")||e.text(),o="cms-btn";e.hasClass("default")&&(o="cms-btn cms-btn-action"),e.hasClass("deletelink")&&(o="cms-btn cms-btn-caution");var m=i(''+s+"");m.on(n.click,function(){e.is("a")&&n._loadIframe({url:e.prop("href"),name:s}),(e.hasClass("default")||e.hasClass("deletelink"))&&(e.hasClass("deletelink")&&(n.options.onClose=null),e.hasClass("default")?n.hideFrame=!0:(n.ui.modal.find(".cms-modal-frame iframe").hide(),n.saved=!0)),(e.is("input")||e.is("button"))&&e[0].click()}),m.wrap(a),l.append(m.parent())}),m.on(n.click,function(){n.options.onClose=!1,n.close()}),m.wrap(a),l.append(m.parent()),l.find(".cms-btn-group").unwrap(),s=l.find(".cms-btn-group").clone(!0,!0),l.find(".cms-btn-group").remove(),l.append(s.wrapAll(a.clone().addClass("cms-modal-item-buttons-left")).parent()),this.ui.modalButtons.html(l)},_prepareUrl:function(i){return i=i.replace("&","&")},_loadIframe:function(t){var e=this;t.url=this._prepareUrl(t.url),t.title=t.title||"",t.breadcrumbs=t.breadcrumbs||"",CMS.API.Toolbar.showLoader(),this.ui.modal.removeClass("cms-modal-markup"),this.ui.modal.addClass("cms-modal-iframe"),this._setBreadcrumb(t.breadcrumbs);var s=this.ui.frame,o=i(''),n=this.ui.titlePrefix,a=this.ui.titleSuffix;o.css("visibility","hidden"),n.text(t.title||""),a.text(""),s.find("iframe").css("visibility","hidden"),e.ui.modalBody.addClass("cms-loader"),o.on("load",function(){var s,n,l,m,d;try{o.contents()}catch(r){CMS.API.Toolbar.openMessage({message:""+r+"",error:!0}),e.close()}return CMS.API.Toolbar.hideLoader(),s=o.contents().find(".messagelist li"),s.length&&CMS.API.Toolbar.openMessage({message:s.eq(0).text()}),s.remove(),n=o.contents(),l=n.find("body"),l.addClass("cms-admin cms-admin-modal"),s.length&&e.enforceReload&&e.reloadBrowser(),s.length&&e.enforceClose?(e.close(),!1):(n.find(".viewsitelink").attr("target","_top"),e._setButtons(i(this)),(o.contents().find(".errornote").length||o.contents().find(".errorlist").length)&&(e.saved=!1),void(e.saved&&!n.find(".delete-confirmation").length?e.reloadBrowser(window.location.href,!1,!0):(o.show(),m=o.contents().find("#content h1:eq(0)"),void 0===t.title&&""===e.ui.titlePrefix.text()&&(d=o.contents().find(".breadcrumbs").contents(),e.ui.titlePrefix.text(d.eq(d.length-1).text().replace("›","").trim())),a.text(m.text()),m.remove(),o.css("visibility","visible"),o.data("ready",!0),l.on("keydown.cms",function(i){i.keyCode===CMS.KEYS.ESC&&e.close()}),n.find(".object-tools").length&&n.find("#content").css("padding-top",38))))}),s.html(o)},_changeIframe:function(i){if(i.hasClass("active"))return!1;var t=i.parent().find("a");t.removeClass("active"),i.addClass("active"),this._loadIframe({url:i.attr("href")}),this.ui.titlePrefix.text(i.text())},_loadMarkup:function(i){this.ui.modal.removeClass("cms-modal-iframe"),this.ui.modal.addClass("cms-modal-markup"),this.ui.modalBody.removeClass("cms-loader"),this.ui.frame.empty().append(i.html),this.ui.titlePrefix.text(i.title||""),this.ui.titleSuffix.text(i.subtitle||"")},_deletePlugin:function(i){var t=this,e=CMS._newPlugin,s='{ "csrfmiddlewaretoken": "'+this.config.csrf+'" }',o=this.config.lang.confirmEmpty.replace("{1}",CMS._newPlugin.breadcrumb.pop().title);return CMS.API.Toolbar.openAjax({url:e["delete"],post:s,text:o,callback:function(){CMS._newPlugin=!1,i&&i.hideAfter&&t._hide({duration:100})}})}})})}(CMS.$);
var CMS=window.CMS||{};!function(i){"use strict";i(function(){CMS.Sideframe=new CMS.Class({implement:[CMS.API.Helpers],options:{onClose:!1,sideframeDuration:300,sideframeWidth:.8},initialize:function(e){this.options=i.extend(!0,{},this.options,e),this.config=CMS.config,this.settings=CMS.settings,this._setupUI(),this.click="click.cms.sideframe",this.pointerDown="pointerdown.cms.sideframe contextmenu.cms.sideframe",this.pointerUp="pointerup.cms.sideframe pointercancel.cms.sideframe",this.pointerMove="pointermove.cms.sideframe",this.enforceReload=!1,this.settingsRefreshTimer=600,this.ui.sideframe.data("ready")||this._events(),this.ui.sideframe.data("ready",!0)},_setupUI:function(){var e=i(".cms-sideframe");this.ui={sideframe:e,body:i("html"),window:i(window),dimmer:e.find(".cms-sideframe-dimmer"),close:e.find(".cms-sideframe-close"),resize:e.find(".cms-sideframe-resize"),frame:e.find(".cms-sideframe-frame"),shim:e.find(".cms-sideframe-shim")}},_events:function(){var i=this;this.ui.close.on(this.click,function(){i.close()}),this.ui.resize.on(this.pointerDown,function(e){e.preventDefault(),i._startResize()}),this.ui.dimmer.on(this.click,function(){i.close()})},open:function(i){if(!i||!i.url)throw new Error('The arguments passed to "open" were invalid.');var e=i.url,t=i.animate,s="language="+CMS.config.request.language,n="page_id="+CMS.config.request.page_id,o=[],r=this.settings.sideframe.position||window.innerWidth*this.options.sideframeWidth;return this.ui.dimmer.show(),this.ui.frame.addClass("cms-loader"),CMS.API&&CMS.API.Toolbar&&CMS.API.Toolbar.showLoader(),e.indexOf(CMS.config.request.tree)>=0&&(CMS.config.request.language&&o.push(s),CMS.config.request.page_id&&o.push(n)),e=this._url(e,o),this._content(e),this.ui.sideframe.is(":visible")&&this.ui.sideframe.outerWidth()'),a=this.ui.frame;r.hide().on("load",function(){t=r.contents(),s=t.find("body"),s.addClass("cms-admin cms-admin-sideframe"),n.ui.frame.removeClass("cms-loader"),r.show(),n.config.debug&&r.contents().find("body").addClass("cms-debug"),n.settings.sideframe.url=r.prop("src"),n.settings=n.setSettings(n.settings),s.on(n.click,function(){i(document).trigger(n.click)}),o&&n.reloadBrowser(!1,!1,!0),o=!0,t.find(".viewsitelink").attr("target","_top")}),a.html(r)},_show:function(e,t){this.ui.sideframe.show(),this.settings.sideframe.hidden&&this._hide(),t?this.ui.sideframe.animate({width:e,overflow:"visible"},this.options.sideframeDuration):(this.ui.sideframe.css("width",e),e>=i(window).width()&&this.ui.sideframe.css({width:i(window).width()-30,overflow:"visible"})),CMS.API&&CMS.API.Toolbar&&(CMS.API.Toolbar.open(),CMS.API.Toolbar.hideLoader(),CMS.API.Toolbar._lock(!0))},close:function(){this.ui.dimmer.hide(),this.settings.sideframe={url:null,hidden:!1,width:this.options.sideframeWidth},this.settings=this.setSettings(this.settings),this.reloadBrowser(this.options.onClose,!1,!0),this._hide({duration:0})},_hide:function(e){var t=this.options.sideframeDuration;e&&e.duration&&(t=e.duration),this.ui.sideframe.animate({width:0},t,function(){i(this).hide()}),this.ui.frame.removeClass("cms-loader"),CMS.API&&CMS.API.Toolbar&&CMS.API.Toolbar._lock(!1)},_startResize:function(){var e=this,t=30,s=function(){};this.ui.body.on(this.pointerUp,function(i){i.preventDefault(),e._stopResize()}),this.ui.shim.css("z-index",20),this.ui.body.attr("data-touch-action","none").on(this.pointerMove,function(n){n.originalEvent.clientX<=320&&(n.originalEvent.clientX=320),n.originalEvent.clientX>=i(window).width()-t&&(n.originalEvent.clientX=i(window).width()-t),e.ui.sideframe.css("width",n.originalEvent.clientX),e.settings.sideframe.position=n.originalEvent.clientX,clearTimeout(s),s=setTimeout(function(){e.settings=e.setSettings(e.settings)},e.settingsRefreshTimer)})},_stopResize:function(){this.ui.shim.css("z-index",1),this.ui.body.off(this.pointerUp).off(this.pointerMove).removeAttr("data-touch-action")},_url:function(e,t){var s=[],n=[],o=[],r="",a=[],d=[],h=e;return e.split("?").length<=1||void 0===window.JSON||(a=e.split("?"),d=a[1].split("&"),h=a[0]),i.each(d,function(i,e){s.push({param:e.split("=")[0],value:e.split("=")[1]})}),i.each(t,function(i,e){s.push({param:e.split("=")[0],value:e.split("=")[1]})}),i.each(s,function(e,t){var s=i.inArray(t.param,n);-1===s?(n.push(t.param),o.push(t.value)):o[s]=t.value}),i.each(n,function(i,e){r+="&"+e+"="+o[i]}),r=r.replace("&","?"),e=h+r}})})}(CMS.$);
var CMS=window.CMS||{};!function(i){"use strict";i(function(){/*!
* Clipboard
diff --git a/cms/static/cms/js/modules/cms.modal.js b/cms/static/cms/js/modules/cms.modal.js
index a3b499f3c33..22d6bcaeb48 100644
--- a/cms/static/cms/js/modules/cms.modal.js
+++ b/cms/static/cms/js/modules/cms.modal.js
@@ -674,6 +674,15 @@ var CMS = window.CMS || {};
} else {
row = iframe.contents().find('.save-box:eq(0)');
}
+ var form = iframe.contents().find('form');
+ //avoids conflict between the browser's form validation and Django's validation
+ form.on('submit', function () {
+ if (that.hideFrame) { // submit button was clicked
+ that.ui.modal.find('.cms-modal-frame iframe').hide();
+ // page has been saved, run checkup
+ that.saved = true;
+ }
+ });
var buttons = row.find('input, a, button');
// hide all submit-rows
@@ -711,12 +720,6 @@ var CMS = window.CMS || {};
var el = $('' + title + '');
el.on(that.click, function () {
- if (item.is('input') || item.is('button')) {
- // we need to use native `.click()` event specifically
- // as we are inside an iframe and magic is happening
- item[0].click();
- }
-
if (item.is('a')) {
that._loadIframe({
url: item.prop('href'),
@@ -730,11 +733,22 @@ var CMS = window.CMS || {};
if (item.hasClass('deletelink')) {
that.options.onClose = null;
}
- // hide iframe
- that.ui.frame.find('iframe').hide();
- // page has been saved or deleted, run checkup
- that.saved = true;
+
+ if (!item.hasClass('default')) { // hide iframe when using buttons other than submit
+ that.ui.modal.find('.cms-modal-frame iframe').hide();
+ // page has been saved or deleted, run checkup
+ that.saved = true;
+ } else { // submit button uses the form's submit event
+ that.hideFrame = true;
+ }
+ }
+
+ if (item.is('input') || item.is('button')) {
+ // we need to use native `.click()` event specifically
+ // as we are inside an iframe and magic is happening
+ item[0].click();
}
+
});
el.wrap(group);
diff --git a/cms/tests/test_frontend.py b/cms/tests/test_frontend.py
index 0c4d7fe8937..3886756a7e0 100644
--- a/cms/tests/test_frontend.py
+++ b/cms/tests/test_frontend.py
@@ -489,7 +489,7 @@ def test_cms_modal_html5_validation_error(self):
create_page('apphook', 'simple.html', 'fr', published=True,
apphook=Example1App)
url = '%s/%s/?%s' % (
- self.live_server_url, 'apphook/detail/class/%s'
+ self.live_server_url, 'fr/apphook/detail/class/%s'
% ex1.pk, get_cms_setting('CMS_TOOLBAR_URL__EDIT_ON')
)
self.driver.get(url)
@@ -502,7 +502,7 @@ def test_cms_modal_html5_validation_error(self):
# Load modal iframe
add_button = self.driver.find_element_by_css_selector(
- '.cms_plugin-placeholderapp-example1-add-0'
+ '.cms-plugin-placeholderapp-example1-add-0'
)
open_modal_actions = ActionChains(self.driver)
open_modal_actions.double_click(add_button)
@@ -539,7 +539,7 @@ def test_cms_modal_html5_validation_error(self):
self.driver.switch_to_default_content()
submit_button = self.driver.find_element_by_css_selector('.default')
submit_button.click()
- time.sleep(0.5)
+ time.sleep(10)
with self.assertRaises(NoSuchElementException):
self.driver.find_element_by_css_selector('iframe')
example = Example1.objects.get(char_1='test')