Remove trailing slash from configured site.url This is because in plugins/liquid templates, page.url includes a *leading* slash
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/commit/bc888e61 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/tree/bc888e61 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/diff/bc888e61 Branch: refs/heads/master Commit: bc888e61a51dab27d257206c7cd832e3027d18d3 Parents: 30dea9e Author: Richard Downer <[email protected]> Authored: Thu Aug 21 16:41:10 2014 +0100 Committer: Richard Downer <[email protected]> Committed: Thu Aug 21 17:47:55 2014 +0100 ---------------------------------------------------------------------- _config.yml | 2 +- _layouts/base.html | 16 ++++++++-------- _plugins/brooklyn_metadata.rb | 2 +- _scripts/build-preview | 2 +- documentation.md | 2 +- quickstart/index.md | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/bc888e61/_config.yml ---------------------------------------------------------------------- diff --git a/_config.yml b/_config.yml index eb92c57..25784b0 100644 --- a/_config.yml +++ b/_config.yml @@ -1,2 +1,2 @@ exclude: ['LICENSE.md', 'README.md', 'Gemfile', 'Gemfile.lock' ] -url: https://brooklyn.incubator.apache.org/ +url: https://brooklyn.incubator.apache.org http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/bc888e61/_layouts/base.html ---------------------------------------------------------------------- diff --git a/_layouts/base.html b/_layouts/base.html index 996c1c2..7d5e84d 100644 --- a/_layouts/base.html +++ b/_layouts/base.html @@ -6,8 +6,8 @@ <meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css";> -<link href="{{site.url}}style/css/bootstrap-theme.css" rel="stylesheet"> -<link href="{{site.url}}style/css/theme.css" rel="stylesheet"> +<link href="{{site.url}}/style/css/bootstrap-theme.css" rel="stylesheet"> +<link href="{{site.url}}/style/css/theme.css" rel="stylesheet"> </head> <body> @@ -23,17 +23,17 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - {% if page.navgroup != 'home' %}<a class="navbar-brand" href="{{site.url}}"><img src="{{site.url}}style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>{% endif %} + {% if page.navgroup != 'home' %}<a class="navbar-brand" href="{{site.url}}"><img src="{{site.url}}/style/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>{% endif %} </div> <!-- Collect the nav links, forms, and other content for toggling --> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> <ul class="nav navbar-nav navbar-right"> - <li class="{% if page.navgroup == 'learnmore' %}active{% endif %}"><a href="{{site.url}}learnmore.html">learn more</a></li> - <li class="{% if page.navgroup == 'download' %}active{% endif %}"><a href="{{site.url}}download.html">download</a></li> - <li class="{% if page.navgroup == 'getstarted' %}active{% endif %}"><a href="{{site.url}}quickstart/">get started</a></li> - <li class="{% if page.navgroup == 'docs' %}active{% endif %}"><a href="{{site.url}}documentation.html">documentation</a></li> - <li class="{% if page.navgroup == 'community' %}active{% endif %}"><a href="{{site.url}}community/">community</a></li> + <li class="{% if page.navgroup == 'learnmore' %}active{% endif %}"><a href="{{site.url}}/learnmore.html">learn more</a></li> + <li class="{% if page.navgroup == 'download' %}active{% endif %}"><a href="{{site.url}}/download.html">download</a></li> + <li class="{% if page.navgroup == 'getstarted' %}active{% endif %}"><a href="{{site.url}}/quickstart/">get started</a></li> + <li class="{% if page.navgroup == 'docs' %}active{% endif %}"><a href="{{site.url}}/documentation.html">documentation</a></li> + <li class="{% if page.navgroup == 'community' %}active{% endif %}"><a href="{{site.url}}/community/">community</a></li> </ul> </div><!-- /.navbar-collapse --> </div><!-- /.container-fluid --> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/bc888e61/_plugins/brooklyn_metadata.rb ---------------------------------------------------------------------- diff --git a/_plugins/brooklyn_metadata.rb b/_plugins/brooklyn_metadata.rb index 724906e..32020a1 100644 --- a/_plugins/brooklyn_metadata.rb +++ b/_plugins/brooklyn_metadata.rb @@ -48,7 +48,7 @@ module BrooklynMetadata } end - url_set['userguide'] = "#{site.config['url']}v/#{BrooklynMetadata::BROOKLYN_VERSION}/" + url_set['userguide'] = "#{site.config['url']}/v/#{BrooklynMetadata::BROOKLYN_VERSION}" site.data['brooklyn'] = { "version" => BrooklynMetadata::BROOKLYN_VERSION, http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/bc888e61/_scripts/build-preview ---------------------------------------------------------------------- diff --git a/_scripts/build-preview b/_scripts/build-preview index 832e449..28ba9dc 100755 --- a/_scripts/build-preview +++ b/_scripts/build-preview @@ -3,7 +3,7 @@ set -x sitedir=$( cd $( dirname $0 ); cd ..; pwd )/_site -siteurl="file://${sitedir}/" +siteurl="file://${sitedir}" echo > _config_local.yml "url: ${siteurl}" rm -rf _site http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/bc888e61/documentation.md ---------------------------------------------------------------------- diff --git a/documentation.md b/documentation.md index ece4353..ec25185 100644 --- a/documentation.md +++ b/documentation.md @@ -8,6 +8,6 @@ navgroup: docs Our main user manual is organised by release version. Please pick the version that you are using: -- [0.7.0-M1]({{ site.url }}v/0.7.0-M1) - +- [0.7.0-M1]({{ site.url }}/v/0.7.0-M1) - Please note that this release was made prior to entering the Apache Incubator, and therefore it is not endorsed by Apache. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn-site/blob/bc888e61/quickstart/index.md ---------------------------------------------------------------------- diff --git a/quickstart/index.md b/quickstart/index.md index cab4a3f..37a7c45 100644 --- a/quickstart/index.md +++ b/quickstart/index.md @@ -81,12 +81,12 @@ Create a `.brooklyn` folder in your home directory and download the template [br {% highlight bash %} $ mkdir ~/.brooklyn $ cd ~/.brooklyn -$ wget {{site.url}}quickstart/brooklyn.properties +$ wget {{site.url}}/quickstart/brooklyn.properties {% endhighlight %} Open brooklyn.properties in a text editor and add your cloud credentials. -If you would rather test Brooklyn on localhost, follow [these instructions]({{ site.data.brooklyn.url.userguide }}use/guide/locations/) to ensure that your Brooklyn can access your machine. +If you would rather test Brooklyn on localhost, follow [these instructions]({{ site.data.brooklyn.url.userguide }}/use/guide/locations/) to ensure that your Brooklyn can access your machine. Restart Brooklyn:
