Skip to content

WIP: Try new publishing flow #9398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sarahmonster wants to merge 7 commits into from
Closed

WIP: Try new publishing flow #9398

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1f61b23
Restyle pre-publish panel to have some extra breathing space.
sarahmonster Aug 24, 2018
381175d
Style visibility settings to be a bit more parseable.
sarahmonster Aug 24, 2018
e5551b5
Try it line-free.
sarahmonster Aug 24, 2018
1b318c7
Add a checkbox to skip the prepublish panel.
sarahmonster Aug 24, 2018
1d9fab2
Nitpicky wee fixes.
sarahmonster Sep 4, 2018
95a40ca
Ensure the right title appears at the right time.
sarahmonster Sep 19, 2018
2976a21
Make sure the checkbox checks itself properly!
sarahmonster Sep 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Ensure the right title appears at the right time.
  • Loading branch information
@sarahmonster
sarahmonster committed Sep 19, 2018
commit 95a40ca2a6aa907ccb78cfabc5bca3b6fef9a1e1
26 changes: 14 additions & 12 deletions packages/editor/src/components/post-publish-panel/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,20 +61,23 @@ class PostPublishPanel extends Component {
this.setState( { loading: true } );
}

onUpdateDisableToggle() {
// There should be a setting to allow users to skip the pre-publish step forever.
// When a user toggles this option on, their setting will be saved and they won't need
// to press two "publish" buttons in order to make a post happen.
}

render() {
const { isScheduled, isPublishSidebarEnabled, onClose, onTogglePublishSidebar, forceIsDirty, forceIsSaving, PrePublishExtension, PostPublishExtension, ...additionalProps } = this.props;
const { loading, submitted, hasPublishAction } = this.state;
const { hasPublishAction, isScheduled, isBeingScheduled, onClose, forceIsDirty, forceIsSaving, PrePublishExtension, PostPublishExtension, ...additionalProps } = this.props;
const { loading, submitted } = this.state;
let prePublishTitle;

if ( ! hasPublishAction ) {
prePublishTitle = __( 'Ready to submit for review?' );
} else if ( isBeingScheduled ) {
prePublishTitle = __( 'Ready to schedule?' );
} else {
prePublishTitle = __( 'Ready to publish?' );
}
return (
<div className="editor-post-publish-panel" { ...additionalProps }>
<div className="editor-post-publish-panel__header">
<strong className="editor-post-publish-panel__title">
{ hasPublishAction ? __( 'Ready to submit for review?' ) : __( 'Ready to publish?' ) }
{ prePublishTitle }
</strong>

<IconButton
Expand Down Expand Up @@ -110,8 +113,6 @@ class PostPublishPanel extends Component {
</div>
) }
</div>
<<<<<<< HEAD
=======

<div className="editor-post-publish-panel__disable-check">
<CheckboxControl
Expand All @@ -121,7 +122,6 @@ class PostPublishPanel extends Component {
/>
</div>

>>>>>>> Add a checkbox to skip the prepublish panel.
</div>
);
}
Expand All @@ -134,6 +134,7 @@ export default compose( [
getCurrentPostType,
isCurrentPostPublished,
isCurrentPostScheduled,
isEditedPostBeingScheduled,
isSavingPost,
isEditedPostDirty,
} = select( 'core/editor' );
Expand All @@ -143,6 +144,7 @@ export default compose( [
hasPublishAction: get( getCurrentPost(), [ '_links', 'wp:action-publish' ], false ),
isPublished: isCurrentPostPublished(),
isScheduled: isCurrentPostScheduled(),
isBeingScheduled: isEditedPostBeingScheduled(),
isSaving: isSavingPost(),
isDirty: isEditedPostDirty(),
isPublishSidebarEnabled: isPublishSidebarEnabled(),
Expand Down
6 changes: 1 addition & 5 deletions packages/editor/src/components/post-publish-panel/prepublish.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,18 @@ function PostPublishPanelPrepublish( {
isBeingScheduled,
children,
} ) {
let prePublishTitle, prePublishBodyText;
let prePublishBodyText;

if ( ! hasPublishAction ) {
prePublishTitle = __( 'Are you ready to submit for review?' );
prePublishBodyText = __( 'When you’re ready, submit your work for review, and an Editor will be able to approve it for you.' );
} else if ( isBeingScheduled ) {
prePublishTitle = __( 'Are you ready to schedule?' );
prePublishBodyText = __( 'Your post will be published at the specified date and time.' );
} else {
prePublishTitle = __( 'Are you ready to publish?' );
prePublishBodyText = __( 'Double-check your settings, then use the button to publish your post.' );
}

return (
<div className="editor-post-publish-panel__prepublish">
<div><strong>{ prePublishTitle }</strong></div>
<p>{ prePublishBodyText }</p>

{ hasPublishAction && (
Expand Down