Skip to content

Commit 9eed6c4

Browse files
author
Jessica Guo
committed
Change logo and update events with pod
1 parent 7622abc commit 9eed6c4

10 files changed

+221
-35
lines changed

‎docs/events.html

+11-3
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,18 @@ <h2 class="anchored" data-anchor-id="upcoming">Upcoming</h2>
170170
<h3 class="anchored" data-anchor-id="section">2023</h3>
171171
<div class="d-flex justify-content-between">
172172
<div>
173-
<p>PSInet social gathering at <a href="https://www.agu.org/fall-meeting">AGU</a></p>
173+
<p>Joint PSInet/FLUXNET mixer at AGU, <a href="https://forms.office.com/Pages/ResponsePage.aspx?id=NL4TEdGuAE2rS83QJRC-kcvvN-vy0YlAr53RIm7OxMhUMk40TjlaTTlOQlZJQTA3SE1MSDc4TjdKQi4u">RSVP</a></p>
174174
</div>
175175
<div class="text-end text-nowrap">
176-
<p>SOMArts Cultural Center, <strong>Dec 11</strong>, <a href="https://forms.office.com/Pages/ResponsePage.aspx?id=NL4TEdGuAE2rS83QJRC-kcvvN-vy0YlAr53RIm7OxMhUMk40TjlaTTlOQlZJQTA3SE1MSDc4TjdKQi4u">RSVP</a></p>
176+
<p>SOMArts Cultural Center, <strong>Dec 11 18:00 - 21:00</strong>,</p>
177+
</div>
178+
</div>
179+
<div class="d-flex justify-content-between">
180+
<div>
181+
<p>PSInet office hours <a href="https://agu.confex.com/agu/fm23/meetingapp.cgi/Session/219640">pod</a></p>
182+
</div>
183+
<div class="text-end text-nowrap">
184+
<p>Poster Hall A-C South, Pod 1, <strong>Dec 12 14:00 - 15:00</strong></p>
177185
</div>
178186
</div>
179187
<div class="d-flex justify-content-between">
@@ -243,7 +251,7 @@ <h3 class="anchored" data-anchor-id="section-2">2023</h3>
243251
</div>
244252
<div class="d-flex justify-content-between">
245253
<div>
246-
<p><a href="https://physfest.wixsite.com/physfest">Physfest4</a>, an early career workshop for graduate students and postdocs to learn ecophysiological tools and techniques. <a href="https://docs.google.com/forms/d/e/1FAIpQLSeodvfjx2zrGbeQ9y1c6n_COmLmU-WBv9GPNAkAwrH6L7YPlA/viewform?pli=1">Apply</a> by August 31</p>
254+
<p><a href="https://physfest.wixsite.com/physfest">Physfest4</a>, an early career workshop on ecophysiological tools and techniques. <a href="https://docs.google.com/forms/d/e/1FAIpQLSeodvfjx2zrGbeQ9y1c6n_COmLmU-WBv9GPNAkAwrH6L7YPlA/viewform?pli=1">Apply</a> by August 31</p>
247255
</div>
248256
<div class="text-end text-nowrap">
249257
<p><a href="https://unmsevilletafieldstation.wordpress.com/">Sevilleta Field Station</a>, <strong>October 15 - 20</strong></p>

‎docs/index.html

+188-23
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head>
33

44
<meta charset="utf-8">
5-
<meta name="generator" content="quarto-1.3.353">
5+
<meta name="generator" content="quarto-1.4.383">
66

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

@@ -45,6 +45,12 @@
4545
"panel-placement": "end",
4646
"type": "overlay",
4747
"limit": 20,
48+
"keyboard-shortcut": [
49+
"f",
50+
"/",
51+
"s"
52+
],
53+
"show-item-context": false,
4854
"language": {
4955
"search-no-results-text": "No results",
5056
"search-matching-documents-text": "matching documents",
@@ -54,7 +60,8 @@
5460
"search-more-matches-text": "more matches in this document",
5561
"search-clear-button-title": "Clear",
5662
"search-detached-cancel-button-title": "Cancel",
57-
"search-submit-button-title": "Submit"
63+
"search-submit-button-title": "Submit",
64+
"search-label": "Search"
5865
}
5966
}</script>
6067

@@ -68,7 +75,7 @@
6875
<header id="quarto-header" class="headroom fixed-top">
6976
<nav class="navbar navbar-expand-lg navbar-dark ">
7077
<div class="navbar-container container-fluid">
71-
<div class="navbar-brand-container">
78+
<div class="navbar-brand-container mx-auto">
7279
<a class="navbar-brand" href="./index.html">
7380
<span class="navbar-title">PSInet</span>
7481
</a>
@@ -80,33 +87,33 @@
8087
<div class="collapse navbar-collapse" id="navbarCollapse">
8188
<ul class="navbar-nav navbar-nav-scroll ms-auto">
8289
<li class="nav-item">
83-
<a class="nav-link active" href="./index.html" rel="" target="" aria-current="page">
84-
<span class="menu-text">Home</span></a>
90+
<a class="nav-link active" href="./index.html" aria-current="page">
91+
<span class="menu-text">Home</span></a>
8592
</li>
8693
<li class="nav-item">
87-
<a class="nav-link" href="./about.html" rel="" target="">
88-
<span class="menu-text">About</span></a>
94+
<a class="nav-link" href="./about.html">
95+
<span class="menu-text">About</span></a>
8996
</li>
9097
<li class="nav-item">
91-
<a class="nav-link" href="./join.html" rel="" target="">
92-
<span class="menu-text">Get Involved</span></a>
98+
<a class="nav-link" href="./join.html">
99+
<span class="menu-text">Get Involved</span></a>
93100
</li>
94101
<li class="nav-item">
95-
<a class="nav-link" href="./submit.html" rel="" target="">
96-
<span class="menu-text">Submit Data</span></a>
102+
<a class="nav-link" href="./submit.html">
103+
<span class="menu-text">Submit Data</span></a>
97104
</li>
98105
<li class="nav-item">
99-
<a class="nav-link" href="./events.html" rel="" target="">
100-
<span class="menu-text">Events</span></a>
106+
<a class="nav-link" href="./events.html">
107+
<span class="menu-text">Events</span></a>
101108
</li>
102109
<li class="nav-item">
103-
<a class="nav-link" href="./posts.html" rel="" target="">
104-
<span class="menu-text">Posts</span></a>
110+
<a class="nav-link" href="./posts.html">
111+
<span class="menu-text">Posts</span></a>
105112
</li>
106113
</ul>
107-
<div class="quarto-navbar-tools">
108-
</div>
109114
</div> <!-- /navcollapse -->
115+
<div class="quarto-navbar-tools">
116+
</div>
110117
</div> <!-- /container-fluid -->
111118
</nav>
112119
</header>
@@ -117,16 +124,16 @@
117124

118125
<!-- main -->
119126
<div class="quarto-about-jolla">
120-
<img src="logo1.png" class="about-image
121-
rounded " style="width: 15em;">
127+
<img src="logos_vf_crop.jpg" class="about-image
128+
rounded " style="width: 400px;">
122129
<header id="title-block-header" class="quarto-title-block default">
123130
<div class="quarto-title">
124131
<h1 class="title">PSInet: A global water potential network</h1>
125132
</div>
126133
<div class="quarto-title-meta">
127134
</div>
128135
</header><main class="content" id="quarto-document-content">
129-
<p>Welcome to the alpha version of the website for PSInet, an NSF-funded Research Coordination Network aimed at building a community of people and data to harness the potential of plant and soil water potential.</p>
136+
<p>Welcome to PSInet, an NSF-funded Research Coordination Network aimed at building a community of people and data to harness the potential of plant water potential.</p>
130137

131138

132139
</main>
@@ -216,10 +223,9 @@ <h1 class="title">PSInet: A global water potential network</h1>
216223
// clear code selection
217224
e.clearSelection();
218225
});
219-
function tippyHover(el, contentFn) {
226+
function tippyHover(el, contentFn, onTriggerFn, onUntriggerFn) {
220227
const config = {
221228
allowHTML: true,
222-
content: contentFn,
223229
maxWidth: 500,
224230
delay: 100,
225231
arrow: false,
@@ -229,8 +235,17 @@ <h1 class="title">PSInet: A global water potential network</h1>
229235
interactive: true,
230236
interactiveBorder: 10,
231237
theme: 'quarto',
232-
placement: 'bottom-start'
238+
placement: 'bottom-start',
233239
};
240+
if (contentFn) {
241+
config.content = contentFn;
242+
}
243+
if (onTriggerFn) {
244+
config.onTrigger = onTriggerFn;
245+
}
246+
if (onUntriggerFn) {
247+
config.onUntrigger = onUntriggerFn;
248+
}
234249
window.tippy(el, config);
235250
}
236251
const noterefs = window.document.querySelectorAll('a[role="doc-noteref"]');
@@ -244,6 +259,128 @@ <h1 class="title">PSInet: A global water potential network</h1>
244259
const note = window.document.getElementById(id);
245260
return note.innerHTML;
246261
});
262+
}
263+
const xrefs = window.document.querySelectorAll('a.quarto-xref');
264+
const processXRef = (id, note) => {
265+
// Strip column container classes
266+
const stripColumnClz = (el) => {
267+
el.classList.remove("page-full", "page-columns");
268+
if (el.children) {
269+
for (const child of el.children) {
270+
stripColumnClz(child);
271+
}
272+
}
273+
}
274+
stripColumnClz(note)
275+
const typesetMath = (el) => {
276+
if (window.MathJax) {
277+
// MathJax Typeset
278+
window.MathJax.typeset([el]);
279+
} else if (window.katex) {
280+
// KaTeX Render
281+
var mathElements = el.getElementsByClassName("math");
282+
var macros = [];
283+
for (var i = 0; i < mathElements.length; i++) {
284+
var texText = mathElements[i].firstChild;
285+
if (mathElements[i].tagName == "SPAN") {
286+
window.katex.render(texText.data, mathElements[i], {
287+
displayMode: mathElements[i].classList.contains('display'),
288+
throwOnError: false,
289+
macros: macros,
290+
fleqn: false
291+
});
292+
}
293+
}
294+
}
295+
}
296+
if (id === null || id.startsWith('sec-')) {
297+
// Special case sections, only their first couple elements
298+
const container = document.createElement("div");
299+
if (note.children && note.children.length > 2) {
300+
for (let i = 0; i < 2; i++) {
301+
container.appendChild(note.children[i].cloneNode(true));
302+
}
303+
typesetMath(container);
304+
return container.innerHTML
305+
} else {
306+
typesetMath(note);
307+
return note.innerHTML;
308+
}
309+
} else {
310+
// Remove any anchor links if they are present
311+
const anchorLink = note.querySelector('a.anchorjs-link');
312+
if (anchorLink) {
313+
anchorLink.remove();
314+
}
315+
typesetMath(note);
316+
return note.innerHTML;
317+
}
318+
}
319+
for (var i=0; i<xrefs.length; i++) {
320+
const xref = xrefs[i];
321+
tippyHover(xref, undefined, function(instance) {
322+
instance.disable();
323+
let url = xref.getAttribute('href');
324+
let hash = undefined;
325+
if (url.startsWith('#')) {
326+
hash = url;
327+
} else {
328+
try { hash = new URL(url).hash; } catch {}
329+
}
330+
if (hash) {
331+
const id = hash.replace(/^#\/?/, "");
332+
const note = window.document.getElementById(id);
333+
if (note !== null) {
334+
try {
335+
const html = processXRef(id, note.cloneNode(true));
336+
instance.setContent(html);
337+
} finally {
338+
instance.enable();
339+
instance.show();
340+
}
341+
} else {
342+
// See if we can fetch this
343+
fetch(url.split('#')[0])
344+
.then(res => res.text())
345+
.then(html => {
346+
const parser = new DOMParser();
347+
const htmlDoc = parser.parseFromString(html, "text/html");
348+
const note = htmlDoc.getElementById(id);
349+
if (note !== null) {
350+
const html = processXRef(id, note);
351+
instance.setContent(html);
352+
}
353+
}).finally(() => {
354+
instance.enable();
355+
instance.show();
356+
});
357+
}
358+
} else {
359+
// See if we can fetch a full url (with no hash to target)
360+
// This is a special case and we should probably do some content thinning / targeting
361+
fetch(url)
362+
.then(res => res.text())
363+
.then(html => {
364+
const parser = new DOMParser();
365+
const htmlDoc = parser.parseFromString(html, "text/html");
366+
const note = htmlDoc.querySelector('main.content');
367+
if (note !== null) {
368+
// This should only happen for chapter cross references
369+
// (since there is no id in the URL)
370+
// remove the first header
371+
if (note.children.length > 0 && note.children[0].tagName === "HEADER") {
372+
note.children[0].remove();
373+
}
374+
const html = processXRef(null, note);
375+
instance.setContent(html);
376+
}
377+
}).finally(() => {
378+
instance.enable();
379+
instance.show();
380+
});
381+
}
382+
}, function(instance) {
383+
});
247384
}
248385
let selectedAnnoteEl;
249386
const selectorForAnnotation = ( cell, annotation) => {
@@ -286,6 +423,7 @@ <h1 class="title">PSInet: A global water potential network</h1>
286423
}
287424
div.style.top = top - 2 + "px";
288425
div.style.height = height + 4 + "px";
426+
div.style.left = 0;
289427
let gutterDiv = window.document.getElementById("code-annotation-line-highlight-gutter");
290428
if (gutterDiv === null) {
291429
gutterDiv = window.document.createElement("div");
@@ -311,6 +449,32 @@ <h1 class="title">PSInet: A global water potential network</h1>
311449
});
312450
selectedAnnoteEl = undefined;
313451
};
452+
// Handle positioning of the toggle
453+
window.addEventListener(
454+
"resize",
455+
throttle(() => {
456+
elRect = undefined;
457+
if (selectedAnnoteEl) {
458+
selectCodeLines(selectedAnnoteEl);
459+
}
460+
}, 10)
461+
);
462+
function throttle(fn, ms) {
463+
let throttle = false;
464+
let timer;
465+
return (...args) => {
466+
if(!throttle) { // first call gets through
467+
fn.apply(this, args);
468+
throttle = true;
469+
} else { // all the others get throttled
470+
if(timer) clearTimeout(timer); // cancel #2
471+
timer = setTimeout(() => {
472+
fn.apply(this, args);
473+
timer = throttle = false;
474+
}, ms);
475+
}
476+
};
477+
}
314478
// Attach click handler to the DT
315479
const annoteDls = window.document.querySelectorAll('dt[data-target-cell]');
316480
for (const annoteDlNode of annoteDls) {
@@ -374,4 +538,5 @@ <h1 class="title">PSInet: A global water potential network</h1>
374538

375539

376540

541+
377542
</body></html>

‎docs/logos_vf.png

222 KB
Loading

‎docs/logos_vf_crop.jpg

572 KB
Loading

‎docs/search.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,21 @@
3939
"href": "events.html",
4040
"title": "Events",
4141
"section": "",
42-
"text": "PSInet social gathering at AGU\n\n\nSOMArts Cultural Center, Dec 11, RSVP\n\n\n\n\nPSInet-sponsored oral session B41C\n\n\nDec 14, 8:30 - 10:00\n\n\n\n\nPSInet-sponsored poster session B43H\n\n\nDec 14, 14:10 - 18:30\n\n\n\n\n\n\n\nPSInet-sponsored session at EGU\n\n\nVienna, Austria, April 14 - 19\n\n\n\n\nGordon Research Seminar\n\n\nUniversity of Southern Maine, June 8 - 9\n\n\n\n\nGordon Research Conference\n\n\nUniversity of Southern Maine, June 9 - 14\n\n\n\n\nPlant Hydraulics Methods workshop\n\n\nHighlands Biological Station, July 16-20"
42+
"text": "Joint PSInet/FLUXNET mixer at AGU, RSVP\n\n\nSOMArts Cultural Center, Dec 11 18:00 - 21:00,\n\n\n\n\nPSInet office hours pod\n\n\nPoster Hall A-C South, Pod 1, Dec 12 14:00 - 15:00\n\n\n\n\nPSInet-sponsored oral session B41C\n\n\nDec 14, 8:30 - 10:00\n\n\n\n\nPSInet-sponsored poster session B43H\n\n\nDec 14, 14:10 - 18:30\n\n\n\n\n\n\n\nPSInet-sponsored session at EGU\n\n\nVienna, Austria, April 14 - 19\n\n\n\n\nGordon Research Seminar\n\n\nUniversity of Southern Maine, June 8 - 9\n\n\n\n\nGordon Research Conference\n\n\nUniversity of Southern Maine, June 9 - 14\n\n\n\n\nPlant Hydraulics Methods workshop\n\n\nHighlands Biological Station, July 16-20"
4343
},
4444
{
4545
"objectID": "events.html#upcoming",
4646
"href": "events.html#upcoming",
4747
"title": "Events",
4848
"section": "",
49-
"text": "PSInet social gathering at AGU\n\n\nSOMArts Cultural Center, Dec 11, RSVP\n\n\n\n\nPSInet-sponsored oral session B41C\n\n\nDec 14, 8:30 - 10:00\n\n\n\n\nPSInet-sponsored poster session B43H\n\n\nDec 14, 14:10 - 18:30\n\n\n\n\n\n\n\nPSInet-sponsored session at EGU\n\n\nVienna, Austria, April 14 - 19\n\n\n\n\nGordon Research Seminar\n\n\nUniversity of Southern Maine, June 8 - 9\n\n\n\n\nGordon Research Conference\n\n\nUniversity of Southern Maine, June 9 - 14\n\n\n\n\nPlant Hydraulics Methods workshop\n\n\nHighlands Biological Station, July 16-20"
49+
"text": "Joint PSInet/FLUXNET mixer at AGU, RSVP\n\n\nSOMArts Cultural Center, Dec 11 18:00 - 21:00,\n\n\n\n\nPSInet office hours pod\n\n\nPoster Hall A-C South, Pod 1, Dec 12 14:00 - 15:00\n\n\n\n\nPSInet-sponsored oral session B41C\n\n\nDec 14, 8:30 - 10:00\n\n\n\n\nPSInet-sponsored poster session B43H\n\n\nDec 14, 14:10 - 18:30\n\n\n\n\n\n\n\nPSInet-sponsored session at EGU\n\n\nVienna, Austria, April 14 - 19\n\n\n\n\nGordon Research Seminar\n\n\nUniversity of Southern Maine, June 8 - 9\n\n\n\n\nGordon Research Conference\n\n\nUniversity of Southern Maine, June 9 - 14\n\n\n\n\nPlant Hydraulics Methods workshop\n\n\nHighlands Biological Station, July 16-20"
5050
},
5151
{
5252
"objectID": "events.html#past",
5353
"href": "events.html#past",
5454
"title": "Events",
5555
"section": "Past",
56-
"text": "Past\n\n2023\n\n\nPSInet meetup at the Physiological Ecology Mixer at ESA\n\n\n6:30 PM - 8:00 PM, August 8\n\n\n\n\nPhysfest4, an early career workshop for graduate students and postdocs to learn ecophysiological tools and techniques. Apply by August 31\n\n\nSevilleta Field Station, October 15 - 20"
56+
"text": "Past\n\n2023\n\n\nPSInet meetup at the Physiological Ecology Mixer at ESA\n\n\n6:30 PM - 8:00 PM, August 8\n\n\n\n\nPhysfest4, an early career workshop on ecophysiological tools and techniques. Apply by August 31\n\n\nSevilleta Field Station, October 15 - 20"
5757
},
5858
{
5959
"objectID": "goals.html",
@@ -67,7 +67,7 @@
6767
"href": "index.html",
6868
"title": "PSInet: A global water potential network",
6969
"section": "",
70-
"text": "Welcome to the alpha version of the website for PSInet, an NSF-funded Research Coordination Network aimed at building a community of people and data to harness the potential of plant and soil water potential."
70+
"text": "Welcome to PSInet, an NSF-funded Research Coordination Network aimed at building a community of people and data to harness the potential of plant water potential."
7171
},
7272
{
7373
"objectID": "join.html",

0 commit comments

Comments
 (0)