Skip to content

Commit 2d7c56c

Browse files
committed
Various file name and organizational cleanups
- Cleaned up file names for sections: section-01.html, section-02.html, etc. Removed unused section file - Front-page "button" definitions moved from config.yml to section-01.html - Small clean up of config.yml
1 parent 9c89dea commit 2d7c56c

12 files changed

Lines changed: 47 additions & 82 deletions

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.
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: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,6 @@ description: Data Science + Oceanography<br>
66
Two parallel, coordinated events:<br>
77
<b>East</b> @ Bigelow Laboratory for Ocean Sciences<br>
88
<b>West</b> @ University of Washington<br>
9-
<br>
10-
11-
Useful resources on the <a href="https://oceanhackweek.github.io/wiki/">Wiki</a>!
12-
13-
# Banner button to lead to form, then schedule, then next year's website.
14-
banner_button_url: projects_2019.html
15-
banner_button_text: 2019 Hack Projects
16-
179

1810
baseurl: "" # the subpath of your site, e.g. /blog
1911
url: "" # the base hostname & protocol for your site

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/section-one.html renamed to jekyll-spectral-theme/_includes/section-01.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<!-- One -->
21
<section id="one" class="wrapper style2 special">
32
<div class="inner">
43
<header class="major">
@@ -13,7 +12,7 @@ <h2>ABOUT OCEANHACKWEEK</h2>
1312
<p>
1413
<a href="https://oceanhackweek.github.io/ohw2018/">See the previously held Oceanhackweek 2018</a>
1514
|
16-
<a href="/hackweek.html">Learn about "hackweek".</a>
15+
<a href="/hackweek.html">What is a Hackweek?</a>
1716
</p>
1817
</header>
1918
<!--<ul class="icons major">-->
File renamed without changes.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<section id="three" class="wrapper style2 special">
2+
<div class="inner">
3+
<header class="major">
4+
<h2>2018 Participant Quotes</h2>
5+
<p><i>"The workshop provided an excellent introduction to the existing infrastructure of oceanographic data-gathering resources. Also provided was an introduction to the open-source evolving tools for accessing and utilizing large data sets. The technical challenges in data-intensive research are daunting, and here this workshop’s model and enactment of collaborative work was particularly valuable to me."</i> ~ Rachel Jackson, San Francisco State University</p>
6+
<p><i>"I am grateful to have attended Oceanhackweek, and to have been given the opportunity to expand my skill set in such a productive and pleasant environment. I live in Fairbanks, AK, where we are rather isolated and aren't naturally exposed to new tools or methods. [...] Oceanhackweek gave me that time, introduced me to possibilities via the tutorials, and through the projects produced a technical structure that I can apply to our research in Alaska."</i> ~ Liz Dobbins, University of Alaska, Fairbanks</p>
7+
<p><i>"It is sometimes hard to predict whether a given conference, training or hack-a-thon might be worth your time. [...] The real challenge, of course, is to find a group of like minded people that want to expand their horizons and learn together, and that is just what I found when I attended Ocean Hackweek." </i> ~ Christian Saranson</p>
8+
</header>
9+
</div>
10+
</section>

jekyll-spectral-theme/_includes/section-three.html renamed to jekyll-spectral-theme/_includes/section-04.html

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
1-
<!-- Three -->
2-
<section id="three" class="wrapper style1 special">
1+
<section id="four" class="wrapper style1 special">
32
<div class="inner">
43
<header class="major">
54
<h2>Oceanhackweek 2019 Sponsors</h2>
65
</header>
76
<div class="sponsors">
87
<div class="sponsors-row">
98
<div class="sponsors-logo">
10-
<img src="assets/images/nsf.jpeg" alt="">
9+
<img src="assets/images/nsf.jpeg" alt="NSF">
1110
</div>
1211
<div class="sponsors-logo">
13-
<img src="assets/images/escience.png" alt="">
12+
<img src="assets/images/escience.png" alt="UW eScience">
1413
</div>
1514
<div class="sponsors-logo">
16-
<img src="assets/images/ioos_logo.jpg" alt="">
15+
<img src="assets/images/ioos_logo.jpg" alt="IOOS">
1716
</div>
1817
<div class="sponsors-logo">
19-
<img src="assets/images/ooi.jpg" alt="">
20-
</div>
21-
18+
<img src="assets/images/ooi.jpg" alt="OOI">
19+
</div>
2220
</div>
2321
</div>
2422
</div>
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<section id="five" class="wrapper style2 special">
2+
<div class="inner">
3+
<header class="major">
4+
<h2>Location</h2>
5+
</header>
6+
<div id="map"></div>
7+
</div>
8+
</section>
9+
<script type="application/javascript">
10+
var map = L.map('map').setView([47.65338269999999, -122.3118654], 12);
11+
12+
L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
13+
attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
14+
}).addTo(map);
15+
16+
L.marker([47.65338269999999, -122.3118654]).addTo(map)
17+
.bindPopup('eScience Institute <br/> WRF Data Science Studio, UW Physics/Astronomy Tower, 6th Floor, Campus Box 351570, 3910 15th Ave NE, Seattle, WA 98195')
18+
.openPopup();
19+
</script>

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

Lines changed: 0 additions & 26 deletions
This file was deleted.

jekyll-spectral-theme/_includes/section-one-three.html

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)