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

Site Settings: Add Disconnect Confirmation Page #18796

Merged
merged 22 commits into from
Oct 17, 2017
Merged

Site Settings: Add Disconnect Confirmation Page #18796

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
541e9bd
Site Settings: add ConfirmDisconnection route definition
AnnaMag Sep 14, 2017
03ab0d6
Site Settings: hook up the Confirm Disconnection page
AnnaMag Sep 14, 2017
bb933a9
Site Settings: add Confirm Disconnection page
AnnaMag Sep 14, 2017
9d35390
Site Settings: include Confirm Disconnection styling
AnnaMag Sep 18, 2017
1a5fb5f
Site Settings: add dev feature flag
AnnaMag Sep 14, 2017
b6ac35a
Use different route, drop extra feature flag
ockham Oct 11, 2017
a3240f7
Simplify a little
ockham Oct 11, 2017
1fc290c
Move to site-settings/disconnect-site/confirm
ockham Oct 11, 2017
8a63b02
Use DisconnectJetpack component
ockham Oct 12, 2017
af5159a
Rename controller
ockham Oct 12, 2017
120bb42
Fix stayConnectedHref
ockham Oct 12, 2017
75bf63e
Alphabetize props
ockham Oct 13, 2017
3e2fe0d
Change route schema
ockham Oct 13, 2017
10e5e3c
Fullscreen styling
ockham Oct 13, 2017
5c38736
Hacky full-width fix
ockham Oct 13, 2017
e93c183
Revert "Hacky full-width fix"
ockham Oct 16, 2017
9e7999b
Set hasSidebar to false
ockham Oct 16, 2017
1824388
Remove obsolete styling
ockham Oct 16, 2017
222c928
Drop two obsolete classNames
ockham Oct 16, 2017
3e97f6e
Add sites middleware for routes without site slug
ockham Oct 16, 2017
c1ebb5f
JITM: Guard against null action
ockham Oct 16, 2017
67638cb
Add showTitle prop
ockham Oct 16, 2017
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
Fullscreen styling
  • Loading branch information
@ockham
ockham committed Oct 16, 2017
commit 10e5e3c204fb7d79cd0755ebcd03b6c7e2f840d1
1 change: 1 addition & 0 deletions client/my-sites/site-settings/controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ const controller = {
},

disconnectSiteConfirm( context ) {
ReactDom.unmountComponentAtNode( document.getElementById( 'secondary' ) );
renderPage( context, <ConfirmDisconnection /> );
},

Expand Down
2 changes: 1 addition & 1 deletion client/my-sites/site-settings/disconnect-site/confirm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const ConfirmDisconnection = ( { siteId, siteSlug, translate } ) => {
}

return (
<Main className="disconnect-site__confirm">
<Main className="disconnect-site__confirm disconnect-site site-settings">
<DocumentHead title={ translate( 'Site Settings' ) } />
<FormattedHeader
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is rather a design comment, but I was just thinking: don't we have just too many headings/subheadings here?

cc @keoshi

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tyxla we totally do, this should be adjusted.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found this mockup over in the PR desc for #18039

screen shot 2017-09-13 at 20 30 59

But it diverges quite a bit from the dialog, especially regarding the layout of the "By disconnection..." part...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, I guess we want full-screen (i.e. no sidebar)?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ockham I would say let's leave the big paragraph as is (without the red icon) and just remove the heading. Also, yes to full-screen!

headerText={ translate( 'Confirm Disconnection' ) }
Expand Down
1 change: 0 additions & 1 deletion client/my-sites/site-settings/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ export default function() {
page(
'/settings/disconnect-site/confirm/:site_id',
mySitesController.siteSelection,
mySitesController.navigation,
settingsController.setScroll,
controller.disconnectSiteConfirm
);
Expand Down