Removed conditions which used @labs.members helper
refs https://github.com/TryGhost/Team/issues/332
refs 870a09b109
- The {{@labs.members}} always evaluates to "true" starting with Ghost 4.0 and will be "null" coercing to "false" starting Ghost 5.0
- Enabled all conditionals be default to pass the build in main Ghost repository. These changes should be reviewed - special attentio to the left out RSS feed which was surrounded with {{unless @labs.members}} condition
This commit is contained in:
parent
5fd447b815
commit
b59893091c
3 changed files with 8 additions and 15 deletions
|
@ -49,7 +49,6 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{{!-- The big email subscribe modal content --}}
|
{{!-- The big email subscribe modal content --}}
|
||||||
{{#if @labs.members}}
|
|
||||||
<div class="subscribe-notification subscribe-success-message">
|
<div class="subscribe-notification subscribe-success-message">
|
||||||
<a class="subscribe-close-button" href="javascript:;"></a>
|
<a class="subscribe-close-button" href="javascript:;"></a>
|
||||||
You've successfully subscribed to {{@site.title}}!
|
You've successfully subscribed to {{@site.title}}!
|
||||||
|
@ -58,7 +57,6 @@
|
||||||
<a class="subscribe-close-button" href="javascript:;"></a>
|
<a class="subscribe-close-button" href="javascript:;"></a>
|
||||||
Could not sign up! Invalid sign up link.
|
Could not sign up! Invalid sign up link.
|
||||||
</div>
|
</div>
|
||||||
{{/if}}
|
|
||||||
|
|
||||||
{{!-- jQuery, required for fitvids --}}
|
{{!-- jQuery, required for fitvids --}}
|
||||||
<script
|
<script
|
||||||
|
|
|
@ -28,17 +28,14 @@
|
||||||
<a class="social-link social-link-tw" href="{{twitter_url @site.twitter}}" title="Twitter" target="_blank" rel="noopener">{{> "icons/twitter"}}</a>
|
<a class="social-link social-link-tw" href="{{twitter_url @site.twitter}}" title="Twitter" target="_blank" rel="noopener">{{> "icons/twitter"}}</a>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</div>
|
</div>
|
||||||
{{#unless @labs.members}}
|
|
||||||
<a class="rss-button" href="https://feedly.com/i/subscription/feed/{{@site.url}}/rss/" title="RSS" target="_blank" rel="noopener">{{> "icons/rss"}}</a>
|
<a class="rss-button" href="https://feedly.com/i/subscription/feed/{{@site.url}}/rss/" title="RSS" target="_blank" rel="noopener">{{> "icons/rss"}}</a>
|
||||||
{{/unless}}
|
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
{{#if @labs.members}}
|
|
||||||
{{#unless @member}}
|
{{#unless @member}}
|
||||||
<a class="subscribe-button" href="#subscribe">Subscribe</a>
|
<a class="subscribe-button" href="#subscribe">Subscribe</a>
|
||||||
{{else}}
|
{{else}}
|
||||||
<a class="subscribe-button" href="#/portal/account">Account</a>
|
<a class="subscribe-button" href="#/portal/account">Account</a>
|
||||||
{{/unless}}
|
{{/unless}}
|
||||||
{{/if}}
|
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
2
post.hbs
2
post.hbs
|
@ -110,9 +110,7 @@ into the {body} of the default.hbs template --}}
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
{{!-- Email subscribe form at the bottom of the page --}}
|
{{!-- Email subscribe form at the bottom of the page --}}
|
||||||
{{#if @labs.members}}
|
|
||||||
{{> subscribe-form}}
|
{{> subscribe-form}}
|
||||||
{{/if}}
|
|
||||||
|
|
||||||
{{!--
|
{{!--
|
||||||
<section class="post-full-comments">
|
<section class="post-full-comments">
|
||||||
|
|
Loading…
Reference in a new issue