From 5fe72462bc90ec430372ae1b50f09b35613aa9a9 Mon Sep 17 00:00:00 2001 From: Steve Larson <9larsons@gmail.com> Date: Mon, 31 Jul 2023 14:22:19 -0500 Subject: [PATCH] Enabled page features (#17544) no refs -moved hide page title and feature image to GA -updated gscan --- .../test/utils/responses/themes.json | 4 ++-- .../components/gh-koenig-editor-lexical.hbs | 8 ++++---- .../app/components/gh-post-settings-menu.hbs | 2 +- ghost/admin/app/models/theme.js | 4 ++-- ghost/admin/app/services/feature.js | 1 - ghost/admin/app/templates/settings/labs.hbs | 14 -------------- ghost/core/core/shared/labs.js | 1 - ghost/core/package.json | 2 +- .../utils/fixtures/themes/casper/package.json | 2 +- .../core/test/utils/fixtures/themes/valid.zip | Bin 227957 -> 229159 bytes yarn.lock | 8 ++++---- 11 files changed, 15 insertions(+), 31 deletions(-) diff --git a/apps/admin-x-settings/test/utils/responses/themes.json b/apps/admin-x-settings/test/utils/responses/themes.json index b8917a0894..3dfb92f029 100644 --- a/apps/admin-x-settings/test/utils/responses/themes.json +++ b/apps/admin-x-settings/test/utils/responses/themes.json @@ -53,7 +53,7 @@ "autoprefixer": "10.4.7", "beeper": "2.1.0", "cssnano": "5.1.12", - "gscan": "4.37.3", + "gscan": "4.37.4", "gulp": "4.0.2", "gulp-concat": "2.6.1", "gulp-livereload": "4.0.2", @@ -315,7 +315,7 @@ "autoprefixer": "10.4.14", "beeper": "2.1.0", "cssnano": "6.0.1", - "gscan": "4.37.3", + "gscan": "4.37.4", "gulp": "4.0.2", "gulp-concat": "2.6.1", "gulp-livereload": "4.0.2", diff --git a/ghost/admin/app/components/gh-koenig-editor-lexical.hbs b/ghost/admin/app/components/gh-koenig-editor-lexical.hbs index 907ae5a1e1..793d188691 100644 --- a/ghost/admin/app/components/gh-koenig-editor-lexical.hbs +++ b/ghost/admin/app/components/gh-koenig-editor-lexical.hbs @@ -15,18 +15,18 @@ @caption={{@featureImageCaption}} @updateCaption={{@setFeatureImageCaption}} @forceButtonDisplay={{or (not @title) (eq @title "(Untitled)") this.titleIsHovered this.titleIsFocused}} - @isHidden={{and (feature 'pageImprovements') (not @cardOptions.post.showTitleAndFeatureImage)}} + @isHidden={{or (not @cardOptions.post.showTitleAndFeatureImage) false}} /> -
- {{#if (and (feature 'pageImprovements') (not @cardOptions.post.showTitleAndFeatureImage) (not @featureImage))}} +
+ {{#if (and (not @cardOptions.post.showTitleAndFeatureImage) (not @featureImage))}} {{svg-jar "eye-closed"}} {{/if}}
    - {{#if (and this.post.isPage this.post.lexical (feature 'pageImprovements'))}} + {{#if (and this.post.isPage this.post.lexical)}}
-
-
-
-

Page improvements

-

- Enables toggling off page title and feature image -

-
-
- -
-
-
-
diff --git a/ghost/core/core/shared/labs.js b/ghost/core/core/shared/labs.js index 6679cfd2e9..2c4a015ceb 100644 --- a/ghost/core/core/shared/labs.js +++ b/ghost/core/core/shared/labs.js @@ -38,7 +38,6 @@ const ALPHA_FEATURES = [ 'emailCustomization', 'collections', 'adminXSettings', - 'pageImprovements', 'flatUrls', 'mailEvents', 'collectionsCard', diff --git a/ghost/core/package.json b/ghost/core/package.json index 26597e5354..d397af54cf 100644 --- a/ghost/core/package.json +++ b/ghost/core/package.json @@ -188,7 +188,7 @@ "ghost-storage-base": "1.0.0", "glob": "8.1.0", "got": "11.8.6", - "gscan": "4.37.3", + "gscan": "4.37.4", "human-number": "2.0.1", "image-size": "1.0.2", "intl": "1.2.5", diff --git a/ghost/core/test/utils/fixtures/themes/casper/package.json b/ghost/core/test/utils/fixtures/themes/casper/package.json index b66af6bd56..f570d70319 100644 --- a/ghost/core/test/utils/fixtures/themes/casper/package.json +++ b/ghost/core/test/utils/fixtures/themes/casper/package.json @@ -49,7 +49,7 @@ "autoprefixer": "10.2.5", "beeper": "2.1.0", "cssnano": "4.1.10", - "gscan": "4.37.3", + "gscan": "4.37.4", "gulp": "4.0.2", "gulp-concat": "2.6.1", "gulp-livereload": "4.0.2", diff --git a/ghost/core/test/utils/fixtures/themes/valid.zip b/ghost/core/test/utils/fixtures/themes/valid.zip index 48a52c7a9107471fdba644026ef634200ac44047..96724706f26d2167409047aafb6cd012e2e012ba 100644 GIT binary patch delta 3765 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 Rmxahe#%XzK-U4V@{vTOsjT`^~ delta 2614 zcmZuzc{r47AAaY3jeXxTmLf}Lj(w|ak;s-TV_za$cE&QsHbx`|jU`^P7YAW*B8e7E zqK-95$eJx{DZ)u->RjjhuJ2sm^Uw3!?&rFn`}zH@>#00s`|_Es;S zHbZx7RQaCEVXG@u@DZUq-PsPHeQuP>LP~E0h#gv($I6DvG zt2gYR`$hT$Q~3x^&y*dRfyL~m$GoUeD{o@y59>c?Kr}XEOL&$&epWrURk1?5$n4#w zLa3!!Hrp%io0Rq9#1pd?dJLJ02*H(U%?_SN4es9-){RcFc=K>*jUF$2CfY>aoNK8u z;JQX{*k7@N?y3q(ml4r;EtpoU-AJ!0aA@zbdQ;#UM5zV4xo>aV&$IQJ`_9{=SOgF>wD#H=Fys4y-!3BA~+UCLrqKrDItu4#AGQjUxYE@|B$StS48%%0-*yfJ&-nski zzWE6WN*j)VLIU1;-Q+bIT@%@6G^+WE!eVb9wq9VpvVQQJ|1W9PBvZ^{!P4rjjmFfw zcN~dpeED9V5fcHwOHGHRO?Q4UyIWq?)IF;qNxoyJ?+)c36xW&vY8- zTwsval@Pr=ddzP#&0!CFVf6z`t=ptyQBn}Glc2$8_bc~=vghs$Gft@_>G|x%fE!31 zd$;6SVQ-H%l_q{{kMCH2*Ph!_!{l=CU`XWWhkheuH2IItE^SWNcDvA=4n#-1vcKO< zmefS}gWt|=3U>|kG*nZ)3M(iMQs=KSf9NF)bL6Kyk+HJYo=Qxf4I%Q5*odf|5d;*8 znsR(*yAp8mRgwYNP2@Rvk}6W01Gwds3T)%do|K|IOVag0-E>fN8ibH zQY&RvN3%)-x%hRk!+(4ko;A`CLUN1u9gUJ)?l?HOaGPPn?lLa%hL^}%<4OI9lmYMg zPa1XP)FbnA_4w=CMg5!C zp!#e1*besLYSgAgKyyn_#Gi58E5xy&w*zXs_PHEJQCpC8%S1!yr0wpp&8hJ#BY^`c zAHo;yCssIe{U1Hnc9oh^|Gr*faT&-*5i5RdY7DmhS$m=tMz#cUw`R)NaJakg$_v zL6(ZnF@EOi;NwD-E7xc64#N8a^{G{;E$`R;30)7Z{}3zpnGx@lue(n=F#NX7J!MSd z65D@j=5r`CZiZ$_I8C246yDTQt0}gqdZ)eI?u3oHX%`wn$!msh^${h!yNxJY9vUK# zIGiS`)}wKSPelnyrlqaSh71Ar6@{wNUT8WwiF*DwTxRM?z1;_2hjs}zvT~6L=Jp;4 zq|zJI<2F`h)dPzD%)_K%Q}Yy0i_(s6 zQVubrf9$gOS?@5tWa6Xuk??ICrMX6?#-fK(%txQ;M=E^1Zd#z^?(^2d-Kz4H@`0jH z!DA!a%v&jX4fx#2YeMc;he{=z)K&c9?@mYCV#(TYIN=Q^RWNXUN27WS;0ZVl}N9*PE8>1;i+lHPUM z4^gebx}6g2E(NQThx$uzlin~AOut49-kUEEk|MYJkg3ipYgv=WIk1&qIMr?jIteUC zzkG4fp)R`kmXqgVFhOmNf4sonuC$<`_1^sAAq!kW0tK&yNvg@=^EN?Eub51j^wW#JEa=p=X` z3yViWYM{6r>=+3dLCe($ScifTfvJ%Y2K0!9w;~}8Ff$gGB|vAvt0Xvt07;0_RI%Ba z^KTcWap?910KtD~(e`o@lKi7e0PZ6|a*%Ta2xqi`0 z4RHVv`XBtMmY)z|_)-*&gI^~+7zLqZ{*CvjHNP;d1puuIh=1Wl=6@j0L(*ap94`s+ z!wS(523nMcU~O5N7fSQM1v9uL8q$SkEg|@{EhLf~LknKFg=JzOb*RY}f?1s)L0F#v zal+X#KlHPM>tkqVN;*JrtPAaOKT{KzAkP21T{$Vs5!Q-@^uc@1aAGW^2ZmmPdt+&` sIlIDaakRLO8;p&E3_w|TxG)Z~1Ven`tvCqHjt0