").attr({href:this.data("url")}).text(this.find(".name").text())).html()},insertHTML:function le(e){
-e.replaceContent(this.getHTML())},updateFromNode:function ue(e){},updateDimensions:function ce(e,t,n){var i=this.find(":input[name=Width]"),r=this.find(":input[name=Height]"),o=i.val(),a=r.val(),s
-o&&a&&(e?(s=r.getOrigVal()/i.getOrigVal(),"Width"==e?(t&&o>t&&(o=t),a=Math.floor(o*s)):"Height"==e&&(n&&a>n&&(a=n),o=Math.ceil(a/s))):(t&&o>t&&(o=t),n&&a>n&&(a=n)),i.val(o),r.val(a))}}),e("form.htmleditorfield-mediaform .ss-htmleditorfield-file.image").entwine({
+getAttributes:function ae(){},getExtraData:function oe(){},getHTML:function se(){return e("
").append(e("
").attr({href:this.data("url")}).text(this.find(".name").text())).html()},insertHTML:function le(e){
+e.replaceContent(this.getHTML())},updateFromNode:function ue(e){},updateDimensions:function ce(e,t,n){var i=this.find(":input[name=Width]"),r=this.find(":input[name=Height]"),a=i.val(),o=r.val(),s
+a&&o&&(e?(s=r.getOrigVal()/i.getOrigVal(),"Width"==e?(t&&a>t&&(a=t),o=Math.floor(a*s)):"Height"==e&&(n&&o>n&&(o=n),a=Math.ceil(o/s))):(t&&a>t&&(a=t),n&&o>n&&(o=n)),i.val(a),r.val(o))}}),e("form.htmleditorfield-mediaform .ss-htmleditorfield-file.image").entwine({
getAttributes:function de(){var e=this.find(":input[name=Width]").val(),t=this.find(":input[name=Height]").val()
return{src:this.find(":input[name=URL]").val(),alt:this.find(":input[name=AltText]").val(),width:e?parseInt(e,10):null,height:t?parseInt(t,10):null,title:this.find(":input[name=Title]").val(),"class":this.find(":input[name=CSSClass]").val(),
"data-id":this.find(":input[name=FileID]").val()}},getExtraData:function fe(){return{CaptionText:this.find(":input[name=CaptionText]").val()}},getHTML:function pe(){},insertHTML:function he(t){var n=this.closest("form"),i=n.getSelection()
t||(t=n.getEditor())
-var r=this.getAttributes(),o=this.getExtraData(),a=i&&i.is("img")?i:null
-a&&a.parent().is(".captionImage")&&(a=a.parent())
+var r=this.getAttributes(),a=this.getExtraData(),o=i&&i.is("img")?i:null
+o&&o.parent().is(".captionImage")&&(o=o.parent())
var s=i&&i.is("img")?i:e("
")
s.attr(r)
var l=s.parent(".captionImage"),u=l.find(".caption")
-o.CaptionText?(l.length||(l=e("
")),l.attr("class","captionImage "+r["class"]).css("width",r.width),u.length||(u=e('
').appendTo(l)),u.attr("class","caption "+r["class"]).text(o.CaptionText)):l=u=null
+a.CaptionText?(l.length||(l=e("
")),l.attr("class","captionImage "+r["class"]).css("width",r.width),u.length||(u=e('
').appendTo(l)),u.attr("class","caption "+r["class"]).text(a.CaptionText)):l=u=null
var c=l?l:s
-a&&a.not(c).length&&a.replaceWith(c),l&&l.prepend(s),a||(t.repaint(),t.insertContent(e("
").append(c).html(),{skip_undo:1})),t.addUndo(),t.repaint()},updateFromNode:function me(e){this.find(":input[name=AltText]").val(e.attr("alt")),
+o&&o.not(c).length&&o.replaceWith(c),l&&l.prepend(s),o||(t.repaint(),t.insertContent(e("
").append(c).html(),{skip_undo:1})),t.addUndo(),t.repaint()},updateFromNode:function me(e){this.find(":input[name=AltText]").val(e.attr("alt")),
this.find(":input[name=Title]").val(e.attr("title")),this.find(":input[name=CSSClass]").val(e.attr("class")),this.find(":input[name=Width]").val(e.width()),this.find(":input[name=Height]").val(e.height()),
this.find(":input[name=CaptionText]").val(e.siblings(".caption:first").text()),this.find(":input[name=FileID]").val(e.data("id"))}}),e("form.htmleditorfield-mediaform .ss-htmleditorfield-file.flash").entwine({
getAttributes:function ge(){var e=this.find(":input[name=Width]").val(),t=this.find(":input[name=Height]").val()
@@ -1976,12 +1976,12 @@ var e=this
this.bind("change",function(){var t=e.closest("form").find(".grid-field")
t.setState("ParentID",e.getValue()),t.reload()})}}),e(".insert-media-react__dialog-wrapper .nav-link").entwine({onclick:function Ie(e){return e.preventDefault()}}),e("#insert-media-react__dialog-wrapper").entwine({
Element:null,Data:{},onunmatch:function Fe(){this._clearModal()},_clearModal:function Ae(){_reactDom2["default"].unmountComponentAtNode(this[0])},open:function De(){this._renderModal(!0)},close:function Me(){
-this._renderModal(!1)},_renderModal:function Ne(e){var t=this,n=function l(){return t.close()},i=function u(){return t._handleInsert.apply(t,arguments)},r=window.ss.store,o=window.ss.apolloClient,a=this.getOriginalAttributes(),s=window.InsertMediaModal["default"]
+this._renderModal(!1)},_renderModal:function Ne(e){var t=this,n=function l(){return t.close()},i=function u(){return t._handleInsert.apply(t,arguments)},r=window.ss.store,a=window.ss.apolloClient,o=this.getOriginalAttributes(),s=window.InsertMediaModal["default"]
if(!s)throw new Error("Invalid Insert media modal component found")
-delete a.url,_reactDom2["default"].render(_react2["default"].createElement(_reactApollo.ApolloProvider,{store:r,client:o},_react2["default"].createElement(s,{title:!1,show:e,onInsert:i,onHide:n,bodyClassName:"modal__dialog",
-className:"insert-media-react__dialog-wrapper",fileAttributes:a})),this[0])},_handleInsert:function Ue(e,t){var n=!1
+delete o.url,_reactDom2["default"].render(_react2["default"].createElement(_reactApollo.ApolloProvider,{store:r,client:a},_react2["default"].createElement(s,{title:!1,show:e,onInsert:i,onHide:n,bodyClassName:"modal__dialog",
+className:"insert-media-react__dialog-wrapper",fileAttributes:o})),this[0])},_handleInsert:function Ue(e,t){var n=!1
this.setData(_extends({},e,t))
try{switch(t.category){case"image":n=this.insertImage()
break
@@ -1989,48 +1989,48 @@ default:n=this.insertFile()}}catch(i){this.statusMessage(i,"bad")}return n&&this
if(!t)return{}
var n=t.getEditor().getSelectedNode()
if(!n)return{}
-var i=e(n),r=i.parent(".captionImage").find(".caption"),o={url:i.attr("src"),AltText:i.attr("alt"),InsertWidth:i.attr("width"),InsertHeight:i.attr("height"),TitleTooltip:i.attr("title"),Alignment:i.attr("class"),
+var i=e(n),r=i.parent(".captionImage").find(".caption"),a={url:i.attr("src"),AltText:i.attr("alt"),InsertWidth:i.attr("width"),InsertHeight:i.attr("height"),TitleTooltip:i.attr("title"),Alignment:i.attr("class"),
Caption:r.text(),ID:i.attr("data-id")}
-return["InsertWidth","InsertHeight","ID"].forEach(function(e){o[e]="string"==typeof o[e]?parseInt(o[e],10):null}),o},getAttributes:function Be(){var e=this.getData()
+return["InsertWidth","InsertHeight","ID"].forEach(function(e){a[e]="string"==typeof a[e]?parseInt(a[e],10):null}),a},getAttributes:function Be(){var e=this.getData()
return{src:e.url,alt:e.AltText,width:e.InsertWidth,height:e.InsertHeight,title:e.TitleTooltip,"class":e.Alignment,"data-id":e.ID}},getExtraData:function He(){var e=this.getData()
return{CaptionText:e&&e.Caption}},insertFile:function $e(){return this.statusMessage(_i18n2["default"]._t("HTMLEditorField_Toolbar.ERROR_OEMBED_REMOTE","Embed is only compatible with remote files"),"bad"),
!1},insertImage:function Ve(){var t=this.getElement()
if(!t)return!1
var n=t.getEditor()
if(!n)return!1
-var i=e(n.getSelectedNode()),r=this.getAttributes(),o=this.getExtraData(),a=i&&i.is("img")?i:null
-a&&a.parent().is(".captionImage")&&(a=a.parent())
+var i=e(n.getSelectedNode()),r=this.getAttributes(),a=this.getExtraData(),o=i&&i.is("img")?i:null
+o&&o.parent().is(".captionImage")&&(o=o.parent())
var s=i&&i.is("img")?i:e("
")
s.attr(r)
var l=s.parent(".captionImage"),u=l.find(".caption")
-o.CaptionText?(l.length||(l=e("
")),l.attr("class","captionImage "+r["class"]).css("width",r.width),u.length||(u=e('
').appendTo(l)),u.attr("class","caption "+r["class"]).text(o.CaptionText)):l=u=null
+a.CaptionText?(l.length||(l=e("
")),l.attr("class","captionImage "+r["class"]).css("width",r.width),u.length||(u=e('
').appendTo(l)),u.attr("class","caption "+r["class"]).text(a.CaptionText)):l=u=null
var c=l||s
-return a&&a.not(c).length&&a.replaceWith(c),l&&l.prepend(s),a||(n.repaint(),n.insertContent(e("
").append(c).html(),{skip_undo:1})),n.addUndo(),n.repaint(),!0},statusMessage:function qe(t,n){var i=e("
").text(t).html()
+return o&&o.not(c).length&&o.replaceWith(c),l&&l.prepend(s),o||(n.repaint(),n.insertContent(e("
").append(c).html(),{skip_undo:1})),n.addUndo(),n.repaint(),!0},statusMessage:function qe(t,n){var i=e("
").text(t).html()
e.noticeAdd({text:i,type:n,stayTime:5e3,inEffect:{left:"0",opacity:"show"}})}})})},function(e,t){e.exports=ReactApollo},function(e,t,n){"use strict"
-function i(e){return e&&e.__esModule?e:{"default":e}}var r=n(1),o=i(r)
-n(166),n(201),n(196),o["default"].entwine("ss",function(e){e(".ss-tabset").entwine({IgnoreTabState:!1,onadd:function t(){var e=window.location.hash
+function i(e){return e&&e.__esModule?e:{"default":e}}var r=n(1),a=i(r)
+n(166),n(201),n(196),a["default"].entwine("ss",function(e){e(".ss-tabset").entwine({IgnoreTabState:!1,onadd:function t(){var e=window.location.hash
this.redrawTabs(),""!==e&&this.openTabFromURL(e),this._super()},onremove:function n(){this.data("tabs")&&this.tabs("destroy"),this._super()},redrawTabs:function i(){this.rewriteHashlinks(),this.tabs()},
openTabFromURL:function r(t){var n
-e.each(this.find(".ui-tabs-anchor"),function(){if(this.href.indexOf(t)!==-1&&1===e(t).length)return n=e(this),!1}),void 0!==n&&e(document).ready("ajaxComplete",function(){n.click()})},rewriteHashlinks:function o(){
+e.each(this.find(".ui-tabs-anchor"),function(){if(this.href.indexOf(t)!==-1&&1===e(t).length)return n=e(this),!1}),void 0!==n&&e(document).ready("ajaxComplete",function(){n.click()})},rewriteHashlinks:function a(){
e(this).find("ul a").each(function(){if(e(this).attr("href")){var t=e(this).attr("href").match(/#.*/)
-t&&e(this).attr("href",document.location.href.replace(/#.*/,"")+t[0])}})}}),e(".ui-tabs-active .ui-tabs-anchor").entwine({onmatch:function a(){this.addClass("nav-link active")},onunmatch:function s(){this.removeClass("active")
+t&&e(this).attr("href",document.location.href.replace(/#.*/,"")+t[0])}})}}),e(".ui-tabs-active .ui-tabs-anchor").entwine({onmatch:function o(){this.addClass("nav-link active")},onunmatch:function s(){this.removeClass("active")
}})})},,function(e,t,n){"use strict"
-function i(e){return e&&e.__esModule?e:{"default":e}}var r=n(1),o=i(r),a=n(114),s=i(a)
-n(166),n(196),o["default"].entwine("ss",function(e){e(".grid-field").entwine({reload:function t(n,i){var r=this,o=this.closest("form"),a=this.find(":input:focus").attr("name"),l=o.find(":input").serializeArray()
+function i(e){return e&&e.__esModule?e:{"default":e}}var r=n(1),a=i(r),o=n(114),s=i(o)
+n(166),n(196),a["default"].entwine("ss",function(e){e(".grid-field").entwine({reload:function t(n,i){var r=this,a=this.closest("form"),o=this.find(":input:focus").attr("name"),l=a.find(":input").serializeArray()
-n||(n={}),n.data||(n.data=[]),n.data=n.data.concat(l),window.location.search&&(n.data=window.location.search.replace(/^\?/,"")+"&"+e.param(n.data)),o.addClass("loading"),e.ajax(e.extend({},{headers:{"X-Pjax":"CurrentField"
-},type:"POST",url:this.data("url"),dataType:"html",success:function u(t){if(r.empty().append(e(t).children()),a&&r.find(':input[name="'+a+'"]').focus(),r.find(".filter-header").length){var s
-"show"==n.data[0].filter?(s='
',r.addClass("show-filter").find(".filter-header").show()):(s='
',
-r.removeClass("show-filter").find(".filter-header").hide()),r.find(".sortable-header th:last").html(s)}o.removeClass("loading"),i&&i.apply(this,arguments),r.trigger("reload",r)},error:function c(e){alert(s["default"]._t("GRIDFIELD.ERRORINTRANSACTION")),
-o.removeClass("loading")}},n))},showDetailView:function n(e){window.location.href=e},getItems:function i(){return this.find(".ss-gridfield-item")},setState:function r(e,t){var n=this.getState()
-n[e]=t,this.find(':input[name="'+this.data("name")+'[GridState]"]').val(JSON.stringify(n))},getState:function o(){return JSON.parse(this.find(':input[name="'+this.data("name")+'[GridState]"]').val())}}),
-e(".grid-field *").entwine({getGridField:function a(){return this.closest(".grid-field")}}),e(".grid-field :button[name=showFilter]").entwine({onclick:function l(e){this.closest(".grid-field__table").find(".filter-header").show().find(":input:first").focus(),
+n||(n={}),n.data||(n.data=[]),n.data=n.data.concat(l),window.location.search&&(n.data=window.location.search.replace(/^\?/,"")+"&"+e.param(n.data)),a.addClass("loading"),e.ajax(e.extend({},{headers:{"X-Pjax":"CurrentField"
+},type:"POST",url:this.data("url"),dataType:"html",success:function u(t){if(r.empty().append(e(t).children()),o&&r.find(':input[name="'+o+'"]').focus(),r.find(".filter-header").length){var s
+"show"==n.data[0].filter?(s='
',r.addClass("show-filter").find(".filter-header").show()):(s='
',
+r.removeClass("show-filter").find(".filter-header").hide()),r.find(".sortable-header th:last").html(s)}a.removeClass("loading"),i&&i.apply(this,arguments),r.trigger("reload",r)},error:function c(e){alert(s["default"]._t("GRIDFIELD.ERRORINTRANSACTION")),
+a.removeClass("loading")}},n))},showDetailView:function n(e){window.location.href=e},getItems:function i(){return this.find(".ss-gridfield-item")},setState:function r(e,t){var n=this.getState()
+n[e]=t,this.find(':input[name="'+this.data("name")+'[GridState]"]').val(JSON.stringify(n))},getState:function a(){return JSON.parse(this.find(':input[name="'+this.data("name")+'[GridState]"]').val())}}),
+e(".grid-field *").entwine({getGridField:function o(){return this.closest(".grid-field")}}),e(".grid-field :button[name=showFilter]").entwine({onclick:function l(e){this.closest(".grid-field__table").find(".filter-header").show().find(":input:first").focus(),
this.closest(".grid-field").addClass("show-filter"),this.parent().html('
'),e.preventDefault()}}),e(".grid-field .ss-gridfield-item").entwine({onclick:function u(t){if(e(t.target).closest(".action").length)return this._super(t),
!1
var n=this.find(".edit-link")
@@ -2043,12 +2043,12 @@ var i=this
e(this.data("target")).find("[data-dismiss]").on("click",function(){n.fadeOut(function(){e(this).removeClass("in")}),e(i.data("target")).removeClass("in")})}}),e(".grid-field .action:button").entwine({
onclick:function p(e){var t="show"
return this.is(":disabled")?void e.preventDefault():(!this.hasClass("ss-gridfield-button-close")&&this.closest(".grid-field").hasClass("show-filter")||(t="hidden"),this.getGridField().reload({data:[{name:this.attr("name"),
-value:this.val(),filter:t}]}),void e.preventDefault())},actionurl:function h(){var t=this.closest(":button"),n=this.getGridField(),i=this.closest("form"),r=i.find(":input.gridstate").serialize(),o=i.find('input[name="SecurityID"]').val()
+value:this.val(),filter:t}]}),void e.preventDefault())},actionurl:function h(){var t=this.closest(":button"),n=this.getGridField(),i=this.closest("form"),r=i.find(":input.gridstate").serialize(),a=i.find('input[name="SecurityID"]').val()
-r+="&"+encodeURIComponent(t.attr("name"))+"="+encodeURIComponent(t.val()),o&&(r+="&SecurityID="+encodeURIComponent(o)),window.location.search&&(r=window.location.search.replace(/^\?/,"")+"&"+r)
-var a=n.data("url").indexOf("?")==-1?"?":"&"
-return e.path.makeUrlAbsolute(n.data("url")+a+r,e("base").attr("href"))}}),e(".grid-field .add-existing-autocompleter").entwine({onbuttoncreate:function m(){var e=this
+r+="&"+encodeURIComponent(t.attr("name"))+"="+encodeURIComponent(t.val()),a&&(r+="&SecurityID="+encodeURIComponent(a)),window.location.search&&(r=window.location.search.replace(/^\?/,"")+"&"+r)
+var o=n.data("url").indexOf("?")==-1?"?":"&"
+return e.path.makeUrlAbsolute(n.data("url")+o+r,e("base").attr("href"))}}),e(".grid-field .add-existing-autocompleter").entwine({onbuttoncreate:function m(){var e=this
this.toggleDisabled(),this.find('input[type="text"]').on("keyup",function(){e.toggleDisabled()})},onunmatch:function g(){this.find('input[type="text"]').off("keyup")},toggleDisabled:function v(){var e=this.find(".ss-ui-button"),t=this.find('input[type="text"]'),n=""!==t.val(),i=e.is(":disabled")
;(n&&i||!n&&!i)&&e.attr("disabled",!i)}}),e(".grid-field .grid-field__col-compact .action.gridfield-button-delete, .cms-edit-form .btn-toolbar button.action.action-delete").entwine({onclick:function y(e){
@@ -2069,10 +2069,10 @@ this.val()&&(e.addClass("filtered"),t.addClass("filtered")),this._super()},onunm
if("13"==e.keyCode){var i=this.closest(".filter-header").find(".ss-gridfield-button-filter"),r="show"
return!this.hasClass("ss-gridfield-button-close")&&this.closest(".grid-field").hasClass("show-filter")||(r="hidden"),this.getGridField().reload({data:[{name:i.attr("name"),value:i.val(),filter:r}]}),!1
-}t.addClass("hover-alike"),n.addClass("hover-alike")}}}),e(".grid-field .relation-search").entwine({onfocusin:function F(t){this.autocomplete({source:function n(t,i){var r=e(this.element),o=e(this.element).closest("form")
+}t.addClass("hover-alike"),n.addClass("hover-alike")}}}),e(".grid-field .relation-search").entwine({onfocusin:function F(t){this.autocomplete({source:function n(t,i){var r=e(this.element),a=e(this.element).closest("form")
-e.ajax({headers:{"X-Pjax":"Partial"},dataType:"json",type:"GET",url:e(r).data("searchUrl"),data:encodeURIComponent(r.attr("name"))+"="+encodeURIComponent(r.val()),success:i,error:function a(e){alert(s["default"]._t("GRIDFIELD.ERRORINTRANSACTION","An error occured while fetching data from the server\n Please try again later."))
+e.ajax({headers:{"X-Pjax":"Partial"},dataType:"json",type:"GET",url:e(r).data("searchUrl"),data:encodeURIComponent(r.attr("name"))+"="+encodeURIComponent(r.val()),success:i,error:function o(e){alert(s["default"]._t("GRIDFIELD.ERRORINTRANSACTION","An error occured while fetching data from the server\n Please try again later."))
}})},select:function i(t,n){var i=e('
')
i.val(n.item.id),e(this).closest(".grid-field").find(".action_gridfield_relationfind").replaceWith(i)
@@ -2082,27 +2082,27 @@ return i.setState("GridFieldPaginator",{currentPage:n}),i.reload(),!1}}})})},fun
function i(e){if(e&&e.__esModule)return e
var t={}
if(null!=e)for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n])
-return t["default"]=e,t}function r(e){return e&&e.__esModule?e:{"default":e}}function o(){var e=h["default"].get("absoluteBaseUrl"),t=new I["default"]({shouldBatch:!0,addTypename:!0,dataIdFromObject:function T(e){
+return t["default"]=e,t}function r(e){return e&&e.__esModule?e:{"default":e}}function a(){var e=h["default"].get("absoluteBaseUrl"),t=new I["default"]({shouldBatch:!0,addTypename:!0,dataIdFromObject:function T(e){
return e.id>=0&&e.__typename?e.__typename+":"+e.id:null},networkInterface:(0,R.createNetworkInterface)({uri:e+"graphql/",opts:{credentials:"same-origin"}})})
g["default"].add("config",_["default"]),g["default"].add("form",d.reducer),g["default"].add("schemas",C["default"]),g["default"].add("records",E["default"]),g["default"].add("campaign",O["default"]),g["default"].add("breadcrumbs",k["default"]),
g["default"].add("routing",f.routerReducer),g["default"].add("apollo",t.reducer()),x["default"].start()
-var n={},i=(0,l.combineReducers)(g["default"].getAll()),r=[c["default"],t.middleware()],o=h["default"].get("environment"),a=h["default"].get("debugging"),u=l.applyMiddleware.apply(void 0,r),p=window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__,m=window.__REDUX_DEVTOOLS_EXTENSION__||window.devToolsExtension
+var n={},i=(0,l.combineReducers)(g["default"].getAll()),r=[c["default"],t.middleware()],a=h["default"].get("environment"),o=h["default"].get("debugging"),u=l.applyMiddleware.apply(void 0,r),p=window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__,m=window.__REDUX_DEVTOOLS_EXTENSION__||window.devToolsExtension
-"dev"===o&&a&&("function"==typeof p?u=p(l.applyMiddleware.apply(void 0,r)):"function"==typeof m&&(u=(0,l.compose)(l.applyMiddleware.apply(void 0,r),m())))
+"dev"===a&&o&&("function"==typeof p?u=p(l.applyMiddleware.apply(void 0,r)):"function"==typeof m&&(u=(0,l.compose)(l.applyMiddleware.apply(void 0,r),m())))
var v=u(l.createStore),b=v(i,n)
b.dispatch(y.setConfig(h["default"].getAll())),window.ss=window.ss||{},window.ss.store=b,window.ss=window.ss||{},window.ss.apolloClient=t
var w=new s["default"](b,t)
-w.start(window.location.pathname),window.jQuery&&window.jQuery("body").addClass("js-react-boot")}var a=n(204),s=r(a),l=n(107),u=n(226),c=r(u),d=n(109),f=n(225),p=n(147),h=r(p),m=n(227),g=r(m),v=n(228),y=i(v),b=n(230),_=r(b),w=n(231),C=r(w),T=n(232),E=r(T),P=n(233),O=r(P),S=n(235),k=r(S),j=n(236),x=r(j),R=n(252),I=r(R),F=n(253),A=r(F),D=n(10),M=r(D)
+w.start(window.location.pathname),window.jQuery&&window.jQuery("body").addClass("js-react-boot")}var o=n(204),s=r(o),l=n(107),u=n(226),c=r(u),d=n(109),f=n(225),p=n(147),h=r(p),m=n(227),g=r(m),v=n(228),y=i(v),b=n(230),_=r(b),w=n(231),C=r(w),T=n(232),E=r(T),P=n(233),O=r(P),S=n(235),k=r(S),j=n(236),x=r(j),R=n(252),I=r(R),F=n(253),A=r(F),D=n(10),M=r(D)
-M["default"].polyfill(),window.onload=o},function(e,t,n){"use strict"
+M["default"].polyfill(),window.onload=a},function(e,t,n){"use strict"
function i(e){return e&&e.__esModule?e:{"default":e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(t,"__esModule",{value:!0})
-var o=function(){function e(e,t){for(var n=0;n
-1}).map(function(e){return""+e.value
@@ -2259,17 +2259,17 @@ g.propTypes={className:u["default"].PropTypes.string,extraClass:u["default"].Pro
source:u["default"].PropTypes.arrayOf(u["default"].PropTypes.shape({value:u["default"].PropTypes.oneOfType([u["default"].PropTypes.string,u["default"].PropTypes.number]),title:u["default"].PropTypes.any,
disabled:u["default"].PropTypes.bool})),onChange:u["default"].PropTypes.func,value:u["default"].PropTypes.any,readOnly:u["default"].PropTypes.bool,disabled:u["default"].PropTypes.bool},g.defaultProps={
extraClass:"",className:"",value:[]},t.CheckboxSetField=g,t["default"]=(0,m["default"])(g)},function(e,t,n){"use strict"
-function i(e){return e&&e.__esModule?e:{"default":e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called")
+function i(e){return e&&e.__esModule?e:{"default":e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function a(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called")
-return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t)
+return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function o(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t)
e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{
value:!0}),t.OptionsetField=void 0
var s=function(){function e(e,t){for(var n=0;n.btn-secondary.dropdown-toggle{
color:#66727d;
- background-color:#cbd0d5;
+ background-color:#c0cad3;
border-color:#abb5be;
background-image:none;
box-shadow:inset 0 3px 5px rgba(0,0,0,.125);
@@ -3834,12 +3834,12 @@ a.btn.disabled,fieldset[disabled] a.btn{
.btn-secondary.active.focus,.btn-secondary.active:focus,.btn-secondary.active:hover,.btn-secondary:active.focus,.btn-secondary:active:focus,.btn-secondary:active:hover,.open>.btn-secondary.dropdown-toggle.focus,.open>.btn-secondary.dropdown-toggle:focus,.open>.btn-secondary.dropdown-toggle:hover{
color:#66727d;
- background-color:#b7bec5;
+ background-color:#abb8c4;
border-color:#8694a1;
}
.btn-secondary.disabled.focus,.btn-secondary.disabled:focus,.btn-secondary.disabled:hover,.btn-secondary:disabled.focus,.btn-secondary:disabled:focus,.btn-secondary:disabled:hover{
- background-color:#e7e9ec;
+ background-color:#dee3e8;
border-color:#ced3d9;
}
@@ -4107,7 +4107,7 @@ a.btn.disabled,fieldset[disabled] a.btn{
}
.btn-group-sm>.btn,.btn-sm{
- padding:.25rem .75rem;
+ padding:.3077rem .4615rem;
font-size:.923rem;
line-height:1.5;
border-radius:.154rem;
@@ -7867,6 +7867,18 @@ h1{
content:"=";
}
+.font-icon-page-multiple:before{
+ content:">";
+}
+
+.font-icon-database:before{
+ content:"?";
+}
+
+.font-icon-external-link:before{
+ content:"@";
+}
+
.icon-btn-icon,.ui-state-default [class*=btn-icon-],.ui-widget-content [class*=btn-icon-]{
background-image:url(../images/sprite-btn-icon.png);
}
@@ -9416,6 +9428,7 @@ body.cms{
.cms-content-header .cms-content-header-info .cms-backlink{
margin-top:-7px;
float:left;
+ min-width:24px;
}
.cms-content-header .ss-ui-button{
@@ -11986,7 +11999,7 @@ li.class-ErrorPage>a .jstree-pageicon{
.cms-menu{
z-index:80;
background:#e9f0f4;
- width:160px;
+ width:13.8465rem;
}
.cms-menu .cms-menu-list{
@@ -12007,7 +12020,7 @@ li.class-ErrorPage>a .jstree-pageicon{
}
.cms-menu.collapsed{
- width:60px !important;
+ width:4.6155rem !important;
cursor:auto;
z-index:1000;
}
@@ -12143,6 +12156,37 @@ li.class-ErrorPage>a .jstree-pageicon{
margin-top:-29px;
}
+.menu__icon{
+ position:absolute;
+ margin-top:-1px;
+ left:13px;
+ font-size:1.23rem;
+ -webkit-transition:all .2s;
+ transition:all .2s;
+ color:#5589a7;
+}
+
+.collapsed .menu__icon{
+ left:22px;
+}
+
+#Menu-Help .text:after{
+ content:"@";
+ font-family:silverstripe;
+ display:inline-block;
+ opacity:0;
+ font-size:10px;
+ margin-left:6px;
+ margin-top:-2px;
+ color:#5589a7;
+ -webkit-transition:opacity .25s ease-in-out;
+ transition:opacity .25s ease-in-out;
+}
+
+#Menu-Help a:hover .text:after{
+ opacity:1;
+}
+
.cms-menu-list a:active,.cms-menu-list a:focus{
text-decoration:none;
}
@@ -13423,10 +13467,10 @@ li.class-ErrorPage>a .jstree-pageicon{
white-space:nowrap;
}
-.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .btn,.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel button.ss-ui-button{
+.cms .ss-ui-action-tabset.action-menus.ss-tabset .ui-tabs-panel .btn{
width:100%;
text-align:left;
- margin:0 5px;
+ border-radius:0;
}
.cms .ss-ui-action-tabset.action-menus.ss-tabset .last .ui-tabs-panel.ss-ui-action-tab{
@@ -14076,18 +14120,23 @@ li.class-ErrorPage>a .jstree-pageicon{
.cms .grid-field .add-existing-autocompleter input.relation-search{
width:270px;
- height:32px;
- margin-bottom:.9231rem;
border-top-right-radius:0;
border-bottom-right-radius:0;
+ padding-right:0;
}
.cms .grid-field .add-existing-autocompleter button.action_gridfield_relationadd{
- height:32px;
margin-left:0;
border-top-left-radius:0;
border-bottom-left-radius:0;
border-left:0;
+ margin-right:0;
+ padding-top:.5385rem;
+ padding-bottom:.5385rem;
+}
+
+.cms .grid-field .add-existing-autocompleter button.action_gridfield_relationadd:hover{
+ border-color:#ced3d9;
}
.cms .grid-field .grid-csv-button,.cms .grid-field .grid-print-button{
@@ -14096,10 +14145,6 @@ li.class-ErrorPage>a .jstree-pageicon{
display:inline-block;
}
-.cms .grid-field .grid-csv-button .btn-secondary,.cms .grid-field .grid-print-button .btn-secondary{
- margin-right:0;
-}
-
.cms .grid-field__table .filter-header .fieldholder-small{
padding-bottom:0;
}
@@ -14223,23 +14268,22 @@ li.class-ErrorPage>a .jstree-pageicon{
margin:0;
}
-.cms .grid-field__table tr th button.ss-gridfield-button-filter:not(.trigger){
- color:#fff;
-}
-
.cms .grid-field__table tr th button.grid-field__filter-clear,.cms .grid-field__table tr th button.ss-gridfield-button-filter:not(.trigger){
margin-top:3px;
margin-bottom:3px;
+ background:transparent;
+ color:#fff;
+}
+
+.cms .grid-field__table tr th button.grid-field__filter-clear.hover-alike,.cms .grid-field__table tr th button.grid-field__filter-clear.hover-alike:active,.cms .grid-field__table tr th button.grid-field__filter-clear:active,.cms .grid-field__table tr th button.grid-field__filter-clear:hover,.cms .grid-field__table tr th button.ss-gridfield-button-filter:not(.trigger).hover-alike,.cms .grid-field__table tr th button.ss-gridfield-button-filter:not(.trigger).hover-alike:active,.cms .grid-field__table tr th button.ss-gridfield-button-filter:not(.trigger):active,.cms .grid-field__table tr th button.ss-gridfield-button-filter:not(.trigger):hover{
+ color:#fff;
+ background-color:#383f45;
}
.cms .grid-field__table tr th button.action_gridfield_relationadd:hover{
color:#444 !important;
}
-.cms .grid-field__table tr th button.ss-gridfield-button-close.hover-alike,.cms .grid-field__table tr th button.ss-gridfield-button-close.hover-alike:active,.cms .grid-field__table tr th button.ss-gridfield-button-close:active,.cms .grid-field__table tr th button.ss-gridfield-button-close:hover,.cms .grid-field__table tr th button.ss-gridfield-button-filter:not(.trigger).hover-alike,.cms .grid-field__table tr th button.ss-gridfield-button-filter:not(.trigger).hover-alike:active,.cms .grid-field__table tr th button.ss-gridfield-button-filter:not(.trigger):active,.cms .grid-field__table tr th button.ss-gridfield-button-filter:not(.trigger):hover{
- color:#fff;
-}
-
.cms .grid-field__table tr th button.ss-gridfield-button-reset{
margin:0;
display:none;
@@ -15046,20 +15090,11 @@ fieldset+.btn-toolbar{
box-shadow:none;
}
-.btn.btn--no-text{
- text-indent:-90000px;
- overflow:hidden;
-}
-
-.btn.btn--no-text:before{
- text-indent:0;
-}
-
.btn[class*=font-icon-]:before{
position:relative;
margin-right:6px;
line-height:20px;
- font-size:16px;
+ font-size:1.23rem;
float:left;
}
@@ -15091,6 +15126,22 @@ fieldset+.btn-toolbar{
.btn--no-text[class*=font-icon-]:before,.no-text[class*=font-icon-]:before{
margin-right:0;
+ text-indent:0;
+}
+
+.btn--hide-text{
+ text-indent:-90000px;
+ overflow:hidden;
+ min-width:2.7684rem;
+}
+
+.btn--hide-text.btn-sm,.btn-group-sm>.btn--hide-text.btn{
+ min-width:2.153rem;
+}
+
+.btn--hide-text[class*=font-icon-]:before{
+ text-indent:0;
+ margin-right:0;
}
.btn__loading-icon{
@@ -15184,14 +15235,20 @@ fieldset+.btn-toolbar{
background-color:transparent;
}
-.btn-secondary:active,.btn-secondary:active:focus,.btn-secondary:active:hover,.btn-secondary:focus,.btn-secondary:hover{
- background-color:#e7e9ec;
+.btn-secondary:hover{
+ background-color:#dee3e8;
border-color:transparent;
- outline-color:#29abe2;
}
-.btn.active:active{
- outline:none;
+.btn-secondary.active,.btn-secondary:active,.btn-secondary:focus{
+ box-shadow:inset 0 0 2px rgba(0,0,0,.125);
+ background-color:#dee3e8;
+ border-color:#ced3d9;
+}
+
+.btn-secondary.active.focus,.btn-secondary.active:focus,.btn-secondary.active:hover,.btn-secondary:active.focus,.btn-secondary:active:focus,.btn-secondary:active:hover,.btn-secondary:focus.focus,.btn-secondary:focus:focus,.btn-secondary:focus:hover{
+ background-color:#dee3e8;
+ border-color:#ced3d9;
}
.btn-secondary-outline{
@@ -15364,14 +15421,7 @@ button.close{
border-bottom:1px solid #e5e8eb;
}
-.grid-field__sort .ui-button-text{
- display:inline;
- padding:0;
- vertical-align:top;
- color:#66727d;
-}
-
-.grid-field__sort .ui-button-text:after{
+.grid-field__sort:after{
content:")";
display:inline-block;
color:#9ba5ae;
@@ -15382,15 +15432,15 @@ button.close{
border-bottom:1px solid #29abe2;
}
-.grid-field__sort.ss-gridfield-sorted-asc .ui-button-text:after,.grid-field__sort.ss-gridfield-sorted-asc:hover.ui-button-text:after,.grid-field__sort.ss-gridfield-sorted-desc .ui-button-text:after,.grid-field__sort.ss-gridfield-sorted-desc:hover.ui-button-text:after{
+.grid-field__sort.ss-gridfield-sorted-asc:after,.grid-field__sort.ss-gridfield-sorted-asc:hover:after,.grid-field__sort.ss-gridfield-sorted-desc:after,.grid-field__sort.ss-gridfield-sorted-desc:hover:after{
color:#29abe2;
}
-.grid-field__sort.ss-gridfield-sorted-desc .ui-button-text:after{
+.grid-field__sort.ss-gridfield-sorted-desc:after{
content:"*";
}
-.grid-field__sort.ss-gridfield-sorted-asc .ui-button-text:after{
+.grid-field__sort.ss-gridfield-sorted-asc:after{
content:"(";
}
@@ -15700,6 +15750,8 @@ div.grid-field__sort-field+.form__fieldgroup-item{
float:left;
margin:.76925rem .6154rem .76925rem -.76925rem;
padding-left:.3077rem;
+ padding-right:.3077rem;
+ min-width:24px;
color:#66727d;
}
@@ -15708,10 +15760,6 @@ div.grid-field__sort-field+.form__fieldgroup-item{
margin-right:5px;
}
-.toolbar__back-button.btn--no-text{
- padding-right:.3077rem;
-}
-
.nav-tabs{
margin-bottom:1.5385rem;
}
@@ -15842,6 +15890,10 @@ div.grid-field__sort-field+.form__fieldgroup-item{
margin-right:6px;
}
+input[type=text]{
+ min-height:calc(20px + .5385rem * 2 + 1px * 2);
+}
+
input.checkbox,input.radio,input[type=checkbox],input[type=radio]{
display:inline;
margin-right:6px;
diff --git a/admin/client/src/components/Form/Form.scss b/admin/client/src/components/Form/Form.scss
index c32f49d4f..02e0c4355 100644
--- a/admin/client/src/components/Form/Form.scss
+++ b/admin/client/src/components/Form/Form.scss
@@ -119,6 +119,10 @@
@extend .form-control-static;
}
+// Fix for IE inputs not holding line-height
+input[type="text"] {
+ min-height: calc(#{$line-height-base} + #{$input-padding-y} * 2 + #{$input-btn-border-width} * 2);
+}
// Radio / Checkbox
input[type="checkbox"],
diff --git a/admin/client/src/components/FormAction/FormAction.scss b/admin/client/src/components/FormAction/FormAction.scss
index 82e77075b..ea7fd90e8 100644
--- a/admin/client/src/components/FormAction/FormAction.scss
+++ b/admin/client/src/components/FormAction/FormAction.scss
@@ -16,15 +16,6 @@
margin-right: $spacer-x * .5; // 8px
position: relative;
box-shadow: none;
-
- &.btn--no-text {
- text-indent: -90000px;
- overflow: hidden;
-
- &:before {
- text-indent: 0;
- }
- }
}
// Button icons
@@ -32,7 +23,7 @@
position: relative;
margin-right: 6px;
line-height: $line-height-base;
- font-size: 16px;
+ font-size: $font-size-lg;
float: left;
}
@@ -69,6 +60,24 @@
.btn--no-text[class*="font-icon-"]::before,
.no-text[class*="font-icon-"]::before {
margin-right: 0;
+ text-indent: 0;
+}
+
+// Used buttons with text and icons, but you wan to hide the text only. eg. gridfield pagination
+// Could change to BS .text-hide { @include text-hide(); }, although slightly different
+.btn--hide-text {
+ text-indent: -90000px;
+ overflow: hidden;
+ min-width: calc(#{$btn-padding-x} * 2 + #{$font-size-lg}); // Fix Safari, enough to show icon and include padding
+
+ &.btn-sm {
+ min-width: calc(#{$btn-padding-x-sm} * 2 + #{$font-size-lg}); // Fix Safari, enough to show icon and include padding
+ }
+
+ &[class*=font-icon-]::before {
+ text-indent: 0;
+ margin-right: 0;
+ }
}
@@ -153,20 +162,24 @@
border-color: transparent;
background-color: transparent;
- &:hover,
- &:active,
- &:focus,
- &:active:hover,
- &:active:focus {
- background-color: $gray-lighter;
+ &:hover {
+ background-color: $btn-secondary-bg;
border-color: transparent;
- outline-color: $brand-primary;
}
-}
-.btn.active {
- &:active {
- outline: none;
+ &:focus,
+ &:active,
+ &.active {
+ @include box-shadow(inset 0 0 2px rgba(0, 0, 0, .125));
+ background-color: $btn-secondary-bg;
+ border-color: $btn-secondary-border;
+
+ &:hover,
+ &:focus,
+ &.focus {
+ background-color: $btn-secondary-bg;
+ border-color: $btn-secondary-border;
+ }
}
}
@@ -205,7 +218,7 @@
}
}
-// For secondary type actions without border
+// For secondary type actions without border, TODO change word "outline" to border
.btn-hide-outline {
border-color: transparent;
}
diff --git a/admin/client/src/components/GridField/GridField.scss b/admin/client/src/components/GridField/GridField.scss
index 1d517f35c..de61b6431 100644
--- a/admin/client/src/components/GridField/GridField.scss
+++ b/admin/client/src/components/GridField/GridField.scss
@@ -61,35 +61,28 @@
border-bottom: $table-border-width solid $border-color-light;
}
- .ui-button-text { // TODO BEMify classes
- display: inline;
- padding: 0;
- vertical-align: top;
- color: $body-color-light;
-
- &::after {
- content: ")";
- display: inline-block;
- color: lighten($text-muted, 20%);
- font-family: silverstripe;
- }
+ &::after {
+ content: ")";
+ display: inline-block;
+ color: lighten($text-muted, 20%);
+ font-family: silverstripe;
}
&.ss-gridfield-sorted-desc, // TODO BEMify class
&.ss-gridfield-sorted-asc {
border-bottom: 1px solid $component-active-border-color;
- .ui-button-text::after, // TODO BEMify class
- &:hover.ui-button-text::after {
+ &::after,
+ &:hover::after {
color: $component-active-border-color;
}
}
- &.ss-gridfield-sorted-desc .ui-button-text::after { // TODO BEMify classes
+ &.ss-gridfield-sorted-desc::after { // TODO BEMify classes
content: "*";
}
- &.ss-gridfield-sorted-asc .ui-button-text::after { // TODO BEMify classes
+ &.ss-gridfield-sorted-asc::after { // TODO BEMify classes
content: "(";
}
diff --git a/admin/client/src/components/Toolbar/Toolbar.scss b/admin/client/src/components/Toolbar/Toolbar.scss
index 6654b94a3..9a06861ed 100644
--- a/admin/client/src/components/Toolbar/Toolbar.scss
+++ b/admin/client/src/components/Toolbar/Toolbar.scss
@@ -96,14 +96,12 @@
float: left;
margin: $spacer-xs $spacer-x / 2 $spacer-xs #{-$spacer-xs};
padding-left: $spacer-x / 4;
+ padding-right: $spacer-x / 4;
+ min-width: 24px; // Safari fix
color: $body-color-light; // TEMP: Needed for anchor buttons to override legacy styles
.toolbar--south & {
margin-top: 0;
margin-right: 5px;
}
-
- &.btn--no-text {
- padding-right: $spacer-x / 4;
- }
}
diff --git a/admin/client/src/font/fonts/silverstripe.eot b/admin/client/src/font/fonts/silverstripe.eot
index 482cc92c8..d71f337c1 100644
Binary files a/admin/client/src/font/fonts/silverstripe.eot and b/admin/client/src/font/fonts/silverstripe.eot differ
diff --git a/admin/client/src/font/fonts/silverstripe.svg b/admin/client/src/font/fonts/silverstripe.svg
index 49bccabdb..0e2b21194 100644
--- a/admin/client/src/font/fonts/silverstripe.svg
+++ b/admin/client/src/font/fonts/silverstripe.svg
@@ -88,4 +88,7 @@
+
+
+
diff --git a/admin/client/src/font/fonts/silverstripe.ttf b/admin/client/src/font/fonts/silverstripe.ttf
index 12f51df9c..914f8dcc8 100644
Binary files a/admin/client/src/font/fonts/silverstripe.ttf and b/admin/client/src/font/fonts/silverstripe.ttf differ
diff --git a/admin/client/src/font/fonts/silverstripe.woff b/admin/client/src/font/fonts/silverstripe.woff
index fbf6a48a8..0dc5c2623 100644
Binary files a/admin/client/src/font/fonts/silverstripe.woff and b/admin/client/src/font/fonts/silverstripe.woff differ
diff --git a/admin/client/src/font/icon-reference.html b/admin/client/src/font/icons-reference.html
similarity index 96%
rename from admin/client/src/font/icon-reference.html
rename to admin/client/src/font/icons-reference.html
index 8730a4bcd..da9094a96 100644
--- a/admin/client/src/font/icon-reference.html
+++ b/admin/client/src/font/icons-reference.html
@@ -339,6 +339,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
Character mapping