Upgrade to 3.1, add static publisher task for generating HTML export (Dash)

This commit is contained in:
Will Rossiter 2014-01-14 21:22:33 +13:00
parent f13d0bc365
commit 31155e223e
6 changed files with 69 additions and 21 deletions

2
.gitignore vendored
View File

@ -5,3 +5,5 @@ assets
vendor/ vendor/
framework/ framework/
docsviewer/ docsviewer/
cache/
staticpublisher/

View File

@ -16,7 +16,7 @@ error_reporting(E_ALL);
// downloaded from http://www.silverstripe.org/themes/ // downloaded from http://www.silverstripe.org/themes/
SSViewer::set_theme('docs'); SSViewer::set_theme('docs');
if(@$_GET['db'] == "sqlite3") { if(Director::isDev() && @$_GET['db'] == "sqlite3") {
global $databaseConfig; global $databaseConfig;
$databaseConfig['type'] = 'SQLite3Database'; $databaseConfig['type'] = 'SQLite3Database';
} }
@ -45,15 +45,10 @@ DocumentationViewer::set_edit_link(
) )
); );
Object::add_extension('Controller', 'ControllerExtension');
if(Director::isLive()) { if(Director::isLive()) {
ControllerExtension::$google_analytics_code = 'UA-84547-8'; ControllerExtension::$google_analytics_code = 'UA-84547-8';
} }
Validator::set_javascript_validation_handler('none');
DocumentationSearch::set_meta_data(array( DocumentationSearch::set_meta_data(array(
'ShortName' => 'SilverStripe Documentation', 'ShortName' => 'SilverStripe Documentation',
'Description' => 'Documentation for SilverStripe CMS / Framework', 'Description' => 'Documentation for SilverStripe CMS / Framework',

7
app/_config/config.yml Normal file
View File

@ -0,0 +1,7 @@
StaticExporter:
extensions:
- DocumentationStaticPublisherExtension
disable_sitetree_export: true
Controller:
extensions:
- ControllerExtension

View File

@ -15,7 +15,7 @@ class ControllerExtension extends Extension {
} }
/** /**
* @return boolean * @return bool
*/ */
public function IsDev() { public function IsDev() {
return (Director::isDev()); return (Director::isDev());

View File

@ -3,8 +3,9 @@
"description": "The source code behind doc.silverstripe.org", "description": "The source code behind doc.silverstripe.org",
"require": { "require": {
"php": ">=5.3.2", "php": ">=5.3.2",
"silverstripe/docsviewer": "0.1.x-dev", "silverstripe/docsviewer": "dev-master",
"silverstripe/framework": "3.0.x-dev" "silverstripe/staticpublisher": "dev-master",
"silverstripe/framework": "3.1.x-dev"
}, },
"config": { "config": {
"process-timeout": 600 "process-timeout": 600

67
composer.lock generated
View File

@ -3,7 +3,7 @@
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
], ],
"hash": "edc15d70fab34d39f90088405d94ea90", "hash": "0d2dbd6336d098b081f4f846fbd227a0",
"packages": [ "packages": [
{ {
"name": "composer/installers", "name": "composer/installers",
@ -82,20 +82,23 @@
}, },
{ {
"name": "silverstripe/docsviewer", "name": "silverstripe/docsviewer",
"version": "0.1.x-dev", "version": "dev-master",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/silverstripe/silverstripe-docsviewer.git", "url": "https://github.com/silverstripe/silverstripe-docsviewer.git",
"reference": "95fee5a9fffeba32e6d09a6bfba0f55d0ba1cefc" "reference": "95b982353b6188287257a542bc4fae0a1b10c16b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/95fee5a9fffeba32e6d09a6bfba0f55d0ba1cefc", "url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/95b982353b6188287257a542bc4fae0a1b10c16b",
"reference": "95fee5a9fffeba32e6d09a6bfba0f55d0ba1cefc", "reference": "95b982353b6188287257a542bc4fae0a1b10c16b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"silverstripe/framework": "3.0.*" "silverstripe/framework": "~3.1"
},
"suggest": {
"silverstripe/staticpublisher": "Allows publishing documentation as HTML"
}, },
"type": "silverstripe-module", "type": "silverstripe-module",
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
@ -114,20 +117,20 @@
"documentation", "documentation",
"silverstripe" "silverstripe"
], ],
"time": "2013-10-30 22:06:02" "time": "2014-01-14 07:41:59"
}, },
{ {
"name": "silverstripe/framework", "name": "silverstripe/framework",
"version": "3.0.x-dev", "version": "3.1.x-dev",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/silverstripe/silverstripe-framework.git", "url": "https://github.com/silverstripe/silverstripe-framework.git",
"reference": "dd801bdb0bfdd199d7bb6ce3269e1aedd7b1a8ce" "reference": "9b5a9afe2be766e9830c795dc26636a82f59743c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/dd801bdb0bfdd199d7bb6ce3269e1aedd7b1a8ce", "url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/9b5a9afe2be766e9830c795dc26636a82f59743c",
"reference": "dd801bdb0bfdd199d7bb6ce3269e1aedd7b1a8ce", "reference": "9b5a9afe2be766e9830c795dc26636a82f59743c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -160,7 +163,46 @@
"framework", "framework",
"silverstripe" "silverstripe"
], ],
"time": "2014-01-10 23:19:12" "time": "2014-01-14 05:19:45"
},
{
"name": "silverstripe/staticpublisher",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/silverstripe-labs/silverstripe-staticpublisher.git",
"reference": "ea1461acd7eb78b25e629b5c6fedf719b37f63e8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/silverstripe-labs/silverstripe-staticpublisher/zipball/ea1461acd7eb78b25e629b5c6fedf719b37f63e8",
"reference": "ea1461acd7eb78b25e629b5c6fedf719b37f63e8",
"shasum": ""
},
"require": {
"silverstripe/framework": "~3.1"
},
"type": "silverstripe-module",
"notification-url": "https://packagist.org/downloads/",
"authors": [
{
"name": "Will Rossiter",
"email": "will@fullscreen.io",
"homepage": "http://wilr.github.com"
},
{
"name": "Sam Minnee",
"email": "sam@silverstripe.com"
}
],
"description": "StaticPublisher provides an extensions for exporting a SilverStripe application to either a local or remote file systems.",
"keywords": [
"export",
"publisher",
"silverstripe-labs",
"static"
],
"time": "2014-01-14 07:36:46"
} }
], ],
"packages-dev": [ "packages-dev": [
@ -172,6 +214,7 @@
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": { "stability-flags": {
"silverstripe/docsviewer": 20, "silverstripe/docsviewer": 20,
"silverstripe/staticpublisher": 20,
"silverstripe/framework": 20 "silverstripe/framework": 20
}, },
"platform": { "platform": {