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/_layouts/default.html b/_layouts/default.html
index 5140a25..6fe417d 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -7,24 +7,24 @@
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
<meta name="description" content="">
<meta name="author" content="">
- <link rel="icon" href="{{ site.url }}favicon.ico">
+ <link rel="icon" href="{{ site.url }}{{ site.baseurl }}/favicon.ico">
<meta http-equiv="Content-Security-Policy" content="frame-src youtube.com www.youtube.com">
<title>{{ page.title }}</title>
<!-- Bootstrap core CSS -->
- <link href="{{ site.url }}css/bootstrap.min.css" rel="stylesheet">
+ <link href="{{ site.url }}{{ site.baseurl }}/css/bootstrap.min.css" rel="stylesheet">
<!-- Bootstrap theme -->
<!-- Custom styles for this template -->
- <link href="{{ site.url }}css/theme.css" rel="stylesheet">
+ <link href="{{ site.url }}{{ site.baseurl }}/css/theme.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
- <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
+ <link rel="stylesheet" href="{{ site.url }}{{ site.baseurl }}/css/font-awesome.min.css">
</head>
<div class="container theme-showcase" role="main">
@@ -49,7 +49,7 @@
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
- <script src="{{ site.url }}js/bootstrap.min.js"></script>
+ <script src="{{ site.url }}{{ site.baseurl }}/js/jquery.min.js"></script>
+ <script src="{{ site.url }}{{ site.baseurl }}/js/bootstrap.min.js"></script>
</body>
</html>