Skip to content

Commit 2681a78

Browse files
authored
Merge pull request #69 from emiliom/openappl
Updates to front page and hackweek page I'm taking the liberty of self merging w/o direct review. Changes can be applied via follow-up PRs.
2 parents cddb51a + 9fa0911 commit 2681a78

5 files changed

Lines changed: 22 additions & 24 deletions

File tree

_pages/02-hackweek.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ Compared to hackathons typically focused on software development, hackweeks have
1515
focus on learning and open-ended projects as informal education and peer learning opportunities.
1616
This setup is particularly powerful for sciences that require not only domain-specific
1717
knowledge but also effective computational workflows to foster rapid exchange of ideas
18-
and make discovery.
18+
and make discovery.
1919

2020
This is an excellent match with the nature of oceanographic research
2121
where data are large and complex and the community is diverse and collaborative.
2222
The hackweek model was spearheaded by the successful [*Astro-*](http://astrohackweek.org/2019/),
2323
[*Neuro-*](https://neurohackweek.github.io/), and [*Geohackweek*](https://geohackweek.github.io/).
2424

25-
[See what we did in Oceanhackweek 2018](https://oceanhackweek.github.io/schedule.html).
25+
See what we did at the previously held [OceanHackWeek 2019](https://oceanhackweek.github.io/ohw19/)
26+
and [OceanHackWeek 2018](https://oceanhackweek.github.io/ohw2018/). The [2019 schedule is here](https://oceanhackweek.github.io/ohw19/curriculum_2019.html), with links to tutorials.

jekyll-spectral-theme/_includes/banner.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
<div class="inner">
44
<h2>{{ site.title }}</h2>
55
<p>{{ site.description }}</p>
6-
<!-- <ul class="actions">
7-
<li><a href="/wiki/" class="button special">wiki</a></li>
8-
<li><a href="projects_2019.html" class="button special">2019 Hack Projects</a></li>
9-
</ul> -->
6+
<ul class="actions">
7+
<!-- <li><a href="/wiki/" class="button special">wiki</a></li> -->
8+
<!-- <li><a href="projects_2019.html" class="button special">2019 Hack Projects</a></li> -->
9+
<li><a href="#two" class="button special">Application due July 13!</a></li>
10+
</ul>
1011
</div>
1112
<a href="#one" class="more scrolly">Learn More</a>
1213
</section>

jekyll-spectral-theme/_includes/section-01.html

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<section id="one" class="wrapper special style2">
22
<div class="inner">
33
<header class="major">
4-
<h2>ABOUT OCEANHACKWEEK</h2>
4+
<h2>About OceanHackWeek</h2>
55
<p>
6-
OceanHackweek is a 5-day collaborative learning experience aimed at exploring,
6+
OceanHackWeek (OHW) is a 5-day collaborative learning experience aimed at exploring,
77
creating and promoting effective computation and analysis workflows for
8-
large and complex oceanographic data. Its objectives are to:
9-
<ul>
8+
large and complex oceanographic data. It includes tutorials, data exploration, software development, collaborative projects and community networking.
9+
Its objectives are to:
10+
<ul style="text-align: left">
1011
<li>Promote data and software proficiency in ocean scientists:
1112
Provide participants with computational and data science skills that can
1213
advance oceanography research, which often requires the integration and
@@ -17,21 +18,16 @@ <h2>ABOUT OCEANHACKWEEK</h2>
1718
an open science and a sharing culture.
1819
</li>
1920
</ul>
20-
21-
OceanHackweek (OHW) 2020 will consist of two parallel, coordinated events taking place at the same time
22-
on the US East and West coasts at the <a href="https://www.bigelow.org">Bigelow Laboratory for Ocean Sciences</a>
23-
in East Boothbay, Maine, and the <a href="https://www.uw.edu/">University of Washington</a> in Seattle,
24-
Washington. While previous OceanHackweeks took place as a single location at the University of Washington,
25-
this new approach will result in smaller individual events, options for closer locations,
26-
and an opportunity for each event to focus on distinct oceanographic disciplines. <b>OHW-East</b> and <b>OHW-West</b>
27-
will emphasize biological themes and observation platforms, respectively. However, participants
28-
with diverse interests will be welcome at both events.
21+
</p>
22+
<p>
23+
Due to COVID-19, OceanHackWeek 2020 will take place as a virtual, online event.
24+
Formal daily activities will take place over a period of up to 3 hours per day, tentatively 10am-1pm US PDT / 1-4pm US EDT / 17:00-20:00 UTC. These activities include tutorials and project check-in with the entire group, but exclude actual project time. The time period will be finalized based on the geographical distribution of participants.
2925
</p>
3026
<p>
3127
<a href="hackweek.html">What is a Hackweek?</a>
3228
|
33-
See the previously held <a href="https://oceanhackweek.github.io/ohw19/">OceanHackweek 2019</a> and
34-
<a href="https://oceanhackweek.github.io/ohw2018/">OceanHackweek 2018</a>
29+
See the previously held <a href="https://oceanhackweek.github.io/ohw19/">OceanHackWeek 2019</a> and
30+
<a href="https://oceanhackweek.github.io/ohw2018/">OceanHackWeek 2018</a>
3531
</p>
3632
</header>
3733
</div>

jekyll-spectral-theme/_includes/section-02.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
{% for page in site.pages%}{% if page.layout == 'applicant' %}
1515

1616
<section class="spotlight">
17-
<div class="image">{% if page.image %}<img src="{% if site.featured-image-source %}{{ page.image | prepend: site.featured-image-source | absolute_url }}{% else %}{{ "" | absolute_url }}/assets/images/{{ page.image }}{% endif %}" alt="" />{% endif %}</div>
17+
<div class="image">
18+
{% if page.image %}<img src="{% if site.featured-image-source %}{{ page.image | prepend: site.featured-image-source | absolute_url }}{% else %}{{ "" | absolute_url }}/assets/images/{{ page.image }}{% endif %}" alt="" />{% endif %}
19+
</div>
1820
<div class="content">
1921
<h2><a href="{{ page.url | relative_url }}" class="link">{{ page.title }}</a></h2>
2022
<p>{{ page.description }}</p>

jekyll-spectral-theme/_layouts/default.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,9 @@
1111
{% include header.html %}
1212
{% include banner.html %}
1313
{% include section-01.html %}
14-
{% include covid19.html %}
1514
{% include section-02.html %}
1615
{% include section-03.html %}
1716
{% include section-04.html %}
18-
{% include section-05.html %}
1917
{% include footer.html %}
2018
</body>
2119

0 commit comments

Comments
 (0)