Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-24 23:48:13 -05:00
Code Issues Activity

Merge tag 'v4.34.1'

Browse source 
v4.34.1
This commit is contained in:
Fabien "egg" O'Carroll 2022-02-01 12:43:29 +02:00
commit a70be14bd5
5 changed files with 37 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ghost/admin/app/components/modal-product.hbs
View file

@ -47,6 +47,7 @@
{{/if}}
<GhErrorMessage @errors={{this.errors}} @property="description" />
</GhFormGroup>
{{#if (feature "tierWelcomePages")}}
<GhFormGroup>
<label for="welcomePage" class="fw6">Welcome page</label>
<GhUrlInput
@ -63,6 +64,7 @@
<p>Redirect to this URL after signup for a free membership</p>
{{/if}}
</GhFormGroup>
{{/if}}
{{#if (not this.isFreeProduct)}}
<GhFormGroup @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="prices">
<div class="gh-settings-members-pricelabelcont">

1
ghost/admin/app/services/feature.js
View file

@ -60,6 +60,7 @@ export default Service.extend({
tweetGridCard: feature('tweetGridCard'),
membersActivityFeed: feature('membersActivityFeed'),
improvedOnboarding: feature('improvedOnboarding'),
tierWelcomePages: feature('tierWelcomePages'),
_user: null,

13
ghost/admin/app/templates/settings/labs.hbs
View file

@ -326,6 +326,19 @@
</div>
</div>
</div>
<div class="gh-expandable-block">
<div class="gh-expandable-header">
<div>
<h4 class="gh-expandable-title">Tier welcome pages</h4>
<p class="gh-expandable-description">
Add welcome pages per Tier (requires Tiers enabled)
</p>
</div>
<div class="for-switch">
<GhFeatureFlag @flag="tierWelcomePages" />
</div>
</div>
</div>
<div class="gh-expandable-block">
<div class="gh-expandable-header">
<div>

6
ghost/admin/app/templates/settings/membership.hbs
View file

@ -95,7 +95,8 @@
@products={{this.products}}
@openEditProduct={{this.openEditProduct}}
/>
{{else}}
{{/if}}
{{#if (or (not (feature "tierWelcomePages")) (not (feature "multipleProducts")))}}
<GhFormGroup @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="free-welcome-page">
<label for="freeWelcomePage">Welcome page</label>
<GhUrlInput
@ -206,6 +207,8 @@
<p class="response w-100"><span class="red">{{this.stripePlanError}}</span></p>
{{/if}}
</GhFormGroup>
{{/if}}
{{#if (or (not (feature "tierWelcomePages")) (not (feature "multipleProducts")))}}
<GhFormGroup @errors={{this.settings.errors}} @hasValidated={{this.settings.hasValidated}} @property="paid-welcome-page">
<label for="paidWelcomePage">Welcome page</label>
<GhUrlInput
@ -221,7 +224,6 @@
/>
<p>Redirect to this URL after signup for premium membership</p>
</GhFormGroup>
{{/if}}
{{/if}}
</div>

2
ghost/admin/package.json
View file

@ -1,6 +1,6 @@
{
"name": "ghost-admin",
"version": "4.34.0",
"version": "4.34.1",
"description": "Ember.js admin client for Ghost",
"author": "Ghost Foundation",
"homepage": "http://ghost.org",