From 22c0025d4744ce9cd127d6e5ad89bb38b1a134b9 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Tue, 1 Mar 2016 11:19:41 +1300 Subject: [PATCH 1/2] Improve documentation on documentation --- .../04_Making_A_SilverStripe_Core_Release.md | 40 +++++++++++++++---- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/docs/en/05_Contributing/04_Making_A_SilverStripe_Core_Release.md b/docs/en/05_Contributing/04_Making_A_SilverStripe_Core_Release.md index c016b595f..c2348aced 100644 --- a/docs/en/05_Contributing/04_Making_A_SilverStripe_Core_Release.md +++ b/docs/en/05_Contributing/04_Making_A_SilverStripe_Core_Release.md @@ -74,6 +74,8 @@ the [core committers](core_committers), who will assist with setting up your cre * AWS write permissions on the `silverstripe-ssorg-releases` s3 bucket. * Permission on [silverstripe release announcement](https://groups.google.com/forum/#!forum/silverstripe-announce). * Moderator permissions in the #silverstripe [IRC channel](http://www.silverstripe.org/community/contributing-to-silverstripe/irc-channel/) +* Administrator account on [docs.silverstripe.org](https://docs.silverstripe.org) and + [userhelp.silverstripe.org](https://userhelp.silverstripe.org). ### First time setup: Security releases @@ -293,20 +295,42 @@ aren't strictly able to be automated: If releasing a new major or minor version it may be necessary to update various SilverStripe portals. Normally a new minor version will require a new branch option to be made available on each site menu. These sites include: -* [docs.silverstripe.org](https://docs.silverstripe.org): Update on [github](https://github.com/silverstripe/doc.silverstripe.org) - and deployed internally. +* [docs.silverstripe.org](https://docs.silverstripe.org): + * New branches (minor releases) require a code update. Changes are made to + [github](https://github.com/silverstripe/doc.silverstripe.org) and deployed via + [SilverStripe Platform](https://platform.silverstripe.com/naut/project/SS-Developer-Docs/environment/Production/) + * Updates to markdown only can be made via the [build tasks](https://docs.silverstripe.org/dev/tasks). + See below for more details. +* [userhelp.silverstripe.org](https://userhelp.silverstripe.org/en/3.2): + * Updated similarly to docs.silverstripe.org: Code changes are made to + [github](https://github.com/silverstripe/userhelp.silverstripe.org) and deployed via + [SilverStripe Platform](https://platform.silverstripe.com/naut/project/SS-User-Docs/environment/Production/). + * The content for this site is pulled from [silverstripe-userhelp-content](https://github.com/silverstripe/silverstripe-userhelp-content) + * Updates to markdown made via the [build tasks](https://userhelp.silverstripe.org/dev/tasks). + See below for more details. +* [demo.silverstripe.org](http://demo.silverstripe.org/): Update code on + [github](https://github.com/silverstripe/demo.silverstripe.org/) + and deployed via [SilverStripe Platform](https://platform.silverstripe.com/naut/project/ss3demo/environment/live). * [api.silverstripe.org](https://api.silverstripe.org): Update on [github](https://github.com/silverstripe/api.silverstripe.org) - and deployed internally. -* [userhelp.silverstripe.org](https://userhelp.silverstripe.org/en/3.2): Update on - [github](https://github.com/silverstripe/userhelp.silverstripe.org) and deployed internally. - The content for this site is pulled from [silverstripe-userhelp-content](https://github.com/silverstripe/silverstripe-userhelp-content) -* [demo.silverstripe.org](http://demo.silverstripe.org/): Update on - [github](https://github.com/silverstripe/demo.silverstripe.org/) and deployed internally. + and deployed via [SilverStripe Platform](https://platform.silverstripe.com/naut/project/api/environment/live). Currently + the only way to rebuild the api docs is via SSH in and running the apigen task. It's also a good idea to check that `Deprecation::notification_version('4.0.0');` in framework/_config.php points to the right major version. This should match the major version of the current release. E.g. all versions of 4.x should be set to `4.0.0`. +*Updating markdown files* + +When updating markdown on sites such as userhelp.silverstripe.org or docs.silverstripe.org, the process is similar: + +* Run `RefreshMarkdownTask` to pull down new markdown files. +* Then `RebuildLuceneDocsIndex` to update search indexes. + +Running either of these tasks may time out when requested, but will continue to run in the background. Normally +only the search index rebuild takes a long period of time. + +Note that markdown is automatically updated daily, and this should only be done if an immediate refresh is necessary. + ### Stage 3: Let the world know Once a release has been published there are a few places where user documentation From 7bb6295c79114ad211400da0602b66f2b299ac59 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 3 Mar 2016 17:54:07 +1300 Subject: [PATCH 2/2] Fix TreeDropdownField auto-close regression Causes build failures due to Behat not being able to select a link from a dropdown in "Insert Media". Follow on effect from triggering a window.resize event when the window wasn't actually resized (in order to force a layout redraw). See https://github.com/silverstripe/silverstripe-framework/pull/5087 for context --- admin/javascript/LeftAndMain.Menu.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/admin/javascript/LeftAndMain.Menu.js b/admin/javascript/LeftAndMain.Menu.js index 5fee1f216..c54ed9aee 100644 --- a/admin/javascript/LeftAndMain.Menu.js +++ b/admin/javascript/LeftAndMain.Menu.js @@ -204,7 +204,10 @@ fromContainingPanel: { ontoggle: function(e){ this.toggleClass('collapsed', $(e.target).hasClass('collapsed')); - $(window).resize(); //Trigger jLayout + + // Trigger synthetic resize event. Avoid native window.resize event + // since it causes other behaviour which should be reserved for actual window dimension changes. + $('.cms-container').trigger('windowresize'); } },