From 6c0150128eb0226484b4e62944f32af83bd52783 Mon Sep 17 00:00:00 2001 From: Ed Linklater Date: Wed, 1 Jul 2015 16:17:55 +1200 Subject: [PATCH] Use protocolless URLs where possible. Fixes silverstripe/silverstripe-globaltoolbar#26 --- app/_config/toolbar.yml | 5 +++-- themes/docs/templates/Includes/DocumentationFooter.ss | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/_config/toolbar.yml b/app/_config/toolbar.yml index cab625f..35c8ae0 100644 --- a/app/_config/toolbar.yml +++ b/app/_config/toolbar.yml @@ -3,12 +3,13 @@ After: - toolbar/* --- GlobalNav: - hostname: 'http://www.silverstripe.org/' + hostname: '//www.silverstripe.org/' css_path: '/themes/ssv3/css/toolbar.css' + snippet_path: '/assets/global-nav.html' use_localhost: false GlobalNavTemplateProvider: connection_timeout: 2000 transfer_timeout: 6000 SiteController: extensions: - - GlobalNavExtension \ No newline at end of file + - GlobalNavExtension diff --git a/themes/docs/templates/Includes/DocumentationFooter.ss b/themes/docs/templates/Includes/DocumentationFooter.ss index fdad592..d08b008 100644 --- a/themes/docs/templates/Includes/DocumentationFooter.ss +++ b/themes/docs/templates/Includes/DocumentationFooter.ss @@ -1,5 +1,5 @@