Skip to content

Commit

Permalink
Update wikifooter; update reading notes logic to often exclude lists.
Browse files Browse the repository at this point in the history
  • Loading branch information
ryan-p-randall committed May 2, 2024
1 parent 72ae804 commit 2811f6d
Show file tree
Hide file tree
Showing 9 changed files with 99 additions and 38 deletions.
7 changes: 7 additions & 0 deletions _includes/item-list-link.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<li>{% if item.pinned %}📌 {% endif %}
<a href="{{ item.url }}">{{ item.title }}
{% if item.status == ":seedling:" %} :seedling:{% endif %}
{% if item.status == ":herb:" %} :herb:{% endif %}
{% if item.status == ":evergreen_tree:" %} :evergreen_tree:{% endif %}
</a>
</li>
22 changes: 16 additions & 6 deletions _includes/wikifooter.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
<div class="">
<div class="wiki-flex notice">
<div class="wiki-flex-item">:seedling: = emerging note</div>
<div class="wiki-flex-item">:herb: = established note</div>
<div class="wiki-flex-item"> :evergreen_tree: = evergreen note</div>
</div>
<div class="notice" style="padding: 0px; display: flex; flex-flow: row nowrap; justify-content: space-evenly;">
<div class="wiki-flex-item">
<ul style="list-style-type: none; margin: 1em;">
<li>:seedling: = emerging note</li>
<li>:herb: = established note</li>
<li>:evergreen_tree: = evergreen note</li>
</ul>
</div>
<div class="wiki-flex-item">
<ul style="list-style-type: none; margin: 1em;">
<li>
<!-- <i class="ai ai-open-access" aria-hidden="true"></i><span class="screen-reader-text">open access unlocked icon</span> -->
:unlock: = open access</li>
<li>:closed_lock_with_key: = paywalled</li>
</ul>
</div>
</div>
8 changes: 5 additions & 3 deletions _layouts/note.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,11 @@
{% if page.reading %}
<h2 id="reading-details">Details</h2>
<p>{% if page.reading-articles %} :page_facing_up: "{{ page.title }}"<br />{% endif %}
{% if page.reading-books %} :book: <strong>{{ page.title }}</strong><br />{% endif %}
{% if page.work_link %}Link: <a href="{{ page.work_link }}">{{ page.work_link_text }}</a><br />{% endif %}
By: {{ page.work_author }}<br />
{% if page.reading-books %} :book: <strong>{{ page.title }}</strong><br />{% endif %}
{% if page.access == "oa" %}Link: <a href="{{ page.work_link }}">{{ page.work_link_text }}</a> :unlock:<br />{% endif %}
{% if page.access == "paywalled" %}Link: <a href="{{ page.work_link }}">{{ page.work_link_text }}</a> :closed_lock_with_key:<br />{% endif %}
{% if page.access != "paywalled" and page.access !="oa" %}Link: <a href="{{ page.work_link }}">{{ page.work_link_text }}</a><br />{% endif %}
By: {{ page.work_author }}<br />
Started: {{ page.date_started }}
{% if page.date_read %}<br />Finished: {{ page.date_read }}{% endif %}<br />
Amount read: {{ page.progress_current }} of {{ page.progress_max }} {% if page.reading-articles or page.reading-books %}pages {% elsif page.reading-lists %}works {% endif %}</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@ date: 2023-02-01
last_modified_at: 2023-02-01
reading: true
reading-articles: true
reading-type: "article"
excerpt: "This paper suggests a three-pronged approach for conceptualizing active learning in the online asynchronous class: the creation of an architecture of engagement in the online classroom, the use of web-based tools in addition to the learning management system, and a re-imagining of discussion boards as interactive spaces."
status: ":herb:"
published: true
title: "Actively Engaging Students in Asynchronous Online Classes."
work_author: "Shannon A. Riggs and Kathryn E. Linder"
work_link: "https://www.ideaedu.org/idea_papers/actively-engaging-students-in-asynchronous-online-classes/"
work_link_text: "IDEA Center"
access: "oa"
year_read: 2023
date_read: 2023-01-20
date_started: 2023-01-19
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ title: "Juan Ponce de León and the Discovery of Florida Reconsidered."
work_author: "Samuel Turner"
work_link: "https://stars.library.ucf.edu/fhq/vol92/iss1/3/"
work_link_text: "The Florida Historical Quarterly"
open_access: true
access: "oa"
year_read: 2024
date_read: 2024-05-01
date_started: 2024-05-01
Expand Down
34 changes: 28 additions & 6 deletions _notes/Reading/Books/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ <h2 id="pinned">Pinned {{page.title}} notes</h2>
{% endunless %}


<h2 id="all">All my notes on books I've read</h2>
<h2 id="all">All my notes on books</h2>
{% assign reading-books_notes_all = site.notes | where:"reading-books","true" | sort: "date_read" %}
{% if reading-books_notes_all.size > 0 %}
<ul>
Expand All @@ -40,15 +40,37 @@ <h2 id="all">All my notes on books I've read</h2>
<p>There's nothing here yet!</p>
{% endif %}

<h2 id="all">All my reading notes on books by year</h2>
<h2 id="by-year">All my reading notes on books by year</h2>

{% assign reading_notes_2022 = site.notes | where:"reading-books","true" | where:"year_read","2022" | sort: "date_read" %}
{% if reading_notes_2022.size > 0 %}
{% assign reading_notes_2024 = site.notes | where:"reading-books","true" | where:"year_read","2024" | sort: "date_read" %}
{% if reading_notes_2024.size > 0 %}

<details open><summary><h3 id="2022">2022</h3></summary>
<details open><summary><h3 id="2024">2024</h3></summary>
<div>
<ul>
{% for item in reading_notes_2022 %}
{% for item in reading_notes_2024 %}
<li>{% if item.pinned %}📌 {% endif %}
<a href="{{ item.url }}">{{ item.title }}
{% if item.status == ":seedling:" %} :seedling:{% endif %}
{% if item.status == ":herb:" %} :herb:{% endif %}
{% if item.status == ":evergreen_tree:" %} :evergreen_tree:{% endif %}
</a>
</li>
{% endfor %}
</ul>
{% else %}
<p>There's nothing here yet!</p>
{% endif %}
</div>
</details>

{% assign reading_notes_2023 = site.notes | where:"reading-books","true" | where:"year_read","2023" | sort: "date_read" %}
{% if reading_notes_2023.size > 0 %}

<details open><summary><h3 id="2023">2023</h3></summary>
<div>
<ul>
{% for item in reading_notes_2023 %}
<li>{% if item.pinned %}📌 {% endif %}
<a href="{{ item.url }}">{{ item.title }}
{% if item.status == ":seedling:" %} :seedling:{% endif %}
Expand Down
1 change: 1 addition & 0 deletions _notes/Reading/Books/merino-el-oro-de-los-suenos.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ date: 2024-02-01
last_modified_at: 2024-05-01
reading: true
reading-books: true
reading-type: "book"
excerpt: "A edition of José María Merino's book, adapted by Yolanda Pinto Gómez."
status: ":herb:"
published: true
Expand Down
1 change: 1 addition & 0 deletions _notes/Reading/Lists/exam-list1-topic.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ work_author: "Ryan P. Randall"
year_read:
date_read:
date_started: 2024-04-22
list: true
# current: true
current-list: true
progress_current: 3
Expand Down
60 changes: 37 additions & 23 deletions _notes/Reading/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,51 +31,65 @@ <h2>All {{page.title}} folders</h2>
</div>
</div>

<h2 id="all">All notes on what I've read</h2>
{% assign reading_notes_all = site.notes | where:"reading","true" | sort: "date_read" %}
<h2 id="all">All my reading notes</h2>
{% assign reading_notes_all = site.notes | where:"reading","true" | sort_natural: "title" %}
{% if reading_notes_all.size > 0 %}
<ul>
{% for item in reading_notes_all %}
<li>{% if item.pinned %}📌 {% endif %}
<a href="{{ item.url }}">{{ item.title }}
{% if item.status == ":seedling:" %} :seedling:{% endif %}
{% if item.status == ":herb:" %} :herb:{% endif %}
{% if item.status == ":evergreen_tree:" %} :evergreen_tree:{% endif %}
</a>
</li>
{% if item.reading-books == true or item.reading-articles == true %}
{% include item-list-link.html%}
{% endif %}
{% endfor %}
</ul>
{% else %}
<p>There's nothing here yet!</p>
{% endif %}

<h2 id="all">All my reading notes, by the year I finished it</h2>

<h3>2024</h3>
<h2 id="all">All my reading notes, by year finished</h2>

{% assign reading_notes_2024 = site.notes | where: "year_read", "2024" %}
{% assign reading_notes_by_year = reading_notes_all | where_exp:"item", "item.year_read > 2022" | group_by:"year_read" %}
{% for year in reading_notes_by_year reversed %}
<section id="{{ year.name }}">
<h3 id="{{year.name}}">{{ year.name }}</h3>
<ul>
{% for item in year.items %}
<li><a href="{{ item.url }}">{{ item.title }}</a></li>
{% endfor %}
</ul>
</section>
{% endfor %}

{% for item in reading_notes_2024 %}
<ul>
<li><a href="{{ item.url }}">{{ item.title }}
{% if item.status == ":seedling:" %} :seedling:{% endif %}
{% if item.status == ":herb:" %} :herb:{% endif %}
{% if item.status == ":evergreen_tree:" %} :evergreen_tree:{% endif %}
</a>
<!--
<h3>2024</h3>
{% assign reading_notes_2024 = site.notes | where: "year_read", "2024" %}
<ul>
{% for item in reading_notes_2024 %}
<li><a href="{{ item.url }}">{{ item.title }}
{% if item.status == ":seedling:" %} :seedling:{% endif %}
{% if item.status == ":herb:" %} :herb:{% endif %}
{% if item.status == ":evergreen_tree:" %} :evergreen_tree:{% endif %}
</a>
</li>
{% endfor %}
</ul>
{% endfor %}
<h3>2023</h3>
{% assign reading_notes_2023 = site.notes | where: "year_read", "2023" %}
{% for item in reading_notes_2023 %}
<ul>
{% for item in reading_notes_2023 %}
<li><a href="{{ item.url }}">{{ item.title }}
{% if item.status == ":seedling:" %} :seedling:{% endif %}
{% if item.status == ":herb:" %} :herb:{% endif %}
{% if item.status == ":evergreen_tree:" %} :evergreen_tree:{% endif %}
</a>
</li>
</ul>
</li>
{% endfor %}
</ul>
-->

0 comments on commit 2811f6d

Please sign in to comment.