Merge branch 'main' into epic/TUP-700-core-components-node-pkg

apps/tup-cms/src/apps/portal/apps.py

@@ -44,18 +44,26 @@ def submit_ticket(form_data):
 
 
 def send_confirmation_email(form_name, form_data):
+
+    tour_receipt = ""
+    if form_name == "Tour Request Form":
+        tour_receipt = "<p>A copy of your tour request is provided below for your records:</p>\n"
+        for key in form_data:
+            tour_receipt += f"<p>{key}: {form_data[key]}</p>\n"
+
     email_body = f"""
             <p>Greetings,</p>
             <p>
                 Thank you for reaching out to TACC and completing the {form_name}.
             </p>
             <p>
                 <ul>
-                    <li>For training registration requests, you will be contacted within one week to confirm registration. For additional help please contact Lauren Bruce (lbruce@tacc.utexas.edu).</li>
+                    <li>For information about training opportunities, please visit the <a href="https://tacc.utexas.edu/use-tacc/training/">Training page</a>, or contact Tabish Khan (tkhan@tacc.utexas.edu).</li>
                     <li>For tour requests, a tour coordinator will contact you within two business days to complete your reservation. For additional assistance please reach out to [email protected].</li>
-                    <li>For all other issues, a TACC support person will be in contact shortly. For additional assistance please reach out to [email protected].</li>
+                    <li>For additional assistance please reach out to [email protected].</li>
                 </ul>
             </p>
+            {tour_receipt}
             <p>
             Thank you for your time,<br>
             TACC Support
@@ -64,7 +72,7 @@ def send_confirmation_email(form_name, form_data):
     send_mail(
     f"TACC Form Submission Received: {form_name}",
     email_body,
-    "[email protected]",
+    settings.DEFAULT_FROM_EMAIL,
     [form_data["email"]],
     html_message=email_body)
 

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

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);
 }
 

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>

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>

libs/tup-components/src/accounts/ManageAccount.tsx

@@ -30,32 +30,6 @@ const ManageUser = () => (
   </article>
 );
 
-const ManageDNs = () => (
-  <article className={styles['tap-feature']}>
-    <h2 className={styles['tap-header']}>
-      <dfn id="dn">Distinguished Name</dfn> (<abbr>DN</abbr>) Managment
-    </h2>
-    <p className={styles['tap-description']}>
-      Generate a <abbr>DN</abbr> to permit you to move data between machines.{' '}
-      <a
-        href="https://docs.tacc.utexas.edu/basics/datatransfer/#step1"
-        rel="noreferrer"
-        target="_blank"
-      >
-        Learn more about DNs.
-      </a>
-    </p>
-    <a
-      href="https://accounts.tacc.utexas.edu/certificates"
-      target="_blank"
-      rel="noreferrer"
-      className={styles['tap-action']}
-    >
-      <Button type="secondary">Manage DNs</Button>
-    </a>
-  </article>
-);
-
 const ManageUpload = () => (
   <article className={styles['tap-feature']}>
     <h2 className={styles['tap-header']}>Identity Management</h2>
@@ -87,7 +61,6 @@ const ManageAccount: React.FC = () => {
       <div className={styles['account-body']}>
         <section>
           <ManageUser />
-          <ManageDNs />
           <ManageUpload />
         </section>
         <span className={styles['tap-separator']} />

libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx

@@ -41,6 +41,21 @@ const LoginError: React.FC<{ status?: number; isError: boolean }> = ({
       </div>
     );
   }
+  if (status === 451) {
+    return (
+      <div className="c-form__errors">
+        Your account has been suspended. Please{' '}
+        <a
+          rel="noopener noreferrer"
+          target="_blank"
+          href="https://accounts.tacc.utexas.edu/login_support"
+        >
+          request account support
+        </a>
+        .
+      </div>
+    );
+  }
   return (
     <div className="c-form__errors">
       Sorry. Something went wrong while trying to log in. Please try again

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>