Temporary updates for preview site.

.gitignore

@@ -1,10 +1,11 @@
-src/
+/src/
 .DS_Store
-silverstripe-cache
+/silverstripe-cache
-assets
+/assets
-vendor/
+/vendor/
-framework/
+/framework/
-docsviewer/
+/docsviewer/
-cache/
+/cache/
-staticpublisher/
+/staticpublisher/
-toolbar/
+/toolbar/
+/display_logic/

README.md

@@ -35,9 +35,7 @@ in the bin/update.sh file.
 
 Once the `make fetch` command has executed and downloaded the latest files,
 those files are registered along with the module version the folder relates to.
-through the `app/_config.php` file.
+through the `app/docsviewer.yml` file.
-
-	DocumentationService::register("sapphire", BASE_PATH ."/src/github/master/sapphire/docs/", '2.4');
 
 ## Contribution
 

app/_config.php

@@ -21,21 +21,8 @@ if(Director::isDev() && @$_GET['db'] == "sqlite3") {
 	$databaseConfig['type'] = 'SQLite3Database';
 }
 
-DocumentationViewer::set_link_base('');
+Config::inst()->update('DocumentationViewer', 'link_base', '');
-DocumentationViewer::$check_permission = false;
+Config::inst()->update('DocumentationViewer', 'check_permission', false);
-
-DocumentationService::set_automatic_registration(false);
-DocumentationSearch::enable();
-
-try {
-	DocumentationService::register("framework", BASE_PATH ."/src/framework_master/docs/", 'trunk');
-	DocumentationService::register("framework", BASE_PATH ."/src/framework_3.1/docs/", '3.1', false, true);
-	DocumentationService::register("framework", BASE_PATH ."/src/framework_3.0/docs/", '3.0');
-	DocumentationService::register("framework", BASE_PATH ."/src/framework_2.4/docs/", '2.4');
-	DocumentationService::register("framework", BASE_PATH ."/src/framework_2.3/docs/", '2.3');
-} catch(InvalidArgumentException $e) {
-	
-} // Silence if path is not found (for CI environment)
 
 DocumentationViewer::set_edit_link(
 	'framework',
@@ -55,10 +42,10 @@ DocumentationSearch::set_meta_data(array(
 	'Tags' => 'silverstripe sapphire php framework cms content management system'
 ));
 
-DocumentationSearch::$boost_by_path = array(
 	// Changelogs have heaps of phrases, but are rarely relevant for content searches
+Config::inst()->update('DocumentationSearch', 'boost_by_path', array(
 	'/^changelog/' => 0.05
-);
+));
 
 // Set shared index (avoid issues with different temp paths between CLI and web users)
 if(file_exists(BASE_PATH . '/.lucene-index')) {

app/_config/docsviewer.yml

@@ -0,0 +1,17 @@
+---
+name: docsviewer
+after: docsviewer#docsviewer
+---
+DocumentationViewer:
+  google_analytics_code: 'UA-84547-8'
+DocumentationSearch:
+  enabled: true
+DocumentationManifest:
+  automatic_registration: false
+  register_entities:
+    -
+      Path: "framework/docs/"
+      Title: "Framework"
+      Version: master
+      Stable: true
+      DefaultEntity: true

app/_config/routes.yml

@@ -9,5 +9,5 @@ Director:
     'admin': 'AdminRootController'
     'dev/buildcache/$Action': 'RebuildStaticCacheTask'
     'dev': 'DevelopmentAdmin'
-    '': '->framework/en/'
+    '': '->en/'
-    '$Action': 'DocumentationViewer'
+    '$Lang/$Action': 'DocumentationViewer'

composer.json

@@ -8,17 +8,25 @@
         }
     ],
     "require": {
-        "php": ">=5.3.2",
+        "ext-gd": "*",
-        "silverstripe/docsviewer": "dev-master",
+        "ext-mbstring": "*",
-        "silverstripe/staticpublisher": "dev-master",
+        "silverstripe/docsviewer": "dev-manifest",
-        "silverstripe/framework": "3.1.*@stable",
+        "silverstripe/framework": "dev-docsrewrite as 3.1.x-dev",
+        "erusev/parsedown-extra": "0.1.0",
         "silverstripe/toolbar": "*"
     },
     "require-dev": {
-        "silverstripe/toolbar": "dev-search"
+        "phpunit/PHPUnit": "~3.7@stable"
     },
+    "repositories": [{
+        "type": "vcs",
+        "url": "git@github.com:wilr/sapphire.git"
+    }, {
+        "type": "vcs",
+        "url": "git@github.com:silverstripe/silverstripe-globaltoolbar.git"
+    }],
     "config": {
-        "process-timeout": 600
+		"process-timeout": 600	
-    },
+	},
     "minimum-stability": "dev"
 }

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "3eb2aa396f1f8115a345960560fa9f1b",
+    "hash": "3db49f8f06c35e18bea6b1696e713c3b",
     "packages": [
         {
             "name": "composer/installers",
@@ -12,12 +12,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/installers.git",
-                "reference": "8024be9aa3ee446272937f46a8807fa52b337767"
+                "reference": "5914f4a3e90a9176c93e5dd0c8ad2b3679fda6ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/installers/zipball/8024be9aa3ee446272937f46a8807fa52b337767",
+                "url": "https://api.github.com/repos/composer/installers/zipball/5914f4a3e90a9176c93e5dd0c8ad2b3679fda6ed",
-                "reference": "8024be9aa3ee446272937f46a8807fa52b337767",
+                "reference": "5914f4a3e90a9176c93e5dd0c8ad2b3679fda6ed",
                 "shasum": ""
             },
             "replace": {
@@ -96,20 +96,20 @@
                 "zend",
                 "zikula"
             ],
-            "time": "2014-11-01 17:51:50"
+            "time": "2014-09-16 22:11:26"
         },
         {
             "name": "erusev/parsedown",
-            "version": "1.1.1",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/erusev/parsedown.git",
-                "reference": "da5d75e97e1ed19e57bd54fa6cb595a6a0879a67"
+                "reference": "d24439ada0704948deef0d3eda2ea20fd8db1747"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/erusev/parsedown/zipball/da5d75e97e1ed19e57bd54fa6cb595a6a0879a67",
+                "url": "https://api.github.com/repos/erusev/parsedown/zipball/d24439ada0704948deef0d3eda2ea20fd8db1747",
-                "reference": "da5d75e97e1ed19e57bd54fa6cb595a6a0879a67",
+                "reference": "d24439ada0704948deef0d3eda2ea20fd8db1747",
                 "shasum": ""
             },
             "type": "library",
@@ -135,7 +135,7 @@
                 "markdown",
                 "parser"
             ],
-            "time": "2014-10-29 20:29:46"
+            "time": "2014-05-21 20:20:46"
         },
         {
             "name": "erusev/parsedown-extra",
@@ -183,16 +183,16 @@
         },
         {
             "name": "silverstripe/docsviewer",
-            "version": "dev-master",
+            "version": "dev-manifest",
             "source": {
                 "type": "git",
                 "url": "https://github.com/silverstripe/silverstripe-docsviewer.git",
-                "reference": "2656f244c7a42d9cc23d833cc75f8a635e7bc608"
+                "reference": "93dc64c48071723709c7de2d8b0305f8b656d1fb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/2656f244c7a42d9cc23d833cc75f8a635e7bc608",
+                "url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/93dc64c48071723709c7de2d8b0305f8b656d1fb",
-                "reference": "2656f244c7a42d9cc23d833cc75f8a635e7bc608",
+                "reference": "93dc64c48071723709c7de2d8b0305f8b656d1fb",
                 "shasum": ""
             },
             "require": {
@@ -219,20 +219,20 @@
                 "documentation",
                 "silverstripe"
             ],
-            "time": "2014-11-11 09:40:17"
+            "time": "2014-09-20 02:20:36"
         },
         {
             "name": "silverstripe/framework",
-            "version": "3.1.6",
+            "version": "dev-docsrewrite",
             "source": {
                 "type": "git",
-                "url": "https://github.com/silverstripe/silverstripe-framework.git",
+                "url": "https://github.com/wilr/sapphire.git",
-                "reference": "9da3357e3a7348914a4778366efa053277097cc4"
+                "reference": "c94563d7f0c0d596da85e3d15c2505870246560e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/9da3357e3a7348914a4778366efa053277097cc4",
+                "url": "https://api.github.com/repos/wilr/sapphire/zipball/c94563d7f0c0d596da85e3d15c2505870246560e",
-                "reference": "9da3357e3a7348914a4778366efa053277097cc4",
+                "reference": "c94563d7f0c0d596da85e3d15c2505870246560e",
                 "shasum": ""
             },
             "require": {
@@ -248,7 +248,6 @@
                     "tests/behat/features/bootstrap"
                 ]
             },
-            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
@@ -268,60 +267,28 @@
                 "framework",
                 "silverstripe"
             ],
-            "time": "2014-08-24 23:25:01"
+            "support": {
-        },
+                "source": "https://github.com/wilr/sapphire/tree/docsrewrite"
-        {
-            "name": "silverstripe/staticpublisher",
-            "version": "dev-master",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/silverstripe-labs/silverstripe-staticpublisher.git",
-                "reference": "76ba1a8b25676bb1bc52ba40c14aa3fce5b71a22"
             },
-            "dist": {
+            "time": "2014-09-20 02:10:49"
-                "type": "zip",
-                "url": "https://api.github.com/repos/silverstripe-labs/silverstripe-staticpublisher/zipball/76ba1a8b25676bb1bc52ba40c14aa3fce5b71a22",
-                "reference": "76ba1a8b25676bb1bc52ba40c14aa3fce5b71a22",
-                "shasum": ""
-            },
-            "require": {
-                "silverstripe/framework": "~3.1"
-            },
-            "type": "silverstripe-module",
-            "notification-url": "https://packagist.org/downloads/",
-            "authors": [
-                {
-                    "name": "Sam Minnée",
-                    "email": "sam@silverstripe.com"
-                },
-                {
-                    "name": "Will Rossiter",
-                    "email": "will@fullscreen.io"
-                }
-            ],
-            "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-09-03 09:04:56"
         },
         {
             "name": "silverstripe/toolbar",
-            "version": "dev-search",
+            "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "https://github.com/mandrew/silverstripe-globaltoolbar.git",
+                "url": "https://github.com/silverstripe/silverstripe-globaltoolbar.git",
-                "reference": "9fb83b302a7d529e480d5564b03950a936cf5e4b"
+                "reference": "b930ace6a0e97aeaf9aaadaf37e242f8ca99dcf4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mandrew/silverstripe-globaltoolbar/zipball/9fb83b302a7d529e480d5564b03950a936cf5e4b",
+                "url": "https://api.github.com/repos/silverstripe/silverstripe-globaltoolbar/zipball/b930ace6a0e97aeaf9aaadaf37e242f8ca99dcf4",
-                "reference": "9fb83b302a7d529e480d5564b03950a936cf5e4b",
+                "reference": "b930ace6a0e97aeaf9aaadaf37e242f8ca99dcf4",
                 "shasum": ""
             },
+            "require": {
+                "unclecheese/display-logic": "1.0.*"
+            },
             "type": "silverstripe-module",
             "license": [
                 "BSD-3-Clause"
@@ -344,23 +311,498 @@
                 "silverstripe"
             ],
             "support": {
-                "source": "https://github.com/mandrew/silverstripe-globaltoolbar/tree/search"
+                "source": "https://github.com/silverstripe/silverstripe-globaltoolbar/tree/master",
+                "issues": "https://github.com/silverstripe/silverstripe-globaltoolbar/issues"
             },
-            "time": "2014-08-31 23:28:18"
+            "time": "2014-09-18 02:53:24"
+        },
+        {
+            "name": "unclecheese/display-logic",
+            "version": "1.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/unclecheese/silverstripe-display-logic.git",
+                "reference": "051a860ebd65006493a19ce3381f9af3de8be875"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/unclecheese/silverstripe-display-logic/zipball/051a860ebd65006493a19ce3381f9af3de8be875",
+                "reference": "051a860ebd65006493a19ce3381f9af3de8be875",
+                "shasum": ""
+            },
+            "require": {
+                "silverstripe/framework": "3.*"
+            },
+            "replace": {
+                "silverstripe/display-logic": "*"
+            },
+            "type": "silverstripe-module",
+            "extra": {
+                "installer-name": "display_logic"
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Uncle Cheese",
+                    "email": "unclecheese@leftandmain.com",
+                    "homepage": "http://leftandmain.com"
+                }
+            ],
+            "description": "Allows assignment of conditions for display and hide of specific form fields based on client side behavior.",
+            "keywords": [
+                "Forms",
+                "cms",
+                "display",
+                "logic",
+                "silverstripe"
+            ],
+            "time": "2014-07-02 03:45:20"
+        }
+    ],
+    "packages-dev": [
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "1.2.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "fe2466802556d3fe4e4d1d58ffd3ccfd0a19be0b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/fe2466802556d3fe4e4d1d58ffd3ccfd0a19be0b",
+                "reference": "fe2466802556d3fe4e4d1d58ffd3ccfd0a19be0b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-file-iterator": ">=1.3.0@stable",
+                "phpunit/php-text-template": ">=1.2.0@stable",
+                "phpunit/php-token-stream": ">=1.1.3,<1.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "3.7.*@dev"
+            },
+            "suggest": {
+                "ext-dom": "*",
+                "ext-xdebug": ">=2.0.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "PHP/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2014-09-02 10:13:14"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb",
+                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "File/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2013-10-10 15:34:57"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
+                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "Text/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2014-01-30 17:20:04"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
+                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "PHP/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2013-08-02 07:42:54"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "1.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/ad4e1e23ae01b483c16f600ff1bebec184588e32",
+                "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "PHP/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2014-03-03 05:10:30"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "3.7.37",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "ae6cefd7cc84586a5ef27e04bae11ee940ec63dc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ae6cefd7cc84586a5ef27e04bae11ee940ec63dc",
+                "reference": "ae6cefd7cc84586a5ef27e04bae11ee940ec63dc",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "php": ">=5.3.3",
+                "phpunit/php-code-coverage": "~1.2",
+                "phpunit/php-file-iterator": "~1.3",
+                "phpunit/php-text-template": "~1.1",
+                "phpunit/php-timer": "~1.0",
+                "phpunit/phpunit-mock-objects": "~1.2",
+                "symfony/yaml": "~2.0"
+            },
+            "require-dev": {
+                "pear-pear.php.net/pear": "1.9.4"
+            },
+            "suggest": {
+                "phpunit/php-invoker": "~1.1"
+            },
+            "bin": [
+                "composer/bin/phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.7.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "PHPUnit/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                "",
+                "../../symfony/yaml/"
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "http://www.phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2014-04-30 12:24:19"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "1.2.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "c39c4511c3b007539eb170c32cbc2af49a07351a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/c39c4511c3b007539eb170c32cbc2af49a07351a",
+                "reference": "c39c4511c3b007539eb170c32cbc2af49a07351a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-text-template": ">=1.1.1@stable"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "3.7.*@dev"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "PHPUnit/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2014-02-16 12:43:56"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "dev-master",
+            "target-dir": "Symfony/Component/Yaml",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Yaml.git",
+                "reference": "9f94dc5d8d7b49a9cb789853278af2b07a0aa4fd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Yaml/zipball/9f94dc5d8d7b49a9cb789853278af2b07a0aa4fd",
+                "reference": "9f94dc5d8d7b49a9cb789853278af2b07a0aa4fd",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Yaml\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "http://symfony.com",
+            "time": "2014-09-17 09:54:14"
+        }
+    ],
+    "aliases": [
+        {
+            "alias": "3.1.x-dev",
+            "alias_normalized": "3.1.9999999.9999999-dev",
+            "version": "dev-docsrewrite",
+            "package": "silverstripe/framework"
         }
     ],
-    "packages-dev": [],
-    "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": {
         "silverstripe/docsviewer": 20,
-        "silverstripe/staticpublisher": 20,
+        "silverstripe/framework": 20,
-        "silverstripe/framework": 0,
+        "phpunit/phpunit": 0
-        "silverstripe/toolbar": 20
     },
     "prefer-stable": false,
     "platform": {
-        "php": ">=5.3.2"
+        "ext-gd": "*",
+        "ext-mbstring": "*"
     },
     "platform-dev": []
 }

themes/docs/templates/DocumentationViewer.ss

@@ -1,93 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-	<head>
-		<% base_tag %>
-		<meta charset="utf-8" />
-		<title><% if PageTitle %>$PageTitle <% end_if %>SilverStripe Documentation</title>
-		<link rel="stylesheet" href="themes/docs/css/ionicons.min.css" />
-		<script type="text/javascript" src="//use.typekit.net/emt4dhq.js"></script>
-		<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
-		<script>window.GLOBAL_NAV_SECONDARY_ID = 1560;</script>
-	</head>
-	
-	<body class="theme-theme1">
-		<header data-0="background-position: 50% 50%;" data-544="background-position: 50% -30%;">
-			<div class="global-nav header-mask">
-				<div id="navWrapper">
-					$GlobalNav
-					<% include SearchBox %>
-				</div>
-			</div>
-		</header>
-		<div id="container" class="container">
-			<div id="header">
-				<h1>
-					<a href="$Top.Link" title="Documentation"><span><% _t('SILVERSTRIPEDOCUMENTATION', 'Documentation') %></span></a>
-				</h1>
-			</div>
-			
-			
-			<div id="layout">
-				<div id="search-bar">
-					<div id="search">
-						$DocumentationSearchForm
-					</div>
-					<div id="top-nav">
-
-						<% if Entities %>
-						<div id="entities-nav" class="documentation-nav clearfix">
-							<h2>Modules:</h2>
-								<ul>
-								<% loop Entities %>
-									<li><a href="$Link" class="$LinkingMode">$Title</a></li>
-								<% end_loop %>
-							</ul>
-							
-							<div class="clear"><!-- --></div>
-						</div>
-						<% end_if %>
-											
-						<% if Versions %>
-						<div id="versions-nav" class="documentation-nav clearfix">
-							<h2>Versions:</h2>
-								<ul>
-								<% loop Versions %>
-									<li><a href="$Link" class="$LinkingMode">$Title</a></li>
-								<% end_loop %>
-							</ul>
-						</div>
-						<% end_if %>
-					</div>
-				</div>
-				
-				<div id="content" class="typography">
-					$Layout
-				</div>
-			</div>
-		</div>
-		
-		<div id="footer">
-			<p>Documentation powered by <a href="http://www.silverstripe.org">SilverStripe</a> (<a href="https://github.com/silverstripe/doc.silverstripe.org">code</a>). <a href="{$BaseHref}sapphire/en/misc/contributing/documentation">Contribute to doc.silverstripe.org</a>, <a href="https://github.com/silverstripe/sapphire/issues/new?labels=documentation">raise a bug or enhancement ticket</a>.
-			<br />Except where otherwise noted, content on this wiki is licensed under <a class="urlextern" rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">CC Attribution-Noncommercial-Share Alike 3.0 Unported</a><a href="http://creativecommons.org/licenses/by/3.0/nz/" rel="license"><img class="cc-logo" src="http://i.creativecommons.org/l/by/3.0/nz/80x15.png" style="border-width: 0pt;" alt="Creative Commons License"></a></p>
-		</div>
-		
-		<script src="framework/thirdparty/jquery/jquery.js"></script>
-
-		<% if GoogleAnalyticsCode %>
-		<script type="text/javascript">
-
-		  var _gaq = _gaq || [];
-		  _gaq.push(['_setAccount', '$GoogleAnalyticsCode']);
-		  _gaq.push(['_trackPageview']);
-
-		  (function() {
-		    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-		    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-		    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-		  })();
-
-		</script>
-		<% end_if %>
-	</body>
-</html>

themes/docs/templates/Includes/DocumentationComments.ss

@@ -2,8 +2,7 @@
 	<h2>Comments</h2>
 
 	<p class="notice">
-			<strong>Comment policy:</strong> Please use comments for <strong>tips and corrections</strong> about the described 
+			<strong>Comment policy:</strong> Please use comments for <strong>tips and corrections</strong> about the described functionality. <br />
-	functionality. <br />
 	Comments are moderated, we reserve the right to remove comments that are inappropriate or are no longer relevant. Use the <strong><a href="http://silverstripe.com/silverstripe-forum">Silverstripe Forum</a></strong> to ask questions.
 	</p>
 

themes/docs/templates/Includes/DocumentationFooter.ss

@@ -0,0 +1,5 @@
+<div id="footer">
+	<p>Documentation powered by <a href="http://www.silverstripe.org">SilverStripe</a> (<a href="https://github.com/silverstripe/doc.silverstripe.org">code</a>). <a href="{$BaseHref}sapphire/en/misc/contributing/documentation">Contribute to doc.silverstripe.org</a>, <a href="https://github.com/silverstripe/sapphire/issues/new?labels=documentation">raise a bug or enhancement ticket</a>. Except where otherwise noted, content on this wiki is licensed under <a class="urlextern" rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">CC Attribution-Noncommercial-Share Alike 3.0 Unported</a></p>
+
+	<p><a href="http://creativecommons.org/licenses/by/3.0/nz/" rel="license"><img class="cc-logo" src="http://i.creativecommons.org/l/by/3.0/nz/80x15.png" style="border-width: 0pt;" alt="Creative Commons License"></a></p>
+</div>

themes/docs/templates/Includes/DocumentationHead.ss

@@ -0,0 +1,21 @@
+<head>
+	<% base_tag %>
+	<meta charset="utf-8" />
+	<title><% if Title %>$Title &#8211; <% end_if %>SilverStripe Documentation</title>
+	<link rel="stylesheet" href="themes/docs/css/ionicons.min.css" />
+	
+	<script type="text/javascript" src="//use.typekit.net/emt4dhq.js"></script>
+	<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
+	<script>window.GLOBAL_NAV_SECONDARY_ID = 1560;</script>
+</head>
+
+<body class="theme-theme1">
+
+<header data-0="background-position: 50% 50%;" data-544="background-position: 50% -30%;">
+	<div class="global-nav header-mask">
+		<div id="navWrapper">
+			$GlobalNav
+			<% include SearchBox %>
+		</div>
+	</div>
+</header>

themes/docs/templates/Includes/Sidebar.ss

@@ -1,36 +0,0 @@
-<div id="sidebar">
-	<% if Menu(2) %>	
-		<ul id="sub-navigation">
-			<% control Menu(2) %>
-				<li class="$LinkingMode">
-					<a href="$Link">$MenuTitle</a>
-					
-					<% if LinkOrSection = section %>
-						<% if Children %>
-							<ul>
-								<% control Children %>
-									<li class="$LinkingMode">
-										<a href="$Link">$MenuTitle</a>
-										
-										
-										<% if LinkOrSection = section %>
-											<% if Children %>
-												<ul>
-													<% control Children %>
-														<li class="$LinkingMode">
-															<a href="$Link">$MenuTitle</a>
-														</li>
-													<% end_control %>
-												</ul>
-											<% end_if %>
-										<% end_if %>
-									</li>	
-								<% end_control %>
-							</ul>
-						<% end_if %>
-					<% end_if %>
-				</li>
-			<% end_control %>
-		</ul>
-	<% end_if %>
-</div>

themes/docs/templates/Layout/DocumentationViewer.ss

@@ -1,32 +0,0 @@
-<% if VersionWarning %>
-	<% include DocumentationVersion_warning %>
-<% end_if %>
-
-<div id="documentation-page">
-	<div id="content-column">
-		<% if Breadcrumbs %>
-			<% include DocBreadcrumbs %>
-		<% end_if %>
-
-
-		$Content
-		
-		<% if EditLink %>
-			<div id="edit-link">
-				<p>
-					<a target="_blank" href="$EditLink">
-						Edit this page <small>(requires github.com login)</small>
-					</a>
-				</p>
-			</div>
-		<% end_if %>
-		
-		<% include Comments %>
-	</div>
-
-	<% if Content %>
-	<div id="sidebar-column">
-		<% include DocInThisModule %>
-	</div>
-	<% end_if %>
-</div>

themes/docs/templates/Layout/Page.ss

@@ -1,11 +0,0 @@
-<% if Menu(2) %>
-	<% include Sidebar %>
-<% end_if %>
-
-<div id="content-column" class="<% if Menu(2) %>has-sidebar<% end_if %>">
-	<h2>$Title</h2>
-
-	$Content
-	$Form
-	$PageComments
-</div>

themes/docs/templates/Layout/Page_results.ss

@@ -1,46 +0,0 @@
-<div class="typography">
-	<% if Results %>
-		<ul id="search-results">
-			<% control Results %>
-				<li>
-					<% if MenuTitle %>
-						<h3 class="search-results-header"><a href="$Link">$MenuTitle</a></h3>
-					<% else %>
-						<h3><a class="search-results-header" href="$Link">$Title</a></h3>
-					<% end_if %>
-					
-					<% if Content %>
-						$Content.FirstParagraph(html)
-					<% end_if %>
-					
-					<a class="read-more-link" href="$Link" title="Read more about &quot;{$Title}&quot;">Read more about &quot;{$Title}&quot;...</a>
-				</li>
-			<% end_control %>
-		</ul>
-		
-		<% else %>
-			<p>Sorry, your search query did not return any results.</p>
-		<% end_if %>
-
-		<% if Results.MoreThanOnePage %>
-			<div id="page-numbers">
-				<% if Results.NotLastPage %>
-					<a class="next" href="$Results.NextLink" title="View the next page">Next</a>
-				<% end_if %>
-				
-				<% if Results.NotFirstPage %>
-					<a class="prev" href="$Results.PrevLink" title="View the previous page">Prev</a>
-				<% end_if %>
-
-				<span>
-					<% control Results.SummaryPagination(5) %>
-						<% if CurrentBool %>
-							$PageNum
- 						<% else %>
-							<a href="$Link" title="View page number $PageNum">$PageNum</a>
-						<% end_if %>
-					<% end_control %>
-				</span>
-			</div>
-	 <% end_if %>
-</div>

themes/docs/templates/Layout/Security.ss

@@ -1,6 +0,0 @@
-<div id="login-container">
-	<h2>$Title</h2>
-	$Content
-	$Form
-	
-</div>