refactor: deletions + changes for newer Core-CMS + Core-Styles

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.28.2
+FROM taccwma/core-cms:v4.39.0
 
 WORKDIR /code
 

apps/tup-cms/src/apps/portal/templates/portal/portal.debug.html

@@ -1,10 +1,10 @@
 {% extends "base.html" %}
 
-{% block html_page_id %}portal{% endblock %}
+{% block html_page_id %}page-portal{% endblock %}
 
 {% block title %}User Portal{% endblock %}
 
-{% block assets_core_project %}
+{% block assets_project %}
 {% include './assets.html' %}
 {% endblock %}
 

apps/tup-cms/src/apps/portal/templates/portal/portal.html

@@ -1,10 +1,10 @@
 {% extends "base.html" %}
 
-{% block html_page_id %}portal{% endblock %}
+{% block html_page_id %}page-portal{% endblock %}
 
 {% block title %}User Portal{% endblock %}
 
-{% block assets_core_project %}
+{% block assets_project %}
 {% include './assets.html' %}
 {% endblock %}
 

apps/tup-cms/src/taccsite_cms/custom_app_settings.py

@@ -1,7 +1,17 @@
 CUSTOM_APPS = [
+
+  # TUP CMS
   'apps.portal.apps.PortalConfig',
   'apps.user_news',
-  'apps.staff_profile'
+  'apps.staff_profile',
+
+  # DJANGOCMS_BLOG
+  'parler',
+  'taggit',
+  'taggit_autosuggest',
+  'sortedm2m',
+  'djangocms_blog',
+
 ]
 CUSTOM_MIDDLEWARE = []
 STATICFILES_DIRS = ()

apps/tup-cms/src/taccsite_cms/settings_custom.py

@@ -138,31 +138,27 @@
 PORTAL_SOCIAL_SHARE_PLATFORMS = ['linkedin', 'bluesky', 'facebook', 'email']
 
 ########################
-# DJANGOCMS_BLOG
+# TACC: STYLES
 ########################
 
-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')),
+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
+########################
 
 # Paths for alternate templates that user can choose for blog-specific plugin
 # - Devs can customize core templates at `templates/djangocms_blog/`.
@@ -208,31 +204,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 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:
     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,6 +10,6 @@
 <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@460405e9/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" />

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

@@ -1,10 +1,26 @@
+{% 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/
+FAQ: Not CSS, but in Core-CMS:
+    - {% render_block "css" %} is in <head> (intended location)
+    - {% render_block "js" %} is at end of <body> (wrong place)
+TODO: Add {% render_block "head" %} (and foot?) in Core-CMS
 {% endcomment %}
+{% addtoblock "css" %}
+<script id="js-hotjar-tracking">
+    (function(h,o,t,j,a,r){
+        h.hj=h.hj||function(){(h.hj.q=h.hj.q||[]).push(arguments)};
+        h._hjSettings={hjid:3319380,hjsv:6};
+        a=o.getElementsByTagName('head')[0];
+        r=o.createElement('script');r.async=1;
+        r.src=t+h._hjSettings.hjid+j+h._hjSettings.hjsv;
+        a.appendChild(r);
+    })(window,document,'https://static.hotjar.com/c/hotjar-','.js?sv=');
+</script>
+{% endaddtoblock %}

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
 
@@ -14,5 +14,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')),
 ]

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,28 +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 reduce width of social media icon links */
-.c-footer .logos--social a {
-    padding: 0.5em;
-}
-
-
-/* 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);
-}