Merge branch 'main' into quick/remove-manage-dn

TACC · Aug 13, 2024 · 2d503cd · 2d503cd
2 parents 32a6d24 + e64429a
commit 2d503cd
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 17 deletions.
diff --git a/apps/tup-cms/src/taccsite_cms/settings_custom.py b/apps/tup-cms/src/taccsite_cms/settings_custom.py
@@ -205,6 +205,7 @@
 TACC_BLOG_CUSTOM_MEDIA_POST_CATEGORY = 'multimedia'
 TACC_BLOG_SHOW_ABSTRACT_TAG = 'external'
 
+TACC_BLOG_CATEGORY_ORDER = ['press-release', 'feature-story', 'multimedia', 'podcast']
 
 ########################
 # TACC: CORE STYLES

diff --git a/apps/tup-cms/src/taccsite_cms/templates/snippets/css-banner-tacc.html b/apps/tup-cms/src/taccsite_cms/templates/snippets/css-banner-tacc.html
@@ -1,3 +1,6 @@
+<template id="css-banner-tacc--notes">
+<!-- TO DYNAMICALL REDUCE HEIGHT OF BANNER: NO NEED to edit this stylesheet. Edit banner "Picture / Image" on CMS. Set `style="height: 60vh; max-height: 550px; min-height: 230px;"`. To use static height, set `style="height: 550px"` instead. -->
+</template>
 <style id="css-banner-tacc">
 /* To limit width of title on wide screens */
 @media (width >= 992px) {
@@ -23,7 +26,7 @@
     left: 0; top: 0; bottom: 0; right: 0;
     background-color: var(--global-color-primary--x-light);
 }
-.banner-cell--major a:hover .u-highlight {
+.banner-cell--major a:hover :is(.u-highlight, .highlight) {
     background-color: var(--global-color-accent--normal);
 }
 

diff --git a/apps/tup-cms/src/taccsite_cms/templates/snippets/css-global-a11y.html b/apps/tup-cms/src/taccsite_cms/templates/snippets/css-global-a11y.html
@@ -0,0 +1,19 @@
+<style id="css-global-a11y">
+/* 1. To make mobile menu button stand out */
+.navbar-dark .navbar-toggler {
+    border-color: var(--global-color-primary--normal);
+}
+
+/* 2. To make keyboard focus stand out on header */
+/*
+.nav-link:focus-visible,
+#header-logo:focus-visible,
+.navbar-dark .navbar-toggler:focus-visible {
+*/
+#s-header :focus,
+#header-branding a:focus,
+.s-search-bar::part(input):focus,
+.s-search-bar::part(button):focus {
+    outline-color: var(--global-color-primary--xx-light);
+}
+</style>
diff --git a/apps/tup-cms/src/taccsite_cms/templates/snippets/css-news-hacks.html b/apps/tup-cms/src/taccsite_cms/templates/snippets/css-news-hacks.html
diff --git a/apps/tup-cms/src/taccsite_cms/templates/snippets/js-prevent-ugly-urls.html b/apps/tup-cms/src/taccsite_cms/templates/snippets/js-prevent-ugly-urls.html
@@ -0,0 +1,23 @@
+<script type="module" id="js-prevent-ugly-urls-tup-715">
+    const links = document.querySelectorAll('body > :is(header, main, footer) a[target="_blank"]');
+
+    /* HACK: To revert URL of links that Google changes on hover */
+    /* FAQ: Google Analytics settings interpret subdomain links as URLs to adjust so it can track navigation */
+    [ ...links ].forEach( function restoreLinkHrefChangedOnHover(link) {
+        const isTACC = link.host.includes('tacc.utexas.edu');
+
+        if ( isTACC ) {
+            let currentHrefVal = link.getAttribute('href');
+
+            link.setAttribute('data-original-href', currentHrefVal );
+            link.addEventListener('click', () => {
+                const originalHrefVal = link.getAttribute('data-original-href');
+
+                currentHrefVal = link.getAttribute('href');
+                if ( currentHrefVal !== originalHrefVal ) {
+                    link.setAttribute('href', originalHrefVal );
+                }
+            });
+        }
+    });
+</script>
diff --git a/libs/tup-components/src/tickets/TicketCreateModal/TicketCreateForm.tsx b/libs/tup-components/src/tickets/TicketCreateModal/TicketCreateForm.tsx
@@ -107,8 +107,8 @@ export const TicketCreateForm: React.FC = () => {
             <option>Jetstream(jetstream.tacc.utexas.edu)</option>
             <option>Lonestar6(lonestar6.tacc.utexas.edu)</option>
             <option>Ranch(ranch.tacc.utexas.edu)</option>
-            <option>Stampede2(stampede2.tacc.utexas.edu)</option>
             <option>Stampede3(stampede3.tacc.utexas.edu)</option>
+            <option>Vista(vista.tacc.utexas.edu)</option>
             <option>Vislab(stallion.tacc.utexas.edu)</option>
             <option>Cyclone(cyclone.tacc.utexas.edu)</option>
             <option>Cloud and Interactive Computing (Agave API)</option>