- {% assign type = site.data.types[citation.type] %}
- {% include icon.html icon=type.icon %}
+ {% include icon.html icon=citation_type.icon %}
- {{ citation.title | default: "[no title info]" }}
+ {{ citation_title | default: "[no title info]" }}
diff --git a/_includes/course-excerpt.html b/_includes/course-excerpt.html
new file mode 100644
index 00000000..59525d96
--- /dev/null
+++ b/_includes/course-excerpt.html
@@ -0,0 +1,65 @@
+
- {{ citation.publisher | default: "[no publisher info]" }}
+ {{ citation_publisher | default: "[no publisher info]" }}
·
- {{ citation.date | default: "[no date info]" | date: "%d %b %Y" }}
+ {{ citation_date | default: "[no date info]" | date: "%d %b %Y" }}
·
- {{ citation.id | default: "[no id info]" }}
+ {{ citation_id | default: "[no id info]" }}
{% if include.style == "rich" %}
- {% if citation.description %}
+ {% if citation_description %}
{{
- citation.description
+ citation_description
| markdownify
| remove: "
{% endif %}
- {% if citation.buttons.size > 0 %}
+ {% if citation_buttons.size > 0 %}
{% endif %}
- {% if citation.tags.size > 0 or citation.repo %}
- {% include tags.html tags=citation.tags repo=citation.repo %}
+ {% if citation_tags.size > 0 or citation_repo %}
+ {% include tags.html tags=citation_tags repo=citation_repo %}
{% endif %}
{% endif %}
" | remove: "
" @@ -73,9 +85,9 @@
+ {% assign course_website = include.course_website | default: empty %}
+ {% assign url = include.url | default: include.link | default: course_website %}
+ {% assign title = include.title | default: "[no course title]" %}
+ {% assign subtitle = include.subtitle %}
+ {% capture display_title %}
+ {% if subtitle %}{{ subtitle }}: {% endif %}{{ title }}
+ {% endcapture %}
+ {% if url %}
+ {{ display_title | strip }}
+ {% else %}
+ {{ display_title | strip }}
+ {% endif %}
+
+ {% if course_website %}
+
diff --git a/_includes/post-excerpt.html b/_includes/post-excerpt.html
index f62849af..195bfed1 100644
--- a/_includes/post-excerpt.html
+++ b/_includes/post-excerpt.html
@@ -1,77 +1,56 @@
-{% assign post = site.posts
+{% assign matched_post = site.posts
| where_exp: "post", "post.slug == include.lookup"
| first
- | default: include
%}
+ Course website: + {{ course_website }} +
+ {% endif %} + + {% if include.distribution %} +Distribution: {{ include.distribution }}
+ {% endif %} + + {% if include.next_offered %} +Next offering: {{ include.next_offered }}
+ {% endif %} + + {% assign terms_offered = include.terms_offered | default: empty %} + {% if terms_offered.size > 0 %} + {% assign teaching_link = "/teaching" | relative_url %} +Previously offered:
+ + {% endif %} + + {% assign body = include.content | default: "" %} + {% if body != "" %} + {% assign excerpt = body + | regex_scan: "(.*)", true + | default: include.excerpt + | default: include.description + | default: "" + | strip_html + %} + {% assign search = body + | strip_html + | strip_newlines + | regex_strip + %} ++ {{ excerpt }} +
+ {% endif %} +
- {% assign course_website = post.course_website | default: empty %}
- {% assign url = post.url | default: post.link | default: course_website %}
- {% assign title = post.title %}
- {% assign subtitle = post.subtitle %}
- {% capture display_title %}
- {% if subtitle %}{{ subtitle }}: {% endif %}{{ title }}
- {% endcapture %}
+ {% assign url = matched_post.url | default: include.url | default: include.link %}
+ {% assign title = matched_post.title | default: include.title | default: include.lookup %}
{% if url %}
- {{ display_title | strip }}
+ {{ title }}
{% else %}
- {{ display_title | strip }}
+ {{ title }}
{% endif %}
- {% if course_website %}
-
diff --git a/_includes/post-info.html b/_includes/post-info.html
index c0585d70..10dfb093 100644
--- a/_includes/post-info.html
+++ b/_includes/post-info.html
@@ -5,7 +5,13 @@
| first
%}
{% if member %}
- {% include portrait.html lookup=include.author style="tiny" %}
+ {% unless include.hide_author_image %}
+ {% include portrait.html lookup=include.author style="tiny" %}
+ {% endunless %}
+
+ {% include icon.html icon="fa-solid fa-feather-pointed" %}
+ {{ member.name }}
+
{% else %}
{% include icon.html icon="fa-solid fa-feather-pointed" %}
@@ -24,14 +30,36 @@
{% endif %}
+ {% unless include.hide_updated %}
{% if updated and updated != "" and updated != published %}
{% include icon.html icon="fa-solid fa-clock-rotate-left" %}
{{ updated }}
{% endif %}
+ {% endunless %}
- Course website: - {{ course_website }} -
- {% endif %} - - {% if post.distribution %} -Distribution: {{ post.distribution }}
- {% endif %} - - {% if post.next_offered %} -Next offering: {{ post.next_offered }}
- {% endif %} - - {% assign terms_offered = post.terms_offered | default: empty %} - {% if terms_offered.size > 0 %} - {% assign teaching_link = "/teaching" | relative_url %} -Previously offered:
- - {% endif %} + {% assign info_author = matched_post.author | default: include.author %} + {% assign info_people = matched_post.people | default: include.people %} + {% assign info_published = matched_post.date | default: include.date %} + {% assign info_updated = matched_post.last_modified_at | default: include.last_modified_at %} + {% assign info_tags = matched_post.tags | default: include.tags %} {% include post-info.html - author=post.author - published=post.date - updated=post.last_modified_at - tags=post.tags + author=info_author + people=info_people + published=info_published + updated=info_updated + tags=info_tags + hide_author_image=true + hide_updated=true %} - {% assign excerpt = post.content - | default: "" - | regex_scan: "(.*)", true - | default: post.excerpt - | default: post.description - | default: "" - | strip_html - %} - {% assign search = post.content - | strip_html - | strip_newlines - | regex_strip - %} -- {{ excerpt }} -
+ {% assign body = matched_post.content | default: include.content | default: "" %} + {% if include.show_full_content %} +
+ {{ body | markdownify }}
+
+ {% else %}
+ {% assign excerpt = body
+ | regex_scan: "(.*)", true
+ | default: matched_post.excerpt
+ | default: matched_post.description
+ | default: include.excerpt
+ | default: include.description
+ | default: ""
+ | strip_html
+ %}
+ {% assign search = body
+ | strip_html
+ | strip_newlines
+ | regex_strip
+ %}
+ + {{ excerpt }} +
+ {% endif %}