From 6b84e38c6efe46bf5936e8add4d5ec7b05e35b2f Mon Sep 17 00:00:00 2001
From: Spencer Bliven <spencer.bliven@gmail.com>
Date: Mon, 17 Jun 2019 14:15:11 +0200
Subject: [PATCH] Removing site.baseurl.

baseurl is important for cross-site theme compatibility.
Unfortunately our gitlab instance provides the incorrect baseurl.

This is a hack. If the configuration gets fixed this commit should
be reverted.
---
 _includes/footer.html       |  2 +-
 _includes/head.html         | 20 ++++++++++----------
 _includes/head_print.html   | 16 ++++++++--------
 _includes/image.html        |  2 +-
 _includes/inline_image.html |  2 +-
 _includes/topnav.html       |  4 ++--
 pdfconfigs/titlepage.html   |  2 +-
 pdfconfigs/tocpage.html     |  4 ++--
 8 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/_includes/footer.html b/_includes/footer.html
index bdaa613..86b2b43 100755
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -3,7 +3,7 @@
                 <div class="col-lg-12 footer">
                &copy;{{ site.time | date: "%Y"  }} {{site.company_name}}. All rights reserved. <br />
 {% if page.last_updated %}<span>Page last updated:</span> {{page.last_updated}}<br/>{% endif %} Site last generated: {{ site.time | date: "%b %-d, %Y"  }} <br />
-<p><img src="{{ "/images/company_logo.png"| prepend: site.baseurl | prepend: site.url }}" alt="Company logo"/></p>
+<p><img src="{{ "/images/company_logo.png"}}" alt="Company logo"/></p>
                 </div>
             </div>
 </footer>
diff --git a/_includes/head.html b/_includes/head.html
index 0191c4c..8c5a397 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -4,32 +4,32 @@
 <meta name="description" content="{% if page.summary %}{{ page.summary | strip_html | strip_newlines | truncate: 160 }}{% endif %}">
 <meta name="keywords" content="{{page.tags}}{% if page.tags %}, {% endif %} {{page.keywords}}">
 <title>{{ page.title }} | {{ site.site_title }}</title>
-<link rel="stylesheet" href="{{ "/css/syntax.css" | prepend: site.baseurl | prepend: site.url}}">
+<link rel="stylesheet" href="{{ "/css/syntax.css"}}">
 
 <link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-<!--<link rel="stylesheet" type="text/css" href="{{ "/css/bootstrap.min.css"| prepend: site.baseurl | prepend: site.url }}">-->
-<link rel="stylesheet" href="{{ "/css/modern-business.css"| prepend: site.baseurl | prepend: site.url }}">
+<!--<link rel="stylesheet" type="text/css" href="{{ "/css/bootstrap.min.css"}}">-->
+<link rel="stylesheet" href="{{ "/css/modern-business.css"}}">
 <!-- Latest compiled and minified CSS -->
 <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
-<link rel="stylesheet" href="{{ "/css/customstyles.css"| prepend: site.baseurl | prepend: site.url }}">
-<link rel="stylesheet" href="{{ "/css/boxshadowproperties.css"| prepend: site.baseurl | prepend: site.url }}">
+<link rel="stylesheet" href="{{ "/css/customstyles.css"}}">
+<link rel="stylesheet" href="{{ "/css/boxshadowproperties.css"}}">
 <!-- most color styles are extracted out to here -->
-<link rel="stylesheet" href="{{ "/css/theme-blue.css"| prepend: site.baseurl | prepend: site.url }}">
+<link rel="stylesheet" href="{{ "/css/theme-blue.css"}}">
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-cookie/1.4.1/jquery.cookie.min.js"></script>
-<script src="{{ "/js/jquery.navgoco.min.js"| prepend: site.baseurl | prepend: site.url }}"></script>
+<script src="{{ "/js/jquery.navgoco.min.js"}}"></script>
 
 
 <!-- Latest compiled and minified JavaScript -->
 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
 <!-- Anchor.js -->
 <script src="https://cdnjs.cloudflare.com/ajax/libs/anchor-js/4.2.0/anchor.min.js"></script>
-<script src="{{ "/js/toc.js"| prepend: site.baseurl | prepend: site.url }}"></script>
-<script src="{{ "/js/customscripts.js"| prepend: site.baseurl | prepend: site.url }}"></script>
+<script src="{{ "/js/toc.js"}}"></script>
+<script src="{{ "/js/customscripts.js"}}"></script>
 
-<link rel="shortcut icon" href="{{ "/images/favicon.ico"| prepend: site.baseurl | prepend: site.url }}">
+<link rel="shortcut icon" href="{{ "/images/favicon.ico"}}">
 
 <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
 <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
diff --git a/_includes/head_print.html b/_includes/head_print.html
index 12b861e..0dd522b 100644
--- a/_includes/head_print.html
+++ b/_includes/head_print.html
@@ -6,14 +6,14 @@
 <title>{% if page.homepage == true %} {{site.homepage_title}} {% elsif page.title %}{{ page.title }}{% endif %}  | {{ site.site_title }}</title>
 
 
-<link rel="stylesheet" href="{{ "/css/syntax.css" | prepend: site.baseurl | prepend: site.url }}">
-<link rel="stylesheet" href="{{ "/css/font-awesome.min.css" | prepend: site.baseurl | prepend: site.url }}">
-<link rel="stylesheet" href="{{ "/css/bootstrap.min.css" | prepend: site.baseurl | prepend: site.url }}">
-<link rel="stylesheet" href="{{ "/css/modern-business.css" | prepend: site.baseurl | prepend: site.url }}">
-<link rel="stylesheet" href="{{ "/css/customstyles.css" | prepend: site.baseurl | prepend: site.url }}">
-<link rel="stylesheet" href="{{ "/css/theme-blue.css" | prepend: site.baseurl | prepend: site.url }}">
-<link rel="stylesheet" href="{{ "/css/syntax.css" | prepend: site.baseurl | prepend: site.url }}">
-<link rel="stylesheet" href="{{ "/css/printstyles.css" | prepend: site.baseurl }}">
+<link rel="stylesheet" href="{{ "/css/syntax.css" }}">
+<link rel="stylesheet" href="{{ "/css/font-awesome.min.css" }}">
+<link rel="stylesheet" href="{{ "/css/bootstrap.min.css" }}">
+<link rel="stylesheet" href="{{ "/css/modern-business.css" }}">
+<link rel="stylesheet" href="{{ "/css/customstyles.css" }}">
+<link rel="stylesheet" href="{{ "/css/theme-blue.css" }}">
+<link rel="stylesheet" href="{{ "/css/syntax.css" }}">
+<link rel="stylesheet" href="{{ "/css/printstyles.css" }}">
 
 <script>
     Prince.addScriptFunc("datestamp", function() {
diff --git a/_includes/image.html b/_includes/image.html
index aaee858..de8902f 100644
--- a/_includes/image.html
+++ b/_includes/image.html
@@ -1 +1 @@
-<figure>{% if {{include.url}} %}<a class="no_icon" target="_blank" rel="noopener" href="{{include.url}}">{% endif %}<img class="docimage" src="{{ "/images/"| prepend: site.baseurl | prepend: site.url }}{{include.file}}" alt="{{include.alt}}" {% if {{include.max-width}} %}style="max-width: {{include.max-width}}px"{% endif %} />{% if {{include.url}} %}</a>{% endif %}{% if {{include.caption}} %}<figcaption>{{include.caption}}</figcaption>{% endif %}</figure>
+<figure>{% if {{include.url}} %}<a class="no_icon" target="_blank" rel="noopener" href="{{include.url}}">{% endif %}<img class="docimage" src="{{ "/images/"}}{{include.file}}" alt="{{include.alt}}" {% if {{include.max-width}} %}style="max-width: {{include.max-width}}px"{% endif %} />{% if {{include.url}} %}</a>{% endif %}{% if {{include.caption}} %}<figcaption>{{include.caption}}</figcaption>{% endif %}</figure>
diff --git a/_includes/inline_image.html b/_includes/inline_image.html
index 2ae9817..9139bbd 100644
--- a/_includes/inline_image.html
+++ b/_includes/inline_image.html
@@ -1 +1 @@
-<img class="inline" src="{{ "/images/"| prepend: site.baseurl | prepend: site.url }}{{include.file}}" alt="{{include.alt}}" />
+<img class="inline" src="{{ "/images/"}}{{include.file}}" alt="{{include.alt}}" />
diff --git a/_includes/topnav.html b/_includes/topnav.html
index 4decdea..61d32b4 100644
--- a/_includes/topnav.html
+++ b/_includes/topnav.html
@@ -60,12 +60,12 @@
                         <input type="text" id="search-input" placeholder="{{site.data.strings.search_placeholder_text}}">
                         <ul id="results-container"></ul>
                     </div>
-                    <script src="{{ "/js/jekyll-search.js"| prepend: site.baseurl | prepend: site.url }}" type="text/javascript"></script>
+                    <script src="{{ "/js/jekyll-search.js"}}" type="text/javascript"></script>
                     <script type="text/javascript">
                             SimpleJekyllSearch.init({
                                 searchInput: document.getElementById('search-input'),
                                 resultsContainer: document.getElementById('results-container'),
-                                dataSource: '{{ "/search.json"| prepend: site.baseurl | prepend: site.url }}',
+                                dataSource: '{{ "/search.json"}}',
                                 searchResultTemplate: '<li><a href="{url}" title="{{page.title | escape }}">{title}</a></li>',
                     noResultsText: '{{site.data.strings.search_no_results_text}}',
                             limit: 10,
diff --git a/pdfconfigs/titlepage.html b/pdfconfigs/titlepage.html
index 3534bc2..6575385 100644
--- a/pdfconfigs/titlepage.html
+++ b/pdfconfigs/titlepage.html
@@ -10,7 +10,7 @@ permalink: /titlepage.html/
     <hr />
 
     <div class="printTitleImage">
-        <img src="{{site.url}}/{{site.baseurl}}/images/company_logo_big.png" alt="Company Logo"/>
+        <img src="/images/company_logo_big.png" alt="Company Logo"/>
     </div>
 
     <div class="copyrightBoilerplate">
diff --git a/pdfconfigs/tocpage.html b/pdfconfigs/tocpage.html
index 5affb96..a6745c3 100644
--- a/pdfconfigs/tocpage.html
+++ b/pdfconfigs/tocpage.html
@@ -18,14 +18,14 @@ permalink: /tocpage.html/
             <ul>
                 {% for folderitem in folder.folderitems %}
                 {% if folderitem.output contains "pdf" and folderitem.type != "frontmatter"%}
-                <li><a href="{{folderitem.url | prepend: site.baseurl}}">{{folderitem.title}}</a>
+                <li><a href="{{folderitem.url }}">{{folderitem.title}}</a>
                     {% for subfolders in folderitem.subfolders %}
                     {% if subfolders.output contains "pdf" and subfolders.type != "frontmatter" %}
                 <li class="sectionHead">{{ subfolders.title }}
                     <ul>
                         {% for subfolderitem in subfolders.subfolderitems%}
                         {% if subfolderitem.output contains "pdf" and subfolderitem.type != "frontmatter"%}
-                        <li><a href="{{subfolderitem.url | prepend: site.baseurl}}">{{subfolderitem.title}}</a></li>
+                        <li><a href="{{subfolderitem.url }}">{{subfolderitem.title}}</a></li>
                         {% endif %}
                         {% endfor %}
                     </ul>