Skip to content

Commit b400ab2

Browse files
lunacodeslunacodes
committed
Attempt Fix for #121 Deploy Preview urls point to commonwl.org
1 parent ccd6162 commit b400ab2

File tree

11 files changed

+40
-40
lines changed

11 files changed

+40
-40
lines changed

‎content/404.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
<div class="container-404">
3232
<h1>404</h1>
3333
<p><strong>Page not found :(</strong></p>
34-
<p>The requested page could not be found. Please visit our <a href="{{ site.url | absolute_url }}">homepage</a> instead.</p>
34+
<p>The requested page could not be found. Please visit our <a href="{{ site.url }}">homepage</a> instead.</p>
3535
</div>

‎content/_includes/custom-head.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<link rel="apple-touch-icon" sizes="180x180" href={{ "/favicon/apple-touch-icon.png" | relative_url }}>
2-
<link rel="icon" type="image/png" sizes="32x32" href={{ "/favicon/favicon-32x32.png" | relative_url }}>
3-
<link rel="icon" type="image/png" sizes="16x16" href={{ "/favicon/favicon-16x16.png" | relative_url }}>
4-
<link rel="manifest" href={{ "/favicon/site.webmanifest" | relative_url }}>
5-
<link rel="mask-icon" href={{ "/favicon/safari-pinned-tab.svg" | relative_url }} color="#b91d47">
6-
<link rel="shortcut icon" href={{ "/favicon/favicon.ico" | relative_url }}>
1+
<link rel="apple-touch-icon" sizes="180x180" href="/favicon/apple-touch-icon.png">
2+
<link rel="icon" type="image/png" sizes="32x32" href="/favicon/favicon-32x32.png">
3+
<link rel="icon" type="image/png" sizes="16x16" href="/favicon/favicon-16x16.png">
4+
<link rel="manifest" href="/favicon/site.webmanifest">
5+
<link rel="mask-icon" href="/favicon/safari-pinned-tab.svg" color="#b91d47">
6+
<link rel="shortcut icon" href="/favicon/favicon.ico">
77
<meta name="msapplication-TileColor" content="#b91d47">
8-
<meta name="msapplication-config" content={{ "/favicon/browserconfig.xml" | relative_url }}>
8+
<meta name="msapplication-config" content="/favicon/browserconfig.xml">
99
<meta name="theme-color" content="#ffffff">
1010

11-
<link rel="stylesheet" href="{{ "assets/plyr/plyr.css" | relative_url }}">
11+
<link rel="stylesheet" href="assets/plyr/plyr.css">

‎content/_includes/footer-scripts.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<script type="text/javascript" src="{{ "/assets/js/jquery-3.5.1.min.js" | relative_url }}"></script>
2-
<script type="text/javascript" src="{{ "/assets/js/bootstrap.min.js" | relative_url }}"></script>
3-
<script type="text/javascript" src="{{ "/assets/js/backToTop.js" | relative_url }}"></script>
4-
<script type="text/javascript" src="{{ "/assets/js/navCloseFix.js" | relative_url }}"></script>
1+
<script type="text/javascript" src="/assets/js/jquery-3.5.1.min.js"></script>
2+
<script type="text/javascript" src="/assets/js/bootstrap.min.js"></script>
3+
<script type="text/javascript" src="/assets/js/backToTop.js"></script>
4+
<script type="text/javascript" src="/assets/js/navCloseFix.js"></script>
55

66
{% if jekyll.environment == "staging" %}
77
{% include hypothesis.html %}

‎content/_includes/footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="container">
33
<div class="row">
44
<div class="col-xs-12 footer-text">
5-
<p>Copyright © 2014-{{ site.time | date: '%Y' }}<span> • </span><a href="{{ site.url}}{{ site.baseurl }}">{{ site.title }}</a> <span> • </span><a href="{{ "code-of-conduct" | absolute_url }}">Code of Conduct</a></p>
5+
<p>Copyright © 2014-{{ site.time | date: '%Y' }}<span> • </span><a href="{{ site.url}}{{ site.baseurl }}">{{ site.title }}</a> <span> • </span><a href="code-of-conduct">Code of Conduct</a></p>
66
</div>
77
</div>
88
</div>

‎content/_includes/head.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
66
<meta http-equiv="X-UA-Compatible" content="IE=edge">
77
<meta name="viewport" content="width=device-width, initial-scale=1">
8-
<link rel="sitemap" type="application/xml" title="Sitemap" href={{ "/sitemap.xml" | relative_url }}>
8+
<link rel="sitemap" type="application/xml" title="Sitemap" href="/sitemap.xml">
99

1010
{%- seo -%}
1111

12-
<script type="text/javascript" src="{{ "/assets/js/redirects.js" | relative_url }}"></script>
12+
<script type="text/javascript" src="/assets/js/redirects.js"></script>
1313

1414
{%- if page.url contains "gallery" -%}
1515
<link rel="preconnect" href="https://fonts.googleapis.com">
@@ -19,7 +19,7 @@
1919

2020

2121
<link rel="stylesheet" href="https://pro.fontawesome.com/releases/v5.15.3/css/all.css" integrity="sha384-iKbFRxucmOHIcpWdX9NTZ5WETOPm0Goy0WmfyNcl52qSYtc2Buk0NCe6jU1sWWNB" crossorigin="anonymous">
22-
<link rel="stylesheet" href="{{ "/style.css" | relative_url }}">
22+
<link rel="stylesheet" href="/style.css">
2323

2424
{%- if (site.url contains 'commonwl.org' and site.google_analytics -%}
2525
{%- include google-analytics.html -%}

‎content/_includes/header.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="container">
33
<div class="site-header-logo">
44
<h1 class="sr-only">Common Workflow Language</h1>
5-
<a class="" href="{{ site.url }}"><img class="" src="{{ "assets/img/CWL-Logo-HD-cropped2.png" | relative_url }}" alt="Common Workflow Language logo"></a>
5+
<a class="" href="{{ site.url }}"><img src="assets/img/CWL-Logo-HD-cropped2.png" alt="Common Workflow Language logo"></a>
66
</div>
77
</div>
88
</header>

‎content/_includes/home/mini-gallery.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@
33
<h2 class="black-text" id="cwl-mini-gallery">Some Users of CWL</h2>
44
</div>
55

6-
<a class="mini-gallery-wrapper" href="{{ site.url }}/gallery"><div class="mini-gallery">
6+
<a class="mini-gallery-wrapper" href="gallery"><div class="mini-gallery">
77
{%- for section in site.data.user-gallery.gallery -%}
88
{%- assign adopters = section.adopters -%}
99
{%- assign sub_adopters = section.subsection.adopters -%}
1010

1111
{%- for adopter in adopters -%}
1212
{%- if adopter.image -%}
1313
{%- unless adopter.duplicate_logo == true -%}
14-
<div id="{{ adopter.image_id }}-container" class="mini-gallery-img-container"><img id="{{ adopter.image_id }}" class="mini-gallery-img" src="{{ adopter.image | absolute_url }}" alt=""></div>
14+
<div id="{{ adopter.image_id }}-container" class="mini-gallery-img-container"><img id="{{ adopter.image_id }}" class="mini-gallery-img" src="{{ adopter.image }}" alt=""></div>
1515
{%- endunless -%}
1616
{%- endif -%}
1717
{%- endfor -%}
1818

1919
{%- for sub_adopter in sub_adopters -%}
2020
{%- if sub_adopter.image -%}
2121
{%- unless sub_adopter.duplicate_logo == true -%}
22-
<div class="mini-gallery-img-container"><img src="{{ sub_adopter.image | absolute_url }}" alt=""></div>
22+
<div class="mini-gallery-img-container"><img src="{{ sub_adopter.image }}" alt=""></div>
2323
{%- endunless -%}
2424
{%- endif -%}
2525
{%- endfor -%}

‎content/_includes/home/video-player.html

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<div class="youtube-container" width="560" height="315">
2-
<video id="player" class="cwl-intro-video" controls poster="{{ "/assets/img/intro_video_poster.png" | relative_url }}">
3-
<source src="{{ "/assets/video/cwl-intro-video.mp4" | relative_url }}" type="video/mp4">
2+
<video id="player" class="cwl-intro-video" controls poster="/assets/img/intro_video_poster.png">
3+
<source src="/assets/video/cwl-intro-video.mp4" type="video/mp4">
44

5-
<track src="{{ "/assets/video/subtitles/chinese_simplified.vtt" | relative_url }}" label="Chinese (Simplified)" kind="subtitles" srclang="zh-Hans">
6-
<track src="{{ "/assets/video/subtitles/english.vtt" | relative_url }}" label="English" kind="captions" srclang="en_US" default>
7-
<track src="{{ "/assets/video/subtitles/french.vtt" | relative_url }}" label="French" kind="subtitles" srclang="fr_FR">
8-
<track src="{{ "/assets/video/subtitles/japanese.vtt" | relative_url }}" label="Japanese" kind="subtitles" srclang="ja">
9-
<track src="{{ "/assets/video/subtitles/lithuanian.vtt" | relative_url }}" label="Lithuanian" kind="subtitles" srclang="lt">
10-
<track src="{{ "/assets/video/subtitles/romanian.vtt" | relative_url }}" label="Romanian" kind="subtitles" srclang="ro">
11-
<track src="{{ "/assets/video/subtitles/russian.vtt" | relative_url }}" label="Russian" kind="subtitles" srclang="ru">
12-
<track src="{{ "/assets/video/subtitles/ukranian.vtt" | relative_url }}" label="Ukranian" kind="subtitles" srclang="uk">
13-
<track src="{{ "/assets/video/subtitles/urdu.vtt" | relative_url }}" label="urdu.vtt" kind="subtitles" srclang="ur">
5+
<track src="/assets/video/subtitles/chinese_simplified.vtt" label="Chinese (Simplified)" kind="subtitles" srclang="zh-Hans">
6+
<track src="/assets/video/subtitles/english.vtt" label="English" kind="captions" srclang="en_US" default>
7+
<track src="/assets/video/subtitles/french.vtt" label="French" kind="subtitles" srclang="fr_FR">
8+
<track src="/assets/video/subtitles/japanese.vtt" label="Japanese" kind="subtitles" srclang="ja">
9+
<track src="/assets/video/subtitles/lithuanian.vtt" label="Lithuanian" kind="subtitles" srclang="lt">
10+
<track src="/assets/video/subtitles/romanian.vtt" label="Romanian" kind="subtitles" srclang="ro">
11+
<track src="/assets/video/subtitles/russian.vtt" label="Russian" kind="subtitles" srclang="ru">
12+
<track src="/assets/video/subtitles/ukranian.vtt" label="Ukranian" kind="subtitles" srclang="uk">
13+
<track src="/assets/video/subtitles/urdu.vtt" label="urdu.vtt" kind="subtitles" srclang="ur">
1414

1515
Your browser does not support the video tag.
1616
</video>
1717
</div>
1818

19-
<script src="{{ "assets/plyr/plyr.min.js" | relative_url }}"></script>
19+
<script src="assets/plyr/plyr.min.js"></script>
2020
<script>
2121
const player = new Plyr('#player', {
2222
controls: [

‎content/_includes/top_nav.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<nav class="navbar navbar-expand-lg navbar-light top-nav sticky-top" aria-label="main navigation">
22
<div class="nav-wrap container-fluid">
33
<a class="navbar-brand" href="/">
4-
<img class="nav-logo" src="{{ "assets/img/CWL-Logo-HD-cropped2.png" | relative_url }}" alt="CWL logo | Homepage link" height="50" width="106">
4+
<img class="nav-logo" src="{{ "assets/img/CWL-Logo-HD-cropped2.png" }}" alt="CWL logo | Homepage link" height="50" width="106">
55
</a>
66
<button class="navbar-toggler navbar-toggler-right ms-auto" type="button" data-bs-toggle="collapse" data-bs-target="#topNav" aria-controls="topNav" aria-expanded="false" aria-label="Toggle navigation">
77
<span class="navbar-toggler-icon"></span>
@@ -20,7 +20,7 @@
2020
{%- if page.url contains "http" or "http" contains page.url -%}
2121
<li><a href="{{ page.url }}" class="{{ page.title | downcase }} dropdown-item">{{ page.title }}<i class="fad fa-external-link-alt"></i></a></li>
2222
{%- else -%}
23-
<li><a href="{{ page.url | absolute_url }}" class=" dropdown-item">{{ page.title }}</a></li>
23+
<li><a href="{{ page.url }}" class=" dropdown-item">{{ page.title }}</a></li>
2424
{%- endif -%}
2525
{%- endfor -%}
2626
</ul>
@@ -29,17 +29,17 @@
2929
{%- if item.subfolderitems[0] -%}
3030
<ul class="dropdown-menu" aria-labelledby="navbarDropdown">
3131
{%- for entry in item.subfolderitems -%}
32-
<li class="dropdown-item nav-item"><a class="nav-link" href="{{ entry.url | absolute_url }}">{{ entry.page }}</a></li>
32+
<li class="dropdown-item nav-item"><a class="nav-link" href="{{ entry.url }}">{{ entry.page }}</a></li>
3333
{%- endfor -%}
3434
</ul>
3535
</li>
3636
{%- endif -%}
3737

3838
{%- else -%}
3939
{%- if page.title == item.title -%}
40-
<li class="nav-item"><a class="nav-link is-current-page" href="{{ item.url | absolute_url }}" aria-current="page">{{ item.title }}</a></li>
40+
<li class="nav-item"><a class="nav-link is-current-page" href="{{ item.url }}" aria-current="page">{{ item.title }}</a></li>
4141
{%- else -%}
42-
<li class="nav-item"><a class="nav-link" href="{{ item.url | absolute_url }}">{{ item.title }}</a></li>
42+
<li class="nav-item"><a class="nav-link" href="{{ item.url }}">{{ item.title }}</a></li>
4343
{%- endif -%}
4444
{%- endif -%}
4545
{%- endfor -%}

‎content/_includes/twitter_feed.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="twitter-feed" id="twitter-feed"><a class="twitter-timeline" data-width="280" data-height="600" data-dnt="true" data-theme="light" href="https://twitter.com/commonwl?ref_src=twsrc%5Etfw">Tweets by @commonwl</a></div> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
22

33
<script>
4-
var twitterText = '<p>See Tweets by <a href="https://twitter.com/commonwl">@commonwl <img class="twitter-icon" src="{{ "/assets/img/twitter.svg" | relative_url }}" width="20" alt="Twitter Icon - a blue bird"></a></p>';
4+
var twitterText = '<p>See Tweets by <a href="https://twitter.com/commonwl">@commonwl <img class="twitter-icon" src="/assets/img/twitter.svg" width="20" alt="Twitter Icon - a blue bird"></a></p>';
55

66
window.addEventListener("load", function() {
77
if (! document.querySelector('[id^="twitter-widget"]')) {

‎content/_includes/user-gallery.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ <h4 id="{{ adopter.name | downcase | replace: " ", "-" }}" class="adopter-title"
4040

4141
{%- if adopter.image -%}
4242
{%- assign img_class = adopter.image | replace: ".", " " | truncate_words: 1 -%}
43-
<div class="adopter-logo-container"><img src="{{ adopter.image | absolute_url }}" class="adopter-logo {{ img_class | append: "-logo" }}" alt="{{ adopter.name | append: " logo" }}"></div>
43+
<div class="adopter-logo-container"><img src="{{ adopter.image }}" class="adopter-logo {{ img_class | append: "-logo" }}" alt="{{ adopter.name | append: " logo" }}"></div>
4444
{%- endif -%}
4545

4646
</div>

0 commit comments

Comments
 (0)