` */ - -.c-feed-list > :is(div, article) { - flex-grow: 1; /* to shrink feed title */ - - display: grid; - grid-template-areas: - 'time link' - 'name link' - 'desc link'; - grid-template-columns: 1fr auto; /* to not let short desc make short column */ - - padding-block: 10px; - border-top: var(--global-border-width--normal) solid var(--global-color-primary--dark); -} -.c-feed-list > :is(div, article):last-of-type { - border-bottom: var(--global-border-width--normal) solid var(--global-color-primary--xx-dark); -} -.c-feed-list > :is(div, article) > time, -.c-feed-list > :is(div, article) > p:has(time) { grid-area: time; } -.c-feed-list > :is(div, article) > :is(h1, h2, h3, h4, h5, h6) { grid-area: name; } -.c-feed-list > :is(div, article) > p:not(:has(time, a:only-child)) { grid-area: desc; } -.c-feed-list > :is(div, article) > p:has(a:only-child) { grid-area: link; } - -.c-feed-list > :is(div, article) > :is(h1, h2, h3, h4, h5, h6) { - margin-top: 10px; - margin-bottom: 5px; -} - -/* TODO: Share styles between c-news and c-feed-list (`time:not(…)`) */ -.c-feed-list > :is(div, article) > time:not(:is(h1, h2, h3, h4, h5, h6) *), -.c-feed-list > :is(div, article) > p:has(time):not(:is(h1, h2, h3, h4, h5, h6) *) { - color: var(--global-color-secondary--normal); - font-weight: var(--medium); - text-transform: uppercase; -} -.c-feed-list > :is(div, article) > p:has(time):not(:is(h1, h2, h3, h4, h5, h6) *) { - margin-bottom: unset; -} - -.c-feed-list > :is(div, article) > p:not(:has(time, a:only-child)) { - /* WARNING: Value is guess-n-check; prevents unexplained visibile 3rd line */ - margin-bottom: 1.15rem; - - /* TODO: When migrated to core-styles, use @extend instead */ - /* @extend .x-truncate--many-lines; */ - display: -webkit-box; - -webkit-box-orient: vertical; - overflow: hidden; - -webkit-line-clamp: var(--lines, 2); -} -.c-feed-list > :is(div, article) > p:has(a:only-child) { - padding-inline: var(--global-space--unnamed); - margin-bottom: unset; - - /* To vertically center content */ - display: flex; - align-items: center; -} - -/* Elements: Link */ - -/* NOTE: `p:has(a:only-child)` is used, but `a:last-child` is desired, but not used until "Link" plugin instance supports an icon before the text. */ - -.c-feed-list > a:last-child, -.c-feed-list > p:has(a:only-child) { - padding-top: 15px; - - /* TODO: When migrated to core-styles, use @extend instead */ - /* @extend .x-truncate--one-line; */ - text-overflow: ellipsis; - overflow: hidden; - white-space: nowrap; - /* max-width: 100%; /* SEE: https://stackoverflow.com/a/44521595 */ - - font-weight: var(--bold); - font-size: var(--global-font-size--medium) -} -.o-section--style-dark .c-feed-list > a:last-child, -.o-section--style-light .c-feed-list > p:has(a:only-child) { - color: var(--global-color-primary--xx-light); -} -.o-section--style-light .c-feed-list > a:last-child, -.o-section--style-light .c-feed-list > p:has(a:only-child) { - color: var(--global-color-primary--xx-dark); -} diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css index 661def38b..f586393ea 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-core-styles.css @@ -14,7 +14,6 @@ /* … */ /* COMPONENTS */ -@import url("./for-core-styles/components/c-feed-list.css") layer(base); @import url("./for-core-styles/components/c-news.css") layer(base); /* TRUMPS */ From 4b189e07d92682191e315d0575597044d404153b Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Thu, 5 Feb 2026 16:34:13 -0600 Subject: [PATCH 08/59] =?UTF-8?q?refactor:=20hotjar=20tracking=20code=20?= =?UTF-8?q?=E2=86=92=20ad-hoc=20JS=20scripts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/taccsite_cms/templates/assets_custom.html | 12 ------------ .../templates/snippets/js-ad-hoc-scripts.html | 11 +++++++++++ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/apps/tup-cms/src/taccsite_cms/templates/assets_custom.html b/apps/tup-cms/src/taccsite_cms/templates/assets_custom.html index c204cf69e..5446d441a 100644 --- a/apps/tup-cms/src/taccsite_cms/templates/assets_custom.html +++ b/apps/tup-cms/src/taccsite_cms/templates/assets_custom.html @@ -32,17 +32,5 @@ {# NEW CODE #} - - - diff --git a/apps/tup-cms/src/taccsite_cms/templates/snippets/js-ad-hoc-scripts.html b/apps/tup-cms/src/taccsite_cms/templates/snippets/js-ad-hoc-scripts.html index 40d19bdb8..6889de2f9 100644 --- a/apps/tup-cms/src/taccsite_cms/templates/snippets/js-ad-hoc-scripts.html +++ b/apps/tup-cms/src/taccsite_cms/templates/snippets/js-ad-hoc-scripts.html @@ -3,3 +3,14 @@ {% endcomment %} + + From d4ba501157977366b8e3afcea490a43ec79f160b Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Thu, 5 Feb 2026 16:54:05 -0600 Subject: [PATCH 09/59] chore: delete breadcrumb code core-cms already has This has been working via Core-CMS for almost a year. https://github.com/TACC/Core-CMS/pull/838 --- .../taccsite_cms/templates/assets_custom.html | 7 ------- .../css/for-tup-cms/trumps/s-breadcrumbs.css | 9 --------- .../static/tup_cms/css/tup-cms.for-tup-cms.css | 1 - .../static/tup_cms/js/modules/breadcrumbs.js | 17 ----------------- 4 files changed, 34 deletions(-) delete mode 100644 apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/trumps/s-breadcrumbs.css delete mode 100644 apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/js/modules/breadcrumbs.js diff --git a/apps/tup-cms/src/taccsite_cms/templates/assets_custom.html b/apps/tup-cms/src/taccsite_cms/templates/assets_custom.html index 5446d441a..58e5f36da 100644 --- a/apps/tup-cms/src/taccsite_cms/templates/assets_custom.html +++ b/apps/tup-cms/src/taccsite_cms/templates/assets_custom.html @@ -27,10 +27,3 @@ {% endfor %} {% endwith %} - - - -{# NEW CODE #} - - - diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/trumps/s-breadcrumbs.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/trumps/s-breadcrumbs.css deleted file mode 100644 index cb9b12d64..000000000 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/trumps/s-breadcrumbs.css +++ /dev/null @@ -1,9 +0,0 @@ -/* To overwrite core-styles.base.css href-less link styles */ -/* TODO: Integrate into Core-CMS (not Core-Styles): - - …/css/src/imports/trumps/s-breadcrumbs.css - - …/js/modules/breadcrumbs.js -*/ -.s-breadcrumbs:is(nav) a:not([href]) { - opacity: 1; - color: unset; -} diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-tup-cms.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-tup-cms.css index 0c7eff986..d9c60a925 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-tup-cms.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/tup-cms.for-tup-cms.css @@ -30,4 +30,3 @@ /* TRUMPS */ @import url("./for-tup-cms/trumps/s-abbr-list.css") layer(project); -@import url("./for-tup-cms/trumps/s-breadcrumbs.css") layer(project); diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/js/modules/breadcrumbs.js b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/js/modules/breadcrumbs.js deleted file mode 100644 index aff1aadab..000000000 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/js/modules/breadcrumbs.js +++ /dev/null @@ -1,17 +0,0 @@ -/* TODO: Try to programmatically only perform if link is a redirect */ -/* TODO: Integrate into Core-CMS (not Core-Styles): - - …/css/src/imports/trumps/s-breadcrumbs.css - - …/js/modules/breadcrumbs.js -*/ -/** - * To "disable" top-level CMS menu nav links in breadcrumbs - * (because they all are always set to redirect to a child) - */ -const link = document.querySelector( - '.s-breadcrumbs:is(nav) li:nth-of-type(2) a' -); -const isAppropriatePage = window.location.pathname.search('/systems/') == -1; - -if (link && isAppropriatePage) { - link.removeAttribute('href'); -} From d634f3e5db7c37d4b0eab285d50deb408242fd18 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Thu, 5 Feb 2026 17:08:07 -0600 Subject: [PATCH 10/59] chore: delete assets_custom, it matches core-cms This file is nto the same code as Core-CMS. No need for it. By deleting this one, it will nto be copied. The default one in Core-CMS image will be used. --- .../taccsite_cms/templates/assets_custom.html | 29 ------------------- 1 file changed, 29 deletions(-) delete mode 100644 apps/tup-cms/src/taccsite_cms/templates/assets_custom.html diff --git a/apps/tup-cms/src/taccsite_cms/templates/assets_custom.html b/apps/tup-cms/src/taccsite_cms/templates/assets_custom.html deleted file mode 100644 index 58e5f36da..000000000 --- a/apps/tup-cms/src/taccsite_cms/templates/assets_custom.html +++ /dev/null @@ -1,29 +0,0 @@ -{# This template overwrites the original from TACC/Core-CMS #} -{# NOTE: This should extend taccsite_cms via taccsite_custom, not overwrite #} -{# FAQ: To extend, via app template inheritance, see TACC/Core-CMS#492 #} - - - -{# COPIED FROM CORE #} -{# https://github.com/TACC/Core-CMS/blob/v4.37.1/taccsite_cms/templates/assets_custom.html #} - -{% load static %} - -{# Load assets as external files, to cache independently of markup. #} -{% comment %} -FAQ: IF a script or style is better cached with markup, THEN: - - Such a style belongs inline before relevant markup, not via this block - - Such a script belongs inline after relevant markup, not via this block -{% endcomment %} - - -{% with settings.PORTAL_FAVICON as favicon %} - -{% endwith %} - - -{% with settings.PORTAL_STYLES as styles %} -{% for style in styles %} - -{% endfor %} -{% endwith %} From 318ec8af453a8d4166dbd4228e9059b121708380 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Thu, 5 Feb 2026 17:14:34 -0600 Subject: [PATCH 11/59] chore: delete file now from Core-CMS since: https://github.com/TACC/Core-CMS/pull/868 --- apps/tup-cms/src/taccsite_cms/templates/plain.html | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 apps/tup-cms/src/taccsite_cms/templates/plain.html diff --git a/apps/tup-cms/src/taccsite_cms/templates/plain.html b/apps/tup-cms/src/taccsite_cms/templates/plain.html deleted file mode 100644 index 3c86e2bd7..000000000 --- a/apps/tup-cms/src/taccsite_cms/templates/plain.html +++ /dev/null @@ -1,3 +0,0 @@ -{# TODO: Remove template after TUP's Core-CMS image has TACC/Core-CMS#868 #} -{# https://github.com/TACC/Core-CMS/pull/868 #} -{% extends "raw.html" %} From c258281f25e6cf16f5fc1b42bd0c1b76c8c60076 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Thu, 5 Feb 2026 17:47:12 -0600 Subject: [PATCH 12/59] fix: put hotjar script in head not body --- .../templates/snippets/js-ad-hoc-scripts.html | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/apps/tup-cms/src/taccsite_cms/templates/snippets/js-ad-hoc-scripts.html b/apps/tup-cms/src/taccsite_cms/templates/snippets/js-ad-hoc-scripts.html index 6889de2f9..7741eed49 100644 --- a/apps/tup-cms/src/taccsite_cms/templates/snippets/js-ad-hoc-scripts.html +++ b/apps/tup-cms/src/taccsite_cms/templates/snippets/js-ad-hoc-scripts.html @@ -1,9 +1,18 @@ +{% load sekizai_tags %} + {% comment %} One +{% comment %} +FAQ: Not CSS, but in Core-CMS: + - {% render_block "css" %} is in
(intended location) + - {% render_block "js" %} is at end of (wrong place) +TODO: Add {% render_block "head" %} (and foot?) in Core-CMS +{% endcomment %} +{% addtoblock "css" %} +{% endaddtoblock %} From a4c24c52fbc0d6f6cd5a46c9311549eb5e7bf1cd Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Thu, 5 Feb 2026 18:27:05 -0600 Subject: [PATCH 13/59] chore: delete unnecessary djangocms_icon override Available since https://github.com/TACC/Core-CMS/pull/611. Updated in https://github.com/TACC/Core-CMS/pull/996. --- apps/tup-cms/src/taccsite_cms/settings_custom.py | 5 ++--- .../templates/admin/djangocms_icon/includes/assets.html | 7 ------- 2 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 apps/tup-cms/src/taccsite_cms/templates/admin/djangocms_icon/includes/assets.html diff --git a/apps/tup-cms/src/taccsite_cms/settings_custom.py b/apps/tup-cms/src/taccsite_cms/settings_custom.py index 125c83c0f..f38d87d90 100644 --- a/apps/tup-cms/src/taccsite_cms/settings_custom.py +++ b/apps/tup-cms/src/taccsite_cms/settings_custom.py @@ -249,9 +249,8 @@ with open(DECAL_ICONFILE, 'r') as fh: DECAL_ICONS = fh.read() -# HELP: Icon dropdown sometimes does not show active icon selected. -# The position of DECAL_ICONS in this array affects the bug. -# SEE: https://github.com/django-cms/djangocms-icon/issues/9 DJANGOCMS_ICON_SETS = [ + # IMPORTANT: Load CORECMS_ICON_SETS set last + # https://github.com/TACC/Core-CMS/blob/v4.37.1/taccsite_cms/_settings/djangocms_plugins.py#L203-L210 (DECAL_ICONS, '', _('TACC Decal SVGs')), ] + CORECMS_ICON_SETS diff --git a/apps/tup-cms/src/taccsite_cms/templates/admin/djangocms_icon/includes/assets.html b/apps/tup-cms/src/taccsite_cms/templates/admin/djangocms_icon/includes/assets.html deleted file mode 100644 index ac50054be..000000000 --- a/apps/tup-cms/src/taccsite_cms/templates/admin/djangocms_icon/includes/assets.html +++ /dev/null @@ -1,7 +0,0 @@ - - From fcff12f3df39d6c7a6bbdd3202f731c7bff90c9e Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Thu, 5 Feb 2026 18:34:52 -0600 Subject: [PATCH 14/59] test: update workflow node version to resolve error https://github.com/TACC/tup-ui/actions/runs/21733908266/job/62694594122?pr=535 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9bc79d73f..3ceb19f00 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 cache: 'npm' - run: npm ci From 636c01f7e2035d71b205dd1e6b21725968564789 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Thu, 5 Feb 2026 18:51:28 -0600 Subject: [PATCH 15/59] docs: settings comments for plugins mimics https://github.com/TACC/Core-CMS/pull/1018 --- apps/tup-cms/src/taccsite_cms/settings_custom.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/tup-cms/src/taccsite_cms/settings_custom.py b/apps/tup-cms/src/taccsite_cms/settings_custom.py index f38d87d90..f9aad9cc6 100644 --- a/apps/tup-cms/src/taccsite_cms/settings_custom.py +++ b/apps/tup-cms/src/taccsite_cms/settings_custom.py @@ -227,21 +227,27 @@ ######################## -# PLUGIN SETTINGS +# DJANGO_FILER ######################## # https://github.com/django-cms/django-filer/blob/2.0.2/docs/permissions.rst FILER_ENABLE_PERMISSIONS = True +######################## +# CKEDITOR # https://github.com/django-cms/djangocms-text-ckeditor +######################## + CKEDITOR_SETTINGS = { 'autoParagraph': True, # Core-CMS had set this to False 'stylesSet': 'default:/static/js/addons/ckeditor.wysiwyg.js', 'contentsCss': ['/static/djangocms_text_ckeditor/ckeditor/contents.css'], } -# DJANGOCMS_ICON SETTINGS +######################## +# DJANGOCMS_ICON # https://github.com/django-cms/djangocms-icon +######################## from taccsite_cms.settings import DJANGOCMS_ICON_SETS as CORECMS_ICON_SETS From 663392f61aeefa4f904479eb35d6c8508ee04af6 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Fri, 6 Feb 2026 11:28:30 -0600 Subject: [PATCH 16/59] refactor: .logos--social styles, core-cms updates Update TUP-CMS styles to respect new Core-CMS styles: See https://github.com/TACC/Core-CMS/pull/1028 Then https://github.com/TACC/Core-CMS/pull/1029 Delete https://tacc.utexas.edu/admin/djangocms_snippet/snippet/172/ --- .../static/tup_cms/css/for-tup-cms/components/c-footer.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css index ffa551cf4..00430c7fd 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css @@ -97,14 +97,13 @@ svg { /* To skin social media logo links */ /* WARNING: Developer styles */ .c-footer .logos--social a { - display: inline-block; padding: 1rem; /* rem, because any em value is 0 because font-size: 0 */ } .c-footer .logos--social a:hover { background-color: var(--global-color-primary--x-dark); } .c-footer .logos--social svg { - height: 2.5rem; /* rem, so it scales like text */ + font-size: 2.5rem; /* rem, so it scales like text */ } From 3cda13afef6f2503b1475072ca7676a1a9151af0 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Fri, 6 Feb 2026 13:40:07 -0600 Subject: [PATCH 17/59] fix: ensure header font does not change So that CMS nav width does not increase with CMS font. --- .../tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css index 30ff985b5..080d71603 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css @@ -25,9 +25,8 @@ } -/* TO MAKE HEADER FONT CONSISTENT ON CMS & PORTAL */ - -/* TODO: Remove after TACC/Core-CMS#v4.25.1 */ +/* To reduce width of text in CMS nav */ .s-header { + /* FAQ: Roboto is narrower than Benton Sans */ font-family: var(--global-font-family--sans--portal); } From 9797eef91bdc495dc6992c9acc3675695179a66b Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Fri, 6 Feb 2026 13:49:15 -0600 Subject: [PATCH 18/59] refactor: header font, do not set, will not change Core-Styles flipped font to Benton (CMS) then back to Roboto (Portal). --- .../tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css | 7 ------- 1 file changed, 7 deletions(-) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css index 080d71603..637590883 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css @@ -23,10 +23,3 @@ .c-footer .logos--social a { padding: 0.5em; } - - -/* To reduce width of text in CMS nav */ -.s-header { - /* FAQ: Roboto is narrower than Benton Sans */ - font-family: var(--global-font-family--sans--portal); -} From cf00ab6a2d8461e5696e7369e3c3ada7643669c1 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Fri, 6 Feb 2026 13:58:03 -0600 Subject: [PATCH 19/59] chore: consolidate styles, remove old comments --- .../tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css | 4 ---- .../static/tup_cms/css/for-tup-cms/components/c-footer.css | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css index 637590883..636dce0bc 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css @@ -19,7 +19,3 @@ display: grid; align-items: center; } -/* To reduce width of social media icon links */ -.c-footer .logos--social a { - padding: 0.5em; -} diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css index 00430c7fd..d2256ae36 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css @@ -95,15 +95,14 @@ svg { } /* To skin social media logo links */ -/* WARNING: Developer styles */ .c-footer .logos--social a { - padding: 1rem; /* rem, because any em value is 0 because font-size: 0 */ + padding: 0.5em; } .c-footer .logos--social a:hover { background-color: var(--global-color-primary--x-dark); } .c-footer .logos--social svg { - font-size: 2.5rem; /* rem, so it scales like text */ + font-size: 2.5rem; } From b8b9434c8b8533e5ab27ec8506fad7e483bc8a80 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Fri, 6 Feb 2026 13:58:22 -0600 Subject: [PATCH 20/59] chore: delete useless style --- .../static/tup_cms/css/for-tup-cms/components/c-footer.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css index d2256ae36..83f72bcd2 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css @@ -98,9 +98,6 @@ svg { .c-footer .logos--social a { padding: 0.5em; } -.c-footer .logos--social a:hover { - background-color: var(--global-color-primary--x-dark); -} .c-footer .logos--social svg { font-size: 2.5rem; } From 90be7266368b3c250808f2ce4cc6441cc1189e2d Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Mon, 9 Feb 2026 11:24:59 -0600 Subject: [PATCH 21/59] feat: hover state on footer social media logos --- .../static/tup_cms/css/for-tup-cms/components/c-footer.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css index 83f72bcd2..275641d69 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css @@ -98,6 +98,10 @@ svg { .c-footer .logos--social a { padding: 0.5em; } +.c-footer .logos--social a:hover { + outline: var(--global-border-width--normal) solid white; + border-radius: 0.5em; +} .c-footer .logos--social svg { font-size: 2.5rem; } From 00f4769384a9a8325956f8476c6a9de82f183c6c Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Mon, 9 Feb 2026 11:25:06 -0600 Subject: [PATCH 22/59] Revert "feat: hover state on footer social media logos" This reverts commit 90be7266368b3c250808f2ce4cc6441cc1189e2d. Core-CMS brings hover states (color of SVG changes to brand color of that social media). --- .../static/tup_cms/css/for-tup-cms/components/c-footer.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css index 275641d69..83f72bcd2 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css @@ -98,10 +98,6 @@ svg { .c-footer .logos--social a { padding: 0.5em; } -.c-footer .logos--social a:hover { - outline: var(--global-border-width--normal) solid white; - border-radius: 0.5em; -} .c-footer .logos--social svg { font-size: 2.5rem; } From 1a5781af50c80b59c3da85de4968b8398b2942aa Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Mon, 9 Feb 2026 12:03:54 -0600 Subject: [PATCH 23/59] fix: hover state on footer social media logos --- .../tup_cms/css/for-tup-cms/components/c-footer.css | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css index 83f72bcd2..04536a0cb 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css @@ -98,10 +98,23 @@ svg { .c-footer .logos--social a { padding: 0.5em; } +.c-footer .logos--social a:hover { + color: inherit; + border-bottom: var(--global-border-width--normal) solid white; +} .c-footer .logos--social svg { font-size: 2.5rem; } +/* HACK: To undo tricky Instagram hover color */ +.c-footer .logos--social a.logos__instagram:hover { + mask: unset; + background: unset; +} +.c-footer .logos--social a.logos__instagram:hover svg { + visibility: visible; +} + From 5a41978a9b1140533334e3cc7532d0943352587b Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Mon, 9 Feb 2026 12:28:38 -0600 Subject: [PATCH 24/59] refactor: simpler hover state on footer logos --- .../tup_cms/css/for-tup-cms/components/c-footer.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css index 04536a0cb..ed53b1211 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css @@ -94,14 +94,14 @@ svg { cursor: default; } -/* To skin social media logo links */ +/* To skin logo links */ +.c-footer [class*="logos--"] a:hover { + color: inherit; + opacity: 0.75; +} .c-footer .logos--social a { padding: 0.5em; } -.c-footer .logos--social a:hover { - color: inherit; - border-bottom: var(--global-border-width--normal) solid white; -} .c-footer .logos--social svg { font-size: 2.5rem; } From ef4475389306b48e9858db3942b5b22ee4d33cbb Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Mon, 9 Feb 2026 12:43:11 -0600 Subject: [PATCH 25/59] refactor: respect in footer buttons No reason to override this. If CMS admin wants to use ``, let her. I just tweak font-size. --- .../static/tup_cms/css/for-tup-cms/components/c-footer.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css index ed53b1211..03c994ec5 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css @@ -17,11 +17,9 @@ svg { .c-footer .c-button, .c-footer [class*="button--"] { --max-width: auto; /* override core-styles.base.css */ - font-size: var(--global-font-size--x-small); /* mimic Botstrap .small and */ - /* TODO: (1) Remove from footer buttons (2) Remove this font-size */ & small { - font-size: inherit; /* gracefully deprecate use of */ + font-size: var(--global-font-size--x-small); } } From 3eae71ad1ad8a13474a745a8cdaf39f7c48f724b Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Mon, 9 Feb 2026 12:45:28 -0600 Subject: [PATCH 26/59] chore: remove tup styles matching core-styles Core-Styles was updated to also use `--max-width: auto`. Thus, TUP CMS need not set it. --- .../static/tup_cms/css/for-tup-cms/components/c-footer.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css index 03c994ec5..dfa859047 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css @@ -16,8 +16,6 @@ svg { /* To style buttons differently than in body */ .c-footer .c-button, .c-footer [class*="button--"] { - --max-width: auto; /* override core-styles.base.css */ - & small { font-size: var(--global-font-size--x-small); } From 725a03040a081f08717da79604788ede2c845c92 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Mon, 9 Feb 2026 12:52:08 -0600 Subject: [PATCH 27/59] chore: delete unnecessary style MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Core-CMS offers — ```css [class*="logos--"] a svg { display: block; } ``` — which makes `vertical-align: middle`[^1] have no effect. [^1]: Even Bootstrap's `vertical-align: middle` has no effect. --- .../tup_cms/css/for-tup-cms/components/c-footer.css | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css index dfa859047..1f638e39a 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-tup-cms/components/c-footer.css @@ -1,16 +1,3 @@ -/* SVGs */ - -/* To mimic Bootstrap _reboot img { vertical-align: middle } */ -/* TODO: Consider for Core-CMS */ -/* TODO: Decide whether this is only for footer */ -svg { - vertical-align: middle; -} - - - - - /* BUTTONS */ /* To style buttons differently than in body */ From b1e0d27201e5bfe6d2dfc37f3f190f313186ac6b Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Mon, 9 Feb 2026 13:16:31 -0600 Subject: [PATCH 28/59] chore: delete outdated fix Core-Styles fixed logo vertical alignment. --- .../tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css index 636dce0bc..611c61cc1 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css @@ -14,8 +14,3 @@ .portal-logo { height: 30px; } -/* To vertically center the logo which was shrunk */ -.s-header .navbar-brand { - display: grid; - align-items: center; -} From 1307a676772483ea6fda60552ff4488a965721ce Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Mon, 9 Feb 2026 13:20:57 -0600 Subject: [PATCH 29/59] refactor: move logo adjustment css to ad-hoc --- .../templates/snippets/css-ad-hoc-styles.html | 1 + .../tup_cms/static/tup_cms/css/ad-hoc/adjust-logo.css | 8 ++++++++ .../tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css | 8 -------- 3 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/adjust-logo.css diff --git a/apps/tup-cms/src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html b/apps/tup-cms/src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html index f0ea83763..6d3605f09 100644 --- a/apps/tup-cms/src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html +++ b/apps/tup-cms/src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html @@ -12,3 +12,4 @@ + diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/adjust-logo.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/adjust-logo.css new file mode 100644 index 000000000..711f5259d --- /dev/null +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/adjust-logo.css @@ -0,0 +1,8 @@ +/* To align first CMS nav with "Dashbaord" heading in Portal */ +.s-header .navbar-brand { + flex-basis: 138px; +} +/* To give CMS nav more room by reducing size of logo */ +.portal-logo { + height: 30px; +} diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css index 611c61cc1..3c8d99ee4 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css @@ -6,11 +6,3 @@ display: none; } } -/* To align first CMS nav with "Dashbaord" heading in Portal */ -.s-header .navbar-brand { - flex-basis: 138px; -} -/* To give CMS nav more room by reducing size of logo */ -.portal-logo { - height: 30px; -} From b557a963c80f36b820dbb36e12fcfdd1849ea96f Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Mon, 9 Feb 2026 13:21:29 -0600 Subject: [PATCH 30/59] fix: logo adjustment css commit hash for URL --- .../src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/tup-cms/src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html b/apps/tup-cms/src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html index 6d3605f09..95cd4aee3 100644 --- a/apps/tup-cms/src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html +++ b/apps/tup-cms/src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html @@ -12,4 +12,4 @@ - + From 9796eebef972bb3259bb6eda1e2f7449847ca499 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Fri, 27 Feb 2026 18:03:00 -0600 Subject: [PATCH 31/59] chore: save new bootstrap5 links from core-styles --- .../src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/tup-cms/src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html b/apps/tup-cms/src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html index 95cd4aee3..16aa27123 100644 --- a/apps/tup-cms/src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html +++ b/apps/tup-cms/src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html @@ -2,6 +2,8 @@ Many s is faster than one with many '@import's. {% endcomment %} + + From e3b8a2c93f592780b6e324c7c33edd1280c1e73d Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Fri, 27 Feb 2026 18:04:22 -0600 Subject: [PATCH 32/59] docs: TODO for loading bootstrap5 links Added a TODO comment for loading styles via Core-CMS. --- .../src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/tup-cms/src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html b/apps/tup-cms/src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html index 16aa27123..3a77f27b9 100644 --- a/apps/tup-cms/src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html +++ b/apps/tup-cms/src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html @@ -2,6 +2,7 @@ Many s is faster than one with many '@import's. {% endcomment %} +{# TODO: Load via Core-CMS after it loads new new Core-Styles release #} From 8fd6f0f51ee2010e4e413c49887ccfe4470933f9 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Fri, 27 Feb 2026 18:23:10 -0600 Subject: [PATCH 33/59] chore: CSS link to point to a specific commit --- .../src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/tup-cms/src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html b/apps/tup-cms/src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html index 3a77f27b9..4f31df7d9 100644 --- a/apps/tup-cms/src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html +++ b/apps/tup-cms/src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html @@ -3,7 +3,7 @@ {% endcomment %} {# TODO: Load via Core-CMS after it loads new new Core-Styles release #} - + From adaf981f25cabc8a03c10693e30d4b43b2842041 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Mon, 9 Mar 2026 14:48:46 -0500 Subject: [PATCH 34/59] refactor: djangocms-blog settings This is the new way to do it. TUP CMS is the only client using old way. --- .../src/taccsite_cms/custom_app_settings.py | 10 ++++++++ .../src/taccsite_cms/settings_custom.py | 23 ------------------- apps/tup-cms/src/taccsite_cms/urls_custom.py | 4 ++-- 3 files changed, 12 insertions(+), 25 deletions(-) diff --git a/apps/tup-cms/src/taccsite_cms/custom_app_settings.py b/apps/tup-cms/src/taccsite_cms/custom_app_settings.py index dadde24f6..132c4500f 100644 --- a/apps/tup-cms/src/taccsite_cms/custom_app_settings.py +++ b/apps/tup-cms/src/taccsite_cms/custom_app_settings.py @@ -1,8 +1,18 @@ CUSTOM_APPS = [ + + # TUP CMS 'apps.portal_nav', 'apps.portal.apps.PortalConfig', 'apps.user_news', 'apps.staff_profile' + + # DJANGOCMS_BLOG + 'parler', + 'taggit', + 'taggit_autosuggest', + 'sortedm2m', + 'djangocms_blog', + ] CUSTOM_MIDDLEWARE = [] STATICFILES_DIRS = () diff --git a/apps/tup-cms/src/taccsite_cms/settings_custom.py b/apps/tup-cms/src/taccsite_cms/settings_custom.py index 45a2764e3..21e084e2a 100644 --- a/apps/tup-cms/src/taccsite_cms/settings_custom.py +++ b/apps/tup-cms/src/taccsite_cms/settings_custom.py @@ -160,29 +160,6 @@ # DJANGOCMS_BLOG ######################## -from taccsite_cms.settings import INSTALLED_APPS - -# News must be installed BEFORE our CMS app; reason unknown -# https://github.com/TACC/Core-CMS-Resources/pull/127/commits/0b09af6cb0ae6dd630f9ca94bf36ca9e042a5d81 -tacc_app_index = INSTALLED_APPS.index('taccsite_cms') -INSTALLED_APPS[tacc_app_index:tacc_app_index] = [ - # 'filer', # already in Core - # 'easy_thumbnails', # already in Core - 'parler', - 'taggit', - 'taggit_autosuggest', - # 'meta', # already in Core - 'sortedm2m', - 'djangocms_blog', -] -# REQ: 'taggit_autosuggest' requires the following is added to `urls.py` -""" -urlpatterns += [ - # Support `taggit_autosuggest` (from `djangocms-blog`) - url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')), -] -""" - # Paths for alternate templates that user can choose for blog-specific plugin # - Devs can customize core templates at `templates/djangocms_blog/`. # - Users can choose alt. templates from `templates/djangocms_blog/plugins/*`. diff --git a/apps/tup-cms/src/taccsite_cms/urls_custom.py b/apps/tup-cms/src/taccsite_cms/urls_custom.py index 91caedb86..891eead0a 100644 --- a/apps/tup-cms/src/taccsite_cms/urls_custom.py +++ b/apps/tup-cms/src/taccsite_cms/urls_custom.py @@ -1,6 +1,6 @@ from django.urls import path, include -from django.urls import re_path as url +from django.urls import re_path from apps.user_news.urls import urls as user_news_urls from django.views.generic.base import RedirectView @@ -15,5 +15,5 @@ path(user_news_urls['legacy']['base'], include('apps.user_news.urls', namespace='user_news_legacy')), # To support `taggit_autosuggest` (from `djangocms-blog`) - url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')), + re_path(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')), ] From 2d4a7f372c66d6c7d21aa39566472a3a00b83d8c Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Mon, 9 Mar 2026 15:04:29 -0500 Subject: [PATCH 35/59] refactor: DJANGOCMS_ICON_SETS settings load path These settings were moved in TACC/Core-CMS#v4.35.10 --- apps/tup-cms/src/taccsite_cms/settings_custom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/tup-cms/src/taccsite_cms/settings_custom.py b/apps/tup-cms/src/taccsite_cms/settings_custom.py index 21e084e2a..19aedcb99 100644 --- a/apps/tup-cms/src/taccsite_cms/settings_custom.py +++ b/apps/tup-cms/src/taccsite_cms/settings_custom.py @@ -226,7 +226,7 @@ # https://github.com/django-cms/djangocms-icon ######################## -from taccsite_cms.settings import DJANGOCMS_ICON_SETS as CORECMS_ICON_SETS +from taccsite_cms._settings.djangocms_plugins import DJANGOCMS_ICON_SETS as CORECMS_ICON_SETS DECAL_ICONFILE = os.path.join(BASE_DIR, 'taccsite_custom', 'tup_cms', 'static', 'tup_cms', 'img', 'icons', 'decals.json') with open(DECAL_ICONFILE, 'r') as fh: From 2e367387bd3ffe9ee21c58bd86bbb31e57d7e49b Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Mon, 9 Mar 2026 15:08:26 -0500 Subject: [PATCH 36/59] fix: missing comma --- apps/tup-cms/src/taccsite_cms/custom_app_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/tup-cms/src/taccsite_cms/custom_app_settings.py b/apps/tup-cms/src/taccsite_cms/custom_app_settings.py index 132c4500f..6c737ef0d 100644 --- a/apps/tup-cms/src/taccsite_cms/custom_app_settings.py +++ b/apps/tup-cms/src/taccsite_cms/custom_app_settings.py @@ -4,7 +4,7 @@ 'apps.portal_nav', 'apps.portal.apps.PortalConfig', 'apps.user_news', - 'apps.staff_profile' + 'apps.staff_profile', # DJANGOCMS_BLOG 'parler', From 7f57486db0cc2f8d5e4b5757e7395d1a3c706f1d Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Mon, 9 Mar 2026 18:23:11 -0500 Subject: [PATCH 37/59] fix: CSS expects portal ID as page-portal https://github.com/search?q=repo%3ATACC%2Ftup-ui%20%22%23page-portal%22&type=code The `page-` was forced in TACC/Core-CMS#v4.28 but not since TACC/Core-CMS#v4.29 https://github.com/TACC/Core-CMS/blob/v4.28.0/taccsite_cms/templates/base.html#L5 https://github.com/TACC/Core-CMS/blob/v4.29.0/taccsite_cms/templates/base.html --- apps/tup-cms/src/apps/portal/templates/portal/portal.debug.html | 2 +- apps/tup-cms/src/apps/portal/templates/portal/portal.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/tup-cms/src/apps/portal/templates/portal/portal.debug.html b/apps/tup-cms/src/apps/portal/templates/portal/portal.debug.html index 6beb10079..8b228aade 100644 --- a/apps/tup-cms/src/apps/portal/templates/portal/portal.debug.html +++ b/apps/tup-cms/src/apps/portal/templates/portal/portal.debug.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block html_page_id %}portal{% endblock %} +{% block html_page_id %}page-portal{% endblock %} {% block title %}User Portal{% endblock %} diff --git a/apps/tup-cms/src/apps/portal/templates/portal/portal.html b/apps/tup-cms/src/apps/portal/templates/portal/portal.html index 3329cf86a..8edbd8da2 100644 --- a/apps/tup-cms/src/apps/portal/templates/portal/portal.html +++ b/apps/tup-cms/src/apps/portal/templates/portal/portal.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block html_page_id %}portal{% endblock %} +{% block html_page_id %}page-portal{% endblock %} {% block title %}User Portal{% endblock %} From bffee577a23b4d1500ea8efac948a072f4fd0a19 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Mon, 9 Mar 2026 18:54:37 -0500 Subject: [PATCH 38/59] deps: update Core-CMS from v37 to v38 --- apps/tup-cms/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/tup-cms/Dockerfile b/apps/tup-cms/Dockerfile index d145c38f6..7ede16635 100644 --- a/apps/tup-cms/Dockerfile +++ b/apps/tup-cms/Dockerfile @@ -7,7 +7,7 @@ COPY . /code/ RUN npx nx build tup-ui RUN npx nx build tup-cms-react -FROM taccwma/core-cms:v4.37.1 +FROM taccwma/core-cms:v4.38.3 WORKDIR /code From 1892f2daa8914eafacf2360ad53f44392f0c6262 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Mon, 9 Mar 2026 18:54:49 -0500 Subject: [PATCH 39/59] fix: login page missing styles --- apps/tup-cms/src/apps/portal/templates/portal/portal.debug.html | 2 +- apps/tup-cms/src/apps/portal/templates/portal/portal.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/tup-cms/src/apps/portal/templates/portal/portal.debug.html b/apps/tup-cms/src/apps/portal/templates/portal/portal.debug.html index 8b228aade..2cd40d041 100644 --- a/apps/tup-cms/src/apps/portal/templates/portal/portal.debug.html +++ b/apps/tup-cms/src/apps/portal/templates/portal/portal.debug.html @@ -4,7 +4,7 @@ {% block title %}User Portal{% endblock %} -{% block assets_core_project %} +{% block assets_project %} {% include './assets.html' %} {% endblock %} diff --git a/apps/tup-cms/src/apps/portal/templates/portal/portal.html b/apps/tup-cms/src/apps/portal/templates/portal/portal.html index 8edbd8da2..39748f1a7 100644 --- a/apps/tup-cms/src/apps/portal/templates/portal/portal.html +++ b/apps/tup-cms/src/apps/portal/templates/portal/portal.html @@ -4,7 +4,7 @@ {% block title %}User Portal{% endblock %} -{% block assets_core_project %} +{% block assets_project %} {% include './assets.html' %} {% endblock %} From 210bd0cca17fd19fd4625f23cd62411e60c4e422 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Wed, 11 Mar 2026 18:45:48 -0500 Subject: [PATCH 40/59] fix: portal nav not showing logged in state Requires https://github.com/TACC/Core-CMS/pull/1117 --- apps/tup-cms/src/taccsite_cms/settings_custom.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/tup-cms/src/taccsite_cms/settings_custom.py b/apps/tup-cms/src/taccsite_cms/settings_custom.py index 19aedcb99..63257f453 100644 --- a/apps/tup-cms/src/taccsite_cms/settings_custom.py +++ b/apps/tup-cms/src/taccsite_cms/settings_custom.py @@ -126,6 +126,11 @@ ######################## PORTAL_IS_TACC_CORE_PORTAL = False + +# IMPORTANT: Requires https://github.com/TACC/Core-CMS/pull/1117 +PORTAL_HOSTS_NAV = True +PORTAL_LOADS_NAV = False + PORTAL_HAS_LOGIN = True PORTAL_HAS_SEARCH = True From bb9a5df1de3587dc5f2b8f9dbfd60514427ce074 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Wed, 11 Mar 2026 18:54:07 -0500 Subject: [PATCH 41/59] Revert "fix: portal nav not showing logged in state" This reverts commit 210bd0cca17fd19fd4625f23cd62411e60c4e422. --- apps/tup-cms/src/taccsite_cms/settings_custom.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/apps/tup-cms/src/taccsite_cms/settings_custom.py b/apps/tup-cms/src/taccsite_cms/settings_custom.py index 63257f453..19aedcb99 100644 --- a/apps/tup-cms/src/taccsite_cms/settings_custom.py +++ b/apps/tup-cms/src/taccsite_cms/settings_custom.py @@ -126,11 +126,6 @@ ######################## PORTAL_IS_TACC_CORE_PORTAL = False - -# IMPORTANT: Requires https://github.com/TACC/Core-CMS/pull/1117 -PORTAL_HOSTS_NAV = True -PORTAL_LOADS_NAV = False - PORTAL_HAS_LOGIN = True PORTAL_HAS_SEARCH = True From cc7f04bb07d3ff80fb9cae9e7958cd3943f1b10a Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Fri, 13 Mar 2026 19:05:47 -0500 Subject: [PATCH 42/59] Revert "test: update workflow node version to resolve error" This reverts commit fcff12f3df39d6c7a6bbdd3202f731c7bff90c9e. --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3ceb19f00..9bc79d73f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 18 + node-version: 16 cache: 'npm' - run: npm ci From 593d91dc4e64df410202b15adc0dde965a2becd3 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Fri, 13 Mar 2026 20:08:18 -0500 Subject: [PATCH 43/59] fix: ci error --- mise.toml | 2 ++ package-lock.json | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 mise.toml diff --git a/mise.toml b/mise.toml new file mode 100644 index 000000000..7d030b2b0 --- /dev/null +++ b/mise.toml @@ -0,0 +1,2 @@ +[tools] +node = "18" diff --git a/package-lock.json b/package-lock.json index ca7f1ce19..02d8827c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14197,6 +14197,24 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/jest-circus/node_modules/babel-plugin-macros": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz", + "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "@babel/runtime": "^7.12.5", + "cosmiconfig": "^7.0.0", + "resolve": "^1.19.0" + }, + "engines": { + "node": ">=10", + "npm": ">=6" + } + }, "node_modules/jest-circus/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", @@ -14231,6 +14249,25 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/jest-circus/node_modules/cosmiconfig": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", + "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "@types/parse-json": "^4.0.0", + "import-fresh": "^3.2.1", + "parse-json": "^5.0.0", + "path-type": "^4.0.0", + "yaml": "^1.10.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/jest-circus/node_modules/dedent": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz", From de6b56f90e6a7b1682d5e7d9425ee2fb494211cd Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Mon, 16 Mar 2026 14:12:35 -0500 Subject: [PATCH 44/59] chore: delete outdated new window js Has not been used for a while in favor of Core-CMS. Outdated since https://github.com/TACC/Core-CMS/pull/1089/commits/89355dd6, in which COre-CMS brings over improvements this script had. --- .../js-new-tab-new-window-accessibility.html | 32 ------------------- 1 file changed, 32 deletions(-) delete mode 100644 apps/tup-cms/src/taccsite_cms/templates/snippets/js-new-tab-new-window-accessibility.html diff --git a/apps/tup-cms/src/taccsite_cms/templates/snippets/js-new-tab-new-window-accessibility.html b/apps/tup-cms/src/taccsite_cms/templates/snippets/js-new-tab-new-window-accessibility.html deleted file mode 100644 index 86158a01a..000000000 --- a/apps/tup-cms/src/taccsite_cms/templates/snippets/js-new-tab-new-window-accessibility.html +++ /dev/null @@ -1,32 +0,0 @@ - - - -