From b8cadb56667fa6b63fdddaf9ef175a69ec35dad0 Mon Sep 17 00:00:00 2001 From: fallow64 Date: Tue, 29 Jul 2025 15:36:03 -0500 Subject: [PATCH 1/5] Add presentation pages --- .gitmodules | 3 +++ _config.yml | 7 +++++ _layouts/presentation.html | 52 ++++++++++++++++++++++++++++++++++++++ _presentations | 1 + assets/js/scripts.js | 27 ++++++++++++++++++++ 5 files changed, 90 insertions(+) create mode 100644 _layouts/presentation.html create mode 160000 _presentations diff --git a/.gitmodules b/.gitmodules index 52af485c..1c4d1121 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "_events_external"] path = _events url = https://github.com/CHTC/events +[submodule "_presentations"] + path = _presentations + url = https://github.com/CHTC/Presentations.git diff --git a/_config.yml b/_config.yml index ea027f75..ddd15aef 100755 --- a/_config.yml +++ b/_config.yml @@ -60,6 +60,9 @@ collections: redirects: output: true permalink: /:path + presentations: + output: true + permalink: /presentations/:year/:month/:day/:title/ defaults: - scope: @@ -97,6 +100,10 @@ defaults: type: redirects values: layout: redirect + - scope: + type: presentations + values: + layout: presentation diff --git a/_layouts/presentation.html b/_layouts/presentation.html new file mode 100644 index 00000000..4a49a1d3 --- /dev/null +++ b/_layouts/presentation.html @@ -0,0 +1,52 @@ +--- +layout: container-default +--- + +{% assign date = page.date | date: "%B %e" %} + +
+
+
+
+

+ {{ page.title }} +

+
+ +
+
+ +
+
+ +
+

{{ page.presenter }} at {{ page.event }}

+

{{ date }}

+
+ +

+ {{ page.description | markdownify }} +

+ +
+ {% for tag in page.keywords %} + {{ tag }} + {% endfor %} +
+ + +

Associated Links

+ +
+
+
diff --git a/_presentations b/_presentations new file mode 160000 index 00000000..40d60c48 --- /dev/null +++ b/_presentations @@ -0,0 +1 @@ +Subproject commit 40d60c48066c5428c19fe97ed7113c7ca121d8ad diff --git a/assets/js/scripts.js b/assets/js/scripts.js index e69de29b..22e0daeb 100644 --- a/assets/js/scripts.js +++ b/assets/js/scripts.js @@ -0,0 +1,27 @@ +function generateStringHash(value) { + // Simple hash function to generate a number from the tag string + let hash = 0; + for (let i = 0; i < value.length; i++) { + hash = value.charCodeAt(i) + ((hash << 5) - hash); + } + + return hash; +} + +document.addEventListener("DOMContentLoaded", () => { + function fillBadgeColors() { + const badges = document.querySelectorAll(".tag-badge"); + badges.forEach(badge => { + const tagText = badge.textContent.trim(); + let hue = generateStringHash(tagText) % 360; + if (hue >= 60 && hue <= 140) { + hue = (hue + 80) % 360; // avoid ugly colors + } + + badge.style.backgroundColor = `hsl(${hue}, 70%, 40%)`; + badge.style.color = "#fff"; + }); + } + + fillBadgeColors(); +}); \ No newline at end of file From f022d432bf0866505778d323fb45e1ed841f38f8 Mon Sep 17 00:00:00 2001 From: fallow64 Date: Tue, 29 Jul 2025 15:58:14 -0500 Subject: [PATCH 2/5] Add presentation list page --- _includes/get/presentations.liquid | 1 + _includes/layout/header.html | 1 + presentations.html | 38 ++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 _includes/get/presentations.liquid create mode 100644 presentations.html diff --git a/_includes/get/presentations.liquid b/_includes/get/presentations.liquid new file mode 100644 index 00000000..19ed0664 --- /dev/null +++ b/_includes/get/presentations.liquid @@ -0,0 +1 @@ +{% assign presentations = site.presentations | where_exp: "presentation", "presentation.publish_on contains site.key" %} diff --git a/_includes/layout/header.html b/_includes/layout/header.html index 573323df..97804680 100644 --- a/_includes/layout/header.html +++ b/_includes/layout/header.html @@ -38,6 +38,7 @@ Spotlights Events News + Presentations
  • diff --git a/presentations.html b/presentations.html new file mode 100644 index 00000000..52a27c6d --- /dev/null +++ b/presentations.html @@ -0,0 +1,38 @@ +--- +layout: sub-page +bodyClass: page-presentations-list +--- + +

    Presentations

    + +
    + {% include get/presentations.liquid %} + {% for presentation in presentations %} +
    +
    +
    + {% if presentation.youtube_video_id %} + {% assign presentation_image_path = "https://img.youtube.com/vi/" | append: presentation.youtube_video_id | append: "/hqdefault.jpg" %} + {% assign presentation_image_alt = presentation.title | append: " presentation thumbnail" %} + {% elsif presentation.image %} + {% assign presentation_image_path = presentation.image.path | relative_url %} + {% assign presentation_image_alt = presentation.image.alt %} + {% endif %} + + {{ presentation_image_alt }} + +

    + {{ presentation.title }} +

    + +
    + {% assign date = presentation.date | date: "%B %e" %} +

    {{ presentation.presenter }} at {{ presentation.event }}

    +

    {{ date }}

    +
    +

    {{ presentation.description }}

    +
    +
    +
    + {% endfor %} +
    From 8a1525a8ff99e0008b44b83400c38e69cdcbebe8 Mon Sep 17 00:00:00 2001 From: fallow64 Date: Thu, 31 Jul 2025 09:34:12 -0500 Subject: [PATCH 3/5] JS Refactor and stylistic changes --- _includes/get/presentations.liquid | 4 +- assets/js/scripts.js | 129 +++++++++++++++++++++++++++++ presentations.html | 52 ++++++++++-- 3 files changed, 178 insertions(+), 7 deletions(-) diff --git a/_includes/get/presentations.liquid b/_includes/get/presentations.liquid index 19ed0664..1d6edd93 100644 --- a/_includes/get/presentations.liquid +++ b/_includes/get/presentations.liquid @@ -1 +1,3 @@ -{% assign presentations = site.presentations | where_exp: "presentation", "presentation.publish_on contains site.key" %} +{% assign presentations = site.presentations | where_exp: "presentation", "presentation.publish_on contains site.key" | sort: "date" | reverse %} +{% assign all_presentation_keywords = presentations | map: "keywords" | uniq | sort %} +{% assign all_presentation_events = presentations | map: "event" | uniq | sort %} diff --git a/assets/js/scripts.js b/assets/js/scripts.js index 22e0daeb..0dba20a0 100644 --- a/assets/js/scripts.js +++ b/assets/js/scripts.js @@ -8,7 +8,131 @@ function generateStringHash(value) { return hash; } +class PresentationFilterManager { + constructor() { + this.selectedEvent = null; + this.selectedKeywords = new Set(); + } + + initialize() { + this.buttonEventFilter = document.getElementById("button-filter-event"); + this.buttonEventDropdownItems = document.querySelectorAll("a[data-event-selector]"); + this.keywordCheckboxes = document.querySelectorAll("input[data-keyword-selector]"); + this.resetButton = document.getElementById("button-clear-filters"); + this.cards = document.querySelectorAll(".presentation-card"); + + this.originalEventFilterText = this.buttonEventFilter.textContent; + this.noPresentationsFoundText = document.getElementById("no-presentations-found"); + + this.initializeEventButtons(); + this.initializeKeywordCheckboxes(); + this.initializeResetButton(); + } + + initializeEventButtons() { + this.buttonEventDropdownItems.forEach(item => { + item.addEventListener("click", (e) => { + e.preventDefault(); + this.selectedEvent = e.target.dataset.eventSelector; + + // Update button text to show selected event + this.buttonEventFilter.textContent = this.selectedEvent; + + console.log("Selected event:", this.selectedEvent); + + // Apply filters + this.filterPresentations(); + }); + }); + } + + initializeKeywordCheckboxes() { + this.keywordCheckboxes.forEach(checkbox => { + checkbox.addEventListener("change", (e) => { + const keyword = e.target.dataset.keywordSelector; + + if (e.target.checked) { + this.selectedKeywords.add(keyword); + } else { + this.selectedKeywords.delete(keyword); + } + + console.log("Selected keywords:", Array.from(this.selectedKeywords)); + + // Apply filters + this.filterPresentations(); + }); + }); + } + + initializeResetButton() { + this.resetButton.addEventListener("click", () => { + // Reset event filter + this.selectedEvent = null; + this.buttonEventFilter.textContent = this.originalEventFilterText; + + // Reset keyword filters + this.selectedKeywords.clear(); + this.keywordCheckboxes.forEach(checkbox => { + checkbox.checked = false; + }); + + // Show all presentations + this.filterPresentations(); + + // Hide reset button + this.resetButton.style.display = "none"; + }); + } + + filterPresentations() { + let anyVisible = false; + this.cards.forEach(card => { + let showCard = true; + + // Check event filter + if (this.selectedEvent) { + const eventText = card.dataset.event || ""; + if (!eventText.includes(this.selectedEvent)) { + showCard = false; + } + } + + // Check keyword filter + if (this.selectedKeywords.size > 0) { + const cardKeywords = card.dataset.keywords ? card.dataset.keywords.split(' ') : []; + + // Check if any selected keyword matches card keywords + const hasMatchingKeyword = Array.from(this.selectedKeywords).some(keyword => + cardKeywords.includes(keyword) + ); + + if (!hasMatchingKeyword) { + showCard = false; + } + } + + anyVisible = anyVisible || showCard; + // Show or hide the card + card.style.display = showCard ? "inline-block" : "none"; + }); + + this.noPresentationsFoundText.style.display = anyVisible ? "none" : "block"; + this.updateResetButtonVisibility(); + } + + updateResetButtonVisibility() { + if (this.selectedEvent || this.selectedKeywords.size > 0) { + this.resetButton.style.display = "inline-block"; + } else { + this.resetButton.style.display = "none"; + } + } +} + document.addEventListener("DOMContentLoaded", () => { + // -- presentations page -- + function fillBadgeColors() { const badges = document.querySelectorAll(".tag-badge"); badges.forEach(badge => { @@ -24,4 +148,9 @@ document.addEventListener("DOMContentLoaded", () => { } fillBadgeColors(); + // do presentation filtering only if on the presentations page + if (document.querySelector(".presentation-card")) { + const filterManager = new PresentationFilterManager(); + filterManager.initialize(); + } }); \ No newline at end of file diff --git a/presentations.html b/presentations.html index 52a27c6d..10f408bc 100644 --- a/presentations.html +++ b/presentations.html @@ -3,12 +3,42 @@ bodyClass: page-presentations-list --- -

    Presentations

    +{% include get/presentations.liquid %} + +

    Presentations

    + +
    + +
      + {% for event in all_presentation_events %} +
    • {{event}}
      • + {% endfor %} +
    + + +
      + {% for keyword in all_presentation_keywords %} +
    • +
      + + +
      +
      • + {% endfor %} +
    + + +
    - {% include get/presentations.liquid %} {% for presentation in presentations %} -
    +
    {% if presentation.youtube_video_id %} @@ -25,10 +55,16 @@

    {{ presentation.title }}

    -
    +
    {% assign date = presentation.date | date: "%B %e" %} -

    {{ presentation.presenter }} at {{ presentation.event }}

    -

    {{ date }}

    +

    {{ presentation.presenter }} at {{ presentation.event }}

    +

    {{ date }}

    +
    + +
    + {% for tag in presentation.keywords %} + {{ tag }} + {% endfor %}

    {{ presentation.description }}

    @@ -36,3 +72,7 @@

    {{ date }}

    {% endfor %}
    + + From 352d6ce55ef11bfbdf23815c3e655270d8bd0c6f Mon Sep 17 00:00:00 2001 From: fallow64 Date: Mon, 4 Aug 2025 08:51:04 -0500 Subject: [PATCH 4/5] Adjust bottom margin of list header --- _layouts/presentation.html | 2 +- _presentations | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_layouts/presentation.html b/_layouts/presentation.html index 4a49a1d3..cf07ddbf 100644 --- a/_layouts/presentation.html +++ b/_layouts/presentation.html @@ -41,7 +41,7 @@

    {{ date }}

    -

    Associated Links

    +

    Associated Links

      {% for link in page.links %}
    • {{ link.name }}
      • diff --git a/_presentations b/_presentations index 40d60c48..00194376 160000 --- a/_presentations +++ b/_presentations @@ -1 +1 @@ -Subproject commit 40d60c48066c5428c19fe97ed7113c7ca121d8ad +Subproject commit 001943760c181e6febd738e7553b5bd5465b8592 From 21f874bd23c22e79dd62435444e1c727f6982ac1 Mon Sep 17 00:00:00 2001 From: fallow64 Date: Mon, 4 Aug 2025 09:11:40 -0500 Subject: [PATCH 5/5] Update presentations submodule --- _presentations | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_presentations b/_presentations index 00194376..bef530cd 160000 --- a/_presentations +++ b/_presentations @@ -1 +1 @@ -Subproject commit 001943760c181e6febd738e7553b5bd5465b8592 +Subproject commit bef530cd3ab365cd7f2e58d1a6ffe8252c71e534