commit 2d92b7fa22db8a81ae7b27a2eedf5a55de474098 parent 6d4576c865870bc3ddbf5a09ca51d607c4640cf6 Author: FIGBERT <figbert@figbert.com> Date: Tue, 19 Mar 2024 18:14:15 -0700 Redesign /reading The Current and To-Read subsections have been removed, under the philosophy that committing to uncertain actions before they happen is less good than simply publishing the actions as they are taken. The very-similar templates for posts/projects and reading have further been merged into one template for ease of maintenance. Diffstat:
23 files changed, 30 insertions(+), 93 deletions(-)
diff --git a/content/posts/stanford-quarterly-reflection-01/index.md b/content/posts/stanford-quarterly-reflection-01/index.md @@ -150,5 +150,5 @@ cool, has nice hair, and writes [a blog of his own][nash-blog]. freshman is something you can do. If you're insane. [corner]: https://www.corner.inc/clouds -[war-of-return]: @/reading/complete/war-of-return/index.md +[war-of-return]: @/reading/war-of-return/index.md [nash-blog]: https://adamnash.blog diff --git a/content/reading/_index.md b/content/reading/_index.md @@ -1,7 +1,6 @@ +++ title = "Reading" -template = "reading.html" -page_template = "book.html" +page_template = "article.html" sort_by = "date" insert_anchor_links = "left" +++ diff --git a/content/reading/complete/_index.md b/content/reading/complete/_index.md @@ -1,4 +0,0 @@ -+++ -weight = 0 -sort_by = "date" -+++ diff --git a/content/reading/complete/desert-and-the-sea.md b/content/reading/desert-and-the-sea.md diff --git a/content/reading/complete/dune.md b/content/reading/dune.md diff --git a/content/reading/list/_index.md b/content/reading/list/_index.md @@ -1,7 +0,0 @@ -+++ -title = "To-Read" -weight = 2 -sort_by = "weight" -[extra] -no_link = true -+++ diff --git a/content/reading/list/emperor-of-all-maladies.md b/content/reading/list/emperor-of-all-maladies.md @@ -1,7 +0,0 @@ -+++ -title = "The Emperor of All Maladies" -weight = 1 -[extra] -book = "The Emperor of All Maladies" -author = "Siddhartha Mukherjee" -+++ diff --git a/content/reading/list/world-behind-the-world.md b/content/reading/list/world-behind-the-world.md @@ -1,7 +0,0 @@ -+++ -title = "World Behind the World" -weight = 0 -[extra] -book = "The World Behind the World" -author = "Erik Hoel" -+++ diff --git a/content/reading/complete/lonely-man-of-faith.md b/content/reading/lonely-man-of-faith.md diff --git a/content/reading/complete/moonwalking-with-einstein.md b/content/reading/moonwalking-with-einstein.md diff --git a/content/reading/complete/neuromancer.md b/content/reading/neuromancer.md diff --git a/content/reading/now/_index.md b/content/reading/now/_index.md @@ -1,7 +0,0 @@ -+++ -title = "Current" -weight = 1 -sort_by = "weight" -[extra] -no_link = true -+++ diff --git a/content/reading/now/carbon-almanac.md b/content/reading/now/carbon-almanac.md @@ -1,7 +0,0 @@ -+++ -title = "Carbon Almanac" -weight = 3 -[extra] -book = "Carbon Almanac" -author = "Seth Godin et. al." -+++ diff --git a/content/reading/now/hypermedia-systems.md b/content/reading/now/hypermedia-systems.md @@ -1,7 +0,0 @@ -+++ -title = "Hypermedia Systems" -weight = 2 -[extra] -book = "Hypermedia Systems" -author = "Carson Gross" -+++ diff --git a/content/reading/now/subtle-art-of-not-giving-a-fuck.md b/content/reading/now/subtle-art-of-not-giving-a-fuck.md @@ -1,7 +0,0 @@ -+++ -title = "The Subtle Art of Not Giving a Fuck" -weight = 1 -[extra] -book = "The Subtle Art of Not Giving a Fuck" -author = "Mark Manson" -+++ diff --git a/content/reading/complete/spies-of-no-country.md b/content/reading/spies-of-no-country.md diff --git a/content/reading/complete/thousand-crimes-ming-tsu.md b/content/reading/thousand-crimes-ming-tsu.md diff --git a/content/reading/complete/war-of-return/index.md b/content/reading/war-of-return/index.md diff --git a/content/reading/complete/war-of-return/refugees.png b/content/reading/war-of-return/refugees.png Binary files differ. diff --git a/content/reading/complete/who-by-fire.md b/content/reading/who-by-fire.md diff --git a/templates/article.html b/templates/article.html @@ -4,9 +4,15 @@ <section id="article-header"> <h1><a href="{{ current_url }}">{{ page.title }}</a></h1> <small> + {% if page.extra is containing("book") %} + <i>{{ page.extra.book }}</i> by {{ page.extra.author }}. <br/> + Finished on {{ page.extra.finished | date(format="%B %d, %Y") }}. <br/> + Rating: {{ page.extra.rating }} <br/> + {% else %} Published by <a href="{{ config.base_url }}">{{ config.title }}</a> on <time datetime="{{ page.date }}">{{ page.date | date(format="%B %d, %Y") }}</time> <br/> + {% endif %} <a href="..">< Back</a> </small> </section> diff --git a/templates/reading.html b/templates/reading.html @@ -1,33 +0,0 @@ -{% extends "index.html" %} -{% block content %} - {% for _path in section.subsections %} - {% set subsection = get_section(path=_path) %} - {% if subsection.title %} - <hr/> - <p><strong>{{ subsection.title }}</strong></p> - {% endif %} - {% if subsection.content %} - {{ subsection.content | safe }} - {% endif %} - {% for page in subsection.pages %} - <ul class="section-list"> - <li> - {% if subsection.extra is not containing("no_link") and page.extra is not containing("no_link") %} - <a href="{{ page.permalink }}" class"section-title">{{ page.extra.book }}</a> - {% else %} - <span class="section-title">{{ page.extra.book }}</span> - {% endif %} - <div class="summary"> - By: {{ page.extra.author }} <br/> - {% if page.extra is containing("finished") %} - Finished: {{ page.extra.finished | date(format="%B %d, %Y") }} <br/> - {% endif %} - {% if page.extra is containing("rating") %} - Rating: {{ page.extra.rating }} - {% endif %} - </div> - </li> - </ul> - {% endfor %} - {% endfor %} -{% endblock content %} diff --git a/templates/section.html b/templates/section.html @@ -6,11 +6,29 @@ <ul class="section-list"> {% for page in section.pages %} <li> - <a href="{{ page.permalink }}" class="section-title">{{ page.title }}</a> - {% if page.summary %} - <div class="summary">{{ page.summary | safe }}</div> + {% if page.extra is containing("book") %} + {% if page.extra is containing("no_link") %} + <span>{{ page.extra.book }}</span> + {% else %} + <a href="{{ page.permalink }}">{{ page.extra.book }}</a> + {% endif %} + {% else %} + <a href="{{ page.permalink }}" class="section-title">{{ page.title }}</a> + {% endif %} + {% if page.extra is containing("book") %} + <p class="summary"> + By: {{ page.extra.author }} <br/> + {% if page.extra is containing("no_link") %} + Finished: {{ page.extra.finished | date(format="%B %d, %Y") }} <br/> + {% endif %} + Rating: {{ page.extra.rating }} + </p> {% else %} - <p class="summary">{{ page.description }}</p> + {% if page.summary %} + <div class="summary">{{ page.summary | safe }}</div> + {% else %} + <p class="summary">{{ page.description }}</p> + {% endif %} {% endif %} </li> {% endfor %}
