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.
This commit is contained in:
Spencer Bliven 2019-06-17 14:15:11 +02:00
parent 5c04f2167b
commit 6b84e38c6e
8 changed files with 26 additions and 26 deletions

View File

@ -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>

View File

@ -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:// -->

View File

@ -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() {

View File

@ -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>

View File

@ -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}}" />

View File

@ -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,

View File

@ -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">

View File

@ -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>