Skip to content

Commit e0c34f7

Browse files
emiliomemiliom
authored
Merge pull request #53 from emiliom/em_updates
dev-build config files + file cleanup + content draft updates
2 parents a060927 + d4ec1a5 commit e0c34f7

20 files changed

Lines changed: 177 additions & 122 deletions

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@
55
.jekyll-metadata
66
.sass-cache/
77
_site/
8+
9+
_config_localdev.yml

‎README.md‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
# OceanHackweek web site
22

3-
This is the Github repository for the OceanHackweek (OHW) webstite, https://oceanhackweek.github.io. It's built on [Jekyll](https://jekyllrb.com).
4-
5-
**Instructions for editing the content of the site** are found in [InstructionSiteUpdates.md](InstructionSiteUpdates.md). This document lays out which files control what content and provide instructions for deploying Jekyll locally and running it to update your local edits before submitting a pull request.
3+
GitHub repository for the OceanHackweek (OHW) webstite, [https://oceanhackweek.github.io](https://oceanhackweek.github.io). The site is built on [Jekyll](https://jekyllrb.com).
64

5+
**Instructions for editing the content of the site** are found in [_InstructionSiteUpdates.md](_InstructionSiteUpdates.md). This document lays out which files control what content and provide instructions for deploying Jekyll locally and running it to update your local edits before submitting a pull request.
76

87
## Archived sites and pages from previous years
98

109
### OHW 2019
1110

12-
Currently the materials from 2019 are archived in a GitHub branch, https://github.com/oceanhackweek/oceanhackweek.github.io/tree/ohw19archive. Though the individual markdown pages are accessible, the site is not currently viewable directly as a web site proper. This repo hosts pages accessible from the upper-right drop-down menu; these are found in the `_pages` directory. The content for the main, "front" page is found on the Jekyll sub-model repo https://github.com/oceanhackweek/jekyll-spectral-theme, in the `_includes` directory.
11+
Currently the materials from 2019 are archived in a GitHub branch, https://github.com/oceanhackweek/oceanhackweek.github.io/tree/ohw19archive. Though the individual markdown pages are accessible, the site is not currently viewable directly as a web site proper. This repo hosts pages accessible from the upper-right drop-down menu; these are found in the `_pages` directory. The content for the main, "front" page is found on the Jekyll sub-module repo https://github.com/oceanhackweek/jekyll-spectral-theme, in the `_includes` directory.
1312

1413
### OHW 2018
1514

InstructionSiteUpdates.md renamed to _InstructionSiteUpdates.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,21 @@
22

33
The OceanHackweek web site is a Jekyll site that uses the [Jekyll Spectral theme.](http://jekyllthemes.org/themes/spectral/)
44

5-
### Location of main content documents
5+
## Location of main content documents
66

77
Relevant, editable content is organized in the following directories and files:
88

99
- [_config.yml](https://github.com/oceanhackweek/oceanhackweek.github.io/blob/master/_config.yml): core Jekyll site configuration, including some banner/header/footer text and urls
1010
- [jekyll-spectral-theme/_includes](https://github.com/oceanhackweek/oceanhackweek.github.io/tree/master/jekyll-spectral-theme/_includes) directory: front page content, broken up into sections, one markdown file per section.
1111
- The layout templates for sections and section order are controlled by [jekyll-spectral-theme/_layouts/default.html](https://github.com/oceanhackweek/oceanhackweek.github.io/blob/master/jekyll-spectral-theme/_layouts/default.html)
1212
- Each section specifies a template for its layout, where the templates available are found in [jekyll-spectral-theme/_layouts](https://github.com/oceanhackweek/oceanhackweek.github.io/tree/master/jekyll-spectral-theme/_layouts)
13-
- Section two ("Information for Applicants") is a special beast. While [jekyll-spectral-theme/_includes/section-two.html](https://github.com/oceanhackweek/oceanhackweek.github.io/blob/master/jekyll-spectral-theme/_includes/section-two.html) orchestrates it, the directives there point to content to be grabbed from tags `title` and `description` in [_pages/01-applicants.md](https://github.com/oceanhackweek/oceanhackweek.github.io/blob/master/_pages/01-applicants.md)
13+
- Section two ("Information for Applicants") is a special beast. While [jekyll-spectral-theme/_includes/section-02.html](https://github.com/oceanhackweek/oceanhackweek.github.io/blob/master/jekyll-spectral-theme/_includes/section-two.html) orchestrates it, the directives there point to content to be grabbed from tags `title` and `description` in [_pages/01-applicants.md](https://github.com/oceanhackweek/oceanhackweek.github.io/blob/master/_pages/01-applicants.md)
1414
- [_pages](https://github.com/oceanhackweek/oceanhackweek.github.io/tree/master/_pages): content for extra pages, including all the pages accessible via the drop-down menu on the upper right of the page.
1515
- The destination page file name (what a user sees) is *not* the source markdown file name on the repository; instead, the destination file name is found in the `permalink` tag within the markdown file. For example, for [_pages/01-applicants.md](https://github.com/oceanhackweek/oceanhackweek.github.io/blob/master/_pages/01-applicants.md), the destination file name is [applicant-info.html](https://oceanhackweek.github.io/applicant-info.html)
1616

17-
There might be more; these are the ones I'm certain about.
17+
Note that apparently any Markdown file dropped at the root level of the repository, or in the `_pages` directory (or possibly anywhere else?), will be automatically added to the Menu drop down; except ones with names starting with the `_` character.
1818

19-
20-
### Editing and testing locally (in your computer) with Jekyll
19+
## Editing and testing locally (in your computer) with Jekyll
2120

2221
Clone the GitHub repo locally, then edit the content of files following the documentation in the previous section. To view your changes, rebuild the site using Jekyll.
2322

‎_config.yml‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
# Site settings
22
title: Oceanhackweek 2020
3-
email: oceanhkw@uw.edu
3+
email: oceanhackweek@uw.edu
44
description: Data Science + Oceanography<br>
5-
University of Washington<br>
6-
Aug 10-14, 2020 <br> <br>
7-
8-
Useful resources on the <a href="https://oceanhackweek.github.io/wiki/">Wiki</a>!
9-
10-
# Banner button to lead to form, then schedule, then next year's website.
11-
banner_button_url: projects_2019.html
12-
banner_button_text: 2019 Hack Projects
13-
5+
Aug 10-14, 2020<br>
6+
Two parallel, coordinated events:<br>
7+
<b>East</b> @ Bigelow Laboratory for Ocean Sciences<br>
8+
<b>West</b> @ University of Washington<br>
149

1510
baseurl: "" # the subpath of your site, e.g. /blog
1611
url: "" # the base hostname & protocol for your site
@@ -23,17 +18,17 @@ tiles-count: 3
2318
featured-image-source:
2419

2520
# Social settings
21+
github_url: https://github.com/oceanhackweek
22+
slack_url: https://oceanhackweek.slack.com
23+
email_url: oceanhackweek@uw.edu
2624
500px_url:
2725
facebook_url:
28-
github_url: https://github.com/oceanhackweek
2926
gitlab_url:
3027
googleplus_url:
3128
instagram_url:
3229
linkedin_url:
3330
pinterest_url:
34-
slack_url: https://oceanhackweek2019.slack.com
3531
twitter_url:
36-
email_url: oceanhkw@uw.edu
3732

3833
# Build settings
3934
markdown: kramdown

‎_config_uwemiliomdev.yml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# Site settings
2+
title: Oceanhackweek 2020
3+
email: oceanhackweek@uw.edu
4+
description: Data Science + Oceanography<br>
5+
Aug 10-14, 2020<br>
6+
Two parallel, coordinated events:<br>
7+
<b>East</b> @ Bigelow Laboratory for Ocean Sciences<br>
8+
<b>West</b> @ University of Washington<br>
9+
10+
# the subpath of your site, e.g. /blog
11+
baseurl: "/emiliom/out/ohw20draft/"
12+
# the base hostname & protocol for your site
13+
url: "https://staff.washington.edu"
14+
15+
# Homepage tiles
16+
tiles-source: posts # accepts "posts" or "pages"
17+
tiles-count: 3
18+
19+
# Misc settings
20+
featured-image-source:
21+
22+
# Social settings
23+
github_url: https://github.com/oceanhackweek
24+
slack_url: https://oceanhackweek.slack.com
25+
email_url: oceanhackweek@uw.edu
26+
500px_url:
27+
facebook_url:
28+
gitlab_url:
29+
googleplus_url:
30+
instagram_url:
31+
linkedin_url:
32+
pinterest_url:
33+
twitter_url:
34+
35+
# Build settings
36+
markdown: kramdown
37+
38+
# Theme setting, we are excluding jekyll-spectral-theme/ root to avoid picking up theme config.
39+
# We should probably clean it up later.
40+
destination: _site/
41+
plugins_dir: jekyll-spectral-theme/_plugins/
42+
layouts_dir: jekyll-spectral-theme/_layouts/
43+
includes_dir: jekyll-spectral-theme/_includes/
44+
exclude:
45+
- jekyll-spectral-theme/
46+
47+
include: ["_pages"]

‎_pages/01-applicants.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
layout: applicant
33
title: Information for Applicants
4-
description: In the Oceanhackweek we will explore the intersection of data science and oceanography
5-
through tutorials and hands-on “hacking” projects. To best benefit from the program,
6-
participants are expected to have some experience with Python programming and data analysis.
4+
description: In OceanHackweek we will explore the intersection of data science
5+
and oceanography through tutorials and hands-on “hacking” projects.
6+
To best benefit from the program, participants are expected to have some experience with Python programming and data analysis.
77
permalink: applicant-info.html
88
image: ohw18-hacking2.JPG
99

@@ -13,7 +13,6 @@ In Oceanhackweek we will explore the intersection of data science and oceanograp
1313

1414
If you are ready to apply, please use the application form [https://form.jotform.com/oceanhack/2020](https://form.jotform.com/oceanhack/2020)
1515

16-
1716
---
1817

1918

@@ -24,7 +23,7 @@ If you are ready to apply, please use the application form [https://form.jotform
2423
We welcome participants from all career stages. We strongly encourage applications from graduate students, postdocs and early career researchers. There are different ways to contribute to the event: by pitching a project, by your knowledge of data sets, by your computational skills, by your project management skills. We want you to grow/learn during the event! We expect all participants to be engaged in the team projects and focus during the week. If in doubt, simply apply and explain your motivation for participation.
2524

2625

27-
**Q: I am proficient in Matlab / R / other languages but have not used Python. It has been on my list to learn. How can I make my application stronger?**
26+
**Q: I am proficient in Matlab / R / other languages but have not used Python. It has been on my list to learn. How can I make my application be stronger?**
2827

2928
We want to build an inclusive Oceanography community regardless of people’s language of choice and programming level. Since the event is only one week long, the tutorials will be presented in one language (Python), and participants will benefit the most if they have basic familiarity with this language. We expect that you have gone through the [Software Carpentry Python tutorial](http://swcarpentry.github.io/python-novice-gapminder) to get familiar with the syntax in advance of the program. The more experience you can obtain before the beginning of the program, the easier it will be to follow the tutorials and contribute to the projects.
3029

_pages/z-projects_2018.md renamed to _pages/_z-projects_2018.md

File renamed without changes.

_pages/z-schedule_2018.md renamed to _pages/_z-schedule_2018.md

File renamed without changes.

‎jekyll-spectral-theme/_includes/banner.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<h2>{{ site.title }}</h2>
55
<p>{{ site.description }}</p>
66
<ul class="actions">
7-
<li><a href="{{ site.banner_button_url }}" class="button special">{{ site.banner_button_text }}</a></li>
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>
89
</ul>
910
</div>
1011
<a href="#one" class="more scrolly">Learn More</a>

‎jekyll-spectral-theme/_includes/covid19.html‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<section id="covid19" class="wrapper special style5">
2+
<div class="inner">
3+
<header class="major">
4+
<h2>Coronavirus (COVID-19) Contingency</h2>
5+
<p>
6+
We are monitoring the COVID-19 situation and will make a decision by late May about whether to proceed with
7+
the event in mid August, as planned, or postpone to January 2021. If it is postpone,
8+
OceanHackweek West may be moved to San Diego.
9+
10+
To stay up to date on the current impact of the coronavirus emergency and government recommendations,
11+
see the US Federal web site <a href="https://www.coronavirus.gov">https://www.coronavirus.gov</a>
12+
and your state and local positions.
13+
</p>
14+
</header>
15+
</div>
16+
</section>

0 commit comments

Comments
 (0)