diff --git a/content/blog/_index.md b/content/blog/_index.md index 52740e8..0bd5832 100644 --- a/content/blog/_index.md +++ b/content/blog/_index.md @@ -1,9 +1,7 @@ --- title: Blog sort_by: date -extra: - section_embed_mode: blog_posts - # redir_to: /timeline +template: "blog-timeline.html" --- The following is a list of articles I've written. This is also available in [RSS](/rss.xml) format. diff --git a/content/photos/2017-06-21-old-quebec.md b/content/photos/2017-06-21-old-quebec.md new file mode 100644 index 0000000..9f87135 --- /dev/null +++ b/content/photos/2017-06-21-old-quebec.md @@ -0,0 +1,8 @@ +--- +title: Old Quebec +date: 2017-06-21 +extra: + cover_image: /photos/2017-06-21-old-quebec.jpeg +--- + + diff --git a/content/photos/2017-06-21-stormy-quebec-street.md b/content/photos/2017-06-21-stormy-quebec-street.md new file mode 100644 index 0000000..28548d6 --- /dev/null +++ b/content/photos/2017-06-21-stormy-quebec-street.md @@ -0,0 +1,8 @@ +--- +title: Stormy Street in Quebec +date: 2017-06-21 +extra: + cover_image: /photos/2017-06-21-stormy-quebec-street.jpeg +--- + + diff --git a/content/photos/2017-06-22-montmorency-falls.md b/content/photos/2017-06-22-montmorency-falls.md new file mode 100644 index 0000000..bcea356 --- /dev/null +++ b/content/photos/2017-06-22-montmorency-falls.md @@ -0,0 +1,8 @@ +--- +title: Montmorency Falls +date: 2017-06-22 +extra: + cover_image: /photos/2017-06-22-montmorency-falls.jpeg +--- + + diff --git a/content/photos/2017-08-04-rocky-shore-halifax.md b/content/photos/2017-08-04-rocky-shore-halifax.md new file mode 100644 index 0000000..44ac389 --- /dev/null +++ b/content/photos/2017-08-04-rocky-shore-halifax.md @@ -0,0 +1,8 @@ +--- +title: Rocky Shore +date: 2017-08-04 +extra: + cover_image: /photos/2017-08-04-rocky-shore-halifax.jpeg +--- + + diff --git a/content/photos/2019-08-04-halifax-port.md b/content/photos/2019-08-04-halifax-port.md new file mode 100644 index 0000000..4b57bb0 --- /dev/null +++ b/content/photos/2019-08-04-halifax-port.md @@ -0,0 +1,10 @@ +--- +title: Halifax Port +date: 2019-08-04 +extra: + cover_image: /photos/2019-08-04-halifax-port.jpeg +--- + + + +*Shot at [PSA International](https://www.globalpsa.com/)'s Halifax port.* diff --git a/content/photos/2019-08-09-jacobs-ladder.md b/content/photos/2019-08-09-jacobs-ladder.md new file mode 100644 index 0000000..f53ab62 --- /dev/null +++ b/content/photos/2019-08-09-jacobs-ladder.md @@ -0,0 +1,10 @@ +--- +title: Jacob's Ladder +date: 2019-08-09 +extra: + cover_image: /photos/2019-08-09-jacobs-ladder.jpeg +--- + + + +*Shot at Jacob's Ladder, a stairway in Victoria Park, Truro, Nova Scotia.* diff --git a/content/photos/2020-07-19-my-desk.md b/content/photos/2020-07-19-my-desk.md new file mode 100644 index 0000000..4a8389e --- /dev/null +++ b/content/photos/2020-07-19-my-desk.md @@ -0,0 +1,8 @@ +--- +title: My Desk +date: 2020-07-19 +extra: + cover_image: /photos/2020-07-19-my-desk.png +--- + + \ No newline at end of file diff --git a/content/photos/2020-07-23-two-cars.md b/content/photos/2020-07-23-two-cars.md new file mode 100644 index 0000000..ae453b5 --- /dev/null +++ b/content/photos/2020-07-23-two-cars.md @@ -0,0 +1,8 @@ +--- +title: Two Cars +date: 2020-07-23 +extra: + cover_image: /photos/2020-07-23-two-cars.png +--- + + diff --git a/content/photos/2022-01-18-snow-day-in-space.md b/content/photos/2022-01-18-snow-day-in-space.md new file mode 100644 index 0000000..1d28fd7 --- /dev/null +++ b/content/photos/2022-01-18-snow-day-in-space.md @@ -0,0 +1,8 @@ +--- +title: Snow Day in Space +date: 2022-01-18 +extra: + cover_image: /photos/2022-01-18-snow-day-in-space.jpg +--- + + diff --git a/content/photos/_index.md b/content/photos/_index.md new file mode 100644 index 0000000..50ff35d --- /dev/null +++ b/content/photos/_index.md @@ -0,0 +1,6 @@ +--- +title: Photography +sort_by: date +template: "photo-timeline.html" +--- + diff --git a/static/photos/quebec-2017/20170621_105921-01.jpeg b/static/photos/2017-06-21-old-quebec.jpeg similarity index 100% rename from static/photos/quebec-2017/20170621_105921-01.jpeg rename to static/photos/2017-06-21-old-quebec.jpeg diff --git a/static/photos/quebec-2017/20170621_132531-01.jpeg b/static/photos/2017-06-21-stormy-quebec-street.jpeg similarity index 100% rename from static/photos/quebec-2017/20170621_132531-01.jpeg rename to static/photos/2017-06-21-stormy-quebec-street.jpeg diff --git a/static/photos/quebec-2017/20170622_153903-01.jpeg b/static/photos/2017-06-22-montmorency-falls.jpeg similarity index 100% rename from static/photos/quebec-2017/20170622_153903-01.jpeg rename to static/photos/2017-06-22-montmorency-falls.jpeg diff --git a/static/photos/nova-scotia-2019/IMG_20190804_195626-01.jpeg b/static/photos/2017-08-04-rocky-shore-halifax.jpeg similarity index 100% rename from static/photos/nova-scotia-2019/IMG_20190804_195626-01.jpeg rename to static/photos/2017-08-04-rocky-shore-halifax.jpeg diff --git a/static/photos/nova-scotia-2019/IMG_20190804_200022-01.jpeg b/static/photos/2019-08-04-halifax-port.jpeg similarity index 100% rename from static/photos/nova-scotia-2019/IMG_20190804_200022-01.jpeg rename to static/photos/2019-08-04-halifax-port.jpeg diff --git a/static/photos/nova-scotia-2019/IMG_20190808_152323-01.jpeg b/static/photos/2019-08-09-jacobs-ladder.jpeg similarity index 100% rename from static/photos/nova-scotia-2019/IMG_20190808_152323-01.jpeg rename to static/photos/2019-08-09-jacobs-ladder.jpeg diff --git a/static/photos/2020-07-19-my-desk.png b/static/photos/2020-07-19-my-desk.png new file mode 100644 index 0000000..46a068d Binary files /dev/null and b/static/photos/2020-07-19-my-desk.png differ diff --git a/static/photos/2020-07-23-two-cars.png b/static/photos/2020-07-23-two-cars.png new file mode 100644 index 0000000..4dced55 Binary files /dev/null and b/static/photos/2020-07-23-two-cars.png differ diff --git a/static/photos/2022-01-18-snow-day-in-space.jpg b/static/photos/2022-01-18-snow-day-in-space.jpg new file mode 100644 index 0000000..c376653 Binary files /dev/null and b/static/photos/2022-01-18-snow-day-in-space.jpg differ diff --git a/static/photos/go_train_wide.jpg b/static/photos/go_train_wide.jpg deleted file mode 100644 index 97dd246..0000000 Binary files a/static/photos/go_train_wide.jpg and /dev/null differ diff --git a/static/photos/nova-scotia-2019/IMG_20190805_151052-01.jpeg b/static/photos/nova-scotia-2019/IMG_20190805_151052-01.jpeg deleted file mode 100644 index c414781..0000000 Binary files a/static/photos/nova-scotia-2019/IMG_20190805_151052-01.jpeg and /dev/null differ diff --git a/static/photos/nova-scotia-2019/IMG_20190807_122409-01.jpeg b/static/photos/nova-scotia-2019/IMG_20190807_122409-01.jpeg deleted file mode 100644 index 076e440..0000000 Binary files a/static/photos/nova-scotia-2019/IMG_20190807_122409-01.jpeg and /dev/null differ diff --git a/static/photos/nova-scotia-2019/PANO_20190805_114718.jpg b/static/photos/nova-scotia-2019/PANO_20190805_114718.jpg deleted file mode 100644 index c26540f..0000000 Binary files a/static/photos/nova-scotia-2019/PANO_20190805_114718.jpg and /dev/null differ diff --git a/static/photos/nova-scotia-2019/PANO_20190805_123604.jpg b/static/photos/nova-scotia-2019/PANO_20190805_123604.jpg deleted file mode 100644 index 93aa54e..0000000 Binary files a/static/photos/nova-scotia-2019/PANO_20190805_123604.jpg and /dev/null differ diff --git a/static/photos/quebec-2017/20170621_105853-01.jpeg b/static/photos/quebec-2017/20170621_105853-01.jpeg deleted file mode 100644 index 6c37ad9..0000000 Binary files a/static/photos/quebec-2017/20170621_105853-01.jpeg and /dev/null differ diff --git a/static/photos/quebec-2017/20170621_131126-01.jpeg b/static/photos/quebec-2017/20170621_131126-01.jpeg deleted file mode 100644 index 8f2405c..0000000 Binary files a/static/photos/quebec-2017/20170621_131126-01.jpeg and /dev/null differ diff --git a/static/photos/quebec-2017/20170621_225558-01.jpeg b/static/photos/quebec-2017/20170621_225558-01.jpeg deleted file mode 100644 index 4b7bdbf..0000000 Binary files a/static/photos/quebec-2017/20170621_225558-01.jpeg and /dev/null differ diff --git a/static/photos/quebec-2017/20170622_112655-01.jpeg b/static/photos/quebec-2017/20170622_112655-01.jpeg deleted file mode 100644 index 2ea7468..0000000 Binary files a/static/photos/quebec-2017/20170622_112655-01.jpeg and /dev/null differ diff --git a/static/photos/quebec-2017/20170622_152959-01.jpeg b/static/photos/quebec-2017/20170622_152959-01.jpeg deleted file mode 100644 index 9e121bc..0000000 Binary files a/static/photos/quebec-2017/20170622_152959-01.jpeg and /dev/null differ diff --git a/static/photos/quebec-2017/20170622_153509-02.jpeg b/static/photos/quebec-2017/20170622_153509-02.jpeg deleted file mode 100644 index c6033f8..0000000 Binary files a/static/photos/quebec-2017/20170622_153509-02.jpeg and /dev/null differ diff --git a/templates/base.html b/templates/base.html index 2e7c1f0..62c34f9 100644 --- a/templates/base.html +++ b/templates/base.html @@ -108,6 +108,7 @@ <li><a href="/blog">Blog</a></li> <li><a href="/radio">Radio</a></li> <li><a href="/music">Music</a></li> + <li><a href="/photos">Photos</a></li> <li><a href="/contact">Contact</a></li> </ul> <hr> diff --git a/templates/blog-timeline.html b/templates/blog-timeline.html new file mode 100644 index 0000000..3a90258 --- /dev/null +++ b/templates/blog-timeline.html @@ -0,0 +1,28 @@ +{% extends "base.html" %} + + +{% block content %} + +{{super()}} + +{# Posts shall be broken down by year #} +{% set title_year = "3000" %} +{% for page in section.pages %} +{% if not page.extra.hidden %} +{% set page_year = page.date | date(format="%Y")%} +{% if page_year != title_year %} +{% set_global title_year = page_year %} + +</ul> +<h2>{{title_year}}</h2> +<ul class="blog-post-list"> + {% endif %} + <li> + <span class="date" {% if page.draft %}data-draft="true" {% endif %}>{{page.date}}:</span> + <a href="{{page.path | safe}}">{{page.title}}</a> + </li> + {% endif %} + {% endfor %} +</ul> + +{% endblock content %} \ No newline at end of file diff --git a/templates/photo-timeline.html b/templates/photo-timeline.html new file mode 100644 index 0000000..27d8c46 --- /dev/null +++ b/templates/photo-timeline.html @@ -0,0 +1,23 @@ +{% extends "base.html" %} + + +{% block content %} + +{{super()}} + +{% for page in section.pages %} +{% if not page.extra.hidden %} + +<a href="{{page.path | safe}}" style="color:black !important;"> + <img src="{{page.extra.cover_image | safe}}" alt="{{page.title}}" style="width:100%;" loading="lazy"> + <div style="display:flex;justify-content:space-between;"> + <span><strong>{{page.title}}</strong></span> + <span class="gray">{{page.date}}</span> + </div> +</a> +<br> + +{% endif %} +{% endfor %} + +{% endblock content %} \ No newline at end of file diff --git a/templates/section.html b/templates/section.html index a1858b6..dbc6c55 100644 --- a/templates/section.html +++ b/templates/section.html @@ -5,29 +5,4 @@ {{super()}} -{# Blog posts page gets special treatment #} -{% if section.path == "/blog/" %} - - -{# Posts shall be broken down by year #} -{% set title_year = "3000" %} -{% for page in section.pages %} -{% if not page.extra.hidden %} -{% set page_year = page.date | date(format="%Y")%} -{% if page_year != title_year %} -{% set_global title_year = page_year %} - -</ul> -<h2>{{title_year}}</h2> -<ul class="blog-post-list"> - {% endif %} - <li> - <span class="date" {% if page.draft %}data-draft="true" {% endif %}>{{page.date}}:</span> - <a href="{{page.path | safe}}">{{page.title}}</a> - </li> - {% endif %} - {% endfor %} -</ul> -{% endif %} - {% endblock content %} \ No newline at end of file