From 20b334f34210efee11e3fc0fcdb0fd4301656e71 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Tue, 13 Aug 2024 09:50:28 -0500 Subject: [PATCH 1/5] fix: tup-715 save patch fix of subdomain link ugly URLs (#468) * fix: tup-715 ugly urls for subdomain links * docs: tup-715 explain code * docs: tup-715 more details about code * style: tup-715 better function name * fix: TUP-715 check link not doc Because doc is always tacc. Link is what may not be tacc. --- .../snippets/js-prevent-ugly-urls.html | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 apps/tup-cms/src/taccsite_cms/templates/snippets/js-prevent-ugly-urls.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 new file mode 100644 index 000000000..d7869244f --- /dev/null +++ b/apps/tup-cms/src/taccsite_cms/templates/snippets/js-prevent-ugly-urls.html @@ -0,0 +1,23 @@ + From 64859a873ad5e1e5d6b9231e97db5b5351011f90 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Tue, 13 Aug 2024 09:52:31 -0500 Subject: [PATCH 2/5] feat: save 2 css snippets (#459) * feat: save css-homepage-2024-02 snippet * fix: save css-banner-tacc bugfix * fix: incorrect location for comments and a11y css * docs: improve tacc banner height edit message * docs: kinder tacc banner height edit message --------- Co-authored-by: Jake Rosenberg --- .../templates/snippets/css-banner-tacc.html | 5 ++++- .../templates/snippets/css-global-a11y.html | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 apps/tup-cms/src/taccsite_cms/templates/snippets/css-global-a11y.html 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 index 6ef15a6d0..c24f48e9b 100644 --- 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 @@ + From 437dc10a8c127b6c11731ac5a9fe9006c1360afb Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Tue, 13 Aug 2024 09:55:21 -0500 Subject: [PATCH 3/5] chore: delete backup code for snippet I deleted (#456) I deleted this snippet yesterday from production CMS. - CMD lead writer and CMD website admin agreed to always show byline. - Hiding "by:" of byline is alreaedy applied via Core-CMS styles. Co-authored-by: Jake Rosenberg --- .../templates/snippets/css-news-hacks.html | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 apps/tup-cms/src/taccsite_cms/templates/snippets/css-news-hacks.html 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 deleted file mode 100644 index 74a2c14b2..000000000 --- a/apps/tup-cms/src/taccsite_cms/templates/snippets/css-news-hacks.html +++ /dev/null @@ -1,15 +0,0 @@ - From 352cdfa4f8c8ff46adff9273cf07ea2aa2df2aff Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Tue, 13 Aug 2024 10:12:47 -0500 Subject: [PATCH 4/5] chore: add missing setting (#455) The setting was inherited from Core-CMS, until: https://github.com/TACC/Core-CMS/commit/a8316ca Co-authored-by: Jake Rosenberg --- apps/tup-cms/src/taccsite_cms/settings_custom.py | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/tup-cms/src/taccsite_cms/settings_custom.py b/apps/tup-cms/src/taccsite_cms/settings_custom.py index 04d9ddd6e..ce79a00cd 100644 --- 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 From e64429a3c700ec9f787c4ff1446f3c6876e81fbd Mon Sep 17 00:00:00 2001 From: Jake Rosenberg Date: Tue, 13 Aug 2024 08:45:16 -0700 Subject: [PATCH 5/5] Remove stampede2 and add Vista to ticket form (#473) --- .../src/tickets/TicketCreateModal/TicketCreateForm.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/tup-components/src/tickets/TicketCreateModal/TicketCreateForm.tsx b/libs/tup-components/src/tickets/TicketCreateModal/TicketCreateForm.tsx index 47275671d..f1a704936 100644 --- 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 = () => { - +