Merge branch 'task/GH-73-tacc-blockquote-plugin' into task/GH-73-tacc…

…-blockquote-plugin--after-FP-1194
TACC · Sep 30, 2021 · 2fbebdc · 2fbebdc
2 parents 2efccc0 + aa854f3
commit 2fbebdc
Show file tree

Hide file tree

Showing 37 changed files with 479 additions and 54 deletions.
diff --git a/_shared/static/css/src/_migrations/v1_v2/override-v2.site.css b/_shared/static/css/src/_migrations/v1_v2/override-v2.site.css
@@ -0,0 +1,9 @@
+/*!
+ * TACC v2 site.css Overrides
+ */
+
+/* ELEMENTS: Content Sectioning: Headings */
+
+h4, h5, h6 {
+	text-transform: unset;
+}
diff --git a/_shared/static/css/src/migrate.v1_v2.css b/_shared/static/css/src/migrate.v1_v2.css
@@ -3,3 +3,4 @@
 @import url("_migrations/v1_v2/bootstrap.3.3.7.css");
 @import url("_migrations/v1_v2/angular-material.1.1.8.css");
 @import url("_migrations/v1_v2/main.portal.css");
+@import url("_migrations/v1_v2/override-v2.site.css");
diff --git a/a2cps-cms/templates/fullwidth.html b/a2cps-cms/templates/fullwidth.html
@@ -2,5 +2,7 @@
 {% load cms_tags %}
 
 {% block assets_custom %}
+  {{ block.super }}
+
   {% include "./assets_custom.html" %}
 {% endblock assets_custom %}
diff --git a/a2cps-cms/templates/standard.html b/a2cps-cms/templates/standard.html
@@ -2,5 +2,7 @@
 {% load cms_tags %}
 
 {% block assets_custom %}
+  {{ block.super }}
+
   {% include "./assets_custom.html" %}
 {% endblock assets_custom %}
diff --git a/core-cms/settings_custom.py b/core-cms/settings_custom.py
@@ -3,5 +3,3 @@
 # *.CEP.TACC.UTEXAS.EDU
 
 # SHOULD USE ALMOST ALL DEFAULT VALUES.
-
-CEP_AUTH_VERIFICATION_ENDPOINT='https://dev.cep.tacc.utexas.edu'
diff --git a/example-cms/settings_custom.py b/example-cms/settings_custom.py
@@ -13,7 +13,6 @@
     ('example-cms/templates/fullwidth.html', 'Fullwidth'),
     # Support standard template for demo purposes
     ('fullwidth.html', 'Standard Fullwidth'),
-
     # Support Portal pages for demo purposes
     ('home_portal.html', 'Standard Portal Homepage'),
     ('guide.html', 'Guide'),

diff --git a/frontera-cms/settings_custom.py b/frontera-cms/settings_custom.py
@@ -12,22 +12,17 @@
 CMS_TEMPLATES = (
     ('frontera-cms/templates/fullwidth.html', 'Fullwidth'),
     ('fullwidth.html', 'DEPRECATED Fullwidth'),
-
     ('frontera-cms/templates/home.html', 'Homepage'),
-
     ('guide.html', 'Guide'),
     ('guides/getting_started.html', 'Guide: Getting Started'),
     ('guides/data_transfer.html', 'Guide: Data Transfer'),
     ('guides/data_transfer.globus.html', 'Guide: Globus Data Transfer'),
     ('guides/portal_technology.html', 'Guide: Portal Technology Stack')
 )
 
-########################
-# BRANDING & LOGOS
-########################
-
 ########################
 # BRANDING
+########################
 
 _NSF_BRANDING = [
     "nsf",
@@ -66,6 +61,7 @@
 
 ########################
 # LOGOS
+########################
 
 LOGO =  [
     "frontera",

diff --git a/frontera-cms/static/frontera-cms/css/src/_imports/trumps/s-home.css b/frontera-cms/static/frontera-cms/css/src/_imports/trumps/s-home.css
@@ -1,5 +1,6 @@
 /* TACC TRUMPS: Home (Page) */
 @import url("../../../../../../../../taccsite_cms/static/site_cms/css/src/_imports/tools/x-truncate.css");
+@import url("../../../../../../../../taccsite_cms/static/site_cms/css/src/_imports/tools/x-overlay.css");
 @import url("../../../../../../../../taccsite_cms/static/site_cms/css/src/_imports/tools/x-center.css");
 @import url("../../../../../../../../taccsite_cms/static/site_cms/css/src/_imports/tools/media-queries.css");
 
@@ -38,6 +39,10 @@
 .s-home__banner .o-section__banner-overlay {
   --spacing: 1.5rem;
 
+  /* To avoid the need to add placeholder markup for empty column */
+  /* FAQ: The `.o-section__banner-image` is not part of the grid */
+  grid-column-start: 2;
+
   display: flex;
   flex-direction: column;
   justify-content: space-between;
@@ -48,7 +53,23 @@
   font-weight: var(--bold);
 
   padding: var(--spacing); /* GH-99: Use standard spacing value */
-  margin: 0 var(--banner-margin-horz);
+}
+/* To reduce width of banner when it only sits on right-side of banner */
+@media (--medium-and-above) {
+  .s-home__banner .o-section__banner-overlay {
+    margin: 0 var(--banner-margin-horz);
+  }
+}
+
+/* To style the overlay */
+.s-home__banner .o-section__banner-overlay {
+  @extend .x-overlay--curtain;
+}
+.s-home__banner .o-section--style-dark .o-section__banner-overlay {
+  --color-bkgd-rgb: var(--global-color-primary--x-dark-rgb);
+}
+.s-home__banner .o-section--style-light .o-section__banner-overlay {
+  --color-bkgd-rgb: var(--global-color-primary--x-light-rgb);
 }
 
 

diff --git a/frontera-cms/static/frontera-cms/css/src/template.home.css b/frontera-cms/static/frontera-cms/css/src/template.home.css
@@ -1,8 +1,5 @@
 /* DO NOT ADD STYLES HERE; ONLY IMPORT OTHER STYLESHEETS */
 
-
-/* NOTE: This file exists so that the Portal and User Guide can load isolated header styles */
-
 /* Organize via ITCSS */
 /* SEE: https://confluence.tacc.utexas.edu/x/IAA9Cw */
 

diff --git a/frontera-cms/templates/home.html b/frontera-cms/templates/home.html
@@ -2,6 +2,8 @@
 {% load cms_tags staticfiles %}
 
 {% block assets_custom %}
+  {{ block.super }}
+
   <link rel="stylesheet" href="{% static 'frontera-cms/css/build/site.css' %}">
   <link rel="stylesheet" href="{% static 'frontera-cms/css/build/site.header.css' %}">
 

diff --git a/lccf-tacc/settings_custom.py b/lccf-tacc/settings_custom.py
@@ -6,11 +6,22 @@
 #      because current infrastructure lacks ability to reference default values
 
 ########################
-# BRANDING & LOGOS
+# DJANGO CMS SETTINGS
 ########################
 
+# CMS_TEMPLATES = (
+#     ('lccf-tacc/templates/standard.html', 'Standard'),
+#     ('lccf-tacc/templates/fullwidth.html', 'Full Width'),
+#     ('guide.html', 'Guide'),
+#     ('guides/getting_started.html', 'Guide: Getting Started'),
+#     ('guides/data_transfer.html', 'Guide: Data Transfer'),
+#     ('guides/data_transfer.globus.html', 'Guide: Globus Data Transfer'),
+#     ('guides/portal_technology.html', 'Guide: Portal Technology Stack')
+# )
+
 ########################
 # BRANDING
+########################
 
 _NSF_BRANDING = [
     "nsf",
@@ -49,6 +60,7 @@
 
 ########################
 # LOGOS
+########################
 
 LOGO = [
     "lccf",

diff --git a/neuronex-cms/settings_custom.py b/neuronex-cms/settings_custom.py
@@ -19,12 +19,9 @@
     ('guides/portal_technology.html', 'Guide: Portal Technology Stack')
 )
 
-########################
-# BRANDING & LOGOS
-########################
-
 ########################
 # BRANDING
+########################
 
 _NSF_BRANDING = [
     "nsf",
@@ -63,6 +60,7 @@
 
 ########################
 # LOGOS
+########################
 
 LOGO = [
     "portal",
@@ -77,6 +75,7 @@
 
 ########################
 # FAVICON
+########################
 
 FAVICON = {
     "img_file_src": "neuronex-cms/img/org_logos/favicon.ico"

diff --git a/protx-cms/settings_custom.py b/protx-cms/settings_custom.py
@@ -20,11 +20,14 @@
 )
 
 ########################
-# BRANDING & LOGOS
+# THEME
 ########################
 
+THEME = 'has-dark-logo'
+
 ########################
 # BRANDING
+########################
 
 COOKS_BRANDING = [
     "cooks",
@@ -59,10 +62,11 @@
     "True"
 ]
 
-CUSTOM_BRANDING = [ COOKS_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING ]
+BRANDING = [ COOKS_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING ]
 
 ########################
 # LOGOS
+########################
 
 LOGO = [
     "protx",

diff --git a/protx-cms/templates/fullwidth.html b/protx-cms/templates/fullwidth.html
@@ -2,5 +2,7 @@
 {% load cms_tags %}
 
 {% block assets_custom %}
+  {{ block.super }}
+
   {% include "./assets_custom.html" %}
 {% endblock assets_custom %}
diff --git a/protx-cms/templates/standard.html b/protx-cms/templates/standard.html
@@ -2,5 +2,7 @@
 {% load cms_tags %}
 
 {% block assets_custom %}
+  {{ block.super }}
+
   {% include "./assets_custom.html" %}
 {% endblock assets_custom %}
diff --git a/sciviscolor-cms/settings_custom.py b/sciviscolor-cms/settings_custom.py
@@ -3,11 +3,12 @@
 # SCIVISCOLOR.ORG
 
 ########################
-# BRANDING & LOGOS
+# BRANDING
 ########################
 
 ########################
 # LOGOS.
+########################
 
 LOGO =  [
     "sciviscolor",

diff --git a/tapis-project-org/settings_custom.py b/tapis-project-org/settings_custom.py
@@ -6,22 +6,22 @@
 #      because current infrastructure lacks ability to reference default values
 
 ########################
-# GOOGLE ANALYTICS
-########################
-
-GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-17"
-GOOGLE_ANALYTICS_PRELOAD = True
-
-########################
-# BRANDING & LOGOS
+# DJANGO CMS SETTINGS
 ########################
 
-# …
+# CMS_TEMPLATES = (
+#     ('tapis-project-org/templates/standard.html', 'Standard'),
+#     ('tapis-project-org/templates/fullwidth.html', 'Full Width'),
+#     ('guide.html', 'Guide'),
+#     ('guides/getting_started.html', 'Guide: Getting Started'),
+#     ('guides/data_transfer.html', 'Guide: Data Transfer'),
+#     ('guides/data_transfer.globus.html', 'Guide: Globus Data Transfer'),
+#     ('guides/portal_technology.html', 'Guide: Portal Technology Stack')
+# )
 
 ########################
 # BRANDING
-
-# …
+########################
 
 UHAWAII_BRANDING = [
     "uhawaii",
@@ -71,6 +71,7 @@
 
 ########################
 # LOGOS
+########################
 
 LOGO =  [
     "tapis",
@@ -88,3 +89,9 @@
 ########################
 
 INCLUDES_CORE_PORTAL = False
+
+########################
+# GOOGLE ANALYTICS
+########################
+
+GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-17"
diff --git a/texascale-org/settings_custom.py b/texascale-org/settings_custom.py
@@ -16,12 +16,9 @@
     ('texascale-org/templates/article.image-map.html', 'Article (Image Map)'),
 )
 
-########################
-# BRANDING & LOGOS
-########################
-
 ########################
 # LOGOS
+########################
 
 LOGO =  [
     "texascale",
@@ -43,7 +40,6 @@
 
 
 
-
 ########################
 # FEATURES
 ########################
@@ -57,8 +53,13 @@
     "blog": True,
 }
 
+
+
+
+
 ########################
 # BLOG
+########################
 
 # Install required apps
 INSTALLED_APPS += [

diff --git a/tup-cms/settings_custom.py b/tup-cms/settings_custom.py
@@ -16,11 +16,12 @@
 )
 
 ########################
-# BRANDING & LOGOS
+# BRANDING
 ########################
 
 ########################
 # LOGOS
+########################
 
 LOGO = [
     "tup",
@@ -32,19 +33,3 @@
     "anonymous",
     "True"
 ]
-
-
-########################
-# CMS BUG FIX
-# See: 
-# https://github.com/django-cms/django-cms/issues/6687
-########################
-
-from cms.utils import conf
-
-def get_templates():
-    templates = conf.get_templates()
-    return [(x, str(y)) for x, y in templates]
-
-
-conf.COMPLEX['TEMPLATES'] = get_templates
diff --git a/utrc-cms/__init__.py b/utrc-cms/__init__.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,5 +3,3 @@
		# *.CEP.TACC.UTEXAS.EDU

		# SHOULD USE ALMOST ALL DEFAULT VALUES.

		CEP_AUTH_VERIFICATION_ENDPOINT='https://dev.cep.tacc.utexas.edu'