deploy: 1f8b9ce

datadiversitylab · Apr 22, 2024 · 3aab02f · 3aab02f
1 parent 08dfe0d
commit 3aab02f
Show file tree

Hide file tree

Showing 29 changed files with 136 additions and 100 deletions.
diff --git a/admin/config.yml b/admin/config.yml
@@ -24,15 +24,16 @@ collections:
     slug: '{{memberName}}'
     fields:
       - { label: 'Member Name', name: 'memberName', widget: 'string', required: true }
+      - { label: 'Member Title', name: 'memberTitle', widget: 'string', required: false }
       - { label: 'Member Education', name: 'memberEducation', widget: 'string', required: false }
       - { label: 'Member Date', name: 'memberDate', widget: 'string', required: false }
       - { label: 'Member Bio', name: 'memberBio', widget: 'string', required: true }
-      - { label: 'Tags', name: 'tags', widget: 'list', required: true}
+      - { label: 'Tags', name: 'tags', widget: 'list', default: ['Current'], required: true}
       - { label: 'Linkedin', name: 'linkedin', widget: 'string', required: false }
       - { label: 'Email', name: 'email', widget: 'string', required: false }
       - { label: 'Github', name: 'github', widget: 'string', required: false }
       - { label: 'Link', name: 'link', widget: 'string', required: false }
-      - { label: 'Resume', name: 'resume', widget: 'string', required: false }
+      - { label: 'Resume', name: 'resume', widget: 'file', required: false, media_folder: '/src/assets/documents/our-team', public_folder: '/assets/documents/our-team' }
       - { label: 'Member Image', name: 'image', widget: 'image', required: false }
       - { label: 'Image Alt', name: 'imageAlt', widget: 'string', required: false }
       - { label: 'Order', name: 'order', widget: 'number', required: false }
@@ -48,8 +49,8 @@ collections:
     fields:
       - { label: 'Publication Title', name: 'publicationTitle', widget: 'markdown', required: true }
       - { label: 'Author', name: 'publicationAuthor', widget: 'string', required: false }
-      - { label: 'Date', name: 'publicationDate', widget: 'string', required: false }
-      - { label: 'Type', name: 'publicationType', widget: 'string', required: false }
+      - { label: 'Year', name: 'publicationDate', widget: 'string', required: false }
+      - { label: 'Journal Name', name: 'publicationType', widget: 'string', required: false }
       - { label: 'Abstract', name: 'publicationAbstract', widget: 'markdown', required: true }
       - { label: 'Keywords', name: 'tags', widget: 'list', required: true }
       - { label: 'Image', name: 'image', widget: 'image', required: false }

diff --git a/assets/images/conference-room.JPG → assets/images/conference-room.jpeg b/assets/images/conference-room.JPG → assets/images/conference-room.jpeg
diff --git a/assets/images/kitchen.JPG → assets/images/kitchen.jpeg b/assets/images/kitchen.JPG → assets/images/kitchen.jpeg
diff --git a/assets/images/study-work-office-2.JPG → assets/images/study-work-office-2.jpeg b/assets/images/study-work-office-2.JPG → assets/images/study-work-office-2.jpeg
diff --git a/assets/images/study-work-office.JPG → assets/images/study-work-office.jpeg b/assets/images/study-work-office.JPG → assets/images/study-work-office.jpeg
diff --git a/assets/js/nav.js b/assets/js/nav.js
@@ -12,7 +12,7 @@ var CSbody = document.querySelector("body");
 const CSnavbarMenu = document.querySelector("#cs-navigation");
 const CShamburgerMenu = document.querySelector("#cs-navigation .cs-toggle");
 
-CShamburgerMenu.addEventListener('click', function() {
+CShamburgerMenu.addEventListener('click', function () {
     CShamburgerMenu.classList.toggle("cs-active");
     CSnavbarMenu.classList.toggle("cs-active");
     CSbody.classList.toggle("cs-open");
@@ -50,7 +50,7 @@ img.forEach((img) => {
         img.src = '../assets/images/placeholder-image.png';
     }
 
-    img.onerror = function() {
+    img.onerror = function () {
         // this.parentElement.querySelector('source').srcset = '../assets/images/placeholder-image.png';
         this.parentElement.querySelectorAll('source').forEach((source) => {
             source.srcset = '../assets/images/placeholder-image.png';
@@ -69,33 +69,52 @@ captionSliders.forEach((slider) => {
     const captions = Array.from(slider.querySelectorAll(".cs-text-caption"));
     const selectors = Array.from(slider.querySelectorAll(".cs-image-selector"));
     let currentIndex = 0;
+    let timer = null;
 
     function updateContent() {
         const newSrcset = captions[currentIndex].dataset.srcset;
         const newCaption = captions[currentIndex].innerHTML;
 
         images.forEach((img) => {
-            img.srcset = newSrcset;
+            // Update srcset for lazy-loaded images
+            if (img.tagName === 'SOURCE') {
+                img.srcset = newSrcset; // Update only if the tag is <source>
+            } else {
+                img.src = newSrcset; // Update <img> src if necessary
+            }
         });
 
         captions.forEach((caption, index) => {
+            caption.style.display = index === currentIndex ? "block" : "none";
             if (index === currentIndex) {
-                caption.style.display = "block";
                 caption.innerHTML = newCaption;
-            } else {
-                caption.style.display = "none";
             }
         });
 
         selectors.forEach((selector, index) => {
-            if (index === currentIndex) {
-                selector.classList.add("active");
-            } else {
-                selector.classList.remove("active");
-            }
+            selector.classList.toggle("active", index === currentIndex);
         });
     }
 
+    function resetTimer() {
+        clearTimeout(timer);
+        timer = setTimeout(() => {
+            moveRight();
+        }, 10000);
+    }
+
+    function moveRight() {
+        if (currentIndex === selectors.length - 1) {
+            currentIndex = 0;
+        } else {
+            currentIndex++;
+        }
+        updateContent();
+        if (slider.classList.contains("timer-slider")) {
+            resetTimer();
+        }
+    }
+
     if (leftArrow && rightArrow) {
         leftArrow.addEventListener("click", () => {
             if (currentIndex === 0) {
@@ -104,24 +123,33 @@ captionSliders.forEach((slider) => {
                 currentIndex--;
             }
             updateContent();
+            if (slider.classList.contains("timer-slider")) {
+                resetTimer();
+            }
         });
 
         rightArrow.addEventListener("click", () => {
-            if (currentIndex === selectors.length - 1) {
-                currentIndex = 0;
-            } else {
-                currentIndex++;
+            moveRight();
+            if (slider.classList.contains("timer-slider")) {
+                resetTimer();
             }
-            updateContent();
         });
-    } else {
-        selectors.forEach((selector, index) => {
-            selector.addEventListener("click", () => {
-                currentIndex = index;
-                updateContent();
-            });
+    }
+
+    // Apply event listeners for direct selection
+    selectors.forEach((selector, index) => {
+        selector.addEventListener("click", () => {
+            currentIndex = index;
+            updateContent();
+            if (slider.classList.contains("timer-slider")) {
+                resetTimer();
+            }
         });
+    });
 
+    // Initialize the timer only if 'timer-slider' class is present
+    if (slider.classList.contains("timer-slider")) {
+        resetTimer();
     }
 });
 

diff --git a/collaborators/index.html b/collaborators/index.html
@@ -450,7 +450,6 @@ <h1 class="cs-title">Collaborators</h1>
 <footer id="footer">
     <div aria-hidden="true" class="line footer"></div>
     <div class="container">
-
         <div class="full-section">
             <a class="logo" href="/">
 
@@ -466,7 +465,6 @@ <h1 class="cs-title">Collaborators</h1>
                 <a href="https://columbiavalleywebdesigns.com/" target="_blank" rel="noopener">columbia valley web designs</a>
             </div>
         </div>
-
     </div>
 </footer>
 

diff --git a/conferences/index.html b/conferences/index.html
@@ -530,7 +530,6 @@ <h6 class="cs-title">Years</h6>
 <footer id="footer">
     <div aria-hidden="true" class="line footer"></div>
     <div class="container">
-
         <div class="full-section">
             <a class="logo" href="/">
 
@@ -546,7 +545,6 @@ <h6 class="cs-title">Years</h6>
                 <a href="https://columbiavalleywebdesigns.com/" target="_blank" rel="noopener">columbia valley web designs</a>
             </div>
         </div>
-
     </div>
 </footer>
 

diff --git a/contact/index.html b/contact/index.html
@@ -311,7 +311,6 @@ <h2 class="cs-title">Contact</h2>
 <footer id="footer">
     <div aria-hidden="true" class="line footer"></div>
     <div class="container">
-
         <div class="full-section">
             <a class="logo" href="/">
 
@@ -327,7 +326,6 @@ <h2 class="cs-title">Contact</h2>
                 <a href="https://columbiavalleywebdesigns.com/" target="_blank" rel="noopener">columbia valley web designs</a>
             </div>
         </div>
-
     </div>
 </footer>
 

diff --git a/css/news.css b/css/news.css
@@ -289,12 +289,18 @@
     margin: 0;
   }
   #dropdown-cards .cs-dropdown-content ul {
-    list-style-position: inside;
+    padding-left: 20px;
+  }
+  #dropdown-cards .cs-dropdown-content ul li {
     text-align: left;
+    padding-left: 0;
   }
   #dropdown-cards .cs-dropdown-content ul ul {
     padding-left: 2rem;
   }
+  #dropdown-cards .cs-dropdown-content ul ::marker {
+    margin: 0;
+  }
   #dropdown-cards .cs-dropdown-content > .cs-text {
     border-bottom: 2px solid #8B8B8B;
     padding: 0.5rem 0;
@@ -340,10 +346,6 @@
   }
   #dropdown-cards .cs-flex-group {
     cursor: pointer;
-    max-height: 5.625rem;
-  }
-  #dropdown-cards .cs-flex-group.is-active {
-    max-height: 500px;
   }
   #dropdown-cards .cs-dropdown-content .teaching-table {
     width: 100%;

diff --git a/css/our-resources.css b/css/our-resources.css
@@ -133,7 +133,7 @@
     border-radius: 100%;
   }
   #sbsr-579 .cs-image-slider .cs-image-selector.active {
-    background-color: var(--lineColor);
+    background-color: var(--bodyTextColor);
   }
   #sbsr-579 .cs-picture-caption .cs-picture {
     display: block;

diff --git a/css/publications.css b/css/publications.css
@@ -238,6 +238,7 @@
     overflow: hidden;
     display: block;
     position: relative;
+    border-bottom: 1px solid var(--bodyTextColor);
   }
   #meet-team-547 .cs-picture img {
     position: absolute;
@@ -246,7 +247,7 @@
     height: 100%;
     width: 100%;
     /* makes image behave like a background image */
-    object-fit: cover;
+    object-fit: contain;
     /* places top of the image at the top of the box */
     object-position: center;
     transition: transform 0.6s;

diff --git a/grants/index.html b/grants/index.html
@@ -297,7 +297,6 @@ <h6 class="cs-title">Grant providers</h6>
 <footer id="footer">
     <div aria-hidden="true" class="line footer"></div>
     <div class="container">
-
         <div class="full-section">
             <a class="logo" href="/">
 
@@ -313,7 +312,6 @@ <h6 class="cs-title">Grant providers</h6>
                 <a href="https://columbiavalleywebdesigns.com/" target="_blank" rel="noopener">columbia valley web designs</a>
             </div>
         </div>
-
     </div>
 </footer>
 

diff --git a/index.html b/index.html
@@ -236,7 +236,7 @@ <h3 class="cs-title">At the University of Arizona</h3>
             </div>
         </div>
     </div>
-    <div class="cs-picture-caption">
+    <div class="cs-picture-caption timer-slider">
         <picture class="cs-picture">
             <source media="(max-width: 600px)" srcset="/assets/images/landing-m.webp">
             <source media="(min-width: 601px)" srcset="/assets/images/landing.webp">
@@ -327,16 +327,18 @@ <h3 class="cs-title">At the University of Arizona</h3>
         </div>
     </div>
 </section>
-</main>
+
+<script>
+
+</script></main>
         <!-- ============================================ -->
 <!--                   Footer                     -->
 <!-- ============================================ -->
 
 <footer id="footer">
     <div aria-hidden="true" class="line footer"></div>
     <div class="container">
-
-        <div class="left-section">
+        <div class="full-section">
             <a class="logo" href="/">
 
 
@@ -346,16 +348,11 @@ <h3 class="cs-title">At the University of Arizona</h3>
 
 
             </a>
-            <div aria-hidden="true" class="line line-full"></div>
             <div class="credit">
                 <span>Designed and hand coded by</span>
                 <a href="https://columbiavalleywebdesigns.com/" target="_blank" rel="noopener">columbia valley web designs</a>
             </div>
         </div>
-        <div class="right-section">
-            <script type="text/javascript" id="clustrmaps" src="//cdn.clustrmaps.com/map_v2.js?u=OyIN&d=ipkSndE8_XFxOZZl00Ta_2fSaEztt1OMQcXl1Lh2LTQ"></script>
-        </div>
-
     </div>
 </footer>
 

diff --git a/join-us/index.html b/join-us/index.html
@@ -351,7 +351,6 @@ <h5 class="cs-title">Graduate students</h5>
 <footer id="footer">
     <div aria-hidden="true" class="line footer"></div>
     <div class="container">
-
         <div class="full-section">
             <a class="logo" href="/">
 
@@ -367,7 +366,6 @@ <h5 class="cs-title">Graduate students</h5>
                 <a href="https://columbiavalleywebdesigns.com/" target="_blank" rel="noopener">columbia valley web designs</a>
             </div>
         </div>
-
     </div>
 </footer>
 

diff --git a/lab-ops/index.html b/lab-ops/index.html
@@ -310,7 +310,6 @@ <h3 class="cs-title">Second title</h3>
 <footer id="footer">
     <div aria-hidden="true" class="line footer"></div>
     <div class="container">
-
         <div class="full-section">
             <a class="logo" href="/">
 
@@ -326,7 +325,6 @@ <h3 class="cs-title">Second title</h3>
                 <a href="https://columbiavalleywebdesigns.com/" target="_blank" rel="noopener">columbia valley web designs</a>
             </div>
         </div>
-
     </div>
 </footer>
 

diff --git a/lab-policies/index.html b/lab-policies/index.html
@@ -294,7 +294,6 @@ <h1 class="cs-title">Lab policies</h1>
 <footer id="footer">
     <div aria-hidden="true" class="line footer"></div>
     <div class="container">
-
         <div class="full-section">
             <a class="logo" href="/">
 
@@ -310,7 +309,6 @@ <h1 class="cs-title">Lab policies</h1>
                 <a href="https://columbiavalleywebdesigns.com/" target="_blank" rel="noopener">columbia valley web designs</a>
             </div>
         </div>
-
     </div>
 </footer>
 

diff --git a/ms-advising/index.html b/ms-advising/index.html
@@ -310,7 +310,6 @@ <h3 class="cs-title">Second title</h3>
 <footer id="footer">
     <div aria-hidden="true" class="line footer"></div>
     <div class="container">
-
         <div class="full-section">
             <a class="logo" href="/">
 
@@ -326,7 +325,6 @@ <h3 class="cs-title">Second title</h3>
                 <a href="https://columbiavalleywebdesigns.com/" target="_blank" rel="noopener">columbia valley web designs</a>
             </div>
         </div>
-
     </div>
 </footer>