mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-11-25 09:03:12 +03:00
Made copy changes to publishing flow
Refs https://github.com/TryGhost/Team/issues/1544
This commit is contained in:
Sanne de Vries
parent
f9ce41620a
commit
7356933d12
@ -1,41 +1,8 @@
|
||||
{{#let @publishOptions.post as |post|}}
|
||||
<div class="gh-publish-title">
|
||||
<span>...aand it's out there.</span>
|
||||
Now that's something to smile about.
|
||||
<span class="green">Boom. It’s out there.</span> That’s 391 posts published, keep going!
|
||||
</div>
|
||||
|
||||
<p class="gh-publish-confirmation">
|
||||
{{#if post.isScheduled}}
|
||||
{{#let (moment-site-tz post.publishedAtUTC) as |scheduledAt|}}
|
||||
On
|
||||
<strong>
|
||||
{{moment-format scheduledAt "D MMM YYYY"}}
|
||||
at
|
||||
{{moment-format scheduledAt "HH:mm"}}
|
||||
</strong>
|
||||
your
|
||||
{{/let}}
|
||||
{{else}}
|
||||
Your
|
||||
{{/if}}
|
||||
|
||||
{{post.displayName}} is
|
||||
|
||||
{{#if post.email}}
|
||||
on its way to
|
||||
|
||||
<strong>{{pluralize post.email.emailCount "member"}}</strong>
|
||||
|
||||
and was
|
||||
|
||||
{{#if post.emailOnly}}
|
||||
<strong>not</strong>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
||||
published on your site.
|
||||
</p>
|
||||
|
||||
<div class="gh-publish-cta">
|
||||
<button type="button" class="gh-btn gh-btn-black gh-btn-large" {{on "click" @close}}><span>Back to {{post.displayName}}</span></button>
|
||||
{{#unless post.emailOnly}}
|
||||
|
||||
@ -19,8 +19,14 @@
|
||||
|
||||
{{@publishOptions.post.displayName}}
|
||||
|
||||
{{#if @publishOptions.willPublish}}
|
||||
will be published on your site{{#if @publishOptions.willEmail}}, and delivered to{{else}}.{{/if}}
|
||||
{{/if}}
|
||||
|
||||
{{#if @publishOptions.willEmail}}
|
||||
will be delivered to
|
||||
{{#unless @publishOptions.willPublish}}
|
||||
will be delivered to
|
||||
{{/unless}}
|
||||
|
||||
{{#let (members-count-fetcher query=(hash filter=@publishOptions.fullRecipientFilter)) as |countFetcher|}}
|
||||
<strong>
|
||||
@ -36,22 +42,16 @@
|
||||
<strong>{{gh-pluralize countFetcher.count "member" without-count=true}}</strong>
|
||||
{{else}}
|
||||
<strong>{{gh-pluralize countFetcher.count "subscriber" without-count=true}}</strong>
|
||||
of <strong>{{@publishOptions.newsletter.name}}</strong>
|
||||
of <strong>{{@publishOptions.newsletter.name}}</strong>{{#if @publishOptions.willPublish}}.{{else}},{{/if}}
|
||||
{{/if}}
|
||||
{{/let}}
|
||||
|
||||
{{#if @publishOptions.willPublish}}
|
||||
and
|
||||
{{else}}
|
||||
{{#unless @publishOptions.willPublish}}
|
||||
and will <strong>not</strong> be published on your site.
|
||||
{{/if}}
|
||||
{{/unless}}
|
||||
{{/if}}
|
||||
|
||||
{{#if @publishOptions.willPublish}}
|
||||
will be published on your site.
|
||||
{{/if}}
|
||||
|
||||
Are you good to go?
|
||||
This is it.
|
||||
</p>
|
||||
|
||||
<div class="gh-publish-cta">
|
||||
@ -62,8 +62,5 @@
|
||||
@successText={{if @publishOptions.willOnlyEmail "Sent" "Published"}}
|
||||
@class="gh-btn gh-btn-pulse gh-btn-large"
|
||||
/>
|
||||
<div class="gh-publish-cta-secondary">
|
||||
Or
|
||||
<button type="button" class="gh-btn gh-btn-link gh-btn-large" {{on "click" @cancel}}>change settings</button>
|
||||
</div>
|
||||
<button type="button" class="gh-btn gh-btn-link gh-btn-large gh-publish-cta-secondary" {{on "click" @cancel}}>Back to publish settings</button>
|
||||
</div>
|
||||
@ -108,9 +108,6 @@
|
||||
</div>
|
||||
|
||||
<div class="gh-publish-cta">
|
||||
<button type="button" class="gh-btn gh-btn-black gh-btn-large" {{on "click" @confirm}}><span>Looks good, next →</span></button>
|
||||
<div class="gh-publish-cta-secondary">
|
||||
Or
|
||||
<button type="button" class="gh-btn gh-btn-link gh-btn-large" {{on "click" @close}}>continue editing</button>
|
||||
</div>
|
||||
<button type="button" class="gh-btn gh-btn-black gh-btn-large" {{on "click" @confirm}}><span>Continue, final review →</span></button>
|
||||
<button type="button" class="gh-btn gh-btn-link gh-btn-large gh-publish-cta-secondary" {{on "click" @close}}>Back to editor</button>
|
||||
</div>
|
||||
@ -1,25 +1,23 @@
|
||||
<div class="flex flex-column h-100 items-center overflow-auto">
|
||||
<header class="gh-publish-header" data-test-modal="update-flow">
|
||||
<button class="gh-publish-back-button" title="Close" type="button" {{on "click" @close}}>
|
||||
<span>{{svg-jar "close-stroke"}} Close</span>
|
||||
<span>{{svg-jar "close-stroke"}}</span>
|
||||
</button>
|
||||
</header>
|
||||
|
||||
{{#let @data.publishOptions.post as |post|}}
|
||||
<div class="gh-publish-settings-container">
|
||||
<div class="gh-publish-settings-container gh-update-flow">
|
||||
<div class="gh-publish-title">
|
||||
This {{post.displayName}} is
|
||||
<span>{{post.status}}</span>
|
||||
<span class="green">{{post.status}}</span>
|
||||
</div>
|
||||
|
||||
<p>
|
||||
<p class="gh-publish-confirmation">
|
||||
{{#let (moment-site-tz post.publishedAtUTC) as |publishedAt|}}
|
||||
On
|
||||
<strong>
|
||||
{{moment-format publishedAt "D MMM YYYY"}}
|
||||
at
|
||||
{{moment-format publishedAt "HH:mm"}}
|
||||
</strong>
|
||||
your
|
||||
{{/let}}
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
</div>
|
||||
<div class="gh-radio {{if @publishOptions.isScheduled "active"}}" {{on "click" (fn @publishOptions.toggleScheduled true)}}>
|
||||
<div class="gh-radio-button" data-test-publishmenu-scheduled-option></div>
|
||||
<label>Schedule it for later</label>
|
||||
<label>Schedule for later</label>
|
||||
</div>
|
||||
</div>
|
||||
{{#if @publishOptions.isScheduled}}
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
{{did-insert this.registerTimeInput}}
|
||||
data-test-date-time-picker-time-input
|
||||
>
|
||||
<small class="gh-date-time-picker-timezone" data-test-date-time-picker-timezone>({{this.timezone}})</small>
|
||||
<small class="gh-date-time-picker-timezone" data-test-date-time-picker-timezone>{{this.timezone}}</small>
|
||||
</div>
|
||||
</div>
|
||||
{{#if this.hasError}}
|
||||
|
||||
@ -461,10 +461,10 @@
|
||||
.gh-publish-title {
|
||||
margin: 2px 0 4rem;
|
||||
color: var(--black);
|
||||
font-size: 4.8rem;
|
||||
font-size: 4.6rem;
|
||||
font-weight: 700;
|
||||
letter-spacing: -.017em;
|
||||
line-height: 1.1em;
|
||||
line-height: 1.2em;
|
||||
}
|
||||
|
||||
.gh-publish-settings {
|
||||
@ -553,12 +553,39 @@
|
||||
}
|
||||
|
||||
.gh-publish-setting-form.last fieldset {
|
||||
display: flex;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.gh-publish-newsletter-trigger {
|
||||
padding: 8px 16px;
|
||||
font-size: 1.45rem;
|
||||
}
|
||||
|
||||
.gh-publish-newsletter-trigger svg {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
right: 16px;
|
||||
}
|
||||
|
||||
.gh-publish-newsletter-dropdown {
|
||||
z-index: 99999;
|
||||
padding: 4px 0;
|
||||
}
|
||||
|
||||
.gh-publish-newsletter-dropdown .ember-power-select-option {
|
||||
padding: 8px 16px;
|
||||
}
|
||||
|
||||
.gh-publish-newsletter-dropdown .ember-power-select-option[aria-selected="true"] {
|
||||
color: var(--black);
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.gh-publish-types,
|
||||
.gh-publish-schedule {
|
||||
display: flex;
|
||||
flex-shrink: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
@ -598,29 +625,44 @@
|
||||
color: var(--middarkgrey-d1);
|
||||
}
|
||||
|
||||
.gh-publish-newsletter-trigger {
|
||||
padding: 8px 16px;
|
||||
font-size: 1.45rem;
|
||||
.gh-publish-schedule .gh-radio {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.gh-publish-newsletter-trigger svg {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
right: 16px;
|
||||
.gh-publish-setting-form .gh-date-time-picker {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr;
|
||||
grid-gap: 12px;
|
||||
}
|
||||
|
||||
.gh-publish-newsletter-dropdown {
|
||||
z-index: 99999;
|
||||
padding: 4px 0;
|
||||
.gh-publish-setting-form .gh-date-time-picker-date {
|
||||
height: 40px;
|
||||
margin: 0;
|
||||
padding: 8px 12px;
|
||||
font-size: 1.4rem;
|
||||
}
|
||||
|
||||
.gh-publish-newsletter-dropdown .ember-power-select-option {
|
||||
padding: 8px 16px;
|
||||
.gh-publish-setting-form .gh-date-time-picker-date svg path,
|
||||
.gh-publish-setting-form .gh-date-time-picker-date svg rect {
|
||||
fill: none;
|
||||
stroke: var(--midgrey);
|
||||
stroke-linecap: round;
|
||||
stroke-linejoin: round;
|
||||
stroke-width: 2px
|
||||
}
|
||||
|
||||
.gh-publish-newsletter-dropdown .ember-power-select-option[aria-selected="true"] {
|
||||
color: var(--black);
|
||||
font-weight: 600;
|
||||
.gh-publish-setting-form .gh-date-time-picker-time {
|
||||
width: unset;
|
||||
height: 40px;
|
||||
margin: 0;
|
||||
padding: 8px 12px;
|
||||
font-size: 1.4rem;
|
||||
}
|
||||
|
||||
.gh-publish-setting-form .gh-date-time-picker-timezone {
|
||||
margin: 0;
|
||||
color: var(--midgrey);
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.gh-publish-cta {
|
||||
@ -629,6 +671,10 @@
|
||||
width: max-content;
|
||||
}
|
||||
|
||||
.gh-update-flow .gh-publish-cta {
|
||||
flex-direction: row;
|
||||
}
|
||||
|
||||
.gh-publish-cta .gh-btn {
|
||||
width: max-content;
|
||||
}
|
||||
|
||||
@ -1 +1,4 @@
|
||||
<svg version="1" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><g><path d="M23.5 2h-3.5v-1.5c0-.276-.224-.5-.5-.5h-3c-.276 0-.5.224-.5.5v1.5h-8v-1.5c0-.276-.224-.5-.5-.5h-3c-.276 0-.5.224-.5.5v1.5h-3.5c-.276 0-.5.224-.5.5v21c0 .276.224.5.5.5h23c.276 0 .5-.224.5-.5v-21c0-.276-.224-.5-.5-.5zm-6.5-1h2v3h-2v-3zm-12 0h2v3h-2v-3zm-1 2v1.5c0 .276.224.5.5.5h3c.276 0 .5-.224.5-.5v-1.5h8v1.5c0 .276.224.5.5.5h3c.276 0 .5-.224.5-.5v-1.5h3v4h-22v-4h3zm-3 20v-15h22v15h-22zM21.5 12c.276 0 .5-.224.5-.5s-.224-.5-.5-.5h-4.5v-1.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v1.5h-4v-1.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v1.5h-4v-1.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v1.5h-3.5c-.276 0-.5.224-.5.5s.224.5.5.5h3.5v3h-3.5c-.276 0-.5.224-.5.5s.224.5.5.5h3.5v3h-3.5c-.276 0-.5.224-.5.5s.224.5.5.5h3.5v1.5c0 .276.224.5.5.5s.5-.224.5-.5v-1.5h4v1.5c0 .276.224.5.5.5s.5-.224.5-.5v-1.5h4v1.5c0 .276.224.5.5.5s.5-.224.5-.5v-1.5h4.5c.276 0 .5-.224.5-.5s-.224-.5-.5-.5h-4.5v-3h4.5c.276 0 .5-.224.5-.5s-.224-.5-.5-.5h-4.5v-3h4.5zm-14.5 0h4v3h-4v-3zm0 7v-3h4v3h-4zm9 0h-4v-3h4v3zm0-4h-4v-3h4v3z"/></g></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
|
||||
<rect x=".752" y="3.75" width="22.5" height="19.5" rx="1.5" ry="1.5"/>
|
||||
<path d="M.752 9.75h22.5M6.752 6V.75M17.252 6V.75"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 195 B |
Loading…
Reference in New Issue
Block a user