Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Attempt Debug for #121 Deploy Preview urls incorrectly point to commonwl.org #122

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Attempt Debug for #121 Deploy Preview urls incorrectly point to commonwl.org #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b400ab2
Attempt Fix for #121 Deploy Preview urls point to commonwl.org
lunacodes Mar 24, 2022
1db4de2
Attempt debug scripts 1
lunacodes Mar 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion content/404.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
<div class="container-404">
<h1>404</h1>
<p><strong>Page not found :(</strong></p>
<p>The requested page could not be found. Please visit our <a href="{{ site.url | absolute_url }}">homepage</a> instead.</p>
<p>The requested page could not be found. Please visit our <a href="{{ site.url }}">homepage</a> instead.</p>
</div>
11 changes: 11 additions & 0 deletions content/_data/debug.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
header:
- title: Home
url: /
- title: About
url: "#"
type: dropdown
subpages:
- title: Timeline
url: /timeline
- title: Features
url: "/features"
16 changes: 8 additions & 8 deletions content/_includes/custom-head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<link rel="apple-touch-icon" sizes="180x180" href={{ "/favicon/apple-touch-icon.png" | relative_url }}>
<link rel="icon" type="image/png" sizes="32x32" href={{ "/favicon/favicon-32x32.png" | relative_url }}>
<link rel="icon" type="image/png" sizes="16x16" href={{ "/favicon/favicon-16x16.png" | relative_url }}>
<link rel="manifest" href={{ "/favicon/site.webmanifest" | relative_url }}>
<link rel="mask-icon" href={{ "/favicon/safari-pinned-tab.svg" | relative_url }} color="#b91d47">
<link rel="shortcut icon" href={{ "/favicon/favicon.ico" | relative_url }}>
<link rel="apple-touch-icon" sizes="180x180" href="/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon/favicon-16x16.png">
<link rel="manifest" href="/favicon/site.webmanifest">
<link rel="mask-icon" href="/favicon/safari-pinned-tab.svg" color="#b91d47">
<link rel="shortcut icon" href="/favicon/favicon.ico">
<meta name="msapplication-TileColor" content="#b91d47">
<meta name="msapplication-config" content={{ "/favicon/browserconfig.xml" | relative_url }}>
<meta name="msapplication-config" content="/favicon/browserconfig.xml">
<meta name="theme-color" content="#ffffff">

<link rel="stylesheet" href="{{ "assets/plyr/plyr.css" | relative_url }}">
<link rel="stylesheet" href="{{ "/assets/plyr/plyr.css" | absolute_url}}">
8 changes: 4 additions & 4 deletions content/_includes/footer-scripts.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script type="text/javascript" src="{{ "/assets/js/jquery-3.5.1.min.js" | relative_url }}"></script>
<script type="text/javascript" src="{{ "/assets/js/bootstrap.min.js" | relative_url }}"></script>
<script type="text/javascript" src="{{ "/assets/js/backToTop.js" | relative_url }}"></script>
<script type="text/javascript" src="{{ "/assets/js/navCloseFix.js" | relative_url }}"></script>
<script type="text/javascript" src="/assets/js/jquery-3.5.1.min.js"></script>
<script type="text/javascript" src="/assets/js/bootstrap.min.js"></script>
<script type="text/javascript" src="/assets/js/backToTop.js"></script>
<script type="text/javascript" src="/assets/js/navCloseFix.js"></script>

{% if jekyll.environment == "staging" %}
{% include hypothesis.html %}
Expand Down
2 changes: 1 addition & 1 deletion content/_includes/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="container">
<div class="row">
<div class="col-xs-12 footer-text">
<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>
<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>
</div>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions content/_includes/head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="sitemap" type="application/xml" title="Sitemap" href={{ "/sitemap.xml" | relative_url }}>
<link rel="sitemap" type="application/xml" title="Sitemap" href="/sitemap.xml">

{%- seo -%}

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

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


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

{%- if (site.url contains 'commonwl.org' and site.google_analytics -%}
{%- include google-analytics.html -%}
Expand Down
2 changes: 1 addition & 1 deletion content/_includes/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="container">
<div class="site-header-logo">
<h1 class="sr-only">Common Workflow Language</h1>
<a class="" href="{{ site.url }}"><img class="" src="{{ "assets/img/CWL-Logo-HD-cropped2.png" | relative_url }}" alt="Common Workflow Language logo"></a>
<a class="" href="{{ site.url }}"><img src="assets/img/CWL-Logo-HD-cropped2.png" alt="Common Workflow Language logo"></a>
</div>
</div>
</header>
Expand Down
6 changes: 3 additions & 3 deletions content/_includes/home/mini-gallery.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
<h2 class="black-text" id="cwl-mini-gallery">Some Users of CWL</h2>
</div>

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

{%- for adopter in adopters -%}
{%- if adopter.image -%}
{%- unless adopter.duplicate_logo == true -%}
<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>
<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>
{%- endunless -%}
{%- endif -%}
{%- endfor -%}

{%- for sub_adopter in sub_adopters -%}
{%- if sub_adopter.image -%}
{%- unless sub_adopter.duplicate_logo == true -%}
<div class="mini-gallery-img-container"><img src="{{ sub_adopter.image | absolute_url }}" alt=""></div>
<div class="mini-gallery-img-container"><img src="{{ sub_adopter.image }}" alt=""></div>
{%- endunless -%}
{%- endif -%}
{%- endfor -%}
Expand Down
24 changes: 12 additions & 12 deletions content/_includes/home/video-player.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<div class="youtube-container" width="560" height="315">
<video id="player" class="cwl-intro-video" controls poster="{{ "/assets/img/intro_video_poster.png" | relative_url }}">
<source src="{{ "/assets/video/cwl-intro-video.mp4" | relative_url }}" type="video/mp4">
<video id="player" class="cwl-intro-video" controls poster="/assets/img/intro_video_poster.png">
<source src="/assets/video/cwl-intro-video.mp4" type="video/mp4">

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

Your browser does not support the video tag.
</video>
</div>

<script src="{{ "assets/plyr/plyr.min.js" | relative_url }}"></script>
<script src="assets/plyr/plyr.min.js"></script>
<script>
const player = new Plyr('#player', {
controls: [
Expand Down
10 changes: 5 additions & 5 deletions content/_includes/top_nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<nav class="navbar navbar-expand-lg navbar-light top-nav sticky-top" aria-label="main navigation">
<div class="nav-wrap container-fluid">
<a class="navbar-brand" href="/">
<img class="nav-logo" src="{{ "assets/img/CWL-Logo-HD-cropped2.png" | relative_url }}" alt="CWL logo | Homepage link" height="50" width="106">
<img class="nav-logo" src="{{ "assets/img/CWL-Logo-HD-cropped2.png" }}" alt="CWL logo | Homepage link" height="50" width="106">
</a>
<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">
<span class="navbar-toggler-icon"></span>
Expand All @@ -20,7 +20,7 @@
{%- if page.url contains "http" or "http" contains page.url -%}
<li><a href="{{ page.url }}" class="{{ page.title | downcase }} dropdown-item">{{ page.title }}<i class="fad fa-external-link-alt"></i></a></li>
{%- else -%}
<li><a href="{{ page.url | absolute_url }}" class=" dropdown-item">{{ page.title }}</a></li>
<li><a href="{{ page.url }}" class=" dropdown-item">{{ page.title }}</a></li>
{%- endif -%}
{%- endfor -%}
</ul>
Expand All @@ -29,17 +29,17 @@
{%- if item.subfolderitems[0] -%}
<ul class="dropdown-menu" aria-labelledby="navbarDropdown">
{%- for entry in item.subfolderitems -%}
<li class="dropdown-item nav-item"><a class="nav-link" href="{{ entry.url | absolute_url }}">{{ entry.page }}</a></li>
<li class="dropdown-item nav-item"><a class="nav-link" href="{{ entry.url }}">{{ entry.page }}</a></li>
{%- endfor -%}
</ul>
</li>
{%- endif -%}

{%- else -%}
{%- if page.title == item.title -%}
<li class="nav-item"><a class="nav-link is-current-page" href="{{ item.url | absolute_url }}" aria-current="page">{{ item.title }}</a></li>
<li class="nav-item"><a class="nav-link is-current-page" href="{{ item.url }}" aria-current="page">{{ item.title }}</a></li>
{%- else -%}
<li class="nav-item"><a class="nav-link" href="{{ item.url | absolute_url }}">{{ item.title }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ item.url }}">{{ item.title }}</a></li>
{%- endif -%}
{%- endif -%}
{%- endfor -%}
Expand Down
2 changes: 1 addition & 1 deletion content/_includes/twitter_feed.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<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>

<script>
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>';
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>';

window.addEventListener("load", function() {
if (! document.querySelector('[id^="twitter-widget"]')) {
Expand Down
2 changes: 1 addition & 1 deletion content/_includes/user-gallery.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ <h4 id="{{ adopter.name | downcase | replace: " ", "-" }}" class="adopter-title"

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

</div>
Expand Down
72 changes: 72 additions & 0 deletions content/debug.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
---
title: Links Debug
permalink: /debug/
layout: page
---

## Scripts Debug

Results: Only

* Absolute URL: {{ "/assets/plyr/plyr.css" | absolute_url }}
* Relative URL: {{ "assets/plyr/plyr.css" | relative_url }}
* no filter: <a href="{{ "assets/plyr/plyr.css" }}">assets/plyr/plyr.css</a> - should break

## Nav Debug

{%- for item in site.data.navigation.header -%}
{%- if item.type contains "dropdown" -%}
* Home: [#]("#")
{% if item.subpages %}
{%- for page in item.subpages -%}
* {{ page.url | absolute_url }}
{% endfor %}
{% endif %}
{% endif %}
{% endfor %}


<ul>
{%- for item in site.data.navigation.header -%}
<!-- Dropdown Menus -->
{%- if item.type contains "dropdown" -%}
<li><a href="#">{{ item.title}}<span class="caret"></span></a></li>
{%- if item.subpages -%}
<ul class="dropdown-menu">
{%- for page in item.subpages -%}
{%- if page.url contains "http" or "http" contains page.url -%}
<!-- External Link -->
<li><a href="{{ page.url | absolute_url }}">{{ page.title }}<i class="fad fa-external-link-alt"></i></a></li>
{%- else -%}
<!-- Internal Link -->
<li><a href="{{ page.url | absolute_url }}">{{ page.title }}</a></li>
{%- endif -%}
{%- endfor -%}
</ul>
{%- endif -%}

<!-- Dropdown Items -->
{%- if item.subfolderitems[0] -%}
<ul class="dropdown-menu">
{%- for entry in item.subfolderitems -%}
<li><a class="nav-link" href="{{ entry.url }}">{{ entry.page }}</a></li>
{%- endfor -%}
</ul>
</li>
<!-- End of Dropdown Menus -->
{%- endif -%}

<!-- Normal Menu Items-->
{%- else -%}
<!-- Current page -->
{%- if page.title == item.title -%}
<li><a class="is-current-page" href="{{ item.url }}">{{ item.title }}</a></li>
{%- else -%}
<!-- Normal Page -->
<li class="nav-item"><a class="nav-link" href="{{ item.url }}">{{ item.title }}</a></li>
{%- endif -%}
<!-- End normal items -->
{%- endif -%}
<!-- End Nav Loop -->
{%- endfor -%}
</ul>