From 865be39b6d0b7b64a5ed55f66602e70e108df89c Mon Sep 17 00:00:00 2001 From: Cam Findlay Date: Tue, 13 Oct 2015 11:17:09 +1300 Subject: [PATCH] Update version UI for archive and more obvious stable --- app/_config/docsviewer.yml | 2 +- app/_config/toolbar.yml | 2 +- composer.json | 4 +- composer.lock | 52 +++++++++---------- themes/docs/css/styles.css | 12 +++++ .../templates/Includes/DocumentationHead.ss | 4 +- .../Includes/DocumentationVersions.ss | 17 ++++++ 7 files changed, 61 insertions(+), 32 deletions(-) create mode 100644 themes/docs/css/styles.css create mode 100644 themes/docs/templates/Includes/DocumentationVersions.ss diff --git a/app/_config/docsviewer.yml b/app/_config/docsviewer.yml index fa17d3a..0fd700f 100644 --- a/app/_config/docsviewer.yml +++ b/app/_config/docsviewer.yml @@ -25,12 +25,12 @@ DocumentationManifest: Path: "src/framework_3.2/docs/" Title: "Framework" Version: "3.2" + Stable: true DefaultEntity: true - Path: "src/framework_3.1/docs/" Title: "Framework" Version: "3.1" - Stable: true DefaultEntity: true - Path: "src/framework_3.0/docs/" diff --git a/app/_config/toolbar.yml b/app/_config/toolbar.yml index c36c6a3..b78334e 100644 --- a/app/_config/toolbar.yml +++ b/app/_config/toolbar.yml @@ -32,6 +32,6 @@ Only: --- GlobalNav: hostname: '//www.silverstripe.org/' - css_path: '/themes/ssv3/css/toolbar.min.css' snippet_path: '/assets' + css_path: '/themes/ssv3/css/toolbar.min.css' use_localhost: false \ No newline at end of file diff --git a/composer.json b/composer.json index 7222b0a..265ff26 100644 --- a/composer.json +++ b/composer.json @@ -4,8 +4,8 @@ "require": { "ext-gd": "*", "ext-mbstring": "*", - "silverstripe/docsviewer": "1.0.1@stable", - "silverstripe/framework": "3.1.*@stable", + "silverstripe/docsviewer": "dev-develop", + "silverstripe/framework": "3.2.*@stable", "silverstripe/toolbar": "^4.0" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 884e5d3..c750dc3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +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": "0be2b6b2c16bb78fa33b01b6010049b0", - "content-hash": "09785a5677261c87f8d63483bc4635c2", + "hash": "4433c3fe37a77dd6b443beea1a7f3b98", + "content-hash": "6d85c8529bc3e18fe8f3d1f27f4be506", "packages": [ { "name": "composer/installers", @@ -187,16 +187,16 @@ }, { "name": "silverstripe/docsviewer", - "version": "1.0.1", + "version": "dev-develop", "source": { "type": "git", "url": "https://github.com/silverstripe/silverstripe-docsviewer.git", - "reference": "3a239fcdfa7afb389f5304ac0e7b8cacc3afb642" + "reference": "720b35d8311a65800ca2ad2f4afea39a76e46e55" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/3a239fcdfa7afb389f5304ac0e7b8cacc3afb642", - "reference": "3a239fcdfa7afb389f5304ac0e7b8cacc3afb642", + "url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/720b35d8311a65800ca2ad2f4afea39a76e46e55", + "reference": "720b35d8311a65800ca2ad2f4afea39a76e46e55", "shasum": "" }, "require": { @@ -224,28 +224,28 @@ "documentation", "silverstripe" ], - "time": "2015-04-30 23:18:36" + "time": "2015-10-12 21:30:27" }, { "name": "silverstripe/framework", - "version": "3.1.15", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/silverstripe/silverstripe-framework.git", - "reference": "c2a407a01b362981d070d6062fef52c8679e4a2b" + "reference": "0092792568fb8a33674669aa200c7c81b163a365" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/c2a407a01b362981d070d6062fef52c8679e4a2b", - "reference": "c2a407a01b362981d070d6062fef52c8679e4a2b", + "url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/0092792568fb8a33674669aa200c7c81b163a365", + "reference": "0092792568fb8a33674669aa200c7c81b163a365", "shasum": "" }, "require": { - "composer/installers": "*", - "php": ">=5.3.2,<7" + "composer/installers": "~1.0", + "php": ">=5.3.3,<7" }, "require-dev": { - "phpunit/phpunit": "~3.7@stable" + "phpunit/phpunit": "~3.7" }, "type": "silverstripe-module", "autoload": { @@ -273,20 +273,20 @@ "framework", "silverstripe" ], - "time": "2015-09-18 02:51:04" + "time": "2015-10-11 19:44:34" }, { "name": "silverstripe/toolbar", - "version": "4.0.0", + "version": "4.0.7", "source": { "type": "git", "url": "https://github.com/silverstripe/silverstripe-globaltoolbar.git", - "reference": "739fcafcae112cd01010e3808c244bf5385796ae" + "reference": "e3e0c35ca30fcae8e9bfd9ea74c977c228b9b43c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silverstripe/silverstripe-globaltoolbar/zipball/739fcafcae112cd01010e3808c244bf5385796ae", - "reference": "739fcafcae112cd01010e3808c244bf5385796ae", + "url": "https://api.github.com/repos/silverstripe/silverstripe-globaltoolbar/zipball/e3e0c35ca30fcae8e9bfd9ea74c977c228b9b43c", + "reference": "e3e0c35ca30fcae8e9bfd9ea74c977c228b9b43c", "shasum": "" }, "require": { @@ -314,10 +314,10 @@ "silverstripe" ], "support": { - "source": "https://github.com/silverstripe/silverstripe-globaltoolbar/tree/master", + "source": "https://github.com/silverstripe/silverstripe-globaltoolbar/tree/4.0.7", "issues": "https://github.com/silverstripe/silverstripe-globaltoolbar/issues" }, - "time": "2015-10-11 21:48:24" + "time": "2015-10-13 01:37:18" }, { "name": "unclecheese/display-logic", @@ -741,12 +741,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "725887b209844abda9d864de722515d0fc13dd75" + "reference": "ff7f886a33f5b7a26a94d62f6e14bb9cf0e3bf5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/725887b209844abda9d864de722515d0fc13dd75", - "reference": "725887b209844abda9d864de722515d0fc13dd75", + "url": "https://api.github.com/repos/symfony/yaml/zipball/ff7f886a33f5b7a26a94d62f6e14bb9cf0e3bf5d", + "reference": "ff7f886a33f5b7a26a94d62f6e14bb9cf0e3bf5d", "shasum": "" }, "require": { @@ -779,13 +779,13 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2015-10-11 08:29:26" + "time": "2015-10-12 11:16:35" } ], "aliases": [], "minimum-stability": "dev", "stability-flags": { - "silverstripe/docsviewer": 0, + "silverstripe/docsviewer": 20, "silverstripe/framework": 0, "phpunit/phpunit": 0 }, diff --git a/themes/docs/css/styles.css b/themes/docs/css/styles.css new file mode 100644 index 0000000..795ad8c --- /dev/null +++ b/themes/docs/css/styles.css @@ -0,0 +1,12 @@ +.has_versions .versions { + float: left; +} + +.has_versions .versions .stable { + background: rgb(3, 91, 136); + color: #FFF; +} + +#VersionsArchive { + float: right; +} \ No newline at end of file diff --git a/themes/docs/templates/Includes/DocumentationHead.ss b/themes/docs/templates/Includes/DocumentationHead.ss index 25703fd..d7e4232 100644 --- a/themes/docs/templates/Includes/DocumentationHead.ss +++ b/themes/docs/templates/Includes/DocumentationHead.ss @@ -3,7 +3,7 @@ <% if Title %>$Title – <% end_if %>SilverStripe Documentation - + @@ -12,7 +12,7 @@
-
+