refactor: manage CMS assets, delete outdated assets

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,31 +206,36 @@
 
 
 ########################
-# 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
 
 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:
     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

apps/tup-cms/src/taccsite_cms/templates/snippets/css-ad-hoc-styles.html

@@ -10,9 +10,12 @@
 <link href="https://cdn.jsdelivr.net/gh/TACC/tup-ui@460405e9/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/scrolling-fixes.css" rel="stylesheet" />
 <link href="https://cdn.jsdelivr.net/gh/TACC/tup-ui@20981794/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/global-a11y.css" rel="stylesheet" />
 <link href="https://cdn.jsdelivr.net/gh/TACC/tup-ui@460405e9/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/tup-730-drop-cap-and-fix-has-blog-tag-no-drop-cap.css" rel="stylesheet" />
-<link href="https://cdn.jsdelivr.net/gh/TACC/tup-ui@460405e9/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/c-feed-list-tweaks.css" rel="stylesheet" />
 <link href="https://cdn.jsdelivr.net/gh/TACC/tup-ui@460405e9/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css" rel="stylesheet" />
 <link href="https://cdn.jsdelivr.net/gh/TACC/tup-ui@460405e9/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/tagged-news-uppercase-tag.css" rel="stylesheet" />
+<link href="https://cdn.jsdelivr.net/gh/TACC/tup-ui@1307a676/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/adjust-logo.css" rel="stylesheet" />
+
+{# TODO: Delete when Core-CMS loads TACC/Core-Styles#621 #}
+<link href="https://cdn.jsdelivr.net/gh/TACC/Core-Styles@010b311/dist/bootstrap4/components/media.css" rel="stylesheet" />
 
 <link href="https://cdn.jsdelivr.net/gh/TACC/Core-CMS-Custom@main/generic_assets/css/core-cms-fixes.css" rel="stylesheet" />
 

apps/tup-cms/src/taccsite_cms/templates/snippets/js-ad-hoc-scripts.html

@@ -1,10 +1,7 @@
+{% load sekizai_tags %}
+
 {% comment %}
 One <script> that loads script with many 'import's is faster than many <script>s.
 {% endcomment %}
 
 <script src="https://cdn.jsdelivr.net/gh/TACC/tup-ui@460405e9/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/js/ad-hoc.js" type="module"></script>
-
-{% comment %}
-If this works, delete `js-prevent-ugly-urls`:
-https://tacc.utexas.edu/admin/djangocms_snippet/snippet/150/change/
-{% endcomment %}

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

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

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 {

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 */

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