Skip to content
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

Jump to bottom

Pages: show scheduled pages and fix empty placeholders #1158

Merged
merged 1 commit into from
Dec 1, 2015
Merged

Pages: show scheduled pages and fix empty placeholders #1158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
73 changes: 37 additions & 36 deletions client/my-sites/pages/main.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ var PageList = require( './page-list' ),
config = require( 'config' ),
notices = require( 'notices' );

module.exports = React.createClass({
const statuses = [ 'published', 'drafts', 'scheduled', 'trashed' ];

module.exports = React.createClass( {

displayName: 'Pages',

Expand Down Expand Up @@ -49,59 +51,58 @@ module.exports = React.createClass({
},

render: function() {
var siteFilter = this.props.sites.selected ? '/' + this.props.sites.selected : '',
statusSlug = this.props.status,
searchPlaceholder, selectedText, filterStrings;

filterStrings = {
drafts: this.translate( 'Drafts', { context: 'Filter label for pages list' } ),
const status = this.props.status || 'published';
const filterStrings = {
published: this.translate( 'Published', { context: 'Filter label for pages list' } ),
trashed: this.translate( 'Trash', { context: 'Filter label for pages list' } ),
status: this.translate( 'Status' )
drafts: this.translate( 'Drafts', { context: 'Filter label for pages list' } ),
scheduled: this.translate( 'Scheduled', { context: 'Filter label for pages list' } ),
trashed: this.translate( 'Trash', { context: 'Filter label for pages list' } )
};
const searchStrings = {
published: this.translate( 'Search published…', { context: 'Search placeholder for pages list', textOnly: true } ),
drafts: this.translate( 'Search drafts…', { context: 'Search placeholder for pages list', textOnly: true } ),
scheduled: this.translate( 'Search scheduled…', { context: 'Search placeholder for pages list', textOnly: true } ),
trashed: this.translate( 'Search trash…', { context: 'Search placeholder for pages list', textOnly: true } )
};



switch( statusSlug ) {
case 'drafts':
searchPlaceholder = this.translate( 'Search drafts…', { context: 'Search placeholder for pages list', textOnly: true } );
selectedText = filterStrings.drafts;
break;
case 'trashed':
searchPlaceholder = this.translate( 'Search trash…', { context: 'Search placeholder for pages list', textOnly: true } );
selectedText = filterStrings.trashed;
break;
default:
searchPlaceholder = this.translate( 'Search published…', { context: 'Search placeholder for pages list', textOnly: true } );
selectedText = filterStrings.published;
break;
}

return (
<div className="main main-column pages" role="main">
<SidebarNavigation />

<SectionNav selectedText={ selectedText }>
<NavTabs label={ filterStrings.status }>
<NavItem path={ '/pages' + siteFilter } selected={ ! statusSlug }>{ filterStrings.published }</NavItem>
<NavItem path={ '/pages/drafts' + siteFilter } selected={ statusSlug === 'drafts' } >{ filterStrings.drafts }</NavItem>
<NavItem path={ '/pages/trashed' + siteFilter } selected={ statusSlug === 'trashed' } >{ filterStrings.trashed }</NavItem>
<SectionNav selectedText={ filterStrings[ status ] }>
<NavTabs label={ this.translate( 'Status', { context: 'Filter page group label for tabs' } ) }>
{ this.getNavItems( filterStrings, status ) }
</NavTabs>
<Search
pinned={ true }
onSearch={ this.doSearch }
initialValue={ this.props.search }
placeholder={ searchPlaceholder }
placeholder={ searchStrings[ status ] }
analyticsGroup="Pages"
delaySearch={ true }
/>
</SectionNav>

<PageList { ...this.props } />
</div>
);
},

getNavItems( filterStrings, currentStatus ) {
const siteFilter = this.props.sites.selected ? '/' + this.props.sites.selected : '';
return statuses.map( function( status ) {
let path = `/pages${ siteFilter }`;
if ( status !== 'publish' ) {
path = `/pages/${ status }${ siteFilter }`;
}
return (
<NavItem
path={ path }
selected={ currentStatus === status }
key={ `page-filter-${ status }` }>
{ filterStrings[ status ] }
</NavItem>
);
} );
},

_setWarning( selectedSite ) {
if ( selectedSite && selectedSite.jetpack && ! selectedSite.hasMinimumJetpackVersion ) {
notices.warning(
Expand All @@ -110,4 +111,4 @@ module.exports = React.createClass({
);
}
}
});
} );
13 changes: 10 additions & 3 deletions client/my-sites/pages/page-list.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ var PageList = React.createClass( {
context: React.PropTypes.object,
search: React.PropTypes.string,
sites: React.PropTypes.object,
statusSlug: React.PropTypes.string,
siteID: React.PropTypes.any
},

Expand Down Expand Up @@ -60,7 +59,6 @@ var Pages = React.createClass({
search: React.PropTypes.string,
siteID: React.PropTypes.any,
sites: React.PropTypes.object.isRequired,
statusSlug: React.PropTypes.string,
trackScrollPage: React.PropTypes.func.isRequired
},

Expand Down Expand Up @@ -137,7 +135,8 @@ var Pages = React.createClass({
newPageLink = selectedSite ? '//wordpress.com/page/' + selectedSite.ID + '/new' : '//wordpress.com/page';
}

switch( this.props.statusSlug ) {
const status = this.props.status || 'published';
switch ( status ) {
case 'drafts':
attributes = {
title: this.translate( 'You don\'t have any drafts.' ),
Expand All @@ -146,6 +145,14 @@ var Pages = React.createClass({
actionURL: newPageLink
};
break;
case 'scheduled':
attributes = {
title: this.translate( 'You don\'t have any scheduled pages yet.' ),
line: this.translate( 'Would you like to create one?' ),
action: this.translate( 'Start a Page' ),
actionURL: newPageLink
};
break;
case 'trashed':
attributes = {
title: this.translate( 'You don\'t have any pages in your trash folder.' ),
Expand Down