From 5a6f0ecf13bb8e466e4e785fc0c0fc38c67945b0 Mon Sep 17 00:00:00 2001 From: Alex Rocha Date: Fri, 10 Sep 2021 17:01:07 -0500 Subject: [PATCH 01/32] updating to match settings structure --- a2cps-cms/{secrets.py => settings_custom.py} | 0 .../{secrets.py => settings_custom.py} | 19 ++++++------- .../{secrets.py => settings_custom.py} | 19 +++++++------ lccf-tacc/{secrets.py => settings_custom.py} | 11 ++++---- .../{secrets.py => settings_custom.py} | 21 +++++++-------- protx-cms/{secrets.py => settings_custom.py} | 27 +++++++++---------- .../{secrets.py => settings_custom.py} | 8 +++--- .../{secrets.py => settings_custom.py} | 12 ++++----- .../{secrets.py => settings_custom.py} | 12 ++++----- tup-cms/{secrets.py => settings_custom.py} | 0 10 files changed, 58 insertions(+), 71 deletions(-) rename a2cps-cms/{secrets.py => settings_custom.py} (100%) rename example-cms/{secrets.py => settings_custom.py} (73%) rename frontera-cms/{secrets.py => settings_custom.py} (81%) rename lccf-tacc/{secrets.py => settings_custom.py} (67%) rename neuronex-cms/{secrets.py => settings_custom.py} (72%) rename protx-cms/{secrets.py => settings_custom.py} (70%) rename sciviscolor-cms/{secrets.py => settings_custom.py} (73%) rename tapis-project-org/{secrets.py => settings_custom.py} (72%) rename texascale-org/{secrets.py => settings_custom.py} (85%) rename tup-cms/{secrets.py => settings_custom.py} (100%) diff --git a/a2cps-cms/secrets.py b/a2cps-cms/settings_custom.py similarity index 100% rename from a2cps-cms/secrets.py rename to a2cps-cms/settings_custom.py diff --git a/example-cms/secrets.py b/example-cms/settings_custom.py similarity index 73% rename from example-cms/secrets.py rename to example-cms/settings_custom.py index 126c49fb..68e26055 100644 --- a/example-cms/secrets.py +++ b/example-cms/settings_custom.py @@ -1,6 +1,3 @@ -# TACC CMS Per-Site Resources - Configuration - -# In a project-specific configuration file like this, edit existing configuration values from `cms-site-template:/taccsite_cms/default_secrets.py` that must change to suit this project. # Until this custom configuration is automatically applied, to use it one must copy the content of it and append it to `cms-site-template:/taccsite_cms/secrets.py` @@ -10,13 +7,13 @@ # DJANGO SETTINGS ######################## -_LDAP_ENABLED = False +LDAP_ENABLED = True ######################## # DJANGO CMS SETTINGS ######################## -_CMS_TEMPLATES = ( +CMS_TEMPLATES = ( ('example-cms/templates/fullwidth.html', 'Fullwidth'), # Support standard template for demo purposes ('fullwidth.html', 'Standard Fullwidth'), @@ -34,8 +31,8 @@ # GOOGLE ANALYTICS ######################## -_GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-##" -_GOOGLE_ANALYTICS_PRELOAD = True +GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-##" +GOOGLE_ANALYTICS_PRELOAD = True ######################## # BRANDING & LOGOS @@ -44,12 +41,12 @@ ######################## # BRANDING. -_BRANDING = [_NSF_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING] +BRANDING = [NSF_BRANDING, TACC_BRANDING, UTEXAS_BRANDING] ######################## # LOGOS. -_PORTAL_LOGO = [ +PORTAL_LOGO = [ "portal", "example-cms/img/org_logos/portal.png", "", @@ -60,10 +57,10 @@ "True" ] -_LOGO = _PORTAL_LOGO +LOGO = PORTAL_LOGO ######################## # PORTAL ######################## -_PORTAL = False +PORTAL = False diff --git a/frontera-cms/secrets.py b/frontera-cms/settings_custom.py similarity index 81% rename from frontera-cms/secrets.py rename to frontera-cms/settings_custom.py index 417122c9..c267066c 100644 --- a/frontera-cms/secrets.py +++ b/frontera-cms/settings_custom.py @@ -4,7 +4,7 @@ # … -_LDAP_ENABLED = True +LDAP_ENABLED = True # … @@ -13,7 +13,7 @@ ######################## # … -_CMS_TEMPLATES = ( +CMS_TEMPLATES = ( ('frontera-cms/templates/fullwidth.html', 'Fullwidth'), ('fullwidth.html', 'DEPRECATED Fullwidth'), @@ -30,8 +30,8 @@ # GOOGLE ANALYTICS ######################## -_GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-13" -_GOOGLE_ANALYTICS_PRELOAD = True +GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-13" +GOOGLE_ANALYTICS_PRELOAD = True # … @@ -46,7 +46,7 @@ # … -_TACC_BRANDING = [ +TACC_BRANDING = [ # … "frontera-cms/img/org_logos/tacc-white.png", # … @@ -54,12 +54,12 @@ # … -_BRANDING = [ _NSF_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING ] +BRANDING = [ NSF_BRANDING, TACC_BRANDING, UTEXAS_BRANDING ] ######################## # LOGOS. -_FRONTERA_LOGO = [ +FRONTERA_LOGO = [ "frontera", "frontera-cms/img/org_logos/frontera-white-solo.png", "", @@ -70,12 +70,11 @@ "True" ] -_LOGO = _FRONTERA_LOGO - +LOGO = FRONTERA_LOGO # … ######################## # PORTAL ######################## -_PORTAL = True +PORTAL = True diff --git a/lccf-tacc/secrets.py b/lccf-tacc/settings_custom.py similarity index 67% rename from lccf-tacc/secrets.py rename to lccf-tacc/settings_custom.py index 2e3d3ef1..9736950d 100644 --- a/lccf-tacc/secrets.py +++ b/lccf-tacc/settings_custom.py @@ -3,9 +3,8 @@ ######################## # GOOGLE ANALYTICS ######################## - -_GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-15" -_GOOGLE_ANALYTICS_PRELOAD = True +GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-15" +GOOGLE_ANALYTICS_PRELOAD = True ######################## # BRANDING & LOGOS @@ -18,12 +17,12 @@ # … -_BRANDING = [ _NSF_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING ] +BRANDING = [ NSF_BRANDING, TACC_BRANDING, UTEXAS_BRANDING ] ######################## # LOGOS. -_LCCF_LOGO = [ +LCCF_LOGO = [ "lccf", "lccf-tacc/img/org_logos/lccf-white.png", "", @@ -34,4 +33,4 @@ "True" ] -_LOGO = _LCCF_LOGO +LOGO = LCCF_LOGO diff --git a/neuronex-cms/secrets.py b/neuronex-cms/settings_custom.py similarity index 72% rename from neuronex-cms/secrets.py rename to neuronex-cms/settings_custom.py index 8cc17545..fb02531d 100644 --- a/neuronex-cms/secrets.py +++ b/neuronex-cms/settings_custom.py @@ -1,6 +1,3 @@ -# TACC CMS Per-Site Resources - Configuration - -# In a project-specific configuration file like this, edit existing configuration values from `cms-site-template:/taccsite_cms/default_secrets.py` that must change to suit this project. # Until this custom configuration is automatically applied, to use it one must copy the content of it and append it to `cms-site-template:/taccsite_cms/secrets.py` @@ -10,13 +7,13 @@ # DJANGO SETTINGS ######################## -_LDAP_ENABLED = True +LDAP_ENABLED = True ######################## # DJANGO CMS SETTINGS ######################## -_CMS_TEMPLATES = ( +CMS_TEMPLATES = ( ('neuronex-cms/templates/fullwidth.html', 'Fullwidth'), ('home_portal.html', 'Standard Portal Homepage'), ('guide.html', 'Guide'), @@ -30,8 +27,8 @@ # GOOGLE ANALYTICS ######################## -_GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-1" -_GOOGLE_ANALYTICS_PRELOAD = True +GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-1" +GOOGLE_ANALYTICS_PRELOAD = True ######################## # BRANDING & LOGOS @@ -40,12 +37,12 @@ ######################## # BRANDING. -_BRANDING = [_NSF_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING] +BRANDING = [NSF_BRANDING, TACC_BRANDING, UTEXAS_BRANDING] ######################## # LOGOS. -_PORTAL_LOGO = [ +PORTAL_LOGO = [ "portal", "neuronex-cms/img/org_logos/logo.3dem.png", "", @@ -56,12 +53,12 @@ "True" ] -_LOGO = _PORTAL_LOGO +LOGO = PORTAL_LOGO ######################## # FAVICON -_FAVICON = { +FAVICON = { "img_file_src": "neuronex-cms/img/org_logos/favicon.ico" } @@ -69,4 +66,4 @@ # PORTAL ######################## -_PORTAL = True +PORTAL = True diff --git a/protx-cms/secrets.py b/protx-cms/settings_custom.py similarity index 70% rename from protx-cms/secrets.py rename to protx-cms/settings_custom.py index 466304e5..051494e5 100644 --- a/protx-cms/secrets.py +++ b/protx-cms/settings_custom.py @@ -1,6 +1,3 @@ -# TACC CMS Per-Site Resources - Configuration - -# In a project-specific configuration file like this, edit existing configuration values from `cms-site-template:/taccsite_cms/default_secrets.py` that must change to suit this project. # Until this custom configuration is automatically applied, to use it one must copy the content of it and append it to `cms-site-template:/taccsite_cms/secrets.py` @@ -10,13 +7,13 @@ # DJANGO SETTINGS ######################## -_LDAP_ENABLED = True +LDAP_ENABLED = True ######################## # DJANGO CMS SETTINGS ######################## -_CMS_TEMPLATES = ( +CMS_TEMPLATES = ( ('protx-cms/templates/standard.html', 'Standard'), ('protx-cms/templates/fullwidth.html', 'Full Width'), @@ -31,8 +28,8 @@ # GOOGLE ANALYTICS ######################## -_GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-##" -_GOOGLE_ANALYTICS_PRELOAD = True +GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-##" +GOOGLE_ANALYTICS_PRELOAD = True ######################## # BRANDING. @@ -42,7 +39,7 @@ # Add custom sponsor branding assets here. # One unique entry per asset. -_COOKS_BRANDING = [ +COOKS_BRANDING = [ "cooks", "protx-cms/img/org_logos/CClogo_Standard_White_Transparent.png", "branding-tacc", @@ -54,22 +51,22 @@ ] # Add custom _SPONSOR_BRANDING assets here. -_CUSTOM_BRANDING = [_COOKS_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING] +CUSTOM_BRANDING = [COOKS_BRANDING, TACC_BRANDING, UTEXAS_BRANDING] # NSF Funded TACC Portal. -_NSF_SPONSORED_BRANDING = [_NSF_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING] +NSF_SPONSORED_BRANDING = [NSF_BRANDING, TACC_BRANDING, UTEXAS_BRANDING] # Default TACC Portal. -_DEFAULT_BRANDING = [_TACC_BRANDING, _UTEXAS_BRANDING] +DEFAULT_BRANDING = [TACC_BRANDING, UTEXAS_BRANDING] # Assign branding selection. -_BRANDING = _CUSTOM_BRANDING +BRANDING = CUSTOM_BRANDING ######################## # LOGOS. ######################## -_PORTAL_LOGO = [ +PORTAL_LOGO = [ "protx", "protx-cms/img/org_logos/protx-logo-temp.png", "", @@ -80,10 +77,10 @@ "True" ] -_LOGO = _PORTAL_LOGO +LOGO = PORTAL_LOGO ######################## # PORTAL ######################## -_PORTAL = True +PORTAL = True diff --git a/sciviscolor-cms/secrets.py b/sciviscolor-cms/settings_custom.py similarity index 73% rename from sciviscolor-cms/secrets.py rename to sciviscolor-cms/settings_custom.py index 67f90489..cb655bcb 100644 --- a/sciviscolor-cms/secrets.py +++ b/sciviscolor-cms/settings_custom.py @@ -5,8 +5,8 @@ # GOOGLE ANALYTICS ######################## -_GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-##" -_GOOGLE_ANALYTICS_PRELOAD = True +GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-##" +GOOGLE_ANALYTICS_PRELOAD = True # … @@ -19,7 +19,7 @@ ######################## # LOGOS. -_SCIVISCOLOR_LOGO = [ +SCIVISCOLOR_LOGO = [ "sciviscolor", "sciviscolor-cms/img/org_logos/sciviscolor-logo-white.png", "", @@ -30,4 +30,4 @@ "True" ] -_LOGO = _SCIVISCOLOR_LOGO +LOGO = SCIVISCOLOR_LOGO diff --git a/tapis-project-org/secrets.py b/tapis-project-org/settings_custom.py similarity index 72% rename from tapis-project-org/secrets.py rename to tapis-project-org/settings_custom.py index 83cefdaa..e405126a 100644 --- a/tapis-project-org/secrets.py +++ b/tapis-project-org/settings_custom.py @@ -4,8 +4,8 @@ # GOOGLE ANALYTICS ######################## -_GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-17" -_GOOGLE_ANALYTICS_PRELOAD = True +GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-17" +GOOGLE_ANALYTICS_PRELOAD = True ######################## # BRANDING & LOGOS @@ -18,7 +18,7 @@ # … -_UHAWAII_BRANDING = [ +UHAWAII_BRANDING = [ "uhawaii", "site_cms/img/org_logos/hawaii-header-trimmed.png", "branding-uhawaii", @@ -29,12 +29,12 @@ "True" ] -_BRANDING = [ _NSF_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING, _UHAWAII_BRANDING ] +BRANDING = [ NSF_BRANDING, TACC_BRANDING, UTEXAS_BRANDING, UHAWAII_BRANDING ] ######################## # LOGOS. -_TAPIS_LOGO = [ +TAPIS_LOGO = [ "tapis", "tapis-project-org/img/org_logos/tapis-logo-navbar.png", "", @@ -45,4 +45,4 @@ "True" ] -_LOGO = _TAPIS_LOGO +LOGO = TAPIS_LOGO diff --git a/texascale-org/secrets.py b/texascale-org/settings_custom.py similarity index 85% rename from texascale-org/secrets.py rename to texascale-org/settings_custom.py index 4d311923..85b4873e 100644 --- a/texascale-org/secrets.py +++ b/texascale-org/settings_custom.py @@ -7,7 +7,7 @@ ######################## # … -_CMS_TEMPLATES = ( +CMS_TEMPLATES = ( ('texascale-org/templates/fullwidth.html', 'Fullwidth'), ('texascale-org/templates/category.html', 'Category'), ('texascale-org/templates/article.html', 'Article'), @@ -21,8 +21,8 @@ # GOOGLE ANALYTICS ######################## -_GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-18" -_GOOGLE_ANALYTICS_PRELOAD = True +GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-18" +GOOGLE_ANALYTICS_PRELOAD = True ######################## # BRANDING & LOGOS @@ -33,7 +33,7 @@ ######################## # LOGOS. -_TEXASCALE_LOGO = [ +TEXASCALE_LOGO = [ "texascale", "texascale-org/img/org_logos/texascale-wordmark.png", "", @@ -44,6 +44,4 @@ "True" ] -_LOGO = _TEXASCALE_LOGO - -# … +LOGO = _TEXASCALE_LOGO diff --git a/tup-cms/secrets.py b/tup-cms/settings_custom.py similarity index 100% rename from tup-cms/secrets.py rename to tup-cms/settings_custom.py From 95d223d48eeb1aa42ea0e153aa3dd7016dbdd414 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 14 Sep 2021 14:16:31 -0500 Subject: [PATCH 02/32] FP-1194: Assist: Remove rogue _ in texascale --- texascale-org/settings_custom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/texascale-org/settings_custom.py b/texascale-org/settings_custom.py index 85b4873e..3c029420 100644 --- a/texascale-org/settings_custom.py +++ b/texascale-org/settings_custom.py @@ -44,4 +44,4 @@ "True" ] -LOGO = _TEXASCALE_LOGO +LOGO = TEXASCALE_LOGO From e4ec59c8d87c5fb6c3cb0ded44192d2df71c86aa Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 14 Sep 2021 14:16:49 -0500 Subject: [PATCH 03/32] FP-1194: Assist: Remove _'s in a2cps & tup --- a2cps-cms/settings_custom.py | 16 ++++++++-------- tup-cms/settings_custom.py | 14 +++++++------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/a2cps-cms/settings_custom.py b/a2cps-cms/settings_custom.py index de313693..2a1bcfbc 100644 --- a/a2cps-cms/settings_custom.py +++ b/a2cps-cms/settings_custom.py @@ -10,13 +10,13 @@ # DJANGO SETTINGS ######################## -_LDAP_ENABLED = True +LDAP_ENABLED = True ######################## # DJANGO CMS SETTINGS ######################## -_CMS_TEMPLATES = ( +CMS_TEMPLATES = ( ('a2cps-cms/templates/standard.html', 'Standard'), ('a2cps-cms/templates/fullwidth.html', 'Full Width') ) @@ -25,8 +25,8 @@ # GOOGLE ANALYTICS ######################## -_GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-10" -_GOOGLE_ANALYTICS_PRELOAD = True +GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-10" +GOOGLE_ANALYTICS_PRELOAD = True ######################## # BRANDING & LOGOS @@ -35,12 +35,12 @@ ######################## # BRANDING. -_BRANDING = [_TACC_BRANDING, _UTEXAS_BRANDING] +BRANDING = [TACC_BRANDING, UTEXAS_BRANDING] ######################## # LOGOS. -_A2CPS_LOGO = [ +A2CPS_LOGO = [ "a2cps", "a2cps-cms/img/org_logos/a2cps.png", "", @@ -51,10 +51,10 @@ "True" ] -_LOGO = _A2CPS_LOGO +LOGO = A2CPS_LOGO ######################## # PORTAL ######################## -_PORTAL = True +PORTAL = True diff --git a/tup-cms/settings_custom.py b/tup-cms/settings_custom.py index 49cbeef5..c4d22ce5 100644 --- a/tup-cms/settings_custom.py +++ b/tup-cms/settings_custom.py @@ -10,13 +10,13 @@ # DJANGO SETTINGS ######################## -_LDAP_ENABLED = False +LDAP_ENABLED = False ######################## # DJANGO CMS SETTINGS ######################## -_CMS_TEMPLATES = ( +CMS_TEMPLATES = ( ('tup-cms/templates/fullwidth.html', 'Fullwidth') ) @@ -24,8 +24,8 @@ # GOOGLE ANALYTICS ######################## -_GOOGLE_ANALYTICS_PROPERTY_ID = "UA-96034853-2" -_GOOGLE_ANALYTICS_PRELOAD = True +GOOGLE_ANALYTICS_PROPERTY_ID = "UA-96034853-2" +GOOGLE_ANALYTICS_PRELOAD = True ######################## # BRANDING. @@ -37,7 +37,7 @@ # LOGOS. ######################## -_PORTAL_LOGO = [ +PORTAL_LOGO = [ "tup", "tup-cms/img/org_logos/tacc-logo.svg", "", @@ -48,10 +48,10 @@ "True" ] -_LOGO = _PORTAL_LOGO +LOGO = PORTAL_LOGO ######################## # PORTAL ######################## -_PORTAL = False +PORTAL = False From a544a72d9c7e41317f47f4b55d303edfc526c978 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 14 Sep 2021 14:18:03 -0500 Subject: [PATCH 04/32] =?UTF-8?q?FP-1194:=20Assist:=20PORTAL=20=E2=86=92?= =?UTF-8?q?=20INCLUDES=5FCORE=5FPORTAL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Like in Core-CMS at https://github.com/TACC/Core-CMS/pull/341/files. --- a2cps-cms/settings_custom.py | 2 +- example-cms/settings_custom.py | 2 +- frontera-cms/settings_custom.py | 2 +- neuronex-cms/settings_custom.py | 2 +- protx-cms/settings_custom.py | 2 +- tup-cms/settings_custom.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/a2cps-cms/settings_custom.py b/a2cps-cms/settings_custom.py index 2a1bcfbc..1eb25359 100644 --- a/a2cps-cms/settings_custom.py +++ b/a2cps-cms/settings_custom.py @@ -57,4 +57,4 @@ # PORTAL ######################## -PORTAL = True +INCLUDES_CORE_PORTAL = True diff --git a/example-cms/settings_custom.py b/example-cms/settings_custom.py index 68e26055..27c22fd8 100644 --- a/example-cms/settings_custom.py +++ b/example-cms/settings_custom.py @@ -63,4 +63,4 @@ # PORTAL ######################## -PORTAL = False +INCLUDES_CORE_PORTAL = False diff --git a/frontera-cms/settings_custom.py b/frontera-cms/settings_custom.py index c267066c..ce80f8b0 100644 --- a/frontera-cms/settings_custom.py +++ b/frontera-cms/settings_custom.py @@ -77,4 +77,4 @@ # PORTAL ######################## -PORTAL = True +INCLUDES_CORE_PORTAL = True diff --git a/neuronex-cms/settings_custom.py b/neuronex-cms/settings_custom.py index fb02531d..9930eb23 100644 --- a/neuronex-cms/settings_custom.py +++ b/neuronex-cms/settings_custom.py @@ -66,4 +66,4 @@ # PORTAL ######################## -PORTAL = True +INCLUDES_CORE_PORTAL = True diff --git a/protx-cms/settings_custom.py b/protx-cms/settings_custom.py index 051494e5..a5e98421 100644 --- a/protx-cms/settings_custom.py +++ b/protx-cms/settings_custom.py @@ -83,4 +83,4 @@ # PORTAL ######################## -PORTAL = True +INCLUDES_CORE_PORTAL = True diff --git a/tup-cms/settings_custom.py b/tup-cms/settings_custom.py index c4d22ce5..517db121 100644 --- a/tup-cms/settings_custom.py +++ b/tup-cms/settings_custom.py @@ -54,4 +54,4 @@ # PORTAL ######################## -PORTAL = False +INCLUDES_CORE_PORTAL = False From c69dec9cd1e48004cd73df37dafdc2790d7d669e Mon Sep 17 00:00:00 2001 From: rstijerina Date: Wed, 15 Sep 2021 16:42:20 -0500 Subject: [PATCH 05/32] add core-cms settings_custom --- core-cms/settings_custom.py | 295 ++++++++++++++++++++++++++++++++++++ 1 file changed, 295 insertions(+) create mode 100644 core-cms/settings_custom.py diff --git a/core-cms/settings_custom.py b/core-cms/settings_custom.py new file mode 100644 index 00000000..6e576980 --- /dev/null +++ b/core-cms/settings_custom.py @@ -0,0 +1,295 @@ +# TACC WMA SAD CMS SITE: DEV.CEP.TACC.UTEXAS.EDU +# CUSTOM SETTINGS VALUES. + +######################## +# DJANGO SETTINGS +######################## + +DEBUG = False # False for Prod. + +# Specify allowed hosts or use an asterisk to allow any host and simplify the config. +# ALLOWED_HOSTS = ['hostname.tacc.utexas.edu', 'host.ip.v4.address', '0.0.0.0', 'localhost', '127.0.0.1'] # In production. +ALLOWED_HOSTS = ['dev.cep.tacc.utexas.edu'] + +# Boolean check to see if ldap is being used by the site. +# Requires django-auth-ldap ≥ 2.0.0 +LDAP_ENABLED = True + +######################## +# DJANGO CMS SETTINGS +######################## + +# CMS Site (allows for multiple sites on a single CMS) +SITE_ID = 1 +CMS_TEMPLATES = ( + # Customize this + # FAQ: First template is default template + # REF: http://docs.django-cms.org/en/latest/how_to/install.html#templates + ('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'), + ('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'), + ('style_guide.html', 'Style Guide') +) + +######################## +# GOOGLE ANALYTICS +######################## + +# To use during dev, Tracking Protection in browser needs to be turned OFF. +GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-1" +GOOGLE_ANALYTICS_PRELOAD = True + + +######################## +# ELASTICSEARCH +######################## +ES_DOMAIN = 'https://dev.cep.tacc.utexas.edu' + +######################## +# FEATURES +######################## + +""" +Features for the CMS that can be turned either ON or OFF + +Usage: + +- For baked-in features, like BRANDING or PORTAL, see relevant section instead. +- For optional features, look below, and enable feature(s) via FEATURES list. + +Baked-In Feature Setting Example. + +# Desctipion of feature X +# SEE: [link to user/div guide about feature] +FEATURE_A = "someValue" + +Optional Feature Toggle Example. + +FEATURES = { + # Desctipion of feature X + # SEE: [link to user/dev guide about feature] + "X": True, + + # Desctipion of feature Y + # SEE: [link to user/dev guide about feature] + "Y": False, + + # Desctipion of feature Z + # SEE: [link to user/dev guide about feature] + "Z": True, +} + +""" + +FEATURES = { + # Blog/News & Social Media Metadata + # GL-42: Split this into two features + # SEE: https://confluence.tacc.utexas.edu/x/EwDeCg + # SEE: https://confluence.tacc.utexas.edu/x/FAA9Cw + "blog": False, +} + +######################## +# BRANDING & LOGOS +######################## + +# Branding settings for portal and navigation. + +""" +Additional Branding and Portal Logos for Partner & Affiliate Organizations + +Usage: + +- For each beand used in the templating, add corresponding new settings values to this file (see example below). +- New branding settings must be added to the BRANDING list to render in the template. +- The order of the BRANDING list determines the rendering order of the elements in the template. +- The portal logo setting must be assigned to the LOGO variable to render in the template. +- The following VALUES for new elements set in the configuration object must exist in the portal css as well: + - Any new selectors or css styles (add to /taccsite_cms/static/site_cms/css/src/_imports/branding_logos.css) + - Image files being references (add to /taccsite_cms/static/site_cms/img/org_logos) + +Values to populate: + +_SETTING_NAME = [ # The name of the branding or logo config setting object. + "org_name", # The name of the organization the branding belongs too. + "img_file_src", # Path and filename relative to the static files folder. + "img_element_classes", # The list of selectors to apply to the rendered element, these need to exist in the css/scss. + "a_target_url", # The href link to follow when clicked, use "/" for portal logos. + "a_target_type", # The target to open the new link in, use _blank for external links, _self for internal links. + "alt_text", # The text to read or render for web assistance standards. + "cors_setting", # The CORS setting for the image, set to anonymous by default. + "visibility" # Toggles wether or not to display the element in the template, use True to render, False to hide. +] + +Branding Configuration Example. + +_ANORG_BRANDING = [ + "anorg", + "site_cms/img/org_logos/anorg-logo.png" + "branding-anorg", + "https://www.anorg.com/" + "_blank", + "ANORG Logo", + "anonymous", + "True" +] + +Logo Configuration Example. + +_ANORG_LOGO = [ + "anorg", + "site_cms/img/org_logos/anorg-logo.png" + "branding-anorg", + "/" + "_self", + "ANORG Logo", + "anonymous", + "True" +] +""" + +######################## +# BRANDING +######################## +_TACC_BRANDING = [ + "tacc", + "site_cms/img/org_logos/tacc-white.png", + "branding-tacc", + "https://www.tacc.utexas.edu/", + "_blank", + "TACC Logo", + "anonymous", + "True" +] + +_UTEXAS_BRANDING = [ + "utexas", + "site_cms/img/org_logos/utaustin-white.png", + "branding-utaustin", + "https://www.utexas.edu/", + "_blank", + "University of Texas at Austin Logo", + "anonymous", + "True" +] + +_NSF_BRANDING = [ + "nsf", + "site_cms/img/org_logos/nsf-white.png", + "branding-nsf", + "https://www.nsf.gov/", + "_blank", + "NSF Logo", + "anonymous", + "True" +] + +#BRANDING = [ _TACC_BRANDING, _UTEXAS_BRANDING ] # Default TACC Portal. +BRANDING = [ _NSF_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING ] # NSF Funded TACC Portal. + +######################## +# LOGOS +######################## +_PORTAL_LOGO = [ + "portal", + "site_cms/img/org_logos/portal.png", + "", + "/", + "_self", + "Portal Logo", + "anonymous", + "True" +] + +LOGO = _PORTAL_LOGO # Default Portal Logo. + +######################## +# FAVICON + +_PORTAL_FAVICON = { + "img_file_src": "site_cms/img/favicons/favicon.ico" +} + +FAVICON = _PORTAL_FAVICON # Default Favicon. + +######################## +# PORTAL +######################## + +INCLUDES_CORE_PORTAL = True # True for any CMS that is part of a Portal. + +""" +Portal Links + +Usage: + +- For each link used in the templating, add new links values (see example below). +- New links must be added to the _PORTAL_AUTH_LINKS and _PORTAL_UNAUTH_LINKS lists. +- The order of the _PORTAL_[…]_LINKS lists determine the rendering order of the elements. + +Values to populate: + +_NAMED_LINK = { # The name of the link object. + "name": "…", # The name of the link (to distinguish it, as if for ID). + "url": "…", # The URL path to which the link should navigate the user. + "text": "…", # The text of the link. + "icon": "…", # The icon of the link. +} + +Links Configuration Example. + +_ANY_AUTH_LINK = { + "name": "section-1", + "url": "/some/section/", + "text": "Visit Section", + "icon": "some-section", +} + +_ANY_UNAUTH_LINK = { + "name": "action-1", + "url": "/some-action/", + "text": "Do Action", + "icon": "some-action", +} + +""" + +######################## +# LINKS (for Portal). +######################## +_DASH_AUTH_LINK = { + "name": "dash", + "url": "/workbench/dashboard/", + "text": "My Dashboard", + "icon": "desktop", +} +_PROFILE_AUTH_LINK = { + "name": "profile", + "url": "/accounts/profile/", + "text": "My Account", + "icon": "user-circle", +} +_LOGOUT_AUTH_LINK = { + "name": "logout", + "url": "/accounts/logout/", + "text": "Log Out", + "icon": "sign-out-alt", +} + +_LOGIN_UNAUTH_LINK = { + "name": "login", + "url": "/login/", + "text": "Log In", + "icon": "sign-in-alt", +} + +PORTAL_AUTH_LINKS = [ _DASH_AUTH_LINK, _PROFILE_AUTH_LINK, _LOGOUT_AUTH_LINK ] # Default TACC Portal. +PORTAL_UNAUTH_LINKS = [ _LOGIN_UNAUTH_LINK ] From 6b4075eda58e5ca54f95e98b5a2c08521be006de Mon Sep 17 00:00:00 2001 From: Alex Rocha Date: Thu, 16 Sep 2021 16:10:16 -0500 Subject: [PATCH 06/32] adding verification endpoint --- core-cms/settings_custom.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core-cms/settings_custom.py b/core-cms/settings_custom.py index 6e576980..64937f8e 100644 --- a/core-cms/settings_custom.py +++ b/core-cms/settings_custom.py @@ -5,7 +5,7 @@ # DJANGO SETTINGS ######################## -DEBUG = False # False for Prod. +DEBUG = True # False for Prod. # Specify allowed hosts or use an asterisk to allow any host and simplify the config. # ALLOWED_HOSTS = ['hostname.tacc.utexas.edu', 'host.ip.v4.address', '0.0.0.0', 'localhost', '127.0.0.1'] # In production. @@ -39,6 +39,8 @@ ('style_guide.html', 'Style Guide') ) +CEP_AUTH_VERIFICATION_ENDPOINT='https://dev.cep.tacc.utexas.edu' + ######################## # GOOGLE ANALYTICS ######################## From 2fdbd873c760434bf6a8e6f27036af1c033b3de9 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 16 Sep 2021 16:44:38 -0500 Subject: [PATCH 07/32] FP-1194: Assist: ProTX to latest secrets, drop redundancy --- protx-cms/settings_custom.py | 42 +++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/protx-cms/settings_custom.py b/protx-cms/settings_custom.py index a5e98421..10251ee3 100644 --- a/protx-cms/settings_custom.py +++ b/protx-cms/settings_custom.py @@ -35,10 +35,6 @@ # BRANDING. ######################## - -# Add custom sponsor branding assets here. -# One unique entry per asset. - COOKS_BRANDING = [ "cooks", "protx-cms/img/org_logos/CClogo_Standard_White_Transparent.png", @@ -50,25 +46,39 @@ "True" ] -# Add custom _SPONSOR_BRANDING assets here. -CUSTOM_BRANDING = [COOKS_BRANDING, TACC_BRANDING, UTEXAS_BRANDING] - -# NSF Funded TACC Portal. -NSF_SPONSORED_BRANDING = [NSF_BRANDING, TACC_BRANDING, UTEXAS_BRANDING] +# ???: Must we have this? It's in Core settings, already +_TACC_BRANDING = [ + "tacc", + "site_cms/img/org_logos/tacc-white.png", + "branding-tacc", + "https://www.tacc.utexas.edu/", + "_blank", + "TACC Logo", + "anonymous", + "True" +] -# Default TACC Portal. -DEFAULT_BRANDING = [TACC_BRANDING, UTEXAS_BRANDING] +# ???: Must we have this? It's in Core settings, already +_UTEXAS_BRANDING = [ + "utexas", + "site_cms/img/org_logos/utaustin-white.png", + "branding-utaustin", + "https://www.utexas.edu/", + "_blank", + "University of Texas at Austin Logo", + "anonymous", + "True" +] -# Assign branding selection. -BRANDING = CUSTOM_BRANDING +CUSTOM_BRANDING = [COOKS_BRANDING, TACC_BRANDING, UTEXAS_BRANDING] ######################## # LOGOS. ######################## -PORTAL_LOGO = [ +LOGO = [ "protx", - "protx-cms/img/org_logos/protx-logo-temp.png", + "protx-cms/img/org_logos/ProTx-logo-nobg.png", "", "/", "_self", @@ -77,8 +87,6 @@ "True" ] -LOGO = PORTAL_LOGO - ######################## # PORTAL ######################## From 93ac57e05b7ea0a421a2898014d9662b4f5ce1c5 Mon Sep 17 00:00:00 2001 From: John Gentle Date: Thu, 16 Sep 2021 17:24:06 -0500 Subject: [PATCH 08/32] Added the a2cps/settings_custom.py file for use across all a2cps CMS sites. --- a2cps-cms/settings_custom.py | 295 ++++++++++++++++++++++++++++++++--- 1 file changed, 272 insertions(+), 23 deletions(-) diff --git a/a2cps-cms/settings_custom.py b/a2cps-cms/settings_custom.py index 1eb25359..e3fa38e1 100644 --- a/a2cps-cms/settings_custom.py +++ b/a2cps-cms/settings_custom.py @@ -1,46 +1,201 @@ -# TACC CMS Per-Site Resources - Configuration - -# In a project-specific configuration file like this, edit existing configuration values from `cms-site-template:/taccsite_cms/default_secrets.py` that must change to suit this project. - -# Until this custom configuration is automatically applied, to use it one must copy the content of it and append it to `cms-site-template:/taccsite_cms/secrets.py` - -# EXAMPLE CONFIGURATION - -######################## -# DJANGO SETTINGS -######################## - -LDAP_ENABLED = True +# TACC WMA CMS SITE: *.A2CPS.TACC.UTEXAS.EDU +# CUSTOM SETTINGS VALUES. ######################## # DJANGO CMS SETTINGS ######################## +# CMS Site (allows for multiple sites on a single CMS) +SITE_ID = 1 + CMS_TEMPLATES = ( ('a2cps-cms/templates/standard.html', 'Standard'), - ('a2cps-cms/templates/fullwidth.html', 'Full Width') + ('a2cps-cms/templates/fullwidth.html', 'Full Width'), + + # May or may not be used; we can remove them when that is confirmed + ('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') ) +CMS_PERMISSION = True + ######################## -# GOOGLE ANALYTICS +# FEATURES ######################## -GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-10" -GOOGLE_ANALYTICS_PRELOAD = True +""" +Features for the CMS that can be turned either ON or OFF + +Usage: + +- For baked-in features, like BRANDING or PORTAL, see relevant section instead. +- For optional features, look below, and enable feature(s) via _FEATURES list. + +Baked-In Feature Setting Example. + +# Desctipion of feature X +# SEE: [link to user/div guide about feature] +FEATURE_A = "someValue" + +Optional Feature Toggle Example. + +FEATURES = { + # Desctipion of feature X + # SEE: [link to user/dev guide about feature] + "X": True, + + # Desctipion of feature Y + # SEE: [link to user/dev guide about feature] + "Y": False, + + # Desctipion of feature Z + # SEE: [link to user/dev guide about feature] + "Z": True, +} + +""" + +FEATURES = { + # Blog/News & Social Media Metadata + # GL-42: Split this into two features + # SEE: https://confluence.tacc.utexas.edu/x/EwDeCg + # SEE: https://confluence.tacc.utexas.edu/x/FAA9Cw + "blog": False, +} ######################## # BRANDING & LOGOS ######################## +# TODO: GH-59: Use Dict Not Array for Branding Settings + +# Branding settings for portal and navigation. +""" +Additional Branding and Portal Logos for Partner & Affiliate Organizations + +Usage: + +- For each beand used in the templating, add corresponding new settings values to this file (see example below). +- New branding settings must be added to the BRANDING list to render in the template. +- The order of the BRANDING list determines the rendering order of the elements in the template. +- The portal logo setting must be assigned to the LOGO variable to render in the template. +- The following VALUES for new elements set in the configuration object must exist in the portal css as well: + - Any new selectors or css styles (add to /taccsite_cms/static/site_cms/css/src/_imports/branding_logos.css) + - Image files being references (add to /taccsite_cms/static/site_cms/img/org_logos) + +Values to populate: + +_SETTING_NAME = [ # The name of the branding or logo config setting object. + "org_name", # The name of the organization the branding belongs too. + "img_file_src", # Path and filename relative to the static files folder. + "img_element_classes", # The list of selectors to apply to the rendered element, these need to exist in the css/scss. + "a_target_url", # The href link to follow when clicked, use "/" for portal logos. + "a_target_type", # The target to open the new link in, use _blank for external links, _self for internal links. + "alt_text", # The text to read or render for web assistance standards. + "cors_setting", # The CORS setting for the image, set to anonymous by default. + "visibility" # Toggles wether or not to display the element in the template, use True to render, False to hide. +] + +Branding Configuration Example. + +_ANORG_BRANDING = [ + "anorg", + "site_cms/img/org_logos/anorg-logo.png" + "branding-anorg", + "https://www.anorg.com/" + "_blank", + "ANORG Logo", + "anonymous", + "True" +] + +Logo Configuration Example. + +_ANORG_LOGO = [ + "anorg", + "site_cms/img/org_logos/anorg-logo.png" + "branding-anorg", + "/" + "_self", + "ANORG Logo", + "anonymous", + "True" +] +""" + +######################## +# BRANDING ######################## -# BRANDING. -BRANDING = [TACC_BRANDING, UTEXAS_BRANDING] +_TACC_BRANDING = [ + "tacc", + "site_cms/img/org_logos/tacc-white.png", + "branding-tacc", + "https://www.tacc.utexas.edu/", + "_blank", + "TACC Logo", + "anonymous", + "True" +] + +_UTEXAS_BRANDING = [ + "utexas", + "site_cms/img/org_logos/utaustin-white.png", + "branding-utaustin", + "https://www.utexas.edu/", + "_blank", + "University of Texas at Austin Logo", + "anonymous", + "True" +] + +_NSF_BRANDING = [ + "nsf", + "site_cms/img/org_logos/nsf-white.png", + "branding-nsf", + "https://www.nsf.gov/", + "_blank", + "NSF Logo", + "anonymous", + "True" +] + +# Add custom sponsor branding assets here. +# One unique entry per asset. + +_ANORG_BRANDING = [] + +# Add custom SPONSOR_BRANDING assets here. +_CUSTOM_BRANDING = [_ANORG_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING] + +# NSF Funded TACC Portal. +_NSF_SPONSORED_BRANDING = [_NSF_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING] + +# Default TACC Portal. +_DEFAULT_BRANDING = [_TACC_BRANDING, _UTEXAS_BRANDING] + +# Assign branding selection. +BRANDING = _DEFAULT_BRANDING ######################## -# LOGOS. +# LOGOS +######################## -A2CPS_LOGO = [ +_PORTAL_LOGO = [ + "portal", + "site_cms/img/org_logos/portal.png", + "", + "/", + "_self", + "Portal Logo", + "anonymous", + "True" +] + +_A2CPS_LOGO = [ "a2cps", "a2cps-cms/img/org_logos/a2cps.png", "", @@ -51,10 +206,104 @@ "True" ] -LOGO = A2CPS_LOGO +LOGO = _A2CPS_LOGO # Default Portal Logo. + +######################## +# FAVICON +######################## + +_PORTAL_FAVICON = { + "img_file_src": "site_cms/img/favicons/favicon.ico" +} + +FAVICON = _PORTAL_FAVICON # Default Favicon. ######################## # PORTAL ######################## -INCLUDES_CORE_PORTAL = True +INCLUDES_CORE_PORTAL = True # True for any CMS that is part of a Portal. + +""" +Portal Links + +Usage: + +- For each link used in the templating, add new links values (see example below). +- New links must be added to the PORTAL_AUTH_LINKS and PORTAL_UNAUTH_LINKS lists. +- The order of the PORTAL_[…]_LINKS lists determine the rendering order of the elements. + +Values to populate: + +NAMED_LINK = { # The name of the link object. + "name": "…", # The name of the link (to distinguish it, as if for ID). + "url": "…", # The URL path to which the link should navigate the user. + "text": "…", # The text of the link. + "icon": "…", # The icon of the link. +} + +Links Configuration Example. + +ANY_AUTH_LINK = { + "name": "section-1", + "url": "/some/section/", + "text": "Visit Section", + "icon": "some-section", +} + +ANY_UNAUTH_LINK = { + "name": "action-1", + "url": "/some-action/", + "text": "Do Action", + "icon": "some-action", +} + +""" + +######################## +# LINKS (for Portal). +######################## + +_DASH_AUTH_LINK = { + "name": "dash", + "url": "/workbench/dashboard/", + "text": "My Dashboard", + "icon": "desktop", +} + +_PROFILE_AUTH_LINK = { + "name": "profile", + "url": "/accounts/profile/", + "text": "My Account", + "icon": "user-circle", +} + +_LOGOUT_AUTH_LINK = { + "name": "logout", + "url": "/accounts/logout/", + "text": "Log Out", + "icon": "sign-out-alt", +} + +_LOGIN_UNAUTH_LINK = { + "name": "login", + "url": "/login/", + "text": "Log In", + "icon": "sign-in-alt", +} + +# Default TACC Portal. +PORTAL_AUTH_LINKS = [_DASH_AUTH_LINK, _PROFILE_AUTH_LINK, _LOGOUT_AUTH_LINK] + +# Default TACC Portal. +PORTAL_UNAUTH_LINKS = [_LOGIN_UNAUTH_LINK] + +# Export any overrides to the Container. +# Exported settings. +SETTINGS_EXPORT = [ + 'BRANDING', + 'LOGO', + 'FAVICON', + 'GOOGLE_ANALYTICS_PROPERTY_ID', + 'GOOGLE_ANALYTICS_PRELOAD' +] From 6ce45d39baec3f6d3a20ec7f76f0b02d37c080fa Mon Sep 17 00:00:00 2001 From: "W. Bomar" <62723358+tacc-wbomar@users.noreply.github.com> Date: Thu, 16 Sep 2021 17:32:06 -0500 Subject: [PATCH 09/32] FP-1194: Export settings in protx-cms --- protx-cms/settings_custom.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/protx-cms/settings_custom.py b/protx-cms/settings_custom.py index 10251ee3..59d94f04 100644 --- a/protx-cms/settings_custom.py +++ b/protx-cms/settings_custom.py @@ -92,3 +92,15 @@ ######################## INCLUDES_CORE_PORTAL = True + +######################## +# EXPORT +######################## + +SETTINGS_EXPORT = [ + 'BRANDING', + 'LOGO', + 'FAVICON', + 'GOOGLE_ANALYTICS_PROPERTY_ID', + 'GOOGLE_ANALYTICS_PRELOAD' +] From 78bee62ad91f0fbf7adeedabfb72590c64589a34 Mon Sep 17 00:00:00 2001 From: John Gentle Date: Thu, 16 Sep 2021 17:38:14 -0500 Subject: [PATCH 10/32] Moved LDAP check into custom fo A2CPS. --- a2cps-cms/settings_custom.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/a2cps-cms/settings_custom.py b/a2cps-cms/settings_custom.py index e3fa38e1..96f2cfcc 100644 --- a/a2cps-cms/settings_custom.py +++ b/a2cps-cms/settings_custom.py @@ -1,6 +1,14 @@ # TACC WMA CMS SITE: *.A2CPS.TACC.UTEXAS.EDU # CUSTOM SETTINGS VALUES. +######################## +# DJANGO SETTINGS +######################## + +# Boolean check to see if ldap is being used by the site. +# Requires django-auth-ldap ≥ 2.0.0 +LDAP_ENABLED = True + ######################## # DJANGO CMS SETTINGS ######################## From 8195f60565c09b05833a43144ed435634cdc2d2c Mon Sep 17 00:00:00 2001 From: John Gentle Date: Thu, 16 Sep 2021 17:44:14 -0500 Subject: [PATCH 11/32] Removed all extraneous commenst from a2cps settings_custom. --- a2cps-cms/settings_custom.py | 182 +---------------------------------- 1 file changed, 4 insertions(+), 178 deletions(-) diff --git a/a2cps-cms/settings_custom.py b/a2cps-cms/settings_custom.py index 96f2cfcc..483a8fc9 100644 --- a/a2cps-cms/settings_custom.py +++ b/a2cps-cms/settings_custom.py @@ -5,15 +5,12 @@ # DJANGO SETTINGS ######################## -# Boolean check to see if ldap is being used by the site. -# Requires django-auth-ldap ≥ 2.0.0 LDAP_ENABLED = True ######################## # DJANGO CMS SETTINGS ######################## -# CMS Site (allows for multiple sites on a single CMS) SITE_ID = 1 CMS_TEMPLATES = ( @@ -34,38 +31,6 @@ # FEATURES ######################## -""" -Features for the CMS that can be turned either ON or OFF - -Usage: - -- For baked-in features, like BRANDING or PORTAL, see relevant section instead. -- For optional features, look below, and enable feature(s) via _FEATURES list. - -Baked-In Feature Setting Example. - -# Desctipion of feature X -# SEE: [link to user/div guide about feature] -FEATURE_A = "someValue" - -Optional Feature Toggle Example. - -FEATURES = { - # Desctipion of feature X - # SEE: [link to user/dev guide about feature] - "X": True, - - # Desctipion of feature Y - # SEE: [link to user/dev guide about feature] - "Y": False, - - # Desctipion of feature Z - # SEE: [link to user/dev guide about feature] - "Z": True, -} - -""" - FEATURES = { # Blog/News & Social Media Metadata # GL-42: Split this into two features @@ -74,66 +39,6 @@ "blog": False, } -######################## -# BRANDING & LOGOS -######################## -# TODO: GH-59: Use Dict Not Array for Branding Settings - -# Branding settings for portal and navigation. - -""" -Additional Branding and Portal Logos for Partner & Affiliate Organizations - -Usage: - -- For each beand used in the templating, add corresponding new settings values to this file (see example below). -- New branding settings must be added to the BRANDING list to render in the template. -- The order of the BRANDING list determines the rendering order of the elements in the template. -- The portal logo setting must be assigned to the LOGO variable to render in the template. -- The following VALUES for new elements set in the configuration object must exist in the portal css as well: - - Any new selectors or css styles (add to /taccsite_cms/static/site_cms/css/src/_imports/branding_logos.css) - - Image files being references (add to /taccsite_cms/static/site_cms/img/org_logos) - -Values to populate: - -_SETTING_NAME = [ # The name of the branding or logo config setting object. - "org_name", # The name of the organization the branding belongs too. - "img_file_src", # Path and filename relative to the static files folder. - "img_element_classes", # The list of selectors to apply to the rendered element, these need to exist in the css/scss. - "a_target_url", # The href link to follow when clicked, use "/" for portal logos. - "a_target_type", # The target to open the new link in, use _blank for external links, _self for internal links. - "alt_text", # The text to read or render for web assistance standards. - "cors_setting", # The CORS setting for the image, set to anonymous by default. - "visibility" # Toggles wether or not to display the element in the template, use True to render, False to hide. -] - -Branding Configuration Example. - -_ANORG_BRANDING = [ - "anorg", - "site_cms/img/org_logos/anorg-logo.png" - "branding-anorg", - "https://www.anorg.com/" - "_blank", - "ANORG Logo", - "anonymous", - "True" -] - -Logo Configuration Example. - -_ANORG_LOGO = [ - "anorg", - "site_cms/img/org_logos/anorg-logo.png" - "branding-anorg", - "/" - "_self", - "ANORG Logo", - "anonymous", - "True" -] -""" - ######################## # BRANDING ######################## @@ -160,49 +65,12 @@ "True" ] -_NSF_BRANDING = [ - "nsf", - "site_cms/img/org_logos/nsf-white.png", - "branding-nsf", - "https://www.nsf.gov/", - "_blank", - "NSF Logo", - "anonymous", - "True" -] - -# Add custom sponsor branding assets here. -# One unique entry per asset. - -_ANORG_BRANDING = [] - -# Add custom SPONSOR_BRANDING assets here. -_CUSTOM_BRANDING = [_ANORG_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING] - -# NSF Funded TACC Portal. -_NSF_SPONSORED_BRANDING = [_NSF_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING] - -# Default TACC Portal. -_DEFAULT_BRANDING = [_TACC_BRANDING, _UTEXAS_BRANDING] - -# Assign branding selection. -BRANDING = _DEFAULT_BRANDING +BRANDING = [_TACC_BRANDING, _UTEXAS_BRANDING] ######################## # LOGOS ######################## -_PORTAL_LOGO = [ - "portal", - "site_cms/img/org_logos/portal.png", - "", - "/", - "_self", - "Portal Logo", - "anonymous", - "True" -] - _A2CPS_LOGO = [ "a2cps", "a2cps-cms/img/org_logos/a2cps.png", @@ -214,59 +82,21 @@ "True" ] -LOGO = _A2CPS_LOGO # Default Portal Logo. +LOGO = _A2CPS_LOGO ######################## # FAVICON ######################## -_PORTAL_FAVICON = { +FAVICON = { "img_file_src": "site_cms/img/favicons/favicon.ico" } -FAVICON = _PORTAL_FAVICON # Default Favicon. - ######################## # PORTAL ######################## -INCLUDES_CORE_PORTAL = True # True for any CMS that is part of a Portal. - -""" -Portal Links - -Usage: - -- For each link used in the templating, add new links values (see example below). -- New links must be added to the PORTAL_AUTH_LINKS and PORTAL_UNAUTH_LINKS lists. -- The order of the PORTAL_[…]_LINKS lists determine the rendering order of the elements. - -Values to populate: - -NAMED_LINK = { # The name of the link object. - "name": "…", # The name of the link (to distinguish it, as if for ID). - "url": "…", # The URL path to which the link should navigate the user. - "text": "…", # The text of the link. - "icon": "…", # The icon of the link. -} - -Links Configuration Example. - -ANY_AUTH_LINK = { - "name": "section-1", - "url": "/some/section/", - "text": "Visit Section", - "icon": "some-section", -} - -ANY_UNAUTH_LINK = { - "name": "action-1", - "url": "/some-action/", - "text": "Do Action", - "icon": "some-action", -} - -""" +INCLUDES_CORE_PORTAL = True ######################## # LINKS (for Portal). @@ -300,14 +130,10 @@ "icon": "sign-in-alt", } -# Default TACC Portal. PORTAL_AUTH_LINKS = [_DASH_AUTH_LINK, _PROFILE_AUTH_LINK, _LOGOUT_AUTH_LINK] -# Default TACC Portal. PORTAL_UNAUTH_LINKS = [_LOGIN_UNAUTH_LINK] -# Export any overrides to the Container. -# Exported settings. SETTINGS_EXPORT = [ 'BRANDING', 'LOGO', From c574f817d95165d955ad2b773ca5aafce995cb09 Mon Sep 17 00:00:00 2001 From: John Gentle Date: Thu, 16 Sep 2021 17:51:16 -0500 Subject: [PATCH 12/32] TWeaked a2cps to include defaults for GA. Fixed a type in protx settings_custom. --- a2cps-cms/settings_custom.py | 11 ++++++++--- protx-cms/settings_custom.py | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/a2cps-cms/settings_custom.py b/a2cps-cms/settings_custom.py index 483a8fc9..f7b83174 100644 --- a/a2cps-cms/settings_custom.py +++ b/a2cps-cms/settings_custom.py @@ -27,6 +27,13 @@ CMS_PERMISSION = True +######################## +# GOOGLE ANALYTICS +######################## + +GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-xx" +GOOGLE_ANALYTICS_PRELOAD = False + ######################## # FEATURES ######################## @@ -71,7 +78,7 @@ # LOGOS ######################## -_A2CPS_LOGO = [ +LOGO = [ "a2cps", "a2cps-cms/img/org_logos/a2cps.png", "", @@ -82,8 +89,6 @@ "True" ] -LOGO = _A2CPS_LOGO - ######################## # FAVICON ######################## diff --git a/protx-cms/settings_custom.py b/protx-cms/settings_custom.py index 59d94f04..eb359de4 100644 --- a/protx-cms/settings_custom.py +++ b/protx-cms/settings_custom.py @@ -35,7 +35,7 @@ # BRANDING. ######################## -COOKS_BRANDING = [ +_COOKS_BRANDING = [ "cooks", "protx-cms/img/org_logos/CClogo_Standard_White_Transparent.png", "branding-tacc", @@ -70,7 +70,7 @@ "True" ] -CUSTOM_BRANDING = [COOKS_BRANDING, TACC_BRANDING, UTEXAS_BRANDING] +CUSTOM_BRANDING = [_COOKS_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING] ######################## # LOGOS. From 9c306e654e8720c3580e1a54140b8d9c17b12ab7 Mon Sep 17 00:00:00 2001 From: John Gentle Date: Thu, 16 Sep 2021 17:52:41 -0500 Subject: [PATCH 13/32] Removed portal links and features from a2cps custom_settings. --- a2cps-cms/settings_custom.py | 44 +----------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/a2cps-cms/settings_custom.py b/a2cps-cms/settings_custom.py index f7b83174..75d85cc5 100644 --- a/a2cps-cms/settings_custom.py +++ b/a2cps-cms/settings_custom.py @@ -38,13 +38,7 @@ # FEATURES ######################## -FEATURES = { - # Blog/News & Social Media Metadata - # GL-42: Split this into two features - # SEE: https://confluence.tacc.utexas.edu/x/EwDeCg - # SEE: https://confluence.tacc.utexas.edu/x/FAA9Cw - "blog": False, -} +# NONE. ######################## # BRANDING @@ -103,42 +97,6 @@ INCLUDES_CORE_PORTAL = True -######################## -# LINKS (for Portal). -######################## - -_DASH_AUTH_LINK = { - "name": "dash", - "url": "/workbench/dashboard/", - "text": "My Dashboard", - "icon": "desktop", -} - -_PROFILE_AUTH_LINK = { - "name": "profile", - "url": "/accounts/profile/", - "text": "My Account", - "icon": "user-circle", -} - -_LOGOUT_AUTH_LINK = { - "name": "logout", - "url": "/accounts/logout/", - "text": "Log Out", - "icon": "sign-out-alt", -} - -_LOGIN_UNAUTH_LINK = { - "name": "login", - "url": "/login/", - "text": "Log In", - "icon": "sign-in-alt", -} - -PORTAL_AUTH_LINKS = [_DASH_AUTH_LINK, _PROFILE_AUTH_LINK, _LOGOUT_AUTH_LINK] - -PORTAL_UNAUTH_LINKS = [_LOGIN_UNAUTH_LINK] - SETTINGS_EXPORT = [ 'BRANDING', 'LOGO', From e751b84bbf7dc46fe0f16dff1ffae2627dc85c79 Mon Sep 17 00:00:00 2001 From: John Gentle Date: Thu, 16 Sep 2021 17:54:40 -0500 Subject: [PATCH 14/32] Up[dated heading in ProTx custom settings. --- protx-cms/settings_custom.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/protx-cms/settings_custom.py b/protx-cms/settings_custom.py index eb359de4..abaedfd3 100644 --- a/protx-cms/settings_custom.py +++ b/protx-cms/settings_custom.py @@ -1,7 +1,5 @@ - -# Until this custom configuration is automatically applied, to use it one must copy the content of it and append it to `cms-site-template:/taccsite_cms/secrets.py` - -# PROTX CONFIGURATION +# TACC WMA CMS SITE: *.PROTX.TACC.UTEXAS.EDU +# CUSTOM SETTINGS VALUES. ######################## # DJANGO SETTINGS From 3c0919c3f1ace778dc3351a7019818fcfd1e016e Mon Sep 17 00:00:00 2001 From: John Gentle Date: Thu, 16 Sep 2021 17:55:41 -0500 Subject: [PATCH 15/32] Removed extraneous comment in a2cps settings. --- a2cps-cms/settings_custom.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/a2cps-cms/settings_custom.py b/a2cps-cms/settings_custom.py index 75d85cc5..4f8e2efb 100644 --- a/a2cps-cms/settings_custom.py +++ b/a2cps-cms/settings_custom.py @@ -16,8 +16,6 @@ CMS_TEMPLATES = ( ('a2cps-cms/templates/standard.html', 'Standard'), ('a2cps-cms/templates/fullwidth.html', 'Full Width'), - - # May or may not be used; we can remove them when that is confirmed ('guide.html', 'Guide'), ('guides/getting_started.html', 'Guide: Getting Started'), ('guides/data_transfer.html', 'Guide: Data Transfer'), From 30b3befd32414df8dc58d793f1481a7579f6bdc1 Mon Sep 17 00:00:00 2001 From: John Gentle Date: Thu, 16 Sep 2021 19:42:29 -0500 Subject: [PATCH 16/32] Resolved concerns about Branding secrets and redundancy. settings.py will provide the redundant values. --- a2cps-cms/settings_custom.py | 26 ++------------------------ protx-cms/settings_custom.py | 34 +++++++--------------------------- 2 files changed, 9 insertions(+), 51 deletions(-) diff --git a/a2cps-cms/settings_custom.py b/a2cps-cms/settings_custom.py index 4f8e2efb..69eaaed8 100644 --- a/a2cps-cms/settings_custom.py +++ b/a2cps-cms/settings_custom.py @@ -29,7 +29,7 @@ # GOOGLE ANALYTICS ######################## -GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-xx" +GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-##" GOOGLE_ANALYTICS_PRELOAD = False ######################## @@ -42,29 +42,7 @@ # BRANDING ######################## -_TACC_BRANDING = [ - "tacc", - "site_cms/img/org_logos/tacc-white.png", - "branding-tacc", - "https://www.tacc.utexas.edu/", - "_blank", - "TACC Logo", - "anonymous", - "True" -] - -_UTEXAS_BRANDING = [ - "utexas", - "site_cms/img/org_logos/utaustin-white.png", - "branding-utaustin", - "https://www.utexas.edu/", - "_blank", - "University of Texas at Austin Logo", - "anonymous", - "True" -] - -BRANDING = [_TACC_BRANDING, _UTEXAS_BRANDING] +# DEFAULT. ######################## # LOGOS diff --git a/protx-cms/settings_custom.py b/protx-cms/settings_custom.py index abaedfd3..0266d6c7 100644 --- a/protx-cms/settings_custom.py +++ b/protx-cms/settings_custom.py @@ -11,6 +11,8 @@ # DJANGO CMS SETTINGS ######################## +SITE_ID = 1 + CMS_TEMPLATES = ( ('protx-cms/templates/standard.html', 'Standard'), ('protx-cms/templates/fullwidth.html', 'Full Width'), @@ -22,18 +24,20 @@ ('guides/portal_technology.html', 'Guide: Portal Technology Stack') ) +CMS_PERMISSION = True + ######################## # GOOGLE ANALYTICS ######################## GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-##" -GOOGLE_ANALYTICS_PRELOAD = True +GOOGLE_ANALYTICS_PRELOAD = False ######################## # BRANDING. ######################## -_COOKS_BRANDING = [ +COOKS_BRANDING = [ "cooks", "protx-cms/img/org_logos/CClogo_Standard_White_Transparent.png", "branding-tacc", @@ -44,31 +48,7 @@ "True" ] -# ???: Must we have this? It's in Core settings, already -_TACC_BRANDING = [ - "tacc", - "site_cms/img/org_logos/tacc-white.png", - "branding-tacc", - "https://www.tacc.utexas.edu/", - "_blank", - "TACC Logo", - "anonymous", - "True" -] - -# ???: Must we have this? It's in Core settings, already -_UTEXAS_BRANDING = [ - "utexas", - "site_cms/img/org_logos/utaustin-white.png", - "branding-utaustin", - "https://www.utexas.edu/", - "_blank", - "University of Texas at Austin Logo", - "anonymous", - "True" -] - -CUSTOM_BRANDING = [_COOKS_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING] +CUSTOM_BRANDING = [COOKS_BRANDING, TACC_BRANDING, UTEXAS_BRANDING] ######################## # LOGOS. From 5231deb1cdbaf2f6e32a61e09f1a1cda094bc2a4 Mon Sep 17 00:00:00 2001 From: John Gentle Date: Thu, 16 Sep 2021 19:48:29 -0500 Subject: [PATCH 17/32] Further removal of redundant defaults from custom settings in a2cps and protx. --- a2cps-cms/settings_custom.py | 22 +++------------------- protx-cms/settings_custom.py | 1 - 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/a2cps-cms/settings_custom.py b/a2cps-cms/settings_custom.py index 69eaaed8..d9b07232 100644 --- a/a2cps-cms/settings_custom.py +++ b/a2cps-cms/settings_custom.py @@ -32,18 +32,6 @@ GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-##" GOOGLE_ANALYTICS_PRELOAD = False -######################## -# FEATURES -######################## - -# NONE. - -######################## -# BRANDING -######################## - -# DEFAULT. - ######################## # LOGOS ######################## @@ -60,19 +48,15 @@ ] ######################## -# FAVICON +# PORTAL ######################## -FAVICON = { - "img_file_src": "site_cms/img/favicons/favicon.ico" -} +INCLUDES_CORE_PORTAL = True ######################## -# PORTAL +# EXPORT ######################## -INCLUDES_CORE_PORTAL = True - SETTINGS_EXPORT = [ 'BRANDING', 'LOGO', diff --git a/protx-cms/settings_custom.py b/protx-cms/settings_custom.py index 0266d6c7..f5af0bf6 100644 --- a/protx-cms/settings_custom.py +++ b/protx-cms/settings_custom.py @@ -16,7 +16,6 @@ CMS_TEMPLATES = ( ('protx-cms/templates/standard.html', 'Standard'), ('protx-cms/templates/fullwidth.html', 'Full Width'), - ('guide.html', 'Guide'), ('guides/getting_started.html', 'Guide: Getting Started'), ('guides/data_transfer.html', 'Guide: Data Transfer'), From 95e1d3293491892b48bff95b3dfbf4e3a16968de Mon Sep 17 00:00:00 2001 From: John Gentle Date: Fri, 17 Sep 2021 01:33:42 -0500 Subject: [PATCH 18/32] Aligning settings_custom with settings.py in Core-CMS. --- a2cps-cms/settings_custom.py | 35 ------------- core-cms/settings_custom.example.py | 77 +++++++++++++++++++++++++++++ protx-cms/settings_custom.py | 35 ------------- 3 files changed, 77 insertions(+), 70 deletions(-) create mode 100644 core-cms/settings_custom.example.py diff --git a/a2cps-cms/settings_custom.py b/a2cps-cms/settings_custom.py index d9b07232..487abafb 100644 --- a/a2cps-cms/settings_custom.py +++ b/a2cps-cms/settings_custom.py @@ -1,18 +1,10 @@ # TACC WMA CMS SITE: *.A2CPS.TACC.UTEXAS.EDU # CUSTOM SETTINGS VALUES. -######################## -# DJANGO SETTINGS -######################## - -LDAP_ENABLED = True - ######################## # DJANGO CMS SETTINGS ######################## -SITE_ID = 1 - CMS_TEMPLATES = ( ('a2cps-cms/templates/standard.html', 'Standard'), ('a2cps-cms/templates/fullwidth.html', 'Full Width'), @@ -23,15 +15,6 @@ ('guides/portal_technology.html', 'Guide: Portal Technology Stack') ) -CMS_PERMISSION = True - -######################## -# GOOGLE ANALYTICS -######################## - -GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-##" -GOOGLE_ANALYTICS_PRELOAD = False - ######################## # LOGOS ######################## @@ -46,21 +29,3 @@ "anonymous", "True" ] - -######################## -# PORTAL -######################## - -INCLUDES_CORE_PORTAL = True - -######################## -# EXPORT -######################## - -SETTINGS_EXPORT = [ - 'BRANDING', - 'LOGO', - 'FAVICON', - 'GOOGLE_ANALYTICS_PROPERTY_ID', - 'GOOGLE_ANALYTICS_PRELOAD' -] diff --git a/core-cms/settings_custom.example.py b/core-cms/settings_custom.example.py new file mode 100644 index 00000000..15dce46a --- /dev/null +++ b/core-cms/settings_custom.example.py @@ -0,0 +1,77 @@ +# CUSTOM SETTINGS VALUES. +# TACC WMA CMS SITE: +# ENV.PROJECT-DOMAIN.TACC.UTEXAS.EDU + +######################## +# DJANGO CMS SETTINGS +######################## + +CMS_TEMPLATES = ( + ('project-cms/templates/standard.html', 'Standard'), + ('project-cms/templates/fullwidth.html', 'Full Width'), + + # May or may not be used; we can remove them when that is confirmed + ('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 +######################## + +TACC_BRANDING = [ + "tacc", + "site_cms/img/org_logos/tacc-white.png", + "branding-tacc", + "https://www.tacc.utexas.edu/", + "_blank", + "TACC Logo", + "anonymous", + "True" +] + +UTEXAS_BRANDING = [ + "utexas", + "site_cms/img/org_logos/utaustin-white.png", + "branding-utaustin", + "https://www.utexas.edu/", + "_blank", + "University of Texas at Austin Logo", + "anonymous", + "True" +] + +NSF_BRANDING = [ + "nsf", + "site_cms/img/org_logos/nsf-white.png", + "branding-nsf", + "https://www.nsf.gov/", + "_blank", + "NSF Logo", + "anonymous", + "True" +] + +# Add custom sponsor branding assets here. +# One unique entry per asset. + +# Assign branding selection. +BRANDING = [TACC_BRANDING, UTEXAS_BRANDING] + +######################## +# LOGOS +######################## + +LOGO = [ + "portal", + "site_cms/img/org_logos/portal.png", + "", + "/", + "_self", + "Portal Logo", + "anonymous", + "True" +] diff --git a/protx-cms/settings_custom.py b/protx-cms/settings_custom.py index f5af0bf6..70a5bf60 100644 --- a/protx-cms/settings_custom.py +++ b/protx-cms/settings_custom.py @@ -1,18 +1,10 @@ # TACC WMA CMS SITE: *.PROTX.TACC.UTEXAS.EDU # CUSTOM SETTINGS VALUES. -######################## -# DJANGO SETTINGS -######################## - -LDAP_ENABLED = True - ######################## # DJANGO CMS SETTINGS ######################## -SITE_ID = 1 - CMS_TEMPLATES = ( ('protx-cms/templates/standard.html', 'Standard'), ('protx-cms/templates/fullwidth.html', 'Full Width'), @@ -23,15 +15,6 @@ ('guides/portal_technology.html', 'Guide: Portal Technology Stack') ) -CMS_PERMISSION = True - -######################## -# GOOGLE ANALYTICS -######################## - -GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-##" -GOOGLE_ANALYTICS_PRELOAD = False - ######################## # BRANDING. ######################## @@ -63,21 +46,3 @@ "anonymous", "True" ] - -######################## -# PORTAL -######################## - -INCLUDES_CORE_PORTAL = True - -######################## -# EXPORT -######################## - -SETTINGS_EXPORT = [ - 'BRANDING', - 'LOGO', - 'FAVICON', - 'GOOGLE_ANALYTICS_PROPERTY_ID', - 'GOOGLE_ANALYTICS_PRELOAD' -] From 3de2a71f051304725d327032fadce0083f02defb Mon Sep 17 00:00:00 2001 From: John Gentle Date: Fri, 17 Sep 2021 01:38:04 -0500 Subject: [PATCH 19/32] Removing unused settings from examples. --- core-cms/settings_custom.example.py | 77 ----------------------------- core-cms/settings_custom.py | 5 ++ example-cms/settings_custom.py | 28 +++-------- 3 files changed, 11 insertions(+), 99 deletions(-) delete mode 100644 core-cms/settings_custom.example.py create mode 100644 core-cms/settings_custom.py diff --git a/core-cms/settings_custom.example.py b/core-cms/settings_custom.example.py deleted file mode 100644 index 15dce46a..00000000 --- a/core-cms/settings_custom.example.py +++ /dev/null @@ -1,77 +0,0 @@ -# CUSTOM SETTINGS VALUES. -# TACC WMA CMS SITE: -# ENV.PROJECT-DOMAIN.TACC.UTEXAS.EDU - -######################## -# DJANGO CMS SETTINGS -######################## - -CMS_TEMPLATES = ( - ('project-cms/templates/standard.html', 'Standard'), - ('project-cms/templates/fullwidth.html', 'Full Width'), - - # May or may not be used; we can remove them when that is confirmed - ('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 -######################## - -TACC_BRANDING = [ - "tacc", - "site_cms/img/org_logos/tacc-white.png", - "branding-tacc", - "https://www.tacc.utexas.edu/", - "_blank", - "TACC Logo", - "anonymous", - "True" -] - -UTEXAS_BRANDING = [ - "utexas", - "site_cms/img/org_logos/utaustin-white.png", - "branding-utaustin", - "https://www.utexas.edu/", - "_blank", - "University of Texas at Austin Logo", - "anonymous", - "True" -] - -NSF_BRANDING = [ - "nsf", - "site_cms/img/org_logos/nsf-white.png", - "branding-nsf", - "https://www.nsf.gov/", - "_blank", - "NSF Logo", - "anonymous", - "True" -] - -# Add custom sponsor branding assets here. -# One unique entry per asset. - -# Assign branding selection. -BRANDING = [TACC_BRANDING, UTEXAS_BRANDING] - -######################## -# LOGOS -######################## - -LOGO = [ - "portal", - "site_cms/img/org_logos/portal.png", - "", - "/", - "_self", - "Portal Logo", - "anonymous", - "True" -] diff --git a/core-cms/settings_custom.py b/core-cms/settings_custom.py new file mode 100644 index 00000000..0444d20b --- /dev/null +++ b/core-cms/settings_custom.py @@ -0,0 +1,5 @@ +# CUSTOM SETTINGS VALUES. +# TACC WMA CMS SITE: +# DEV.CEP.TACC.UTEXAS.EDU + +# USES ALL DEFAULT VALUES. diff --git a/example-cms/settings_custom.py b/example-cms/settings_custom.py index 27c22fd8..df36de5d 100644 --- a/example-cms/settings_custom.py +++ b/example-cms/settings_custom.py @@ -1,14 +1,9 @@ - -# Until this custom configuration is automatically applied, to use it one must copy the content of it and append it to `cms-site-template:/taccsite_cms/secrets.py` +# CUSTOM SETTINGS VALUES. +# TACC WMA CMS SITE: +# ENV.PROJECT-DOMAIN.TACC.UTEXAS.EDU # EXAMPLE CONFIGURATION -######################## -# DJANGO SETTINGS -######################## - -LDAP_ENABLED = True - ######################## # DJANGO CMS SETTINGS ######################## @@ -28,25 +23,16 @@ ) ######################## -# GOOGLE ANALYTICS +# BRANDING ######################## -GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-##" -GOOGLE_ANALYTICS_PRELOAD = True - -######################## -# BRANDING & LOGOS -######################## - -######################## -# BRANDING. - BRANDING = [NSF_BRANDING, TACC_BRANDING, UTEXAS_BRANDING] ######################## # LOGOS. +######################## -PORTAL_LOGO = [ +LOGO = [ "portal", "example-cms/img/org_logos/portal.png", "", @@ -57,8 +43,6 @@ "True" ] -LOGO = PORTAL_LOGO - ######################## # PORTAL ######################## From 9c5a6e9b740f8b7c7a2ab92823e492dd8d5c40c6 Mon Sep 17 00:00:00 2001 From: John Gentle Date: Fri, 17 Sep 2021 01:44:21 -0500 Subject: [PATCH 20/32] Aligning the custom settings across projects. --- a2cps-cms/settings_custom.py | 3 ++- core-cms/settings_custom.py | 4 ++-- example-cms/settings_custom.py | 2 +- protx-cms/settings_custom.py | 3 ++- tup-cms/settings_custom.py | 17 +++-------------- 5 files changed, 10 insertions(+), 19 deletions(-) diff --git a/a2cps-cms/settings_custom.py b/a2cps-cms/settings_custom.py index 487abafb..43a83164 100644 --- a/a2cps-cms/settings_custom.py +++ b/a2cps-cms/settings_custom.py @@ -1,5 +1,6 @@ -# TACC WMA CMS SITE: *.A2CPS.TACC.UTEXAS.EDU # CUSTOM SETTINGS VALUES. +# TACC WMA CMS SITE: +# *.A2CPS.TACC.UTEXAS.EDU ######################## # DJANGO CMS SETTINGS diff --git a/core-cms/settings_custom.py b/core-cms/settings_custom.py index 0444d20b..7cccd37a 100644 --- a/core-cms/settings_custom.py +++ b/core-cms/settings_custom.py @@ -1,5 +1,5 @@ # CUSTOM SETTINGS VALUES. # TACC WMA CMS SITE: -# DEV.CEP.TACC.UTEXAS.EDU +# *.CEP.TACC.UTEXAS.EDU -# USES ALL DEFAULT VALUES. +# USES DEFAULT VALUES. diff --git a/example-cms/settings_custom.py b/example-cms/settings_custom.py index df36de5d..fe17062a 100644 --- a/example-cms/settings_custom.py +++ b/example-cms/settings_custom.py @@ -1,6 +1,6 @@ # CUSTOM SETTINGS VALUES. # TACC WMA CMS SITE: -# ENV.PROJECT-DOMAIN.TACC.UTEXAS.EDU +# *.PROJECT-DOMAIN.TACC.UTEXAS.EDU # EXAMPLE CONFIGURATION diff --git a/protx-cms/settings_custom.py b/protx-cms/settings_custom.py index 70a5bf60..b7262e81 100644 --- a/protx-cms/settings_custom.py +++ b/protx-cms/settings_custom.py @@ -1,5 +1,6 @@ -# TACC WMA CMS SITE: *.PROTX.TACC.UTEXAS.EDU # CUSTOM SETTINGS VALUES. +# TACC WMA CMS SITE: +# *.PROTX.TACC.UTEXAS.EDU ######################## # DJANGO CMS SETTINGS diff --git a/tup-cms/settings_custom.py b/tup-cms/settings_custom.py index 517db121..bb393b0e 100644 --- a/tup-cms/settings_custom.py +++ b/tup-cms/settings_custom.py @@ -1,10 +1,6 @@ -# TACC CMS Per-Site Resources - Configuration - -# In a project-specific configuration file like this, edit existing configuration values from `cms-site-template:/taccsite_cms/default_secrets.py` that must change to suit this project. - -# Until this custom configuration is automatically applied, to use it one must copy the content of it and append it to `cms-site-template:/taccsite_cms/secrets.py` - -# TUP CONFIGURATION +# CUSTOM SETTINGS VALUES. +# TACC WMA CMS SITE: +# *.TUP.TACC.UTEXAS.EDU ######################## # DJANGO SETTINGS @@ -25,13 +21,6 @@ ######################## GOOGLE_ANALYTICS_PROPERTY_ID = "UA-96034853-2" -GOOGLE_ANALYTICS_PRELOAD = True - -######################## -# BRANDING. -######################## - -_BRANDING = [_TACC_BRANDING, _UTEXAS_BRANDING] ######################## # LOGOS. From 4044081bd516440efa5b7246bfd51ec53dd142ac Mon Sep 17 00:00:00 2001 From: John Gentle Date: Fri, 17 Sep 2021 02:37:31 -0500 Subject: [PATCH 21/32] Updated tup custom settings. --- tup-cms/settings_custom.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tup-cms/settings_custom.py b/tup-cms/settings_custom.py index bb393b0e..a826a3ea 100644 --- a/tup-cms/settings_custom.py +++ b/tup-cms/settings_custom.py @@ -20,13 +20,14 @@ # GOOGLE ANALYTICS ######################## -GOOGLE_ANALYTICS_PROPERTY_ID = "UA-96034853-2" +# GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-##" +GOOGLE_ANALYTICS_PROPERTY_ID = "UA-96034853-2" # What is this property? ######################## # LOGOS. ######################## -PORTAL_LOGO = [ +LOGO = [ "tup", "tup-cms/img/org_logos/tacc-logo.svg", "", @@ -37,8 +38,6 @@ "True" ] -LOGO = PORTAL_LOGO - ######################## # PORTAL ######################## From 920f25cd0120241c340ef3b265dbf447583f32b7 Mon Sep 17 00:00:00 2001 From: John Gentle Date: Fri, 17 Sep 2021 02:39:57 -0500 Subject: [PATCH 22/32] Updated tup custom settings. --- tup-cms/settings_custom.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tup-cms/settings_custom.py b/tup-cms/settings_custom.py index a826a3ea..8841de21 100644 --- a/tup-cms/settings_custom.py +++ b/tup-cms/settings_custom.py @@ -16,13 +16,6 @@ ('tup-cms/templates/fullwidth.html', 'Fullwidth') ) -######################## -# GOOGLE ANALYTICS -######################## - -# GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-##" -GOOGLE_ANALYTICS_PROPERTY_ID = "UA-96034853-2" # What is this property? - ######################## # LOGOS. ######################## From 12c6d24a4fd590cfb334f71ffef76527fdc84e64 Mon Sep 17 00:00:00 2001 From: John Gentle Date: Fri, 17 Sep 2021 03:10:46 -0500 Subject: [PATCH 23/32] Updated the tup.dev cms image tag. --- tup-cms/settings_custom.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tup-cms/settings_custom.py b/tup-cms/settings_custom.py index 8841de21..906c56e2 100644 --- a/tup-cms/settings_custom.py +++ b/tup-cms/settings_custom.py @@ -6,14 +6,19 @@ # DJANGO SETTINGS ######################## -LDAP_ENABLED = False +#LDAP_ENABLED = False ######################## # DJANGO CMS SETTINGS ######################## CMS_TEMPLATES = ( - ('tup-cms/templates/fullwidth.html', 'Fullwidth') + ('tup-cms/templates/fullwidth.html', 'Fullwidth'), + # ('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') ) ######################## @@ -35,4 +40,4 @@ # PORTAL ######################## -INCLUDES_CORE_PORTAL = False +#INCLUDES_CORE_PORTAL = False From a7d471b394e5a9ce6ad05314bcef643be23ab427 Mon Sep 17 00:00:00 2001 From: John Gentle Date: Fri, 17 Sep 2021 03:27:35 -0500 Subject: [PATCH 24/32] Addiniig some detailsinto tup settings custom. --- tup-cms/settings_custom.py | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/tup-cms/settings_custom.py b/tup-cms/settings_custom.py index 906c56e2..6a31f77c 100644 --- a/tup-cms/settings_custom.py +++ b/tup-cms/settings_custom.py @@ -2,23 +2,17 @@ # TACC WMA CMS SITE: # *.TUP.TACC.UTEXAS.EDU -######################## -# DJANGO SETTINGS -######################## - -#LDAP_ENABLED = False - ######################## # DJANGO CMS SETTINGS ######################## CMS_TEMPLATES = ( ('tup-cms/templates/fullwidth.html', 'Fullwidth'), - # ('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') + ('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') ) ######################## @@ -28,16 +22,10 @@ LOGO = [ "tup", "tup-cms/img/org_logos/tacc-logo.svg", - "", + "tup", "/", "_self", "TACC Logo", "anonymous", "True" ] - -######################## -# PORTAL -######################## - -#INCLUDES_CORE_PORTAL = False From 708963419e168d62063bc2b15156ab41cf855989 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 17 Sep 2021 15:59:54 -0500 Subject: [PATCH 25/32] FP-1194: TAPIS, LCCF, Example, ProTX: Fix settings --- example-cms/settings_custom.py | 43 ++++++++++---- lccf-tacc/settings_custom.py | 58 ++++++++++++++----- protx-cms/settings_custom.py | 35 +++++++++-- tapis-project-org/settings_custom.py | 56 +++++++++++++++--- .../tapis-project-org/css/src/placeholder.css | 1 + 5 files changed, 157 insertions(+), 36 deletions(-) create mode 100644 tapis-project-org/static/tapis-project-org/css/src/placeholder.css diff --git a/example-cms/settings_custom.py b/example-cms/settings_custom.py index fe17062a..ec7fb186 100644 --- a/example-cms/settings_custom.py +++ b/example-cms/settings_custom.py @@ -2,7 +2,8 @@ # TACC WMA CMS SITE: # *.PROJECT-DOMAIN.TACC.UTEXAS.EDU -# EXAMPLE CONFIGURATION +# FAQ: Some _VARIABLES are duplicated from settings.py (but prefixed with "_") +# because current infrastructure lacks ability to reference default values ######################## # DJANGO CMS SETTINGS @@ -26,23 +27,41 @@ # BRANDING ######################## -BRANDING = [NSF_BRANDING, TACC_BRANDING, UTEXAS_BRANDING] +_NSF_BRANDING = [ + "nsf", + "site_cms/img/org_logos/nsf-white.png", + "branding-nsf", + "https://www.nsf.gov/", + "_blank", + "NSF Logo", + "anonymous", + "True" +] -######################## -# LOGOS. -######################## +_TACC_BRANDING = [ + "tacc", + "site_cms/img/org_logos/tacc-white.png", + "branding-tacc", + "https://www.tacc.utexas.edu/", + "_blank", + "TACC Logo", + "anonymous", + "True" +] -LOGO = [ - "portal", - "example-cms/img/org_logos/portal.png", - "", - "/", - "_self", - "Portal Logo", +_UTEXAS_BRANDING = [ + "utexas", + "site_cms/img/org_logos/utaustin-white.png", + "branding-utaustin", + "https://www.utexas.edu/", + "_blank", + "University of Texas at Austin Logo", "anonymous", "True" ] +BRANDING = [ _NSF_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING ] + ######################## # PORTAL ######################## diff --git a/lccf-tacc/settings_custom.py b/lccf-tacc/settings_custom.py index 9736950d..1d9c21c5 100644 --- a/lccf-tacc/settings_custom.py +++ b/lccf-tacc/settings_custom.py @@ -1,28 +1,56 @@ -# … +# CUSTOM SETTINGS VALUES. +# TACC WMA CMS SITE: +# *.LCCF.TACC.UTEXAS.EDU -######################## -# GOOGLE ANALYTICS -######################## -GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-15" -GOOGLE_ANALYTICS_PRELOAD = True +# FAQ: Some _VARIABLES are duplicated from settings.py (but prefixed with "_") +# because current infrastructure lacks ability to reference default values ######################## # BRANDING & LOGOS ######################## -# … - ######################## -# BRANDING. +# BRANDING -# … +_NSF_BRANDING = [ + "nsf", + "site_cms/img/org_logos/nsf-white.png", + "branding-nsf", + "https://www.nsf.gov/", + "_blank", + "NSF Logo", + "anonymous", + "True" +] + +_TACC_BRANDING = [ + "tacc", + "site_cms/img/org_logos/tacc-white.png", + "branding-tacc", + "https://www.tacc.utexas.edu/", + "_blank", + "TACC Logo", + "anonymous", + "True" +] + +_UTEXAS_BRANDING = [ + "utexas", + "site_cms/img/org_logos/utaustin-white.png", + "branding-utaustin", + "https://www.utexas.edu/", + "_blank", + "University of Texas at Austin Logo", + "anonymous", + "True" +] BRANDING = [ NSF_BRANDING, TACC_BRANDING, UTEXAS_BRANDING ] ######################## -# LOGOS. +# LOGOS -LCCF_LOGO = [ +LOGO = [ "lccf", "lccf-tacc/img/org_logos/lccf-white.png", "", @@ -33,4 +61,8 @@ "True" ] -LOGO = LCCF_LOGO +######################## +# PORTAL +######################## + +INCLUDES_CORE_PORTAL = False diff --git a/protx-cms/settings_custom.py b/protx-cms/settings_custom.py index b7262e81..150c39e9 100644 --- a/protx-cms/settings_custom.py +++ b/protx-cms/settings_custom.py @@ -2,6 +2,9 @@ # TACC WMA CMS SITE: # *.PROTX.TACC.UTEXAS.EDU +# FAQ: Some _VARIABLES are duplicated from settings.py (but prefixed with "_") +# because current infrastructure lacks ability to reference default values + ######################## # DJANGO CMS SETTINGS ######################## @@ -17,8 +20,11 @@ ) ######################## -# BRANDING. +# BRANDING & LOGOS +######################## + ######################## +# BRANDING COOKS_BRANDING = [ "cooks", @@ -31,11 +37,32 @@ "True" ] -CUSTOM_BRANDING = [COOKS_BRANDING, TACC_BRANDING, UTEXAS_BRANDING] +_TACC_BRANDING = [ + "tacc", + "site_cms/img/org_logos/tacc-white.png", + "branding-tacc", + "https://www.tacc.utexas.edu/", + "_blank", + "TACC Logo", + "anonymous", + "True" +] + +_UTEXAS_BRANDING = [ + "utexas", + "site_cms/img/org_logos/utaustin-white.png", + "branding-utaustin", + "https://www.utexas.edu/", + "_blank", + "University of Texas at Austin Logo", + "anonymous", + "True" +] + +CUSTOM_BRANDING = [ COOKS_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING ] ######################## -# LOGOS. -######################## +# LOGOS LOGO = [ "protx", diff --git a/tapis-project-org/settings_custom.py b/tapis-project-org/settings_custom.py index e405126a..0f256479 100644 --- a/tapis-project-org/settings_custom.py +++ b/tapis-project-org/settings_custom.py @@ -1,4 +1,9 @@ -# … +# CUSTOM SETTINGS VALUES. +# TACC WMA CMS SITE: +# *.TAPIS-PROJECT.ORG + +# FAQ: Some _VARIABLES are duplicated from settings.py (but prefixed with "_") +# because current infrastructure lacks ability to reference default values ######################## # GOOGLE ANALYTICS @@ -14,13 +19,13 @@ # … ######################## -# BRANDING. +# BRANDING # … UHAWAII_BRANDING = [ "uhawaii", - "site_cms/img/org_logos/hawaii-header-trimmed.png", + "tapis-project-org/img/org_logos/hawaii-header-trimmed.png", "branding-uhawaii", "https://www.hawaii.edu/", "_blank", @@ -29,12 +34,45 @@ "True" ] -BRANDING = [ NSF_BRANDING, TACC_BRANDING, UTEXAS_BRANDING, UHAWAII_BRANDING ] +_NSF_BRANDING = [ + "nsf", + "site_cms/img/org_logos/nsf-white.png", + "branding-nsf", + "https://www.nsf.gov/", + "_blank", + "NSF Logo", + "anonymous", + "True" +] + +_TACC_BRANDING = [ + "tacc", + "site_cms/img/org_logos/tacc-white.png", + "branding-tacc", + "https://www.tacc.utexas.edu/", + "_blank", + "TACC Logo", + "anonymous", + "True" +] + +_UTEXAS_BRANDING = [ + "utexas", + "site_cms/img/org_logos/utaustin-white.png", + "branding-utaustin", + "https://www.utexas.edu/", + "_blank", + "University of Texas at Austin Logo", + "anonymous", + "True" +] + +BRANDING = [ _NSF_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING, UHAWAII_BRANDING ] ######################## -# LOGOS. +# LOGOS -TAPIS_LOGO = [ +LOGO = [ "tapis", "tapis-project-org/img/org_logos/tapis-logo-navbar.png", "", @@ -45,4 +83,8 @@ "True" ] -LOGO = TAPIS_LOGO +######################## +# PORTAL +######################## + +INCLUDES_CORE_PORTAL = False diff --git a/tapis-project-org/static/tapis-project-org/css/src/placeholder.css b/tapis-project-org/static/tapis-project-org/css/src/placeholder.css new file mode 100644 index 00000000..36e7a39e --- /dev/null +++ b/tapis-project-org/static/tapis-project-org/css/src/placeholder.css @@ -0,0 +1 @@ +/* FAQ: This exists because CSS build process still assumes custom styles */ From fd2c1af05cb60793f3d0932c2d0b0c7b5ae318f1 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 17 Sep 2021 17:08:14 -0500 Subject: [PATCH 26/32] FP-1194: FP, 3Dem, SciVis, Texascale: Fix settings --- frontera-cms/settings_custom.py | 79 +++++++++++++++--------------- neuronex-cms/settings_custom.py | 70 +++++++++++++++----------- sciviscolor-cms/settings_custom.py | 24 ++++----- texascale-org/settings_custom.py | 26 ++++------ 4 files changed, 100 insertions(+), 99 deletions(-) diff --git a/frontera-cms/settings_custom.py b/frontera-cms/settings_custom.py index ce80f8b0..0e64a877 100644 --- a/frontera-cms/settings_custom.py +++ b/frontera-cms/settings_custom.py @@ -1,18 +1,14 @@ -######################## -# DJANGO SETTINGS -######################## - -# … +# CUSTOM SETTINGS VALUES. +# TACC WMA CMS SITE: +# *.FRONTERA-PORTAL.TACC.UTEXAS.EDU -LDAP_ENABLED = True - -# … +# FAQ: Some _VARIABLES are duplicated from settings.py (but prefixed with "_") +# because current infrastructure lacks ability to reference default values ######################## # DJANGO CMS SETTINGS ######################## -# … CMS_TEMPLATES = ( ('frontera-cms/templates/fullwidth.html', 'Fullwidth'), ('fullwidth.html', 'DEPRECATED Fullwidth'), @@ -26,40 +22,52 @@ ('guides/portal_technology.html', 'Guide: Portal Technology Stack') ) -######################## -# GOOGLE ANALYTICS -######################## - -GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-13" -GOOGLE_ANALYTICS_PRELOAD = True - -# … - ######################## # BRANDING & LOGOS ######################## -# … - ######################## -# BRANDING. - -# … +# BRANDING + +_NSF_BRANDING = [ + "nsf", + "site_cms/img/org_logos/nsf-white.png", + "branding-nsf", + "https://www.nsf.gov/", + "_blank", + "NSF Logo", + "anonymous", + "True" +] -TACC_BRANDING = [ - # … - "frontera-cms/img/org_logos/tacc-white.png", - # … +_FRONTERA_TACC_BRANDING = [ + "tacc", + "frontera-cms/img/org_logos/tacc-white.png", # TACC/Core-CMS#283 & #284 + "branding-tacc", + "https://www.tacc.utexas.edu/", + "_blank", + "TACC Logo", + "anonymous", + "True" ] -# … +_UTEXAS_BRANDING = [ + "utexas", + "site_cms/img/org_logos/utaustin-white.png", + "branding-utaustin", + "https://www.utexas.edu/", + "_blank", + "University of Texas at Austin Logo", + "anonymous", + "True" +] -BRANDING = [ NSF_BRANDING, TACC_BRANDING, UTEXAS_BRANDING ] +BRANDING = [ _NSF_BRANDING, _FRONTERA_TACC_BRANDING, _UTEXAS_BRANDING ] ######################## -# LOGOS. +# LOGOS -FRONTERA_LOGO = [ +LOGO = [ "frontera", "frontera-cms/img/org_logos/frontera-white-solo.png", "", @@ -69,12 +77,3 @@ "anonymous", "True" ] - -LOGO = FRONTERA_LOGO -# … - -######################## -# PORTAL -######################## - -INCLUDES_CORE_PORTAL = True diff --git a/neuronex-cms/settings_custom.py b/neuronex-cms/settings_custom.py index 9930eb23..606fb559 100644 --- a/neuronex-cms/settings_custom.py +++ b/neuronex-cms/settings_custom.py @@ -1,13 +1,9 @@ +## CUSTOM SETTINGS VALUES. +# TACC WMA CMS SITE: +# 3DEM[...] -# Until this custom configuration is automatically applied, to use it one must copy the content of it and append it to `cms-site-template:/taccsite_cms/secrets.py` - -# EXAMPLE CONFIGURATION - -######################## -# DJANGO SETTINGS -######################## - -LDAP_ENABLED = True +# FAQ: Some _VARIABLES are duplicated from settings.py (but prefixed with "_") +# because current infrastructure lacks ability to reference default values ######################## # DJANGO CMS SETTINGS @@ -23,26 +19,52 @@ ('guides/portal_technology.html', 'Guide: Portal Technology Stack') ) -######################## -# GOOGLE ANALYTICS -######################## - -GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-1" -GOOGLE_ANALYTICS_PRELOAD = True - ######################## # BRANDING & LOGOS ######################## ######################## -# BRANDING. +# BRANDING + +_NSF_BRANDING = [ + "nsf", + "site_cms/img/org_logos/nsf-white.png", + "branding-nsf", + "https://www.nsf.gov/", + "_blank", + "NSF Logo", + "anonymous", + "True" +] -BRANDING = [NSF_BRANDING, TACC_BRANDING, UTEXAS_BRANDING] +_FRONTERA_TACC_BRANDING = [ + "tacc", + "site_cms/img/org_logos/tacc-white.png", + "branding-tacc", + "https://www.tacc.utexas.edu/", + "_blank", + "TACC Logo", + "anonymous", + "True" +] + +_UTEXAS_BRANDING = [ + "utexas", + "site_cms/img/org_logos/utaustin-white.png", + "branding-utaustin", + "https://www.utexas.edu/", + "_blank", + "University of Texas at Austin Logo", + "anonymous", + "True" +] + +BRANDING = [ _NSF_BRANDING, _FRONTERA_TACC_BRANDING, _UTEXAS_BRANDING ] ######################## -# LOGOS. +# LOGOS -PORTAL_LOGO = [ +LOGO = [ "portal", "neuronex-cms/img/org_logos/logo.3dem.png", "", @@ -53,17 +75,9 @@ "True" ] -LOGO = PORTAL_LOGO - ######################## # FAVICON FAVICON = { "img_file_src": "neuronex-cms/img/org_logos/favicon.ico" } - -######################## -# PORTAL -######################## - -INCLUDES_CORE_PORTAL = True diff --git a/sciviscolor-cms/settings_custom.py b/sciviscolor-cms/settings_custom.py index cb655bcb..2ed53abf 100644 --- a/sciviscolor-cms/settings_custom.py +++ b/sciviscolor-cms/settings_custom.py @@ -1,25 +1,15 @@ -# … - - -######################## -# GOOGLE ANALYTICS -######################## - -GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-##" -GOOGLE_ANALYTICS_PRELOAD = True - -# … +## CUSTOM SETTINGS VALUES. +# TACC WMA CMS SITE: +# SCIVISCOLOR.ORG ######################## # BRANDING & LOGOS ######################## -# … - ######################## # LOGOS. -SCIVISCOLOR_LOGO = [ +LOGO = [ "sciviscolor", "sciviscolor-cms/img/org_logos/sciviscolor-logo-white.png", "", @@ -30,4 +20,8 @@ "True" ] -LOGO = SCIVISCOLOR_LOGO +######################## +# PORTAL +######################## + +INCLUDES_CORE_PORTAL = False diff --git a/texascale-org/settings_custom.py b/texascale-org/settings_custom.py index 3c029420..6bbbed6a 100644 --- a/texascale-org/settings_custom.py +++ b/texascale-org/settings_custom.py @@ -1,12 +1,11 @@ -import os - -# … +## CUSTOM SETTINGS VALUES. +# TACC WMA CMS SITE: +# SCIVISCOLOR.ORG ######################## # DJANGO CMS SETTINGS ######################## -# … CMS_TEMPLATES = ( ('texascale-org/templates/fullwidth.html', 'Fullwidth'), ('texascale-org/templates/category.html', 'Category'), @@ -17,23 +16,14 @@ ('texascale-org/templates/article.image-map.html', 'Article (Image Map)'), ) -######################## -# GOOGLE ANALYTICS -######################## - -GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-18" -GOOGLE_ANALYTICS_PRELOAD = True - ######################## # BRANDING & LOGOS ######################## -# … - ######################## -# LOGOS. +# LOGOS -TEXASCALE_LOGO = [ +LOGO = [ "texascale", "texascale-org/img/org_logos/texascale-wordmark.png", "", @@ -44,4 +34,8 @@ "True" ] -LOGO = TEXASCALE_LOGO +######################## +# PORTAL +######################## + +INCLUDES_CORE_PORTAL = False From 591d6faa66bc3a967d9abe3cc16b8b1909fd39b1 Mon Sep 17 00:00:00 2001 From: John Gentle Date: Fri, 17 Sep 2021 17:12:30 -0500 Subject: [PATCH 27/32] Update settings_custom.py Testing a TUP DEV CMS bugfix solution. --- tup-cms/settings_custom.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tup-cms/settings_custom.py b/tup-cms/settings_custom.py index 6a31f77c..4800d17c 100644 --- a/tup-cms/settings_custom.py +++ b/tup-cms/settings_custom.py @@ -29,3 +29,19 @@ "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 From c192e55694f85d1e364f8d375aededeb7359c8d4 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 17 Sep 2021 17:42:08 -0500 Subject: [PATCH 28/32] Quick: Formatting consistency tweak --- tup-cms/settings_custom.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tup-cms/settings_custom.py b/tup-cms/settings_custom.py index 6a31f77c..f1b2e59d 100644 --- a/tup-cms/settings_custom.py +++ b/tup-cms/settings_custom.py @@ -16,9 +16,12 @@ ) ######################## -# LOGOS. +# BRANDING & LOGOS ######################## +######################## +# LOGOS + LOGO = [ "tup", "tup-cms/img/org_logos/tacc-logo.svg", From b04a77417b124618abac1b71beaf3936ade554f9 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 20 Sep 2021 13:38:56 -0500 Subject: [PATCH 29/32] FP-1213: Add UTRC (with FP-1194 setup) For UTRC for main (as of this date) see: - PR #79 - branch `task/FP-1213-utrc-setup` --- utrc-cms/__init__.py | 0 utrc-cms/settings_custom.py | 61 ++++++++++++++++++ utrc-cms/static/README.md | 20 ++++++ utrc-cms/static/utrc-cms/README.md | 5 ++ .../static/utrc-cms/css/src/migrate.v1_v2.css | 3 + .../static/utrc-cms/img/org_logos/favicon.ico | Bin 0 -> 15406 bytes .../utrc-cms/img/org_logos/tacc-white.png | Bin 0 -> 2375 bytes utrc-cms/templates/assets_custom.html | 4 ++ utrc-cms/templates/fullwidth.html | 6 ++ utrc-cms/templates/snippets/README.md | 1 + utrc-cms/templates/standard.html | 6 ++ 11 files changed, 106 insertions(+) create mode 100755 utrc-cms/__init__.py create mode 100644 utrc-cms/settings_custom.py create mode 100644 utrc-cms/static/README.md create mode 100644 utrc-cms/static/utrc-cms/README.md create mode 100644 utrc-cms/static/utrc-cms/css/src/migrate.v1_v2.css create mode 100644 utrc-cms/static/utrc-cms/img/org_logos/favicon.ico create mode 100644 utrc-cms/static/utrc-cms/img/org_logos/tacc-white.png create mode 100644 utrc-cms/templates/assets_custom.html create mode 100644 utrc-cms/templates/fullwidth.html create mode 100644 utrc-cms/templates/snippets/README.md create mode 100644 utrc-cms/templates/standard.html diff --git a/utrc-cms/__init__.py b/utrc-cms/__init__.py new file mode 100755 index 00000000..e69de29b diff --git a/utrc-cms/settings_custom.py b/utrc-cms/settings_custom.py new file mode 100644 index 00000000..5e48cc5b --- /dev/null +++ b/utrc-cms/settings_custom.py @@ -0,0 +1,61 @@ +# CUSTOM SETTINGS VALUES. +# TACC WMA CMS SITE: +# *.UTRC.TACC.UTEXAS.EDU + +# FAQ: Some _VARIABLES are duplicated from settings.py (but prefixed with "_") +# because current infrastructure lacks ability to reference default values + +######################## +# DJANGO CMS SETTINGS +######################## + +CMS_TEMPLATES = ( + ('utrc-cms/templates/standard.html', 'Standard'), + ('utrc-cms/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 & LOGOS +######################## + +######################## +# BRANDING + +_UTEXAS_BRANDING = [ + "utexas", + "site_cms/img/org_logos/utaustin-white.png", + "branding-utaustin", + "https://www.utexas.edu/", + "_blank", + "University of Texas at Austin Logo", + "anonymous", + "True" +] + +BRANDING = [ _UTEXAS_BRANDING ] + +######################## +# LOGOS + +LOGO = [ + "portal", + "utrc-cms/img/org_logos/tacc-white.png", + "", + "/", + "_self", + "TACC Logo", + "anonymous", + "True" +] + +######################## +# FAVICON + +_FAVICON = { + "img_file_src": "utrc-cms/img/org_logos/favicon.ico" +} diff --git a/utrc-cms/static/README.md b/utrc-cms/static/README.md new file mode 100644 index 00000000..96ef8cae --- /dev/null +++ b/utrc-cms/static/README.md @@ -0,0 +1,20 @@ +# TACC CMS Per-Site Resources - Example - Static Files + +All static files specific to this CMS project __must__ be placed here _within_ a directory whose name matches _the parent directory of this directory_. Failure to do so will make them unavailable via [Core CMS][core-cms-repo]. + +See [Core `static/README.md`](/taccsite_cms/static/README.md). + + +[core-cms-repo]: https://gitlab.tacc.utexas.edu/wma-cms/cms-site-template + + +## Clarification + +Where `cms-project-a` and `cms-project-b` are unique CMS projects with custom resources: + +- `cms-site-resources:/cms-project-a/static/cms-project-a/…` +- `cms-site-resources:/cms-project-b/static/cms-project-b/…` + +The redundancy is intentional. The high-level instance isolates per-project resources. The low-level instance [namespaces the custom static files and templates][djangocms-custom-resources]. + +[djangocms-custom-resources]: https://docs.djangoproject.com/en/2.2/intro/tutorial06/#customize-your-app-s-look-and-feel diff --git a/utrc-cms/static/utrc-cms/README.md b/utrc-cms/static/utrc-cms/README.md new file mode 100644 index 00000000..77e7df42 --- /dev/null +++ b/utrc-cms/static/utrc-cms/README.md @@ -0,0 +1,5 @@ +# TACC CMS Per-Site Resources - Example - Static Files (Namespaced) + +The directory structure here __should__ mirror that of `/taccsite_cms/static/site_cms` in the [Core CMS][core-cms-repo]. This simplifies the effort of developing and maintaining multiple custom websites. + +[core-cms-repo]: https://gitlab.tacc.utexas.edu/wma-cms/cms-site-template diff --git a/utrc-cms/static/utrc-cms/css/src/migrate.v1_v2.css b/utrc-cms/static/utrc-cms/css/src/migrate.v1_v2.css new file mode 100644 index 00000000..0d46c5ab --- /dev/null +++ b/utrc-cms/static/utrc-cms/css/src/migrate.v1_v2.css @@ -0,0 +1,3 @@ +/* DO NOT ADD STYLES HERE; ONLY IMPORT OTHER STYLESHEETS */ + +@import url("../../../../../_shared/static/css/src/migrate.v1_v2.css"); diff --git a/utrc-cms/static/utrc-cms/img/org_logos/favicon.ico b/utrc-cms/static/utrc-cms/img/org_logos/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..c6289ad0c3337ad1c51c7ca6e47015feab3f745c GIT binary patch literal 15406 zcmeHO2Y6LQ7M_4@ttcq&t|j;(;(`d01W;T+MTEt*tU(df5Ynahp3sYeiX?$RfKYUi zPy(1BxP&I)2L_Q9g3>|>B%up|glYcMo{R`o z(@^e>2vYyyqwAKoCtV>4@mIHm2dPAi{a<7wB~Bmo0bc^g+Tsa*K>Y#jYn{S4$CXJK z0|#KIdH}0=BMjjq8>lBslWAxzj)svdNe;3;i$e4vVtXry*`YjKCHoI76TkBgFl zuRJ6%&)g(y7sgBX=kAm#z1zyPLBaCH$Gv3m>yOA+^FEN|*pAY_?Vp9Pz;*G1$Y=Gq zsK$OWXLOjBZ)M6@U49tV46r>VWn`#uTteShZ0F`8xXd0NA{l^B85Js12mC`m zn-HTP%AMHnH9aQw&Bv+3>~QG7)Q2lwyJ*+2Ud$ioo;E<6^ppp}5SBmMGvG7b#SxCN zE_@)FcI6Te`rufg~0uK;EyVGTT< zmb3$`A!9jL9?&iFLGlDY1RrC&)>JopLO(Q6Jp$OQQq#552V}@1PIq{K@74#;$9+ZH z#1o{B5qC*Ebbdeu?!x(M9B5t$eN5c}+28aP zPEYZ`AKPJ_NwkHVF|@t>w0*t&uyKW?&l)AsPv2m!X?@$=FKbid<@9Qqbt_*&yhD0~1jQTuT96vz!$G!Cz;QCVb|9gw9n*X76YjL}YkF?$qR&tm%k$N)Z&wwAH)vVQJn(SIXtR~WXv@jYDhBV0{3$ zB6)=QZs0Ua?oT%Rn=|@{_G~W(?~4A8^~)q_P&>%GT0ZLff`&<(HdHcZTh6;CP207? za!x&A^p!-PbHQ=8^xuE>7TsnGH!-FK=Ik5YKC)wdZOaCJ`x3I}L;qWicAlj(7f#Wz zmNq{*vUjI`UzsvadbO-7pMTg@`v&W@@u9)BBz@*6ZGSwMub44Hveu-UI9ARXFAG2E zto1tp-RuMXt$6e|68&gN!azxzIz;;s>BskeS(Z`l#DKquyyC zsgwK2S92%G>dz(te-G)_+{VX%=hL2TwBOSI#&!xa>C^x88elsoiI9*e8?BUr6 z>%+(3;j$Ne@cVQUaXC_OuO&1}ntC zW*i0mr}4fYc9w}J3Gs{ev?0V(ssU*wXNb$PEezo>fZKIoI*Haugyj@`MtrUM6LC;-lRVfEAlWhKJ9L8>ZzI0m#% zmqOQu&aYO|=6X^`ki*YcvLNo>5V~Fr+~pBVxB^-$LmQ|jzTh7^4}p#Id%$~J@zAC~ zGpe*QU~RY&`VIq*vt?*6CEF8X84&@hucvWN%1qh8e?f)uZk;Rea2med)suMuOeFZf zP|>`b^uY`4xVt+tbPiBKfIDKsx@)s#JPv!sN$fYzLk5@YQZVuh(ESqVzWjXEO}W9> zuaIF)rv?hyUgtmfY&7)l&AGN@e{_@A66T)ylOE2vf48A}h`v$+Y+3W>7Jl;Bsjhm^ zR)#p9XS~R3mbc85@w*g6M(z!L$VHRGLL;C0Iee1QKl zbUqyX`^7L$6{tS<0nYN`UDJUde8q2%kU(`m>Ibev{&N{Sh=v`3|6lF-@AJ}qxLXk} z+t)6Uo!_L(*PnkZW8Q11??~8>9sOQ_FjmYQ24my%$45!mX18fQF_xS>tb?pU9)U67 ze@^TsJ)XZy_YHmHQAtN!eICXSwB{z57nu;zR5qq1Bj2!A)-RqaAK=}HNgK4uGuHbT zQ4TWNjFR^#evC(pt`)%9C$1=HpJv z!#b})e7qYn=+zo>{9rcv^JPN#GddU31#+!fFj==Th8&B049D|6%BkarBzs$?j$`v4 z%lairI{r+)3?5nHUc^ZFL8@&V>x<(D%H>OiI=&r+ybs%0GRB>E=x6EEx_U7@>}L)s z|HwW`OB~|R$Nrq%-^r=G!-$tx)BVgJoj-dDarZ9fc*eXh6`q%!o6_}t8^ZDF+U!;t z9TI^1Fcuk&cC0!4CUMB^GFL%ej_6R!8=fBwu#9XB^|SZR2|fArIpW!u+Z$j{q1 z6w}3qrPJl&`Lp^Cjy-;7@8JDMtosfz!GpWD%IW+g#c&(&Cy(VI*VVb0Tw8VipAkOhnH%Nc?roZGUnlcx(6=qYKXdvH@iY6mwuQ+*x=;J3Z5!+E@K1Y5 z{j{&-9@wRGHN3ZF;Njh^-2FdF{^7l7v&dxhxhkRii&*;|_N|imFF3j%{70K~4czYV zU--)z7EzX*?C+%D=mG8D2HvZbh42A0&t{A*EBAp1V9^VC)ER`)vKDabuw-p%{rn=gg?9CM(& zhe+F6o)oL!x!-JBK1<@-*VVpx$cj_1pYYjX?P|;6pLWQ)MTx~|FgLq%Q-;n}6K{9i zb(|FQoZf#N_Atc$Fb8o4|Fl8g7d)MRR0^?8JC-nVnJeqWoKAZL)HPwfAi-ha6#T{s8-MNV@ma-lzNS*3HzBi??Z82{Y2 zQz!S8t*aMkJiK#o_T+K-`TLCyb_M?(%kN#tU^zcPFI?lffAXPC82cCZb-oXJ^?GB#vEKPCHOzWT;n_S)NSyAdDjcyCZ9nnx zjh)$3p7q}c^L}fJ>nilW1m$242W!6O_^8L@jo>qb1 zGS3a*O#ELw8^QuqOBd{vsu{7mD#!(Pfo{qy9|^wC(O%xIt*U}amwBR6319`{-Uk_` z!lrUidY#WE4m^kP%!#V6{Jr7LUD)PI-N5f2*i;|rY!RM=pzpSS=&?cS5OlB%Hr^k1 z)0#9?rT0;H`F1vr-w*r-!n_24uYP*}4piBwpTI-i@-7tbHSB?HEP~8Kn0p`$WB0&W RCU)YC*WcTI*MPkS{ty1005<>t literal 0 HcmV?d00001 diff --git a/utrc-cms/static/utrc-cms/img/org_logos/tacc-white.png b/utrc-cms/static/utrc-cms/img/org_logos/tacc-white.png new file mode 100644 index 0000000000000000000000000000000000000000..f7e56b5af93b200b99574282f3eaf13963b9f9f1 GIT binary patch literal 2375 zcmV-N3Apx&P)pavdLBkI#QsfNmZ@$#MoUI1EwO=h;Ygi7AvxJ?1ZcwE*Fv;i%S+x~oR{0SukXJdGdkaV`ddt6)O zK^rXT>yln8!t*~VX?790jg+)XQhR~Cx+HCsH0gX*teax4@04^Xrp?+S4&3#U4wj%F z9+UL$0=YFwI#y&}=Oo?dX27iI)dO9ZkH!4{TVO*>n?^}}3mi0)bQiD{xUdAz*#xvn zx-<`N{Uogi9s`Dzz%O44JR_<8yihDjBb@J&3$5;7E(`}|6{1wY{lHgB{K#W~T_MWl zUYJe5k`iMO|?-LcX{i_0wnZVu^=z=AZrsm)_5V)s8!}BFc<9q6i)#zgeB@J-tgjOIf@fd0jZ*;yz zrI0JnxB?hmAzuA}+q!%BDUGiKCIkq302u4pb}jIzXWMgT_Ed&9a)(PkWEJMwwZs=Zv-6P5r(&pbnS@e9Ce3MF%k2%sL7+O?v}!A73r-Uc)_-qK~___e(nB(gAmR zaJ$Bn!)1Z_o`aGmddOW6n7mw(LB_m5ZhIuX&m*0(T+*2Ux$}CODfBUetu77F;7r05 z-F&V>&Ea(ce9r+*X7+q+QpoHHU~z!#YYXId0{Ezz?Tg_hGiwG`=EJS0C|2Cy3)lus z1X4-6dB7im!*MAL&*(5D@3qm)p7U*NW?MaijT9yq$gMfB=GP4TIh0%C70cys;yUgR zW_H9WQwnp=R3U*-6H4AIgOU$o`%oGmfINjlPljf?SL{?tXZk|GrA zh)QKXErlCP zCE66a#b`5Qn!VzDsT(pp&s;M*0X!WeV?>NO3@I{qmSU|}k+{8GE>cN1g~vT|Go5B8 zNpmwrDXxyS5U44j(+4JT@RH0e(TZheostHVJIRS8fH_$@{ma0MF}M1Mnf)op@BIR3 zpDA-UC6ZfW6-&|(qAc|xryMKt6!qPh-=A_Rhg#r5Gy7+O1JbX|U6n{~N%pZ80KW$= zH?v!STZ)dai;*ePkAnXLvE5p6yw2G$T| zyz5;kJ)LMNO{TZ{V1V4d`7FmN03qD^zoSi|GlN&B`AM53tu(VAOPU32CMuTZgD&6} zGyAEetDLOV+VY_;I^5pvngfCN7z?}<_{?>{WuDD12jB>oV}^E$OX*`!wazpSK2V zW~fcOZlwFp7nAeg_CrtEN0M#|vklA_onQ1S(cZYH17scrW|-L)Nh^t#@w_XOZ`a)% znpqd{Ou)Ss>9$|6H z37rujce?w3K%O(^wt#!}1~y2#+(W4r01pSq&Q#Of9&r62V6*d^a`7@r%Yh#R$lg(m znWZE?mZYs7^47SvPX=)4lyrfl#U5?n$P^t)+8yZAosjf1NpmEPb^HA;kaUTw@$JZC zH}bd)y!uFbB~aFz&S#w_sou#LE@^_KnX1jn%L^a1$rC~}yPAc0B z`aR&mGWE-Uh}M-I^K5@}QKBNDaIjfZeQT5B^bD0xQ!C|j*m%NCh2$y&d2&m-1%5ZQLN8+%GvDNPj`C=^WiTGKWd}R*?=l+nFiVQNTFWyIS9gA}G{mSGbRb6+rkwqBAyq&}?Rp + diff --git a/utrc-cms/templates/fullwidth.html b/utrc-cms/templates/fullwidth.html new file mode 100644 index 00000000..e6ac9f1b --- /dev/null +++ b/utrc-cms/templates/fullwidth.html @@ -0,0 +1,6 @@ +{% extends "fullwidth.html" %} +{% load cms_tags %} + +{% block assets_custom %} + {% include "./assets_custom.html" %} +{% endblock assets_custom %} diff --git a/utrc-cms/templates/snippets/README.md b/utrc-cms/templates/snippets/README.md new file mode 100644 index 00000000..bab2d79b --- /dev/null +++ b/utrc-cms/templates/snippets/README.md @@ -0,0 +1 @@ +See [Core `templates/snippets/README.md`](/taccsite_cms/templates/snippets/README.md). diff --git a/utrc-cms/templates/standard.html b/utrc-cms/templates/standard.html new file mode 100644 index 00000000..fa3b3303 --- /dev/null +++ b/utrc-cms/templates/standard.html @@ -0,0 +1,6 @@ +{% extends "standard.html" %} +{% load cms_tags %} + +{% block assets_custom %} + {% include "./assets_custom.html" %} +{% endblock assets_custom %} From 32f234aa16053e5cf3a4ef853127aded50cbd7e8 Mon Sep 17 00:00:00 2001 From: John Gentle Date: Mon, 20 Sep 2021 15:48:02 -0500 Subject: [PATCH 30/32] Update settings_custom.py We added the fix in the base of Core-CMS in PR: https://github.com/TACC/Core-CMS/pull/344 --- tup-cms/settings_custom.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/tup-cms/settings_custom.py b/tup-cms/settings_custom.py index b04ac8a0..f1b2e59d 100644 --- a/tup-cms/settings_custom.py +++ b/tup-cms/settings_custom.py @@ -32,19 +32,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 From 002487f31a582de31e6364db662e04d11b793693 Mon Sep 17 00:00:00 2001 From: John Gentle Date: Mon, 20 Sep 2021 21:54:51 -0500 Subject: [PATCH 31/32] Update settings_custom.py Just use `BRANDING` for variable. --- protx-cms/settings_custom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protx-cms/settings_custom.py b/protx-cms/settings_custom.py index 150c39e9..6493d17f 100644 --- a/protx-cms/settings_custom.py +++ b/protx-cms/settings_custom.py @@ -59,7 +59,7 @@ "True" ] -CUSTOM_BRANDING = [ COOKS_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING ] +BRANDING = [ COOKS_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING ] ######################## # LOGOS From ca0cf9448214662f0cdde8c44a9f0e21d7c64cd4 Mon Sep 17 00:00:00 2001 From: John Gentle Date: Mon, 20 Sep 2021 22:16:12 -0500 Subject: [PATCH 32/32] Tweaking some formatting and layout inconsistencies and fixing a few typos in the custom settings. --- example-cms/settings_custom.py | 1 - frontera-cms/settings_custom.py | 8 ++------ lccf-tacc/settings_custom.py | 14 +++++++++++++- neuronex-cms/settings_custom.py | 7 +++---- protx-cms/settings_custom.py | 6 ++---- sciviscolor-cms/settings_custom.py | 3 ++- tapis-project-org/settings_custom.py | 29 +++++++++++++++++----------- texascale-org/settings_custom.py | 3 ++- tup-cms/settings_custom.py | 3 ++- utrc-cms/settings_custom.py | 9 ++++----- 10 files changed, 48 insertions(+), 35 deletions(-) diff --git a/example-cms/settings_custom.py b/example-cms/settings_custom.py index ec7fb186..19b08d35 100644 --- 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 index 0e64a877..eec4feb3 100644 --- a/frontera-cms/settings_custom.py +++ b/frontera-cms/settings_custom.py @@ -12,9 +12,7 @@ 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'), @@ -22,12 +20,9 @@ ('guides/portal_technology.html', 'Guide: Portal Technology Stack') ) -######################## -# BRANDING & LOGOS -######################## - ######################## # BRANDING +######################## _NSF_BRANDING = [ "nsf", @@ -66,6 +61,7 @@ ######################## # LOGOS +######################## LOGO = [ "frontera", diff --git a/lccf-tacc/settings_custom.py b/lccf-tacc/settings_custom.py index 1d9c21c5..5f7fe04c 100644 --- 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 index 606fb559..1d7b6f52 100644 --- 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 index 6493d17f..943a4e6e 100644 --- a/protx-cms/settings_custom.py +++ b/protx-cms/settings_custom.py @@ -19,12 +19,9 @@ ('guides/portal_technology.html', 'Guide: Portal Technology Stack') ) -######################## -# BRANDING & LOGOS -######################## - ######################## # BRANDING +######################## COOKS_BRANDING = [ "cooks", @@ -63,6 +60,7 @@ ######################## # LOGOS +######################## LOGO = [ "protx", diff --git a/sciviscolor-cms/settings_custom.py b/sciviscolor-cms/settings_custom.py index 2ed53abf..2919fb5a 100644 --- 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 index 0f256479..3b7fabfe 100644 --- 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 +# DJANGO CMS SETTINGS ######################## -GOOGLE_ANALYTICS_PROPERTY_ID = "UA-125525035-17" -GOOGLE_ANALYTICS_PRELOAD = True - -######################## -# BRANDING & LOGOS -######################## - -# … +# 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" \ No newline at end of file diff --git a/texascale-org/settings_custom.py b/texascale-org/settings_custom.py index 6bbbed6a..3c5d1555 100644 --- a/texascale-org/settings_custom.py +++ b/texascale-org/settings_custom.py @@ -17,11 +17,12 @@ ) ######################## -# BRANDING & LOGOS +# BRANDING ######################## ######################## # LOGOS +######################## LOGO = [ "texascale", diff --git a/tup-cms/settings_custom.py b/tup-cms/settings_custom.py index f1b2e59d..e8a02a88 100644 --- a/tup-cms/settings_custom.py +++ b/tup-cms/settings_custom.py @@ -16,11 +16,12 @@ ) ######################## -# BRANDING & LOGOS +# BRANDING ######################## ######################## # LOGOS +######################## LOGO = [ "tup", diff --git a/utrc-cms/settings_custom.py b/utrc-cms/settings_custom.py index 5e48cc5b..86213441 100644 --- a/utrc-cms/settings_custom.py +++ b/utrc-cms/settings_custom.py @@ -19,12 +19,9 @@ ('guides/portal_technology.html', 'Guide: Portal Technology Stack') ) -######################## -# BRANDING & LOGOS -######################## - ######################## # BRANDING +######################## _UTEXAS_BRANDING = [ "utexas", @@ -41,6 +38,7 @@ ######################## # LOGOS +######################## LOGO = [ "portal", @@ -55,7 +53,8 @@ ######################## # FAVICON +######################## -_FAVICON = { +FAVICON = { "img_file_src": "utrc-cms/img/org_logos/favicon.ico" }