Merge Split Branch

preview-update-submodules/.well-known/issuer.jwks

@@ -56,11 +56,11 @@
         {
             "alg": "ES256",
             "crv": "P-256",
-            "kid": "dcb8",
+            "kid": "8d9b",
             "kty": "EC",
             "use": "sig",
-            "x": "uZuja5BBP-CCongrDM0z7rVKeGyieCW0T2bTRaEuyoY=",
-            "y": "eYtm6i8pyOFdfZz7ahmtiBQiC4ioUuwxAxc5txJRUFY="
+            "x": "N45Fz5S8OXUvRvkziV3IvRku4o84-hfYdbu9RWdapwY=",
+            "y": "haNd4VKCj3_8AHe0luUTWx1XJk5sKDqciiLR35_oAHo="
         },
         {
             "alg": "ES256",

preview-update-submodules/README.md

@@ -123,7 +123,7 @@ For internal links (to a header inside the document), use this syntax:
 	```
 	[link to header A](#a-sample-header)
 	```
-
+ 
 ### Converting HTML to Markdown
 
 Right now, most of our pages are written in html and have a `.shtml` extension. We are 

preview-update-submodules/assets/js/uw-style.js

@@ -46,24 +46,28 @@ uw_utils.ready(function () {
             return;
         }
         [].forEach.call(dropdown_buttons, function (el) {
-            el.addEventListener("click", function (e) {
+            var parent = el.parentNode;
+            var child_menu = parent.querySelector(".uw-child-menu");
+
+            el.addEventListener("mouseover", function (e) {
                 e.preventDefault();
-                var parent = this.parentNode,
-                    parent_siblings = uw_utils.getSiblings(parent),
-                    child_menu = parent.querySelector(".uw-child-menu");
-                parent.classList.toggle("uw-is-active");
+                parent.classList.add("uw-is-active");
                 uw_utils.toggleBooleanAttr(this, "aria-expanded");
                 uw_utils.toggleBooleanAttr(child_menu, "aria-hidden");
-                [].forEach.call(parent_siblings, function (el) {
-                    if (el.classList.contains("uw-dropdown")) {
-                        el.classList.remove("uw-is-active");
-                        el.querySelector("a:first-child").setAttribute("aria-expanded", false);
-                        el.querySelector(".uw-child-menu").setAttribute("aria-hidden", true);
-                    }
-                });
+            });
+
+            parent.addEventListener("mouseleave", function (e) {
+                var relatedTarget = e.relatedTarget || e.toElement;
+
+                // Check if the mouse is outside both the triggering element and the dropdown
+                if (!parent.contains(relatedTarget)) {
+                    parent.classList.remove("uw-is-active");
+                    uw_utils.toggleBooleanAttr(el, "aria-expanded");
+                    uw_utils.toggleBooleanAttr(child_menu, "aria-hidden");
+                }
             });
         });
-    };
+    };     
     var main_nav_items = document.querySelectorAll("#uw-main-nav > li");
     var calcMainMenuWidth = function () {
         var main_nav_width = 0;

preview-update-submodules/fellowships/index.html

@@ -250,7 +250,7 @@ <h1 class="uw-mini-bar mb-4">
 The Center for High Throughput Computing Fellows Program
 </h1>
 
-      <p class="alert alert-primary"><strong>Applications for the <a href="https://chtc.cs.wisc.edu/">Center for High Throughput Computing (CHTC)</a> Fellows Program for Summer 2024 are now open.</strong> The final deadline for applications is March 1, 2024 (end of the day, any time zone).</p>
+      <p class="alert alert-primary"><strong>Applications for the <a href="https://chtc.cs.wisc.edu/">Center for High Throughput Computing (CHTC)</a> Fellows Program for Summer 2024 are now open.</strong> The final deadline for applications is March 8, 2024 (end of the day, any time zone).</p>
 
       <p>The CHTC Fellows Program trains students in the development and use of cyberinfrastructure through a 12-week summer program where participants will work with mentors on delivering a project that will make an impact on the nation’s science.</p>
 
@@ -289,23 +289,24 @@ <h3 id="software-development"><a href="/fellowships/list#software-development">S
 
       <h2 id="how-it-works">How it Works</h2>
 
-      <p>Fellows work with a mentor to develop a project relevant to one of the areas listed. Fellows will receive a monthly stipend for participating in the Program, during their fellowship. In-person participation at CHTC is preferred to maximize interaction with mentors and others in the cohort, but remote involvement is an option for some projects for those based outside of the Madison, Wisconsin area.</p>
+      <p>Fellows work with a mentor to develop a project relevant to one of the areas listed. Fellows will receive a monthly stipend for participating in the Program, during their fellowship. In-person participation at CHTC is preferred to maximize interaction with mentors and others in the cohort, but remote involvement is an option for some projects for those based outside of the Madison, Wisconsin area. However, you must be located in the United States during the Fellowship Program to participate.</p>
 
       <p><strong>Eligibility:</strong></p>
 
       <ul>
         <li>You must be enrolled in an undergraduate or graduate program at an accredited University or College within the US.</li>
         <li>You must have completed at least 1 academic year by the start of the Fellowship.</li>
         <li>U.S. citizenship is not required to participate.</li>
+        <li>In order to ensure the safety of the workplace, proof of COVID-19 vaccination is required unless an exemption is granted for medical, disability or religious reasons.</li>
       </ul>
 
       <p><strong>Duration of fellowship and total stipend:</strong></p>
 
       <ul>
-        <li>The Fellowship Program lasts for 12 weeks during Summer 2024.</li>
+        <li>The Fellowship Program lasts for 12 weeks during Summer 2024. The Program will begin on June 3 and end on August 23, 2024.</li>
         <li>The Program provides $650/week stipend for large projects and $325/week stipend for medium projects. The stipends will be dispersed monthly.</li>
         <li>It is expected that a Fellow working on a large project is available full time during the fellowship period and will not have another significant activity (such as classes, another trainee position or a job) in the same time period.</li>
-        <li>Applications are now open - deadline 1 March, 2024 (any time zone).</li>
+        <li>Applications are now open - deadline 8 March, 2024 (any time zone).</li>
       </ul>
 
       <p><strong>Developing a project</strong></p>
@@ -331,11 +332,11 @@ <h2 id="applying">Applying</h2>
       <h3 id="timeline">Timeline:</h3>
 
       <ul>
-        <li><strong>Friday 1 March, 2024</strong> - Final deadline for applications (applications will be reviewed on a rolling basis as they arrive.)</li>
+        <li><strong>Friday 8 March, 2024</strong> - Final deadline for applications (applications will be reviewed on a rolling basis as they arrive.)</li>
         <li><strong>Friday 15 March, 2024</strong> - End of selection period for applications. Those selected will be matched to work with mentors on developing a proposal - this may involve a short interview and other follow-up. (Interviews for selected applicants will occur on a rolling basis.)</li>
         <li><strong>Monday 1 April, 2024</strong> - Deadline for submission of proposals. (Proposals will be reviewed on a rolling basis.)</li>
         <li><strong>By 15 April, 2023</strong> - Final selection of Fellows for summer 2024</li>
-        <li><strong>May-Sep</strong> - Fellows work on projects. (Exact dates may depend on specific academic year constraints.)</li>
+        <li><strong>June-August</strong> - Fellows work on projects.</li>
       </ul>
 
       <h2 id="funding">Funding</h2>