From c1b13ba85b166ea92e3545b1ab3fb1310f71e1df Mon Sep 17 00:00:00 2001
From: Dom Brassey <dombrassey@gmail.com>
Date: Mon, 8 Jul 2024 12:37:30 +0100
Subject: [PATCH] fix events hyperlinks to 2 cals

---
 index.html                 | 30 ++++++++++++++++++------------
 script/scriptEventLists.js |  7 ++-----
 style/style.css            |  3 ++-
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/index.html b/index.html
index 354a30d..85e3ca1 100644
--- a/index.html
+++ b/index.html
@@ -95,28 +95,34 @@ <h3>SS</h3>
     </div>
 
     <!-- Upcoming Events -->
-    <a href='https://calendar.google.com/calendar/u/0/embed?src=ccpaedu.com_ftu0la54kio0crhh83m267lri8@group.calendar.google.com&ctz=America/Los_Angeles&mode=AGENDA' class="lowkey" target="_blank">
-      <div class="container-fluid py-2" id="events">
-        <div class="row">
-          <div class="col-lg-3 col-md-6 col-sm-12 pt-2">
+    <div class="container-fluid py-2" id="events">
+      <div class="row">
+        <div class="col-lg-3 col-md-6 col-sm-12 pt-2">
+          <a href='https://calendar.google.com/calendar/u/0/embed?src=ccpaedu.com_ftu0la54kio0crhh83m267lri8@group.calendar.google.com&ctz=America/Los_Angeles&mode=AGENDA' class="lowkey" target="_blank">
             <h2>Student Holidays:</h2>
             <ul id="events-student-holiday"></ul>
-          </div>
-          <div class="col-lg-3 col-md-6 col-sm-12 pt-2">
+          </a>
+        </div>
+        <div class="col-lg-3 col-md-6 col-sm-12 pt-2">
+          <a href='https://calendar.google.com/calendar/u/0/embed?src=ccpaedu.com_ftu0la54kio0crhh83m267lri8@group.calendar.google.com&ctz=America/Los_Angeles&mode=AGENDA' class="lowkey" target="_blank">
             <h2>Student Activities:</h2>
             <ul id="events-student-activities"></ul>
-          </div>
-          <div class="col-lg-3 col-md-6 col-sm-12 pt-2">
+          </a>
+        </div>
+        <div class="col-lg-3 col-md-6 col-sm-12 pt-2">
+          <a href='https://calendar.google.com/calendar/u/0/embed?src=ccpaedu.com_ftu0la54kio0crhh83m267lri8@group.calendar.google.com&ctz=America/Los_Angeles&mode=AGENDA' class="lowkey" target="_blank">
             <h2>Dates to Note:</h2>
             <ul id="events-student-non-holiday"></ul>
-          </div>
-          <div class="col-lg-3 col-md-6 col-sm-12 pt-2">
+          </a>
+        </div>
+        <div class="col-lg-3 col-md-6 col-sm-12 pt-2">
+          <a href='https://calendar.google.com/calendar/u/0/embed?src=a71ff6b63e1709ae2bfbcada2b3b64ebeb1f7f5e30787b2bb059725fa17b7b2b@group.calendar.google.com&ctz=America/Los_Angeles&mode=AGENDA' class="lowkey" target="_blank">
             <h2>Opportunities:</h2>
             <ul id="events-student-opps"></ul>
-          </div>
+          </a>
         </div>
       </div>
-    </a>
+    </div>
 
     <!-- Footer -->
     <div class="py-1 d-flex" id="footer">
diff --git a/script/scriptEventLists.js b/script/scriptEventLists.js
index 8e626ad..220e31c 100644
--- a/script/scriptEventLists.js
+++ b/script/scriptEventLists.js
@@ -1,9 +1,6 @@
 const calendarIds = [
   "ccpaedu.com_ftu0la54kio0crhh83m267lri8@group.calendar.google.com", // CCPA
   "a71ff6b63e1709ae2bfbcada2b3b64ebeb1f7f5e30787b2bb059725fa17b7b2b@group.calendar.google.com", // Opportunities HS - https://github.com/ccpa-ousd/opps-cal-hs
-  // "en.usa#holiday@group.v.calendar.google.com", // US observances
-  // "hhm0o0t2uqmmm0dsjg9t5n7uk0nnspe4@import.calendar.google.com", // UN observances
-  // "398cuok6nh0gpq8ild25ros54qmlrabf@import.calendar.google.com", // culture_awareness
 ];
 let combinedGCalEvents = [];
 let combinedAllEvents = [];
@@ -124,8 +121,8 @@ function showEvents(eventsArray) {
       );
     }
     // truncate any long titles or desc
-    if (eventsArray[i].name.length > 20) {
-      eventsArray[i].name = eventsArray[i].name.substring(0, 20);
+    if (eventsArray[i].name.length > 17) {
+      eventsArray[i].name = eventsArray[i].name.substring(0, 17) + "..";
     }
     if (eventsArray[i].description.length > 100) {
       eventsArray[i].description = eventsArray[i].description.substring(0, 100);
diff --git a/style/style.css b/style/style.css
index 74c5163..3c768a4 100644
--- a/style/style.css
+++ b/style/style.css
@@ -113,6 +113,7 @@ iframe {
 .lowkey,
 .lowkey:hover {
   text-decoration: none;
+  color: inherit;
 }
 #events {
   background-color: rgba(217, 121, 4, 0.9);
@@ -141,7 +142,7 @@ iframe {
 #events-student-holiday .event-item:nth-child(-n + 4) {
   display: list-item;
 }
-#events-student-activities .event-item:nth-child(-n + 5) {
+#events-student-activities .event-item:nth-child(-n + 3) {
   display: list-item;
 }
 #events-student-non-holiday .event-item:nth-child(-n + 5) {