OpenSourceArk/Ghost
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rewrote the publish modal logic and layout (#20832)

Browse Source 
Removed unnecessary code, rewrote it in places where we were repeating
ourselves, and followed the new layout for posts + emails.
This commit is contained in:
Daniël van der Winden 2024-08-27 17:22:11 +02:00 committed by GitHub
parent 344f440de9
commit af0338b504
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 72 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
ghost/admin/app/components/modal-post-success.hbs
View File

@ -5,23 +5,17 @@
<span>All set!</span>
{{else}}
<span>
{{#if this.showPostCount}}
Boom! It's out there.
{{else}}
Your post is published.
{{/if}}
{{if this.showPostCount "Boom! It's out there." "Your post is published."}}
</span>
<span>
{{#if this.post.isPost}}
{{#if this.post.emailOnly}}
Your email has been sent.
{{else}}
{{#if this.showPostCount}}
{{else if this.showPostCount}}
That's {{format-number this.postCount}} {{gh-pluralize this.postCount "post" without-count=true}} published.
{{else}}
Spread the word!
{{/if}}
{{/if}}
{{else}}
Your page is published.
{{/if}}
@ -30,40 +24,26 @@
</h1>
</header>
{{#if (and this.post.isPublished (not this.post.emailOnly))}}
{{else}}
{{#if (not (and this.post.isPublished (not this.post.emailOnly)))}}
<div class="modal-body email">
{{#if this.post.isSent}}
It
{{else}}
{{#if this.post.emailOnly}}
{{else if this.post.emailOnly}}
Your email
{{else}}
Your {{this.post.displayName}}
{{/if}}
{{/if}}
{{if this.post.isScheduled "will be" "was"}}
{{#if this.post.emailOnly}}
sent to
{{else if this.post.willEmail}}
published on your site, and sent to
{{else}}
published on your site
{{/if}}
{{if this.post.emailOnly "sent to" (if this.post.willEmail "published on your site, and sent to" "published on your site")}}
{{#if (or this.post.hasEmail this.post.willEmail)}}
{{#let (members-count-fetcher query=(hash filter=this.post.fullRecipientFilter)) as |countFetcher|}}
<strong class="nowrap">
{{if (eq @recipientType "all") "all"}}
{{format-number countFetcher.count}}
{{!-- @recipientType = free/paid/all/specific --}}
{{if (not-eq @recipientType "all") @recipientType}}
{{gh-pluralize countFetcher.count "subscriber" without-count=true}}
</strong>
of <strong>{{this.post.newsletter.name}}</strong>
{{/let}}
{{/if}}
@ -75,9 +55,37 @@
<strong>{{moment-format publishedAt "HH:mm"}}</strong>.
{{/let}}
</div>
{{/if}}
{{#if this.post.emailOnly}}
<footer class="modal-footer-email">
<div class="gh-post-card">
{{#if (or this.post.featureImage this.post.twitterImage this.post.ogImage)}}
<figure class="modal-image">
<img src="{{or this.post.featureImage this.post.twitterImage this.post.ogImage}}" alt="{{this.post.title}}">
</figure>
{{/if}}
<div class="modal-body">
<h2>{{this.post.title}}</h2>
{{#if this.post.excerpt}}
<p class="post-excerpt">{{this.post.excerpt}}</p>
{{/if}}
<div class="gh-post-details">
{{#if (get-setting "icon")}}
<div class="gh-post-bookmark-site-icon">
<img src={{get-setting "icon"}} alt="" role="presentation" />
</div>
{{/if}}
{{#if (get-setting "title")}}
<div class="gh-post-bookmark-site-name">{{get-setting "title"}}</div>
{{/if}}
<div class="gh-post-bookmark-authors">{{post-author-names this.post}}</div>
</div>
</div>
</div>
<footer class="modal-footer">
<button
class="gh-btn gh-btn-primary dismiss"
type="button"
@ -88,7 +96,6 @@
</button>
</footer>
{{/if}}
{{/if}}
<button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
@ -154,7 +161,8 @@
@successText="Link copied"
@class="gh-btn gh-btn-primary gh-btn-icon copy-link" />
{{else}}
{{#if (and this.post.isScheduled (not this.post.emailOnly))}}
{{#if (or this.post.isScheduled this.post.emailOnly)}}
{{#if this.post.isScheduled}}
<GhTaskButton
@buttonText="Copy preview link"
@task={{this.handleCopyPreviewLink}}
@ -162,17 +170,7 @@
@idleIcon="link"
@successText="Preview link copied"
@class="gh-btn gh-btn-icon copy-preview-link" />
<button
class="gh-btn gh-btn-primary dismiss"
type="button"
{{on "click" @close}}
{{on "mousedown" (optional this.noop)}}
>
<span>Close</span>
</button>
{{else}}
{{/if}}
<button
class="gh-btn gh-btn-primary dismiss"
type="button"
@ -182,8 +180,8 @@
<span>Close</span>
</button>
{{/if}}
{{/if}}
</footer>
{{/unless}}
</div>