@@ -44,30 +52,25 @@
{{ page.title }}
+ {% assign info_counter = 0 %}
{% for link in site.data.event-links %}
- {% if page[link.key] or link.key == 'ICS' %}{% unless page.location != 'online' and link.key == 'meeting-room' %}{% unless status == 'past' and link.key == 'meeting-room' %}{% unless status == 'past' and link.key == 'ICS' %}{% assign info_counter = info_counter | plus:1 %}{% endunless %}{% endunless %}{% endunless %}{% endif %}
+ {%- capture link_visibility %}{%- include event-link-visible.html -%}{%- endcapture -%}
+ {% if link_visibility != '' %}
+ {% assign info_counter = info_counter | plus: 1 %}
+ {% endif %}
{% endfor %}
- {% assign info_counter = info_counter | minus:1 %}
-
+
{% for link in site.data.event-links %}
- {%- if page[link.key] or link.key == 'ICS' -%}
- {% unless page[link.key] == 'online' %}{% unless page.location != 'online' and link.key == 'meeting-room' %}{% unless status == 'past' and link.key == 'meeting-room' %}{% unless status == 'past' and link.key == 'ICS' %}
- {%- assign link-index = forloop.index0 %}
- {% if status == 'past' %}{% assign link-index = link-index | minus: 1 %}{% endif %}
- {% if info_counter > 3 %}
- {% assign link-index = link-index | modulo: 2 %}
- {% else %}
- {% assign link-index = link-index | modulo: 3 %}
- {% endif %}
-
- {% endunless %}{% endunless %}{% endunless %}{% endunless %}
- {%- endif -%}
+ {% endif %}
{% endfor %}
@@ -86,4 +89,4 @@
{{ page.title }}
-{% include ICS-modal.html %}
+{% include add-to-calendar-modal.html %}
diff --git a/_plugins/recurring_events_permalink.rb b/_plugins/recurring_events_permalink.rb
new file mode 100644
index 000000000..367cedd8a
--- /dev/null
+++ b/_plugins/recurring_events_permalink.rb
@@ -0,0 +1,17 @@
+module Jekyll
+ class RecurringEventsPermalinkGenerator < Generator
+ safe true
+ priority :highest
+
+ def generate(site)
+ events = site.collections['events']
+ return unless events
+
+ events.docs.each do |event|
+ if event.data['recurring'] && !event.data['permalink']
+ event.data['permalink'] = '/events/:slug'
+ end
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/_sass/_custom.scss b/_sass/_custom.scss
index c86868199..2cd739cb9 100644
--- a/_sass/_custom.scss
+++ b/_sass/_custom.scss
@@ -624,6 +624,18 @@ blockquote {
padding-right: 1rem;
}
+.event-links-grid > .event-link-item {
+ border-left: 0;
+}
+
+.event-links-grid > .event-link-item + .event-link-item {
+ border-left: $border-width solid var(--bs-border-color);
+}
+
+.event-links-grid.row-cols-2 > .event-link-item:nth-child(2n + 1) {
+ border-left: 0;
+}
+
// Boxes and Cards - Use Bootstrap's .card-img-top for images
.project-card {
background: var(--bs-tertiary-bg);
diff --git a/assets/js/copy-url.js b/assets/js/copy-url.js
index 373183631..8dc3a05ee 100644
--- a/assets/js/copy-url.js
+++ b/assets/js/copy-url.js
@@ -1,9 +1,23 @@
-function copyUrl() {
- let url = (event.target.value ==null) ? document.location.href:event.target.value;
+function copyUrl(event) {
+ event?.preventDefault();
+ const url = event?.currentTarget?.getAttribute('data-copy-url')
+ ?? event?.currentTarget?.getAttribute('value')
+ ?? event?.currentTarget?.value
+ ?? document.location.href;
- navigator.clipboard.writeText(url).then(function() {
- console.log('Copied!');
- }, function() {
- console.log('Copy error')
- });
-};
+ if (!navigator.clipboard?.writeText) {
+ return;
+ }
+
+ navigator.clipboard.writeText(url)
+ .then(function() {
+ const tooltipTrigger = event?.currentTarget;
+ if (tooltipTrigger?.getAttribute('data-bs-toggle') === 'tooltip' && window.bootstrap?.Tooltip) {
+ const tooltip = bootstrap.Tooltip.getOrCreateInstance(tooltipTrigger);
+ tooltip.show();
+ }
+ })
+ .catch(function() {
+ // Clipboard access can fail when permissions are denied.
+ });
+}
diff --git a/events-with-RDATE.ics b/events-with-RDATE.ics
deleted file mode 100644
index cc95f5fdd..000000000
--- a/events-with-RDATE.ics
+++ /dev/null
@@ -1,102 +0,0 @@
----
-layout: null
----
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-PRODID:-//AntennaPod//Website events section 0.1//EN
-LAST-MODIFIED:{{ 'now' | date: "%Y%m%dT%H%M00Z"}}
-NAME:AntennaPod
-
-{%- assign recurringevents = site.events | sort: 'datetime-start' | reverse | where:"recurring", true %}
-{%- assign normalevents = site.events | sort: 'datetime-start' | reverse | where:"recurring", false %}
-{%- assign events = recurringevents | concat: normalevents %}
-
-{%- for event in events -%}{% if event.unlisted != true %}
-BEGIN:VEVENT
-DTSTAMP:{{ event.datetime-start | date: "%Y%m%dT%H%M00Z" }}{% if event.sequence %}
-SEQUENCE:{{ event.sequence }}{% endif %}
-UID:{{ event.uid | upcase }}
-DTSTART
-{%- if event.timezone -%};TZID={{ event.timezone }}{% endif %}:
-{{- event.datetime-start | date: "%Y%m%dT%H%M00" }}{% unless event.timezone %}Z{% endunless %}
-DTEND
-{%- if event.timezone -%};TZID={{ event.timezone }}{% endif %}:
-{{- event.datetime-end | date: "%Y%m%dT%H%M00" }}{% unless event.timezone %}Z{% endunless %}
-STATUS:CONFIRMED
-SUMMARY:{{ event.title }}
-
-{%- capture description %}
-DESCRIPTION:
-{{- event.content | remove_last: '' | replace: '','\n\n' | strip_html | replace:',','\,' | replace:':','\:' | replace:';','\;' | strip_newlines }}
-{%- if event.location == 'online' %}{% if event.location-label %}\n\n{{ event.meeting-room }}{% endif %}{% endif %}
-{%- endcapture %}
-{%- assign description = description | replace: '\n\n\n\n','\n\n' %}
-
-{%- assign descriptionChars = description.size %}
-{%- assign descriptionTotalRows = descriptionChars | divided_by: 74.00 | ceil %}
-{%- assign descriptionChars = descriptionChars | plus: descriptionTotalRows %}
-{%- assign descriptionTotalRows = descriptionChars | divided_by: 74.00 | ceil %}
-{%- assign descriptionChars = descriptionChars | minus: descriptionTotalRows %}
-{%- assign start = 0 %}
-{%- assign separator = '\||/' %}
-{%- assign descriptionWorker = '' %}
-
-{%- for rowToBe in (1..descriptionTotalRows) %}
- {%- if descriptionChars <= 74 %}
- {%- assign descriptionWorker = description %}
- {%- break %}
- {%- else %}
- {%- assign descriptionRow = description | slice: start, 73 | prepend: ' ' | append: separator %}
- {%- assign descriptionWorker = descriptionWorker | append: descriptionRow %}
- {%- assign start = start | plus: 73 %}
- {%- endif %}
-{%- endfor %}
-
-{%- if descriptionChars > 74 %}
- {%- assign descriptionWorker = descriptionWorker | lstrip %}
- {%- assign lastChar = descriptionWorker.size | minus: separator.size %}
- {%- assign descriptionWorker = descriptionWorker | slice: 0, lastChar %}
- {%- assign descriptionArray = descriptionWorker | split: separator %}
-{%- endif %}
-
-{%- for descriptionLine in descriptionArray %}
-{{ descriptionLine }}
-{%- endfor %}
-LOCATION:{% if event.location-label %}{{ event.location-label }}
-{%- elsif event.location == 'online' %}{{ event.meeting-room }}
-{%- else %}{{ site.data.event-links[location].url }}{{ event.location }}
-{%- endif %}{% if event.location == 'online' %}
-URL:{{ event.meeting-room }}
-CONFERENCE:{{ event.meeting-room }}
-{%- endif %}{% if event.recurring == true %}
-RRULE:{{ event.recurrence-rule -}}
-{%- endif %}{% if event.recurrence-exceptions %}
-EXDATE
-{%- if event.timezone -%};TZID={{ event.timezone }}{% endif %}:
-{%- for exception in event.recurrence-exceptions %}
-{{- exception | date: "%Y%m%d" }}T{{ event.datetime-start | date: "%H%M00" }}{% unless event.timezone %}Z{% endunless %}
-{%- unless forloop.last %},{% endunless %}
-{%- endfor -%}
-{%- endif %}{% if event.recurrence-additions %}
-RDATE;VALUE=PERIOD
-{%- if event.timezone -%};TZID={{ event.timezone }}{% endif %}:
-{%- for extra-occurrence in event.recurrence-additions %}
-{{- extra-occurrence.start | date: "%Y%m%dT%H%M00" }}{% unless event.timezone %}Z{% endunless %}/
-{{- extra-occurrence.end | date: "%Y%m%dT%H%M00" }}{% unless event.timezone %}Z{% endunless %}
-{%- unless forloop.last %},{% endunless %}
-{%- endfor -%}
-{%- endif %}
-END:VEVENT
-{%- endif %}
-{%- endfor %}{%- for timezone in site.data.ics-timezones %}
-BEGIN:VTIMEZONE
-TZID:{{ timezone[0] }}
-{%- comment %} Following is unfortunately necessary to ensure that CRLF is used for EOL, as Jekyll uses LF when printing an array value in build process on Unix machine {% endcomment %}
-{%- assign timezoneDefinitionArray = timezone[1] | split: ' ' %}
-{%- for definitionLine in timezoneDefinitionArray %}
-{{ definitionLine }}
-{%- endfor %}
-END:VTIMEZONE
-{%- endfor %}
-END:VCALENDAR
diff --git a/events.ics b/events.ics
deleted file mode 100644
index a4ee19f88..000000000
--- a/events.ics
+++ /dev/null
@@ -1,94 +0,0 @@
----
-layout: null
----
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-PRODID:-//AntennaPod//Website events section 0.1//EN
-LAST-MODIFIED:{{ 'now' | date: "%Y%m%dT%H%M00Z"}}
-NAME:AntennaPod
-
-{%- assign recurringevents = site.events | sort: 'datetime-start' | reverse | where:"recurring", true %}
-{%- assign normalevents = site.events | sort: 'datetime-start' | reverse | where:"recurring", false %}
-{%- assign events = recurringevents | concat: normalevents %}
-
-{%- for event in events -%}{% if event.unlisted != true %}
-BEGIN:VEVENT
-DTSTAMP:{{ event.datetime-start | date: "%Y%m%dT%H%M00Z" }}{% if event.sequence %}
-SEQUENCE:{{ event.sequence }}{% endif %}
-UID:{{ event.uid | upcase }}
-DTSTART
-{%- if event.timezone -%};TZID={{ event.timezone }}{% endif %}:
-{{- event.datetime-start | date: "%Y%m%dT%H%M00" }}{% unless event.timezone %}Z{% endunless %}
-DTEND
-{%- if event.timezone -%};TZID={{ event.timezone }}{% endif %}:
-{{- event.datetime-end | date: "%Y%m%dT%H%M00" }}{% unless event.timezone %}Z{% endunless %}
-STATUS:CONFIRMED
-SUMMARY:{{ event.title }}
-
-{%- capture description %}
-DESCRIPTION:
-{{- event.content | remove_last: '' | replace: '','\n\n' | strip_html | replace:',','\,' | replace:':','\:' | replace:';','\;' | strip_newlines }}
-{%- if event.location == 'online' %}{% if event.location-label %}\n\n{{ event.meeting-room }}{% endif %}{% endif %}
-{%- endcapture %}
-{%- assign description = description | replace: '\n\n\n\n','\n\n' %}
-
-{%- assign descriptionChars = description.size %}
-{%- assign descriptionTotalRows = descriptionChars | divided_by: 74.00 | ceil %}
-{%- assign descriptionChars = descriptionChars | plus: descriptionTotalRows %}
-{%- assign descriptionTotalRows = descriptionChars | divided_by: 74.00 | ceil %}
-{%- assign descriptionChars = descriptionChars | minus: descriptionTotalRows %}
-{%- assign start = 0 %}
-{%- assign separator = '\||/' %}
-{%- assign descriptionWorker = '' %}
-
-{%- for rowToBe in (1..descriptionTotalRows) %}
- {%- if descriptionChars <= 74 %}
- {%- assign descriptionWorker = description %}
- {%- break %}
- {%- else %}
- {%- assign descriptionRow = description | slice: start, 73 | prepend: ' ' | append: separator %}
- {%- assign descriptionWorker = descriptionWorker | append: descriptionRow %}
- {%- assign start = start | plus: 73 %}
- {%- endif %}
-{%- endfor %}
-
-{%- if descriptionChars > 74 %}
- {%- assign descriptionWorker = descriptionWorker | lstrip %}
- {%- assign lastChar = descriptionWorker.size | minus: separator.size %}
- {%- assign descriptionWorker = descriptionWorker | slice: 0, lastChar %}
- {%- assign descriptionArray = descriptionWorker | split: separator %}
-{%- endif %}
-
-{%- for descriptionLine in descriptionArray %}
-{{ descriptionLine }}
-{%- endfor %}
-LOCATION:{% if event.location-label %}{{ event.location-label }}
-{%- elsif event.location == 'online' %}{{ event.meeting-room }}
-{%- else %}{{ site.data.event-links[location].url }}{{ event.location }}
-{%- endif %}{% if event.location == 'online' %}
-URL:{{ event.meeting-room }}
-CONFERENCE:{{ event.meeting-room }}
-{%- endif %}{% if event.recurring == true %}
-RRULE:{{ event.recurrence-rule -}}
-{%- endif %}{% if event.recurrence-exceptions %}
-EXDATE
-{%- if event.timezone -%};TZID={{ event.timezone }}{% endif %}:
-{%- for exception in event.recurrence-exceptions %}
-{{- exception | date: "%Y%m%d" }}T{{ event.datetime-start | date: "%H%M00" }}{% unless event.timezone %}Z{% endunless %}
-{%- unless forloop.last %},{% endunless %}
-{%- endfor -%}
-{%- endif %}
-END:VEVENT
-{%- endif %}
-{%- endfor %}{%- for timezone in site.data.ics-timezones %}
-BEGIN:VTIMEZONE
-TZID:{{ timezone[0] }}
-{%- comment %} Following is unfortunately necessary to ensure that CRLF is used for EOL, as Jekyll uses LF when printing an array value in build process on Unix machine {% endcomment %}
-{%- assign timezoneDefinitionArray = timezone[1] | split: ' ' %}
-{%- for definitionLine in timezoneDefinitionArray %}
-{{ definitionLine }}
-{%- endfor %}
-END:VTIMEZONE
-{%- endfor %}
-END:VCALENDAR
diff --git a/events/index.html b/events/index.html
index 5dd30af1d..a9991e9f0 100644
--- a/events/index.html
+++ b/events/index.html
@@ -87,6 +87,4 @@