diff --git a/apps/tup-cms/src/taccsite_cms/settings_custom.py b/apps/tup-cms/src/taccsite_cms/settings_custom.py index 0acd05f07..94472816a 100644 --- a/apps/tup-cms/src/taccsite_cms/settings_custom.py +++ b/apps/tup-cms/src/taccsite_cms/settings_custom.py @@ -136,8 +136,28 @@ # TACC: SOCIAL MEDIA ######################## +# TODO: Delete after project uses Core-CMS version with TACC/Core-CMS#1155 PORTAL_SOCIAL_SHARE_PLATFORMS = ['linkedin', 'bluesky', 'facebook', 'email'] +######################## +# TACC: STYLES +######################## + +PORTAL_STYLES = [ + { + "is_remote": False, + "path": "tup_cms/css/tup-cms.for-core-styles.css" + }, + { + "is_remote": False, + "path": "tup_cms/css/tup-cms.for-core-cms.css" + }, + { + "is_remote": False, + "path": "tup_cms/css/tup-cms.for-tup-cms.css" + }, +] + ######################## # DJANGOCMS_BLOG ######################## @@ -186,21 +206,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.djangocms_plugins import DJANGOCMS_ICON_SETS as CORECMS_ICON_SETS @@ -208,9 +234,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 @@ - - 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 5e7f0070c..000000000 --- a/apps/tup-cms/src/taccsite_cms/templates/assets_custom.html +++ /dev/null @@ -1,27 +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.8.3/taccsite_cms/templates/assets_custom.html #} - -{% load static %} - - -{% with settings.PORTAL_FAVICON as favicon %} - -{% endwith %} - - - -{# NEW CODE #} - - - - - - - - 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 e3a42eee3..b8b7709f7 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 @@ -10,9 +10,12 @@ - + + +{# TODO: Delete when Core-CMS loads TACC/Core-Styles#621 #} + 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 c78797a37..8ccdeccdb 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,10 +1,7 @@ +{% load sekizai_tags %} + {% comment %} One - -{% comment %} -If this works, delete `js-prevent-ugly-urls`: -https://tacc.utexas.edu/admin/djangocms_snippet/snippet/150/change/ -{% endcomment %} 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 deleted file mode 100644 index c4d011c30..000000000 --- a/apps/tup-cms/src/taccsite_cms/templates/snippets/news/open-external-post.html +++ /dev/null @@ -1,32 +0,0 @@ -{# 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 deleted file mode 100644 index 9ea076eca..000000000 --- a/apps/tup-cms/src/taccsite_cms/templates/snippets/redirect.html +++ /dev/null @@ -1,30 +0,0 @@ -{# To redirect page to given URL or external URL from known content #} -{% load static %} - - 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/c-feed-list-tweaks.css b/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/c-feed-list-tweaks.css deleted file mode 100644 index 428f829b6..000000000 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/c-feed-list-tweaks.css +++ /dev/null @@ -1,6 +0,0 @@ -/* TODO: Release TACC/Core-Styles#508. Update Core-CMS then TUP. Remove this… */ -.c-feed-list > :is(div, article) { - /* FAQ: The `flex-grow: 1` makes /use-tacc/training/ lists same height */ - /* CAVEAT: The `flex-grow: 1` breaks max line height (user can see top of next line) */ - flex-grow: unset; -} 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 991b589aa..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,24 +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; -} -/* To vertically center the logo which was shrunk */ -.s-header .navbar-brand { - display: grid; - align-items: center; -} - - -/* TO MAKE HEADER FONT CONSISTENT ON CMS & PORTAL */ - -/* TODO: Remove after TACC/Core-CMS#v4.25.1 */ -.s-header { - font-family: var(--global-font-family--sans--portal); -} 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 deleted file mode 100644 index 34a9e3652..000000000 --- a/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/for-core-styles/components/c-feed-list.css +++ /dev/null @@ -1,115 +0,0 @@ -/* FAQ: Used on homepage for "User Updates" and "Upcoming Training" */ -/* SEE: https://dev.tup.tacc.utexas.edu/ */ - -/* A list of preview content for articles, documents, or pages. */ - - - -/* Settings */ - -:root { - --global-space--unnamed: 50px; -} - - - -/* Block */ - -.c-feed-list { - display: flex; - flex-direction: column; - - font-size: var(--global-font-size--small); -} - - - -/* Elements */ - -/* Elements: Title */ - -.c-feed-list > :is(h1, h2, h3, h4, h5, h6) { - margin-top: 0; - margin-bottom: 10px; -} - -/* To style "Update" pill in title */ -.c-feed-list .c-pill { - margin-left: 0.5ch; - vertical-align: middle; - transform: translateY(-0.125em); -} - -/* Elements: Items */ - -/* NOTE: `p:has(time)` styles CMS markup, but templates use `time` sans `

` */ - -.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; - - font-weight: var(--bold); - font-size: var(--global-font-size--medium) -} 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 9fc3fd84d..da8109691 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 @@ -218,11 +218,6 @@ html#page-portal .c-footer p { padding-block: var(--pad-vert); } -/* To tweak minor styles */ -#cms-footer { - color: var(--global-color-primary--light); -} - /* Add vertical space between panes, except for aside when it is below others */ /* FAQ: Bootstrap 4 grid does not have a way to do so */ #cms-footer .col.c-pane--nav { 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-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 */ 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'); -}