mirror of
https://github.com/silverstripe/doc.silverstripe.org
synced 2024-10-22 15:05:50 +00:00
Merge pull request #57 from edlinklater/master
Use new keyed global toolbar
This commit is contained in:
☃ Stephen Shkardoon ☃
commit
1664b534d6
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,5 +1,6 @@
|
||||
/src/
|
||||
.DS_Store
|
||||
.idea/
|
||||
/silverstripe-cache
|
||||
/assets
|
||||
/vendor/
|
||||
@ -8,4 +9,4 @@
|
||||
/cache/
|
||||
/staticpublisher/
|
||||
/toolbar/
|
||||
/display_logic/
|
||||
/display_logic/
|
||||
|
||||
@ -5,11 +5,11 @@ After:
|
||||
GlobalNav:
|
||||
hostname: '//www.silverstripe.org/'
|
||||
css_path: '/themes/ssv3/css/toolbar.css'
|
||||
snippet_path: '/assets/global-nav.html'
|
||||
snippet_path: '/assets'
|
||||
use_localhost: false
|
||||
GlobalNavTemplateProvider:
|
||||
connection_timeout: 2000
|
||||
transfer_timeout: 6000
|
||||
transfer_timeout: 6000
|
||||
SiteController:
|
||||
extensions:
|
||||
- GlobalNavExtension
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
"ext-mbstring": "*",
|
||||
"silverstripe/docsviewer": "1.0.1@stable",
|
||||
"silverstripe/framework": "3.1.*@stable",
|
||||
"silverstripe/toolbar": "2.0.6"
|
||||
"silverstripe/toolbar": "dev-master"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/PHPUnit": "~3.7@stable"
|
||||
|
||||
48
composer.lock
generated
48
composer.lock
generated
@ -4,7 +4,7 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"hash": "035d15b8599bee1c2336843812ab5f8f",
|
||||
"hash": "57dc658522e7400069270f840ff6377d",
|
||||
"packages": [
|
||||
{
|
||||
"name": "composer/installers",
|
||||
@ -276,16 +276,16 @@
|
||||
},
|
||||
{
|
||||
"name": "silverstripe/toolbar",
|
||||
"version": "2.0.6",
|
||||
"version": "dev-master",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/silverstripe/silverstripe-globaltoolbar.git",
|
||||
"reference": "cd20eabf1537b99d52c7655ef2e7b7aa0d9af530"
|
||||
"reference": "c349b4f0126cb5945d1051588abac67803d3e186"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/silverstripe/silverstripe-globaltoolbar/zipball/cd20eabf1537b99d52c7655ef2e7b7aa0d9af530",
|
||||
"reference": "cd20eabf1537b99d52c7655ef2e7b7aa0d9af530",
|
||||
"url": "https://api.github.com/repos/silverstripe/silverstripe-globaltoolbar/zipball/c349b4f0126cb5945d1051588abac67803d3e186",
|
||||
"reference": "c349b4f0126cb5945d1051588abac67803d3e186",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -313,10 +313,10 @@
|
||||
"silverstripe"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/silverstripe/silverstripe-globaltoolbar/tree/2.0.6",
|
||||
"source": "https://github.com/silverstripe/silverstripe-globaltoolbar/tree/master",
|
||||
"issues": "https://github.com/silverstripe/silverstripe-globaltoolbar/issues"
|
||||
},
|
||||
"time": "2015-01-03 17:43:43"
|
||||
"time": "2015-07-07 02:01:10"
|
||||
},
|
||||
{
|
||||
"name": "unclecheese/display-logic",
|
||||
@ -431,12 +431,12 @@
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/php-file-iterator.git",
|
||||
"reference": "a923bb15680d0089e2316f7a4af8f437046e96bb"
|
||||
"reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a923bb15680d0089e2316f7a4af8f437046e96bb",
|
||||
"reference": "a923bb15680d0089e2316f7a4af8f437046e96bb",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
|
||||
"reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -470,20 +470,20 @@
|
||||
"filesystem",
|
||||
"iterator"
|
||||
],
|
||||
"time": "2015-04-02 05:19:05"
|
||||
"time": "2015-06-21 13:08:43"
|
||||
},
|
||||
{
|
||||
"name": "phpunit/php-text-template",
|
||||
"version": "1.2.0",
|
||||
"version": "1.2.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/php-text-template.git",
|
||||
"reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a"
|
||||
"reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
|
||||
"reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
|
||||
"reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -492,20 +492,17 @@
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"classmap": [
|
||||
"Text/"
|
||||
"src/"
|
||||
]
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"include-path": [
|
||||
""
|
||||
],
|
||||
"license": [
|
||||
"BSD-3-Clause"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Sebastian Bergmann",
|
||||
"email": "sb@sebastian-bergmann.de",
|
||||
"email": "sebastian@phpunit.de",
|
||||
"role": "lead"
|
||||
}
|
||||
],
|
||||
@ -514,7 +511,7 @@
|
||||
"keywords": [
|
||||
"template"
|
||||
],
|
||||
"time": "2014-01-30 17:20:04"
|
||||
"time": "2015-06-21 13:50:34"
|
||||
},
|
||||
{
|
||||
"name": "phpunit/php-timer",
|
||||
@ -743,12 +740,12 @@
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Yaml.git",
|
||||
"reference": "a15e132f00e258c2da4cb409eec86d65ea2eabcb"
|
||||
"reference": "000e7fc2653335cd42c6d21405dac1c74224a387"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Yaml/zipball/a15e132f00e258c2da4cb409eec86d65ea2eabcb",
|
||||
"reference": "a15e132f00e258c2da4cb409eec86d65ea2eabcb",
|
||||
"url": "https://api.github.com/repos/symfony/Yaml/zipball/000e7fc2653335cd42c6d21405dac1c74224a387",
|
||||
"reference": "000e7fc2653335cd42c6d21405dac1c74224a387",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -784,7 +781,7 @@
|
||||
],
|
||||
"description": "Symfony Yaml Component",
|
||||
"homepage": "https://symfony.com",
|
||||
"time": "2015-06-18 16:14:27"
|
||||
"time": "2015-07-01 14:16:54"
|
||||
}
|
||||
],
|
||||
"aliases": [],
|
||||
@ -792,6 +789,7 @@
|
||||
"stability-flags": {
|
||||
"silverstripe/docsviewer": 0,
|
||||
"silverstripe/framework": 0,
|
||||
"silverstripe/toolbar": 20,
|
||||
"phpunit/phpunit": 0
|
||||
},
|
||||
"prefer-stable": false,
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<meta charset="utf-8" />
|
||||
<title><% if Title %>$Title – <% 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>
|
||||
@ -14,7 +14,7 @@
|
||||
<header data-0="background-position: 50% 50%;" data-544="background-position: 50% -30%;">
|
||||
<div class="global-nav header-mask">
|
||||
<div id="navWrapper">
|
||||
$GlobalNav
|
||||
$GlobalNav('doc')
|
||||
<% include SearchBox %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user