Fix breakage due to CSP changes
The Apache CSP changed so that we can't load any
scripts, fonts, or images from other URLs.
Therefore all the ones we currently use have to be
put here so they're loaded from the same domain.
Also fix some Jekyll URL templating so that
_config_dev.yml can work properly with modern
Jekyll verisons.
Change-Id:If17ec8dbd1de435c9a0c6edf4dab71e6ede2a5a3
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/incubator-asterixdb-site/+/19508
Reviewed-by: Ian Maxon <imaxon@apache.org>
diff --git a/_includes/nav_header.html b/_includes/nav_header.html
index e056d13..55e55fe 100644
--- a/_includes/nav_header.html
+++ b/_includes/nav_header.html
@@ -15,11 +15,11 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="{{ site.url }}index.html">Overview</a>
+ <a class="navbar-brand" href="{{ site.url }}{{ site.baseurl }}/index.html">Overview</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
- <li><a href="{{ site.url }}download.html">Download</a></li>
+ <li><a href="{{ site.url }}{{ site.baseurl }}/download.html">Download</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Documentation<span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
@@ -30,16 +30,16 @@
<li><a href="{{ site.UNSTABLE_DOCS_BASE_URL }}index.html">Documentation for {{ site.UNSTABLE_VERSION }} <i class="fa fa-external-link fa-sm"></i></a></li>
<li class="divider"></li>
<li class="dropdown-header">Tutorial for SQL Users</li>
- <li><a href="{{ site.url }}files/SQL_Book.pdf">Don Chamberlin's SQL++ for SQL Users<i class="fa fa-external-link fa-sm"></i></a></li>
+ <li><a href="{{ site.url }}{{ site.baseurl }}/files/SQL_Book.pdf">Don Chamberlin's SQL++ for SQL Users<i class="fa fa-external-link fa-sm"></i></a></li>
</ul>
</li>
- <li><a href="{{ site.url }}about.html">About</a></li>
+ <li><a href="{{ site.url }}{{ site.baseurl }}/about.html">About</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Community<span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
- <li><a href="{{ site.url }}community.html">Mailing Lists</a></li>
- <li><a href="{{ site.url }}community.html#irc">IRC</a></li>
- <li><a href="{{ site.url }}community.html#asterixdb-team">Team</a></li>
+ <li><a href="{{ site.url }}{{ site.baseurl }}/community.html">Mailing Lists</a></li>
+ <li><a href="{{ site.url }}{{ site.baseurl }}/community.html#irc">IRC</a></li>
+ <li><a href="{{ site.url }}{{ site.baseurl }}/community.html#asterixdb-team">Team</a></li>
<li><a href="https://issues.apache.org/jira/browse/ASTERIXDB">Issue Tracker</a></li>
</ul>
</li>
@@ -47,13 +47,13 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Development<span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li class="dropdown-header">For New Contributors</li>
- <li><a href="{{ site.url }}dev-setup.html">Development Setup</a></li>
+ <li><a href="{{ site.url }}{{ site.baseurl }}/dev-setup.html">Development Setup</a></li>
<li class="divider"></li>
<li class="dropdown-header">For Committers</li>
- <li><a href="{{ site.url }}pushing.html">Pushing changes</a></li>
- <li><a href="{{ site.url }}site.html">Editing this site</a></li>
+ <li><a href="{{ site.url }}{{ site.baseurl }}/pushing.html">Pushing changes</a></li>
+ <li><a href="{{ site.url }}{{ site.baseurl }}/site.html">Editing this site</a></li>
<li class="dropdown-header">Extensions</li>
- <li><a href="{{ site.url }}extension.html">Extending AsterixDB</a></li>
+ <li><a href="{{ site.url }}{{ site.baseurl }}/extension.html">Extending AsterixDB</a></li>
</ul>
</li>
</ul>