From cf5c055dede91a0da362aef8b3a9e5465af16de4 Mon Sep 17 00:00:00 2001
From: Paul Clarke <paul@silverstripe.com>
Date: Wed, 21 Dec 2016 15:52:45 +1300
Subject: [PATCH] Enhancement Fix Campaign admin publish button styles missing
 API remove unused textures Enhancement Update legacy DB icon to match new
 colour Enhancement Remove Done button on import modal

---
 .../images/textures/bg_cms_main_content.png   | Bin 2601 -> 0 bytes
 .../images/textures/cms_content_header.png    | Bin 14612 -> 0 bytes
 admin/client/dist/js/bundle.js                |   5 +++--
 .../src/components/FormAction/FormAction.js   |   5 +++++
 .../CampaignAdmin/CampaignAdminList.js        |   4 ++--
 .../src/sprites/menu-icons/16x16/db.png       | Bin 301 -> 14712 bytes
 .../GridField/GridFieldImportButton_Modal.ss  |   4 ----
 7 files changed, 10 insertions(+), 8 deletions(-)
 delete mode 100644 admin/client/dist/images/textures/bg_cms_main_content.png
 delete mode 100644 admin/client/dist/images/textures/cms_content_header.png

diff --git a/admin/client/dist/images/textures/bg_cms_main_content.png b/admin/client/dist/images/textures/bg_cms_main_content.png
deleted file mode 100644
index ce265dba18b4b5a3d810383ca38b3598094932ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2601
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
LNkvXXu0mjfd^04Y

diff --git a/admin/client/dist/images/textures/cms_content_header.png b/admin/client/dist/images/textures/cms_content_header.png
deleted file mode 100644
index d815a26547b7c7c6338362b6436e74fd91f7308d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14612
zcmeI3&u`mg7{}jAXc~bDAr4GCAma(d1j%bVb<<c*rjm4P0hg)`T6&_6{id~=*v592
zG$1jJ6IU)Eg!l)L5C={Si3{BL3lKXXaRDLi!iB?t*LG?@Nt3?YwBsAK$&>f}exK*{
z=lv01{PFhI^$Ued1%%Lr&5h;`{iN~I-{;TK=!v`E@6(Sb{f)g4p{JgU|Ci9`UtC0J
z^@`JKM{VOR&GPys)Al-~H0t|QjgWqI<eSzJiG&V0aNL@B@6HdR;Mg_shH6NL-ynz1
z#yB9m<E@r8KC-H|c(q>8M;cAgCy^<P`aL()Ml~_XtI;@a#-fl&qNAF)78exS#<tM#
z0wSoTm7*od%R;4ElGT+;wep&v(C=7U#fnsvs+wBXBt@9K#Cm~7dSG|8o#wSkIr^<8
z9!8O`VLTiTOT%)>3l6YctyZz5U_~iXMKL^fBXd-A!^>%slRQllT7lz7j^_$-UbEv3
zqM9hig|gS=y83=r$PFj#C`CLneJqzGJkMlXna3Xly<}*%g-MU}i5rE~C(rfyhhF4`
zhu(scS@*)ibWRK-t37wT{r=q2VYGgeBA6hZ>kM1RKEXRA^ag=N)^E~FxjgUcBd42B
z&QzwjXW`h%$XQ^Eds17n6w(>e>9uN&fS8dNv^=j@PgmLY2|}UKNLH2bieXxg8*{y)
z<5^Qa<9R;PG$T@{D^e{=%f+(Pk}H}lX_ES?tZ0%1lBCL+9EN8*-D8krCCMREtENol
z0Ls}MbO+gHWIj+9s0Dd!OY3?;-;C-`-#j4LcMo)&Hv(n0uC#{N^8z|7QZMUxUNdkd
zYfam9!^m_kve~TDhLYph+KNI}%ay89Tvn70ee2l8Rhg(oRhH~-l`Kn2IfZB#(0(d)
z)3XNgewn1UA2KztpGy69;Lx+q>;X+Y`iCtsC(Wr+8%{`9=rLHibp0l$*)Dl+y7i=^
z=Om|+Zw4WW_gqap*>u@4mYq_uC)vB2X~pMR-HNvav2{Gvnhz^;PHfJjPGFiJ*caCr
z9uoJg4V9)!REv{@UN;(=0a-hsYvRFndzyFJI9ou+@h?EnnVyQYb$W)9jZfF?=^54I
zgH5BWfsV{fW<l2RskXdws&B`$+8ZSLiXzb$mgDz{6?V^B_s+J$?pbT@e8+X7x-zLY
z(+phk>6;!5yYxnZ)K^rstm=5SdDgM*j7YEDbm$Ha<8>+1>q<Pc9dnI)xlxUY<WA5t
zai((xe$$hwOk3$41HD<n+1<+YEN6S+F$ei2J?6wP9WMfDFk_C3i3kcfE=YqJb6iYB
zP{46P8qApEVj_Y9jtkOY#vB(D5fpG-kOnj6xR{8bfa8KRm@&u2L<9vK7o@?AIW8t5
zDB!pt4Q9-7F%dxl#|3FHV~&f72nskZNP`)3Tuekzz;Qtu%$Vb1B7y>r3({c592XN2
z6mVRS1~cZkn24Z&<AOApF~`M31O*%yq`{0iE+!%<;J6?SX3TLh5kUdR1!*v2j*E#1
z3OFuEgBf#NOhiz?aX}i)nB!t1f&z{U(qP7C;wt3N{}Goy^f#nW_qA_5^Cf*UP_Q<3
z41~rnA$02_g#P)De*S^bKtkxxeT1~n5PIJG<lUdHQ7wJ`XRS5*<*#4mXOZ;ukKcTI
z<KLfO*nQ*0_kZ8J_`!E~UcP(j+->3fBmRB$+ndVx{{1ENDJmEr)~=6fLA1HP)%^PP
H{oDTolK8%S

diff --git a/admin/client/dist/js/bundle.js b/admin/client/dist/js/bundle.js
index f39c83595..780c46554 100644
--- a/admin/client/dist/js/bundle.js
+++ b/admin/client/dist/js/bundle.js
@@ -327,6 +327,7 @@ t&&e.push("btn-"+t),"string"!=typeof this.props.title&&e.push("btn--no-text")
 var n=this.getIcon()
 return n&&e.push("font-icon-"+n),this.props.loading&&e.push("btn--loading"),this.props.disabled&&e.push("disabled"),"string"==typeof this.props.extraClass&&e.push(this.props.extraClass),e.join(" ")}},{
 key:"getButtonStyle",value:function d(){if("undefined"!=typeof this.props.data.buttonStyle)return this.props.data.buttonStyle
+if("undefined"!=typeof this.props.buttonStyle)return this.props.buttonStyle
 var e=this.props.extraClass.split(" ")
 return e.find(function(e){return e.indexOf("btn-")>-1})?null:"action_save"===this.props.name||e.find(function(e){return"ss-ui-action-constructive"===e})?"primary":"secondary"}},{key:"getIcon",value:function f(){
 return this.props.icon||this.props.data.icon||null}},{key:"getLoadingIcon",value:function p(){return this.props.loading?c["default"].createElement("div",{className:"btn__loading-icon"},c["default"].createElement("span",{
@@ -2571,8 +2572,8 @@ className:c.join(" ")},u),h["default"].createElement("div",{className:"toolbar t
 },{key:"renderButtonToolbar",value:function p(){var e=this.getItems()
 if(!e||!e.length)return h["default"].createElement("div",{className:"btn-toolbar"})
 var t={}
-return"open"===this.props.record.State?t=c(t,{title:$["default"]._t("Campaigns.PUBLISHCAMPAIGN"),bootstrapButtonStyle:"primary",loading:this.props.campaign.isPublishing,handleClick:this.handlePublish,icon:"rocket"
-}):"published"===this.props.record.State&&(t=c(t,{title:$["default"]._t("Campaigns.REVERTCAMPAIGN"),bootstrapButtonStyle:"secondary-outline",icon:"back-in-time",disabled:!0})),h["default"].createElement("div",{
+return"open"===this.props.record.State?t=c(t,{title:$["default"]._t("Campaigns.PUBLISHCAMPAIGN"),buttonStyle:"primary",loading:this.props.campaign.isPublishing,handleClick:this.handlePublish,icon:"rocket"
+}):"published"===this.props.record.State&&(t=c(t,{title:$["default"]._t("Campaigns.REVERTCAMPAIGN"),buttonStyle:"secondary-outline",icon:"back-in-time",disabled:!0})),h["default"].createElement("div",{
 className:"btn-toolbar"},h["default"].createElement(F["default"],t))}},{key:"getItems",value:function m(){return this.props.record&&this.props.record._embedded?this.props.record._embedded.items:null}},{
 key:"groupItemsForSet",value:function g(){var e={},t=this.getItems()
 return t?(t.forEach(function(t){var n=t.BaseClass
diff --git a/admin/client/src/components/FormAction/FormAction.js b/admin/client/src/components/FormAction/FormAction.js
index e1f38aa0b..f19c58b2a 100644
--- a/admin/client/src/components/FormAction/FormAction.js
+++ b/admin/client/src/components/FormAction/FormAction.js
@@ -46,6 +46,7 @@ class FormAction extends SilverStripeComponent {
 
     // Add 'type' class
     const style = this.getButtonStyle();
+
     if (style) {
       buttonClasses.push(`btn-${style}`);
     }
@@ -89,6 +90,10 @@ class FormAction extends SilverStripeComponent {
       return this.props.data.buttonStyle;
     }
 
+    if (typeof this.props.buttonStyle !== 'undefined') {
+      return this.props.buttonStyle;
+    }
+
     const extraClasses = this.props.extraClass.split(' ');
 
     // defined their own `btn-${something}` class
diff --git a/admin/client/src/containers/CampaignAdmin/CampaignAdminList.js b/admin/client/src/containers/CampaignAdmin/CampaignAdminList.js
index 58f42c70d..c10f7cc86 100644
--- a/admin/client/src/containers/CampaignAdmin/CampaignAdminList.js
+++ b/admin/client/src/containers/CampaignAdmin/CampaignAdminList.js
@@ -204,7 +204,7 @@ class CampaignAdminList extends SilverStripeComponent {
     if (this.props.record.State === 'open') {
       actionProps = Object.assign(actionProps, {
         title: i18n._t('Campaigns.PUBLISHCAMPAIGN'),
-        bootstrapButtonStyle: 'primary',
+        buttonStyle: 'primary',
         loading: this.props.campaign.isPublishing,
         handleClick: this.handlePublish,
         icon: 'rocket',
@@ -213,7 +213,7 @@ class CampaignAdminList extends SilverStripeComponent {
       // TODO Implement "revert" feature
       actionProps = Object.assign(actionProps, {
         title: i18n._t('Campaigns.REVERTCAMPAIGN'),
-        bootstrapButtonStyle: 'secondary-outline',
+        buttonStyle: 'secondary-outline',
         icon: 'back-in-time',
         disabled: true,
       });
diff --git a/admin/client/src/sprites/menu-icons/16x16/db.png b/admin/client/src/sprites/menu-icons/16x16/db.png
index 4675fe08a86ed7a74024c9f60f029e99ce484939..f3eb44e57c081a0bffdd5581ecb6e6cf6d2434b0 100644
GIT binary patch
literal 14712
zcmeI3TZ|J`7{`Yta@hzWKB&PMhLSZPv~%fwn0ABP#odIi%WjdbFEBfEc01C}l$j~*
zt|p=q!03xUC=rEZBZ(2B0TW|XBq3@9ebC^8;)C$G@<2cnyavy7y6x9)%K^jVY0{l<
z&-wqq@67L9Ixq9m@X+JSx>t5H46|%-AT@%oE8OprMfmTk-)<`Sva~obW;0Az)cr2F
zu_$$xVPb3bOxDS!w@9j42q>C4jslfJ5vv(S?yVFRbr*8jaWttL3E$OE&-hqfOZc{j
z(|o$vhjRMBw1q~ehcfE)E;X+CdXwF9MZyUR$WhozA#d1HCE=^)m2m7fb3V2zadstq
zo7{qIHa*PtnHFNhfrwuff-yE44+!CSObl&cMP7(-e4G<PeqNCHxWo%=?c+;!<4Cr&
z327v?xmFJUm+<8rrzmk;xm*sEg8|c;<b-%U&ha8Aihiu{+f#<4RQ!g$#!E7nCxvX)
z(u<C68myaF88=H#!sl}f)jzfSDirI547<h-Q{*a2krM(u*UqG=bx*Nm<*P%}R1W1)
z0U3^seL`DbF=slaoijU>tao=TjOQesuGelm-a?^mY1`@FgAvq_wsqQ>sUqS=kZqPM
z74`4Ix3Z?)-8=e3V{)1@xjh}njw*Two7>~rs!PF}AsOGR)Mp{ZF|CYg=9Atk8=gbR
z_Vu}|D$1@+E2?g|T-V85tEn;LjeIDjI4J3^NIxI;i=m7Vl0v)`j;$9&iRVEQPuY?q
zZEE_&R3nEV`b8ll1f_693WnF?U@iwxw&uV)NK+i;wz5Di$fK#!glQENC#e^dNyHV6
zNttUj0%d(&NquJCwD7P{GAMKHnt`jj)}%qhb`(QJgQ+BL2<W;d#l(q7T+t$aF^KOy
zqy;s9Y&;tEtKpCq4F?r56hu{s=`^&@OPw;+lDl7OskJ*y4eaw$KVj+ktW)wp<BtAL
zOSDNduhf8U;}tpuRxVz@)zfSg?QU+J>&WZXQ>my}Hgfk|!Z)|+>c?39lyW`Qy(=lI
zd!8j#cS|5m=9*d?!>T)LHvRujpqC%mJJ%@Zka4RG<)x~sIw!Hs38$=BXwxKK6Sue9
zy}ZrF)&er;{sQFn=Be;nn`dZl&CZ`u**(}Kyc+Pxl<F)9GB>ZSQQ6aH-C50-Jbfs{
z3o%aM@uy~m-L2NKTU%jwtF__WX6Q~*tW|4i1}^vX^$vzn{Gfo6k#IN|mbupER>!bj
zLHTS-$2-_|*QF4td0IQ#8pk>rK}XH#O%?b_ug;{`iXRy8vkF&#SZSW*`c}BhLF10@
za$=Z{7J)Q~F~vnh1O*fqq(O`+E+Qf*ptv9nVoY%n5kUdP1!)jtii?N{3Mei}gBVj>
zL_|<PaX}iynBpQLf&z*Q(jdkZ7ZDK@P+X7(F{ZePh@gPtf;5OR#YIE}1r!&gL5wLb
zA|fcDxF8K;OmPtrK>@`DX%J(Ii--scC@x5Y7*kwCL{LC+K^nxE;vyn~0*VXLAjT9I
z5fKznT#yDarnrcRpn&3nG>9?9MMMMz6c?mHj43W6A}FA^APr(naS;(g0mTJr5aV0o
z>TbOLhYbAAUm3sLSNUYae*9t}s}78$8D_eNVfMbrFn`{}*I9-s@eK3pPKJ>VG0X$z
zYdgN&jJ4+nQ=2lCi|<@mZFFs2@zu3ehlM3w>t<$7EqyP++`oPM==U2l+jj4LbJ4lg
z@18h*rDw_hhfd@cKHYO@^-t{Ar~dBQ@yOMl;4k0wn$z6T;|q>l+b3+ERi6A&Ia)f<
z`_H9~!!uV;85c^YXC7S{+A(tGyRG*`9{wx({9^f|eIGC1aPn-|f&J$aTTb5l*|8gc
zd~oco``$jC+jm%g`Qi_kXRkkX5G_84E-nA?^%c)8w4c5F@A==K`F7!|*}{;~wfmKG
q@h=8{KAJ7<&Gs8(S4zp{%;#^!uXmq(^+9}B%wYde>ix%dzVIKf5CFjd

delta 254
zcmV<a00IB_a;*Z8Bn<>}LP=Bz2nYy#2xN$nAs2rD8FWQhbW?9;ba!ELWdL_~cP?pe
zYja~^aAhuUa%Y?FJQ@H10IEquK~y-6t<xc{0znLb;jf?&1Oi7Od5#MpaX9Y7F}Mg0
z$0Z1c8z3G5!^&cYWP{r5FiF#l_}j_fPGF2JHke~tVp1|Z@GSX(e;jcLyfD)5G=c01
zgF$8u{3&p$;4hJxB4VkB#LPUy9xFs<>Jo^;?AsEbxVO4|I{JFi6ti;olPTOP_*-Cz
zwSJp;f*lrJ1-3*kuxmTGmdafu&hf{OBsLX%6Dq&+8!#h(9_l7V!vFvP07*qoM6N<$
Ef_EZl*Z=?k

diff --git a/templates/SilverStripe/Forms/GridField/GridFieldImportButton_Modal.ss b/templates/SilverStripe/Forms/GridField/GridFieldImportButton_Modal.ss
index fca0236e2..e8de94d62 100644
--- a/templates/SilverStripe/Forms/GridField/GridFieldImportButton_Modal.ss
+++ b/templates/SilverStripe/Forms/GridField/GridFieldImportButton_Modal.ss
@@ -11,9 +11,5 @@
                 $ImportForm
             <% end_if %>
         </div>
-
-        <div class="modal-footer">
-            <button type="button" class="btn btn-secondary-outline font-icon-check-mark" data-dismiss="modal"><%t GridField.DONE 'Done' %></button>
-        </div>
     </div>
 </div>