From a19a62597f86213549865870a0f8e043c8aac9df Mon Sep 17 00:00:00 2001
From: Greg Wilson <gvwilson@third-bit.com>
Date: Wed, 20 Jul 2016 20:01:47 -0400
Subject: [PATCH] Forcing CSS and Javascript to be loaded via HTTPS.
Using `site.github.url` to refer to the repository fails to load resources when the GitHub Pages site is accessed via HTTPS, because `site.github.url` is `http` protocol. This modifies loads of CSS and Javascript files to always use `https`.
---
_includes/javascript.html | 6 +++---
_layouts/base.html | 8 ++++----
_layouts/workshop.html | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/_includes/javascript.html b/_includes/javascript.html
index c2d678c..ccf0a88 100644
--- a/_includes/javascript.html
+++ b/_includes/javascript.html
@@ -1,3 +1,3 @@
-<script src="{{ site.github.url }}/assets/js/jquery.min.js"></script>
-<script src="{{ site.github.url }}/assets/js/bootstrap.min.js"></script>
-<script src="{{ site.github.url }}/assets/js/lesson.js"></script>
+<script src="{{ site.github.url | replace_first: 'http:', 'https:' }}/assets/js/jquery.min.js"></script>
+<script src="{{ site.github.url | replace_first: 'http:', 'https:' }}/assets/js/bootstrap.min.js"></script>
+<script src="{{ site.github.url | replace_first: 'http:', 'https:' }}/assets/js/lesson.js"></script>
diff --git a/_layouts/base.html b/_layouts/base.html
index 2efa93a..20ce747 100644
--- a/_layouts/base.html
+++ b/_layouts/base.html
@@ -7,10 +7,10 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta http-equiv="last-modified" content="{{ site.time }}">
<meta name="viewport" content="width=device-width, initial-scale=1">
- <meta name="search-domain" value="{{ site.github.url }}">
- <link rel="stylesheet" type="text/css" href="{{ site.github.url }}/assets/css/bootstrap.css" />
- <link rel="stylesheet" type="text/css" href="{{ site.github.url }}/assets/css/bootstrap-theme.css" />
- <link rel="stylesheet" type="text/css" href="{{ site.github.url }}/assets/css/lesson.css" />
+ <meta name="search-domain" value="{{ site.github.url | replace_first: 'http:', 'https:' }}">
+ <link rel="stylesheet" type="text/css" href="{{ site.github.url | replace_first: 'http:', 'https:' }}/assets/css/bootstrap.css" />
+ <link rel="stylesheet" type="text/css" href="{{ site.github.url | replace_first: 'http:', 'https:' }}/assets/css/bootstrap-theme.css" />
+ <link rel="stylesheet" type="text/css" href="{{ site.github.url | replace_first: 'http:', 'https:' }}/assets/css/lesson.css" />
{% if site.carpentry == "swc" %}
<link rel="shortcut icon" type="image/x-icon" href="/favicon-swc.ico" />
{% endif %}
diff --git a/_layouts/workshop.html b/_layouts/workshop.html
index b9367e0..d52ee62 100644
--- a/_layouts/workshop.html
+++ b/_layouts/workshop.html
@@ -25,9 +25,9 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta http-equiv="last-modified" content="{{ site.time }}">
<meta name="viewport" content="width=device-width, initial-scale=1">
- <link rel="stylesheet" type="text/css" href="{{ site.github.url }}/assets/css/bootstrap.css" />
- <link rel="stylesheet" type="text/css" href="{{ site.github.url }}/assets/css/bootstrap-theme.css" />
- <link rel="stylesheet" type="text/css" href="{{ site.github.url }}/assets/css/lesson.css" />
+ <link rel="stylesheet" type="text/css" href="{{ site.github.url | replace_first: 'http:', 'https:' }}/assets/css/bootstrap.css" />
+ <link rel="stylesheet" type="text/css" href="{{ site.github.url | replace_first: 'http:', 'https:' }}/assets/css/bootstrap-theme.css" />
+ <link rel="stylesheet" type="text/css" href="{{ site.github.url | replace_first: 'http:', 'https:' }}/assets/css/lesson.css" />
{% if site.carpentry == "swc" %}
<link rel="shortcut icon" type="image/x-icon" href="/favicon-swc.ico" />
{% endif %}
--
GitLab