From 7f0b985d52876bee75f7e24fc9d29aa6f54ad0d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torben=20B=C3=B6hnke?= <torben.boehnke-makerspace@rub.de> Date: Mon, 23 Sep 2024 14:43:25 +0200 Subject: [PATCH] update calendar style --- docs/javascripts/ics_calendar.js | 37 +++++++++++++++++---- docs/stylesheets/base/variables.css | 4 +-- docs/stylesheets/components/calender.css | 9 +++++ public/feed_rss_created.xml | 2 +- public/feed_rss_updated.xml | 2 +- public/javascripts/ics_calendar.js | 37 +++++++++++++++++---- public/sitemap.xml.gz | Bin 1335 -> 1335 bytes public/stylesheets/base/variables.css | 4 +-- public/stylesheets/components/calender.css | 9 +++++ 9 files changed, 86 insertions(+), 18 deletions(-) diff --git a/docs/javascripts/ics_calendar.js b/docs/javascripts/ics_calendar.js index f9fe63578..69eeef69c 100755 --- a/docs/javascripts/ics_calendar.js +++ b/docs/javascripts/ics_calendar.js @@ -307,6 +307,7 @@ processICSFile().then(events => { eventDidMount: function(info) { handlePastEventsVisibility(); + styleOddEvenEvents(); }, //Opens the contact form with event specific informations after clicking an event @@ -531,16 +532,40 @@ processICSFile().then(events => { var view = calendar.view; var displayStyle = view.type.includes('list') ? 'table-row' : 'block'; var pastEvents = document.querySelectorAll('.past-event'); - pastEvents.forEach(function(eventEl) { - eventEl.style.display = showPastEvents ? displayStyle : 'none'; + pastEvents.forEach(function (eventEl) { + eventEl.style.display = showPastEvents ? displayStyle : 'none'; }); if (view.type.includes('list')) { - var pastDays = document.querySelectorAll('.fc-day-past'); - pastDays.forEach(function(dayEl) { - dayEl.style.display = showPastEvents ? 'table-row' : 'none'; - }); + var pastDays = document.querySelectorAll('.fc-day-past'); + pastDays.forEach(function (dayEl) { + dayEl.style.display = showPastEvents ? 'table-row' : 'none'; + }); } } + + function styleOddEvenEvents() { + // Select tbody elements + document.querySelectorAll('tbody').forEach(tbody => { + let fcEventCount = 0; // Counter for fc-event rows + + // Loop through all child elements of tbody + tbody.querySelectorAll('tr').forEach(row => { + if (row.classList.contains('fc-event')) { + // Increment counter only for fc-event rows + fcEventCount++; + + // Apply alternating background based on the counter + if (fcEventCount % 2 === 0) { + row.classList.add('even-event'); + row.classList.remove('odd-event'); + } else { + row.classList.add('odd-event'); + row.classList.remove('even-event'); + } + } + }); + }); + }; }); // Function to disable the submit button for a certain period diff --git a/docs/stylesheets/base/variables.css b/docs/stylesheets/base/variables.css index 043a8f103..eae17ad81 100644 --- a/docs/stylesheets/base/variables.css +++ b/docs/stylesheets/base/variables.css @@ -72,7 +72,7 @@ --header-svg: url('/medien/header-formen.svg'); /* Bunte Formen im Hintergrund des Headers */ --header-logo: url(/medien/makerspace-weiss.svg); --hours-shadow: black; - --spNews-arrow: url('/medien/spNews_right_dark.svg') + --spNews-arrow: url('/medien/spNews_right_dark.svg'); } [data-md-color-scheme="default"] { /* Variables for light-Mode */ @@ -108,7 +108,7 @@ --md-typeset-a-color: var(--link-color); --header-svg: url('/medien/header-formen.svg'); /* Bunte Formen im Hintergrund des Headers */ --hours-shadow: var(--md-typeset-color); - --spNews-arrow: url('/medien/spNews_right.svg') + --spNews-arrow: url('/medien/spNews_right.svg'); } diff --git a/docs/stylesheets/components/calender.css b/docs/stylesheets/components/calender.css index 18b2c53ec..1b4e56ae8 100644 --- a/docs/stylesheets/components/calender.css +++ b/docs/stylesheets/components/calender.css @@ -71,6 +71,15 @@ body { margin: 2px; } +/* Add styles for odd and even fc-event rows */ +tbody tr.fc-event.odd-event { + background-color: var(--header-bg-color); /* Color for odd rows */ +} + +tbody tr.fc-event.even-event { + background-color: transparent; /* Color for even rows */ +} + .fc-list-event:hover, .fc-list-event:hover a, .fc-list-event:hover .fc-event-title, diff --git a/public/feed_rss_created.xml b/public/feed_rss_created.xml index 3c303d008..50ab89648 100644 --- a/public/feed_rss_created.xml +++ b/public/feed_rss_created.xml @@ -1,2 +1,2 @@ <?xml version='1.0' encoding='utf-8'?> -<rss xmlns:ns0="http://www.w3.org/2005/Atom" version="2.0"> <channel><title>RUB-MAKERSPACE</title><description>Die offene Werkstatt an der RUB</description><link>https://test-ms-boehntxp-a762342731fc2e4f5ac31921f2de1d2c94efb6952110ae.io.noc.ruhr-uni-bochum.de/</link><ns0:link href="https://test-ms-boehntxp-a762342731fc2e4f5ac31921f2de1d2c94efb6952110ae.io.noc.ruhr-uni-bochum.de/feed_rss_created.xml" rel="self" type="application/rss+xml" /><language>en-None</language> <pubDate>Mon, 23 Sep 2024 11:06:27 -0000</pubDate> <lastBuildDate>Mon, 23 Sep 2024 11:06:27 -0000</lastBuildDate> <ttl>1440</ttl> <generator>MkDocs RSS plugin - v1.8.0</generator> <image> <url>https://git.noc.ruhr-uni-bochum.de/makerspace/homepage/-/raw/main/docs/medien/rub-makerspace-logo.svg</url> <title>RUB-MAKERSPACE</title><link>https://test-ms-boehntxp-a762342731fc2e4f5ac31921f2de1d2c94efb6952110ae.io.noc.ruhr-uni-bochum.de/</link> </image> </channel></rss> \ No newline at end of file +<rss xmlns:ns0="http://www.w3.org/2005/Atom" version="2.0"> <channel><title>RUB-MAKERSPACE</title><description>Die offene Werkstatt an der RUB</description><link>https://test-ms-boehntxp-a762342731fc2e4f5ac31921f2de1d2c94efb6952110ae.io.noc.ruhr-uni-bochum.de/</link><ns0:link href="https://test-ms-boehntxp-a762342731fc2e4f5ac31921f2de1d2c94efb6952110ae.io.noc.ruhr-uni-bochum.de/feed_rss_created.xml" rel="self" type="application/rss+xml" /><language>en-None</language> <pubDate>Mon, 23 Sep 2024 12:42:52 -0000</pubDate> <lastBuildDate>Mon, 23 Sep 2024 12:42:52 -0000</lastBuildDate> <ttl>1440</ttl> <generator>MkDocs RSS plugin - v1.8.0</generator> <image> <url>https://git.noc.ruhr-uni-bochum.de/makerspace/homepage/-/raw/main/docs/medien/rub-makerspace-logo.svg</url> <title>RUB-MAKERSPACE</title><link>https://test-ms-boehntxp-a762342731fc2e4f5ac31921f2de1d2c94efb6952110ae.io.noc.ruhr-uni-bochum.de/</link> </image> </channel></rss> \ No newline at end of file diff --git a/public/feed_rss_updated.xml b/public/feed_rss_updated.xml index 8abf021f3..e8f93efd3 100644 --- a/public/feed_rss_updated.xml +++ b/public/feed_rss_updated.xml @@ -1,2 +1,2 @@ <?xml version='1.0' encoding='utf-8'?> -<rss xmlns:ns0="http://www.w3.org/2005/Atom" version="2.0"> <channel><title>RUB-MAKERSPACE</title><description>Die offene Werkstatt an der RUB</description><link>https://test-ms-boehntxp-a762342731fc2e4f5ac31921f2de1d2c94efb6952110ae.io.noc.ruhr-uni-bochum.de/</link><ns0:link href="https://test-ms-boehntxp-a762342731fc2e4f5ac31921f2de1d2c94efb6952110ae.io.noc.ruhr-uni-bochum.de/feed_rss_updated.xml" rel="self" type="application/rss+xml" /><language>en-None</language> <pubDate>Mon, 23 Sep 2024 11:06:27 -0000</pubDate> <lastBuildDate>Mon, 23 Sep 2024 11:06:27 -0000</lastBuildDate> <ttl>1440</ttl> <generator>MkDocs RSS plugin - v1.8.0</generator> <image> <url>https://git.noc.ruhr-uni-bochum.de/makerspace/homepage/-/raw/main/docs/medien/rub-makerspace-logo.svg</url> <title>RUB-MAKERSPACE</title><link>https://test-ms-boehntxp-a762342731fc2e4f5ac31921f2de1d2c94efb6952110ae.io.noc.ruhr-uni-bochum.de/</link> </image> </channel></rss> \ No newline at end of file +<rss xmlns:ns0="http://www.w3.org/2005/Atom" version="2.0"> <channel><title>RUB-MAKERSPACE</title><description>Die offene Werkstatt an der RUB</description><link>https://test-ms-boehntxp-a762342731fc2e4f5ac31921f2de1d2c94efb6952110ae.io.noc.ruhr-uni-bochum.de/</link><ns0:link href="https://test-ms-boehntxp-a762342731fc2e4f5ac31921f2de1d2c94efb6952110ae.io.noc.ruhr-uni-bochum.de/feed_rss_updated.xml" rel="self" type="application/rss+xml" /><language>en-None</language> <pubDate>Mon, 23 Sep 2024 12:42:52 -0000</pubDate> <lastBuildDate>Mon, 23 Sep 2024 12:42:52 -0000</lastBuildDate> <ttl>1440</ttl> <generator>MkDocs RSS plugin - v1.8.0</generator> <image> <url>https://git.noc.ruhr-uni-bochum.de/makerspace/homepage/-/raw/main/docs/medien/rub-makerspace-logo.svg</url> <title>RUB-MAKERSPACE</title><link>https://test-ms-boehntxp-a762342731fc2e4f5ac31921f2de1d2c94efb6952110ae.io.noc.ruhr-uni-bochum.de/</link> </image> </channel></rss> \ No newline at end of file diff --git a/public/javascripts/ics_calendar.js b/public/javascripts/ics_calendar.js index f9fe63578..69eeef69c 100644 --- a/public/javascripts/ics_calendar.js +++ b/public/javascripts/ics_calendar.js @@ -307,6 +307,7 @@ processICSFile().then(events => { eventDidMount: function(info) { handlePastEventsVisibility(); + styleOddEvenEvents(); }, //Opens the contact form with event specific informations after clicking an event @@ -531,16 +532,40 @@ processICSFile().then(events => { var view = calendar.view; var displayStyle = view.type.includes('list') ? 'table-row' : 'block'; var pastEvents = document.querySelectorAll('.past-event'); - pastEvents.forEach(function(eventEl) { - eventEl.style.display = showPastEvents ? displayStyle : 'none'; + pastEvents.forEach(function (eventEl) { + eventEl.style.display = showPastEvents ? displayStyle : 'none'; }); if (view.type.includes('list')) { - var pastDays = document.querySelectorAll('.fc-day-past'); - pastDays.forEach(function(dayEl) { - dayEl.style.display = showPastEvents ? 'table-row' : 'none'; - }); + var pastDays = document.querySelectorAll('.fc-day-past'); + pastDays.forEach(function (dayEl) { + dayEl.style.display = showPastEvents ? 'table-row' : 'none'; + }); } } + + function styleOddEvenEvents() { + // Select tbody elements + document.querySelectorAll('tbody').forEach(tbody => { + let fcEventCount = 0; // Counter for fc-event rows + + // Loop through all child elements of tbody + tbody.querySelectorAll('tr').forEach(row => { + if (row.classList.contains('fc-event')) { + // Increment counter only for fc-event rows + fcEventCount++; + + // Apply alternating background based on the counter + if (fcEventCount % 2 === 0) { + row.classList.add('even-event'); + row.classList.remove('odd-event'); + } else { + row.classList.add('odd-event'); + row.classList.remove('even-event'); + } + } + }); + }); + }; }); // Function to disable the submit button for a certain period diff --git a/public/sitemap.xml.gz b/public/sitemap.xml.gz index 5bfc15e2c088448ae80a00d9f4ddfa97b59516fb..a25a0a56bb7ea6730f71146175e322476edd6c3d 100644 GIT binary patch delta 15 WcmdnawVjJizMF$1C}|^`Au9kP{R89x delta 15 WcmdnawVjJizMF$%m-j|CLskGJ`UEuq diff --git a/public/stylesheets/base/variables.css b/public/stylesheets/base/variables.css index 043a8f103..eae17ad81 100644 --- a/public/stylesheets/base/variables.css +++ b/public/stylesheets/base/variables.css @@ -72,7 +72,7 @@ --header-svg: url('/medien/header-formen.svg'); /* Bunte Formen im Hintergrund des Headers */ --header-logo: url(/medien/makerspace-weiss.svg); --hours-shadow: black; - --spNews-arrow: url('/medien/spNews_right_dark.svg') + --spNews-arrow: url('/medien/spNews_right_dark.svg'); } [data-md-color-scheme="default"] { /* Variables for light-Mode */ @@ -108,7 +108,7 @@ --md-typeset-a-color: var(--link-color); --header-svg: url('/medien/header-formen.svg'); /* Bunte Formen im Hintergrund des Headers */ --hours-shadow: var(--md-typeset-color); - --spNews-arrow: url('/medien/spNews_right.svg') + --spNews-arrow: url('/medien/spNews_right.svg'); } diff --git a/public/stylesheets/components/calender.css b/public/stylesheets/components/calender.css index 18b2c53ec..1b4e56ae8 100644 --- a/public/stylesheets/components/calender.css +++ b/public/stylesheets/components/calender.css @@ -71,6 +71,15 @@ body { margin: 2px; } +/* Add styles for odd and even fc-event rows */ +tbody tr.fc-event.odd-event { + background-color: var(--header-bg-color); /* Color for odd rows */ +} + +tbody tr.fc-event.even-event { + background-color: transparent; /* Color for even rows */ +} + .fc-list-event:hover, .fc-list-event:hover a, .fc-list-event:hover .fc-event-title, -- GitLab