From 48b07884b75f13a8cb2916d8b2fe048c4ad240ab Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Thu, 5 Jun 2025 14:19:58 -0500 Subject: [PATCH 1/3] docs: core-cms v4.30 has code for external news https://github.com/TACC/Core-CMS/pull/868/files --- .../static/site_cms/js/modules/getArticleExternalURL.js | 2 ++ .../templates/snippets/news/open-external-post.html | 4 ++++ .../tup-cms/src/taccsite_cms/templates/snippets/redirect.html | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/apps/tup-cms/src/taccsite_cms/static/site_cms/js/modules/getArticleExternalURL.js b/apps/tup-cms/src/taccsite_cms/static/site_cms/js/modules/getArticleExternalURL.js index 0daad1023..6a46ebb50 100644 --- a/apps/tup-cms/src/taccsite_cms/static/site_cms/js/modules/getArticleExternalURL.js +++ b/apps/tup-cms/src/taccsite_cms/static/site_cms/js/modules/getArticleExternalURL.js @@ -1,3 +1,5 @@ +/* TODO: Use Core-CMS v4.30 code instead */ +/* SEE: https://github.com/TACC/Core-CMS/pull/868/files */ /** * Get URL of external web article of which internal news article represents * @param {HTMLElement} article - The article within which to find external URL diff --git a/apps/tup-cms/src/taccsite_cms/templates/snippets/news/open-external-post.html b/apps/tup-cms/src/taccsite_cms/templates/snippets/news/open-external-post.html index c4d011c30..fe0010c92 100644 --- a/apps/tup-cms/src/taccsite_cms/templates/snippets/news/open-external-post.html +++ b/apps/tup-cms/src/taccsite_cms/templates/snippets/news/open-external-post.html @@ -1,3 +1,7 @@ +{% comment %} + + +{% endcomment %} {# To open external article URL, instead of internal one, on news listing #} {% load static %} diff --git a/apps/tup-cms/src/taccsite_cms/templates/snippets/redirect.html b/apps/tup-cms/src/taccsite_cms/templates/snippets/redirect.html index 9ea076eca..db39ab259 100644 --- a/apps/tup-cms/src/taccsite_cms/templates/snippets/redirect.html +++ b/apps/tup-cms/src/taccsite_cms/templates/snippets/redirect.html @@ -1,3 +1,7 @@ +{% comment %} + + +{% endcomment %} {# To redirect page to given URL or external URL from known content #} {% load static %} From 1767fc34a59c18e39bfd31ba826560aa890df1fb Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Thu, 5 Jun 2025 14:26:27 -0500 Subject: [PATCH 2/3] chore: delete breadcrumbs CSS & JS These have been successful from Core-CMS since Core-CMS v4.12 and v4.13. https://github.com/TACC/Core-CMS/pull/838 https://github.com/TACC/Core-CMS/pull/855 --- .../taccsite_cms/templates/assets_custom.html | 3 --- .../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, 30 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 0c1b6c327..a8a039da2 100644 --- a/apps/tup-cms/src/taccsite_cms/templates/assets_custom.html +++ b/apps/tup-cms/src/taccsite_cms/templates/assets_custom.html @@ -30,9 +30,6 @@ })(window,document,'https://static.hotjar.com/c/hotjar-','.js?sv='); - - - 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 3f2ee85a6ff6dcc531daa3984044b95ee5a87dbf Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Thu, 5 Jun 2025 16:12:35 -0500 Subject: [PATCH 3/3] docs: c-feed-list.css --- .../tup_cms/css/for-core-styles/components/c-feed-list.css | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-feed-list.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-feed-list.css index a3e7d396e..d948e602d 100644 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-feed-list.css +++ b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-feed-list.css @@ -1,3 +1,4 @@ +/* TODO: Release TACC/Core-Styles#508. Update Core-CMS then TUP. Remove this… */ /* FAQ: Used on homepage for "User Updates" and "Upcoming Training" */ /* SEE: https://dev.tup.tacc.utexas.edu/ */