From 6321cfbb78ff2761665b4282b3c2d28a8a28930a Mon Sep 17 00:00:00 2001 From: Mike Andrewartha Date: Mon, 12 Oct 2015 11:59:50 +1300 Subject: [PATCH] added site header, updated latest version of toolbar, set to test and live urls for docs toolbar yml file set to tag 4.0 --- app/_config/toolbar.yml | 32 ++++++++++-- composer.json | 2 +- composer.lock | 51 +++++++++---------- .../templates/Includes/DocumentationHead.ss | 4 +- 4 files changed, 54 insertions(+), 35 deletions(-) diff --git a/app/_config/toolbar.yml b/app/_config/toolbar.yml index 439ffe5..c36c6a3 100644 --- a/app/_config/toolbar.yml +++ b/app/_config/toolbar.yml @@ -2,14 +2,36 @@ After: - toolbar/* --- -GlobalNav: - hostname: '//www.silverstripe.org/' - css_path: '/themes/ssv3/css/toolbar.css' - snippet_path: '/assets' - use_localhost: false GlobalNavTemplateProvider: connection_timeout: 2000 transfer_timeout: 6000 SiteController: extensions: - GlobalNavExtension +--- +Only: + environment: dev +--- +GlobalNav: + hostname: '//ssorg.dev/' + css_path: '/themes/ssv3/css/toolbar.min.css' + snippet_path: '/assets' + use_localhost: false +--- +Only: + environment: test +--- +GlobalNav: + hostname: '//sssites-ssorg-uat.sites.silverstripe.com/' + css_path: '/themes/ssv3/css/toolbar.min.css' + snippet_path: '/assets' + use_localhost: false +--- +Only: + environment: live +--- +GlobalNav: + hostname: '//www.silverstripe.org/' + css_path: '/themes/ssv3/css/toolbar.min.css' + snippet_path: '/assets' + use_localhost: false \ No newline at end of file diff --git a/composer.json b/composer.json index 541e590..7222b0a 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "ext-mbstring": "*", "silverstripe/docsviewer": "1.0.1@stable", "silverstripe/framework": "3.1.*@stable", - "silverstripe/toolbar": "3.0.*@stable" + "silverstripe/toolbar": "^4.0" }, "require-dev": { "phpunit/PHPUnit": "~3.7@stable" diff --git a/composer.lock b/composer.lock index 09d28db..884e5d3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "2ab3b01a5dd130a4a16bded53ab63508", + "hash": "0be2b6b2c16bb78fa33b01b6010049b0", + "content-hash": "09785a5677261c87f8d63483bc4635c2", "packages": [ { "name": "composer/installers", @@ -227,21 +228,21 @@ }, { "name": "silverstripe/framework", - "version": "3.1.13", + "version": "3.1.15", "source": { "type": "git", "url": "https://github.com/silverstripe/silverstripe-framework.git", - "reference": "04b803dfc6dc60f2e6a38fa74f957156230b54be" + "reference": "c2a407a01b362981d070d6062fef52c8679e4a2b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/04b803dfc6dc60f2e6a38fa74f957156230b54be", - "reference": "04b803dfc6dc60f2e6a38fa74f957156230b54be", + "url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/c2a407a01b362981d070d6062fef52c8679e4a2b", + "reference": "c2a407a01b362981d070d6062fef52c8679e4a2b", "shasum": "" }, "require": { "composer/installers": "*", - "php": ">=5.3.2" + "php": ">=5.3.2,<7" }, "require-dev": { "phpunit/phpunit": "~3.7@stable" @@ -272,20 +273,20 @@ "framework", "silverstripe" ], - "time": "2015-05-28 06:59:11" + "time": "2015-09-18 02:51:04" }, { "name": "silverstripe/toolbar", - "version": "3.0.5", + "version": "4.0.0", "source": { "type": "git", "url": "https://github.com/silverstripe/silverstripe-globaltoolbar.git", - "reference": "aad67d0ebd2c1d469f732934f249836f636549fd" + "reference": "739fcafcae112cd01010e3808c244bf5385796ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silverstripe/silverstripe-globaltoolbar/zipball/aad67d0ebd2c1d469f732934f249836f636549fd", - "reference": "aad67d0ebd2c1d469f732934f249836f636549fd", + "url": "https://api.github.com/repos/silverstripe/silverstripe-globaltoolbar/zipball/739fcafcae112cd01010e3808c244bf5385796ae", + "reference": "739fcafcae112cd01010e3808c244bf5385796ae", "shasum": "" }, "require": { @@ -313,10 +314,10 @@ "silverstripe" ], "support": { - "source": "https://github.com/silverstripe/silverstripe-globaltoolbar/tree/3.0.5", + "source": "https://github.com/silverstripe/silverstripe-globaltoolbar/tree/master", "issues": "https://github.com/silverstripe/silverstripe-globaltoolbar/issues" }, - "time": "2015-07-08 02:55:08" + "time": "2015-10-11 21:48:24" }, { "name": "unclecheese/display-logic", @@ -515,16 +516,16 @@ }, { "name": "phpunit/php-timer", - "version": "1.0.6", + "version": "1.0.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "83fe1bdc5d47658b727595c14da140da92b3d66d" + "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/83fe1bdc5d47658b727595c14da140da92b3d66d", - "reference": "83fe1bdc5d47658b727595c14da140da92b3d66d", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b", + "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b", "shasum": "" }, "require": { @@ -552,7 +553,7 @@ "keywords": [ "timer" ], - "time": "2015-06-13 07:35:30" + "time": "2015-06-21 08:01:12" }, { "name": "phpunit/php-token-stream", @@ -739,21 +740,18 @@ "version": "2.8.x-dev", "source": { "type": "git", - "url": "https://github.com/symfony/Yaml.git", - "reference": "000e7fc2653335cd42c6d21405dac1c74224a387" + "url": "https://github.com/symfony/yaml.git", + "reference": "725887b209844abda9d864de722515d0fc13dd75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/000e7fc2653335cd42c6d21405dac1c74224a387", - "reference": "000e7fc2653335cd42c6d21405dac1c74224a387", + "url": "https://api.github.com/repos/symfony/yaml/zipball/725887b209844abda9d864de722515d0fc13dd75", + "reference": "725887b209844abda9d864de722515d0fc13dd75", "shasum": "" }, "require": { "php": ">=5.3.9" }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7|~3.0.0" - }, "type": "library", "extra": { "branch-alias": { @@ -781,7 +779,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2015-07-01 14:16:54" + "time": "2015-10-11 08:29:26" } ], "aliases": [], @@ -789,7 +787,6 @@ "stability-flags": { "silverstripe/docsviewer": 0, "silverstripe/framework": 0, - "silverstripe/toolbar": 0, "phpunit/phpunit": 0 }, "prefer-stable": false, diff --git a/themes/docs/templates/Includes/DocumentationHead.ss b/themes/docs/templates/Includes/DocumentationHead.ss index 00431df..25703fd 100644 --- a/themes/docs/templates/Includes/DocumentationHead.ss +++ b/themes/docs/templates/Includes/DocumentationHead.ss @@ -11,8 +11,8 @@ -
-
+
+