Skip to content

Commit

Permalink
a few updates on research page
Browse files Browse the repository at this point in the history
  • Loading branch information
@astaaudzi
astaaudzi committed Apr 24, 2024
1 parent 6b32cd9 commit 687ea4f
Show file tree
Hide file tree
Showing 26 changed files with 565 additions and 3,630 deletions.
293 changes: 84 additions & 209 deletions docs/index.html
View file

Large diffs are not rendered by default.

221 changes: 24 additions & 197 deletions docs/pages/join.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head>

<meta charset="utf-8">
<meta name="generator" content="quarto-1.4.550">
<meta name="generator" content="quarto-1.3.450">

<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">

Expand Down Expand Up @@ -46,13 +46,7 @@
"collapse-after": 3,
"panel-placement": "end",
"type": "overlay",
"limit": 50,
"keyboard-shortcut": [
"f",
"/",
"s"
],
"show-item-context": false,
"limit": 20,
"language": {
"search-no-results-text": "No results",
"search-matching-documents-text": "matching documents",
Expand All @@ -61,7 +55,6 @@
"search-more-match-text": "more match in this document",
"search-more-matches-text": "more matches in this document",
"search-clear-button-title": "Clear",
"search-text-placeholder": "",
"search-detached-cancel-button-title": "Cancel",
"search-submit-button-title": "Submit",
"search-label": "Search"
Expand All @@ -77,9 +70,9 @@

<div id="quarto-search-results"></div>
<header id="quarto-header" class="headroom fixed-top">
<nav class="navbar navbar-expand-lg " data-bs-theme="dark">
<nav class="navbar navbar-expand-lg navbar-dark ">
<div class="navbar-container container-fluid">
<div class="navbar-brand-container mx-auto">
<div class="navbar-brand-container">
<a href="../index.html" class="navbar-brand navbar-brand-logo">
<img src="../resources/logo-files/fishsize-logo-wide2.png" alt="" class="navbar-logo">
</a>
Expand All @@ -91,33 +84,33 @@
<div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav navbar-nav-scroll me-auto">
<li class="nav-item">
<a class="nav-link" href="../index.html">
<span class="menu-text">Home</span></a>
<a class="nav-link" href="../index.html" rel="" target="">
<span class="menu-text">Home</span></a>
</li>
<li class="nav-item">
<a class="nav-link" href="../pages/team.html">
<span class="menu-text">Our Team</span></a>
<a class="nav-link" href="../pages/team.html" rel="" target="">
<span class="menu-text">Our Team</span></a>
</li>
<li class="nav-item">
<a class="nav-link" href="../pages/research.html">
<span class="menu-text">Research</span></a>
<a class="nav-link" href="../pages/research.html" rel="" target="">
<span class="menu-text">Research</span></a>
</li>
<li class="nav-item">
<a class="nav-link" href="../pages/media.html">
<span class="menu-text">Impact &amp; Outreach</span></a>
<a class="nav-link" href="../pages/media.html" rel="" target="">
<span class="menu-text">Impact &amp; Outreach</span></a>
</li>
<li class="nav-item">
<a class="nav-link" href="../pages/resources.html">
<span class="menu-text">Resources</span></a>
<a class="nav-link" href="../pages/resources.html" rel="" target="">
<span class="menu-text">Resources</span></a>
</li>
<li class="nav-item">
<a class="nav-link active" href="../pages/join.html" aria-current="page">
<span class="menu-text">Join Us!</span></a>
<a class="nav-link active" href="../pages/join.html" rel="" target="" aria-current="page">
<span class="menu-text">Join Us!</span></a>
</li>
</ul>
</div> <!-- /navcollapse -->
<div class="quarto-navbar-tools">
<div class="quarto-navbar-tools ms-auto">
</div>
</div> <!-- /navcollapse -->
</div> <!-- /container-fluid -->
</nav>
</header>
Expand All @@ -131,7 +124,6 @@




<div class="column-screen hero-img hero-strip-page">
<p>&nbsp;&nbsp;&nbsp;</p>
</div>
Expand Down Expand Up @@ -231,9 +223,10 @@ <h3 data-anchor-id="position-title">Position title</h3>
// clear code selection
e.clearSelection();
});
function tippyHover(el, contentFn, onTriggerFn, onUntriggerFn) {
function tippyHover(el, contentFn) {
const config = {
allowHTML: true,
content: contentFn,
maxWidth: 500,
delay: 100,
arrow: false,
Expand All @@ -243,17 +236,8 @@ <h3 data-anchor-id="position-title">Position title</h3>
interactive: true,
interactiveBorder: 10,
theme: 'quarto',
placement: 'bottom-start',
placement: 'bottom-start'
};
if (contentFn) {
config.content = contentFn;
}
if (onTriggerFn) {
config.onTrigger = onTriggerFn;
}
if (onUntriggerFn) {
config.onUntrigger = onUntriggerFn;
}
window.tippy(el, config);
}
const noterefs = window.document.querySelectorAll('a[role="doc-noteref"]');
Expand All @@ -267,125 +251,6 @@ <h3 data-anchor-id="position-title">Position title</h3>
const note = window.document.getElementById(id);
return note.innerHTML;
});
}
const xrefs = window.document.querySelectorAll('a.quarto-xref');
const processXRef = (id, note) => {
// Strip column container classes
const stripColumnClz = (el) => {
el.classList.remove("page-full", "page-columns");
if (el.children) {
for (const child of el.children) {
stripColumnClz(child);
}
}
}
stripColumnClz(note)
if (id === null || id.startsWith('sec-')) {
// Special case sections, only their first couple elements
const container = document.createElement("div");
if (note.children && note.children.length > 2) {
container.appendChild(note.children[0].cloneNode(true));
for (let i = 1; i < note.children.length; i++) {
const child = note.children[i];
if (child.tagName === "P" && child.innerText === "") {
continue;
} else {
container.appendChild(child.cloneNode(true));
break;
}
}
if (window.Quarto?.typesetMath) {
window.Quarto.typesetMath(container);
}
return container.innerHTML
} else {
if (window.Quarto?.typesetMath) {
window.Quarto.typesetMath(note);
}
return note.innerHTML;
}
} else {
// Remove any anchor links if they are present
const anchorLink = note.querySelector('a.anchorjs-link');
if (anchorLink) {
anchorLink.remove();
}
if (window.Quarto?.typesetMath) {
window.Quarto.typesetMath(note);
}
// TODO in 1.5, we should make sure this works without a callout special case
if (note.classList.contains("callout")) {
return note.outerHTML;
} else {
return note.innerHTML;
}
}
}
for (var i=0; i<xrefs.length; i++) {
const xref = xrefs[i];
tippyHover(xref, undefined, function(instance) {
instance.disable();
let url = xref.getAttribute('href');
let hash = undefined;
if (url.startsWith('#')) {
hash = url;
} else {
try { hash = new URL(url).hash; } catch {}
}
if (hash) {
const id = hash.replace(/^#\/?/, "");
const note = window.document.getElementById(id);
if (note !== null) {
try {
const html = processXRef(id, note.cloneNode(true));
instance.setContent(html);
} finally {
instance.enable();
instance.show();
}
} else {
// See if we can fetch this
fetch(url.split('#')[0])
.then(res => res.text())
.then(html => {
const parser = new DOMParser();
const htmlDoc = parser.parseFromString(html, "text/html");
const note = htmlDoc.getElementById(id);
if (note !== null) {
const html = processXRef(id, note);
instance.setContent(html);
}
}).finally(() => {
instance.enable();
instance.show();
});
}
} else {
// See if we can fetch a full url (with no hash to target)
// This is a special case and we should probably do some content thinning / targeting
fetch(url)
.then(res => res.text())
.then(html => {
const parser = new DOMParser();
const htmlDoc = parser.parseFromString(html, "text/html");
const note = htmlDoc.querySelector('main.content');
if (note !== null) {
// This should only happen for chapter cross references
// (since there is no id in the URL)
// remove the first header
if (note.children.length > 0 && note.children[0].tagName === "HEADER") {
note.children[0].remove();
}
const html = processXRef(null, note);
instance.setContent(html);
}
}).finally(() => {
instance.enable();
instance.show();
});
}
}, function(instance) {
});
}
let selectedAnnoteEl;
const selectorForAnnotation = ( cell, annotation) => {
Expand Down Expand Up @@ -428,7 +293,6 @@ <h3 data-anchor-id="position-title">Position title</h3>
}
div.style.top = top - 2 + "px";
div.style.height = height + 4 + "px";
div.style.left = 0;
let gutterDiv = window.document.getElementById("code-annotation-line-highlight-gutter");
if (gutterDiv === null) {
gutterDiv = window.document.createElement("div");
Expand All @@ -454,32 +318,6 @@ <h3 data-anchor-id="position-title">Position title</h3>
});
selectedAnnoteEl = undefined;
};
// Handle positioning of the toggle
window.addEventListener(
"resize",
throttle(() => {
elRect = undefined;
if (selectedAnnoteEl) {
selectCodeLines(selectedAnnoteEl);
}
}, 10)
);
function throttle(fn, ms) {
let throttle = false;
let timer;
return (...args) => {
if(!throttle) { // first call gets through
fn.apply(this, args);
throttle = true;
} else { // all the others get throttled
if(timer) clearTimeout(timer); // cancel #2
timer = setTimeout(() => {
fn.apply(this, args);
timer = throttle = false;
}, ms);
}
};
}
// Attach click handler to the DT
const annoteDls = window.document.querySelectorAll('dt[data-target-cell]');
for (const annoteDlNode of annoteDls) {
Expand Down Expand Up @@ -542,23 +380,12 @@ <h3 data-anchor-id="position-title">Position title</h3>
</div> <!-- /content -->
<footer class="footer">
<div class="nav-footer">
<div class="nav-footer-left">
<p><a href="mailto:[email protected]"><img src="..\resources/icons/ic--baseline-mail.svg" class="img-fluid"></a> <a href="mailto:[email protected]">[email protected]</a> <br> <a href="https://github.com/fishsizeproject/"><img src="..\resources/icons/mdi--github.svg" class="img-fluid"></a> <a href="https://github.com/fishsizeproject/">fishsizeproject</a> <br><br> <a href="https://www.imas.utas.edu.au/">Institute of Marine and Antarctic Research</a><br> 20 Castray Esplanade<br> Battery Point TAS 7000<br> Australia<br></p>
</div>
<div class="nav-footer-center">
<div class="quarto-figure quarto-figure-center">
<figure class="figure">
<p><a href="../index.html"><img src="..\resources/logo-files/fishsize-logo-wide2.png" class="img-fluid quarto-figure quarto-figure-center figure-img" data-fig-valign="middle" alt="FishSize Project"></a></p>
</figure>
</div>
</div>
<div class="nav-footer-right">
<p><i>We acknowledge the traditional owners of the land on which we live and work.<br> Sovereignty was never ceded </i><img src="../resources/images/Australian_Aboriginal_Flag.png" class="img-fluid" style="height: 1em;"> <br><br><br> © FishSize Project, 2024<br> Website created by <a href="https://drtreimer.com">Tormey Reimer</a></p>
</div>
<div class="nav-footer-left"><a href="mailto:[email protected]"><img src="..\resources/icons/ic--baseline-mail.svg" class="img-fluid"></a> <a href="mailto:[email protected]">[email protected]</a> <br> <a href="https://github.com/fishsizeproject/"><img src="..\resources/icons/mdi--github.svg" class="img-fluid"></a> <a href="https://github.com/fishsizeproject/">fishsizeproject</a> <br><br> <a href="https://www.imas.utas.edu.au/">Institute of Marine and Antarctic Research</a><br> 20 Castray Esplanade<br> Battery Point TAS 7000<br> Australia<br></div>
<div class="nav-footer-center"><a href="../index.html"><img src="..\resources/logo-files/fishsize-logo-wide2.png" class="img-fluid" data-fig-align="center" data-fig-valign="middle" alt="FishSize Project"></a></div>
<div class="nav-footer-right"><i>We acknowledge the traditional owners of the land on which we live and work.<br> Sovereignty was never ceded </i><img src="../resources/images/Australian_Aboriginal_Flag.png" class="img-fluid" style="height: 1em;"> <br><br><br> © FishSize Project, 2024<br> Website created by <a href="https://drtreimer.com">Tormey Reimer</a></div>
</div>
</footer>




</body></html>
Loading

0 comments on commit 687ea4f

Please sign in to comment.