diff --git a/a2cps_cms/src/taccsite_cms/settings_custom.py b/a2cps_cms/src/taccsite_cms/settings_custom.py index fa49985b..ad65510d 100644 --- a/a2cps_cms/src/taccsite_cms/settings_custom.py +++ b/a2cps_cms/src/taccsite_cms/settings_custom.py @@ -2,9 +2,8 @@ # TACC WMA CMS SITE: # *.A2CPS.TACC.UTEXAS.EDU - ######################## -# DJANGO CMS SETTINGS +# DJANGO_CMS ######################## CMS_TEMPLATES = ( @@ -20,7 +19,7 @@ ) ######################## -# TACC: LOGOS +# TACC: LOGO & FAVICON ######################## LOGO = [ diff --git a/apcd-cms/src/taccsite_cms/settings_custom.py b/apcd-cms/src/taccsite_cms/settings_custom.py index 92e736e6..9ccb2082 100644 --- a/apcd-cms/src/taccsite_cms/settings_custom.py +++ b/apcd-cms/src/taccsite_cms/settings_custom.py @@ -3,7 +3,7 @@ # *.APCD.TACC.UTEXAS.EDU ######################## -# DJANGO (EMAIL) +# DJANGO: EMAIL ######################## # Set on server, NOT here @@ -13,7 +13,7 @@ # DEFAULT_FROM_EMAIL = "..." ######################## -# DJANGO CMS SETTINGS +# DJANGO_CMS ######################## CMS_TEMPLATES = ( @@ -27,7 +27,7 @@ ) ######################## -# TACC: LOGOS +# TACC: LOGO & FAVICON ######################## LOGO = [ @@ -43,4 +43,4 @@ FAVICON = { "img_file_src": "apcd-cms/img/favicons/favicon.ico" -} \ No newline at end of file +} diff --git a/demdata_cms/src/taccsite_cms/settings_custom.py b/demdata_cms/src/taccsite_cms/settings_custom.py index 5ead7035..cce3d602 100644 --- a/demdata_cms/src/taccsite_cms/settings_custom.py +++ b/demdata_cms/src/taccsite_cms/settings_custom.py @@ -1,24 +1,15 @@ # CUSTOM SETTINGS VALUES. # TACC WMA CMS SITE: # *.DEMOCTRATIZING-SITE.TACC.UTEXAS.EDU -# https://democratizingdata.ai/ ######################## -# TACC: PORTAL -######################## - -# Does this CMS site have a portal (default value: True)? -INCLUDES_CORE_PORTAL = False -INCLUDES_PORTAL_NAV = False -INCLUDES_SEARCH_BAR = False - -######################## -# DJANGO CMS SETTINGS +# DJANGO_CMS ######################## CMS_TEMPLATES = ( ('standard.html', 'Standard'), ('fullwidth.html', 'Full Width'), + ('demdata_cms/templates/standard.html', 'Standard (with CSS from TUP)'), ('demdata_cms/templates/fullwidth.html', 'Full Width (with CSS from TUP)'), ('demdata-cms/templates/standard.html', 'DEPRECATED Standard (with CSS from TUP)'), @@ -29,48 +20,10 @@ # TACC: BRANDING ######################## -# LOOK INTO THIS SOLUTION. -# from taccsite_cms.settings import TACC_BRANDING, UTEXAS_BRANDING, NSF_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, NSF_BRANDING ] -BRANDING = [ TACC_BRANDING, UTEXAS_BRANDING ] # this matches prod 2022 -# BRANDING = [] # prod 2022 hides bar via snippet CSS but should also do this +BRANDING = False ######################## -# TACC: LOGOS +# TACC: LOGO & FAVICON ######################## LOGO = [ @@ -88,6 +41,14 @@ "img_file_src": "demdata_cms/img/favicons/Favicon_64x64.svg" } +######################## +# TACC: PORTAL +######################## + +INCLUDES_CORE_PORTAL = False +INCLUDES_PORTAL_NAV = False +INCLUDES_SEARCH_BAR = False + ######################## # TACC: CORE STYLES ######################## diff --git a/ecep_cms/src/taccsite_cms/custom_app_settings.py b/ecep_cms/src/taccsite_cms/custom_app_settings.py index 084ea2dc..c831a4cf 100644 --- a/ecep_cms/src/taccsite_cms/custom_app_settings.py +++ b/ecep_cms/src/taccsite_cms/custom_app_settings.py @@ -3,7 +3,7 @@ # ... ######################## - # NEWS / BLOG + # DJANGOCMS_BLOG ######################## # 'filer', # already in Core diff --git a/ecep_cms/src/taccsite_cms/settings_custom.py b/ecep_cms/src/taccsite_cms/settings_custom.py index 259ad69f..261c7ae8 100644 --- a/ecep_cms/src/taccsite_cms/settings_custom.py +++ b/ecep_cms/src/taccsite_cms/settings_custom.py @@ -2,29 +2,30 @@ # TACC WMA CMS SITE: # *.ECEP.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 +# DJANGO_CMS ######################## CMS_TEMPLATES = ( ('standard.html', 'Standard'), ('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') ) +######################## +# TACC: SEARCH +######################## + +# Support Google search instead of Portal's Elasticsearch +SEARCH_PATH = '/site-search' # cuz Portal Nginx config hijacks /search +SEARCH_QUERY_PARAM_NAME = 'q' # as Google expects + ######################## # TACC: BRANDING ######################## -_NSF_BRANDING = [ +# NOTE: Variables NSF_BRANDING, TACC_BRANDING, and UTEXAS_BRANDING are duplicated from Core-CMS cuz current infrastructure lacks ability to reference default values. + +NSF_BRANDING = [ "nsf", "site_cms/img/nsf-white.png", "branding-nsf", @@ -35,7 +36,7 @@ "True" ] -_TACC_BRANDING = [ +TACC_BRANDING = [ "tacc", "site_cms/img/tacc-white.png", "branding-tacc", @@ -46,7 +47,7 @@ "True" ] -_UTEXAS_BRANDING = [ +UTEXAS_BRANDING = [ "utexas", "site_cms/img/utaustin-white.png", "branding-utaustin", @@ -57,10 +58,10 @@ "True" ] -BRANDING = [_NSF_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING] +BRANDING = [ NSF_BRANDING, TACC_BRANDING, UTEXAS_BRANDING ] ######################## -# TACC: LOGOS +# TACC: LOGO & FAVICON ######################## LOGO = [ @@ -78,14 +79,6 @@ "img_file_src": "ecep_cms/img/favicon.ico" } -######################## -# TACC: SEARCH -######################## - -# Support Google search instead of Portal's Elasticsearch -SEARCH_PATH = '/site-search' # cuz Portal Nginx config hijacks /search -SEARCH_QUERY_PARAM_NAME = 'q' # as Google expects - ######################## # TACC: PORTAL ######################## @@ -95,15 +88,7 @@ INCLUDES_SEARCH_BAR = True ######################## -# TACC: NEWS/BLOG -######################## - -# TACC settings -TACC_BLOG_SHOW_CATEGORIES = False -TACC_BLOG_SHOW_TAGS = False - -######################## -# NEWS / BLOG +# DJANGOCMS_BLOG ######################## # REQ: Assumes various "NEWS / BLOG" are installed via `custom_app_settings.py` @@ -128,6 +113,13 @@ # Miscellaneous settings BLOG_ENABLE_COMMENTS = False +######################## +# DJANGOCMS_BLOG: TACC +######################## + +TACC_BLOG_SHOW_CATEGORIES = False +TACC_BLOG_SHOW_TAGS = False + ######################## # TACC: CORE STYLES ######################## diff --git a/example_cms/src/taccsite_cms/settings_custom.py b/example_cms/src/taccsite_cms/settings_custom.py index 9154b792..2f424b2c 100644 --- a/example_cms/src/taccsite_cms/settings_custom.py +++ b/example_cms/src/taccsite_cms/settings_custom.py @@ -3,7 +3,7 @@ # *.PROJECT_DOMAIN.TACC.UTEXAS.EDU ######################## -# DJANGO (EMAIL) +# DJANGO: EMAIL ######################## # Set on server, NOT here @@ -13,13 +13,16 @@ # DEFAULT_FROM_EMAIL = "..." ######################## -# DJANGO CMS SETTINGS +# DJANGO_CMS ######################## -CMS_TEMPLATES = ( - ('standard.html', 'Standard'), - ('fullwidth.html', 'Full Width'), -) +# CMS_TEMPLATES = ( +# ('standard.html', 'Standard'), +# ('fullwidth.html', 'Full Width'), + +# ('guide.html', 'Guide'), +# ('guides/portal_technology.html', 'Guide: Portal Technology Stack'), +# } ######################## # TACC: BRANDING @@ -41,7 +44,7 @@ # BRANDING = [ TACC_BRANDING, UTEXAS_BRANDING, NSF_BRANDING, _CUSTOM_BRANDING ] ######################## -# TACC: LOGOS +# TACC: LOGO & FAVICON ######################## LOGO = [ diff --git a/matcssi_cms/src/taccsite_cms/settings_custom.py b/matcssi_cms/src/taccsite_cms/settings_custom.py index 2126dc4b..dce03a14 100644 --- a/matcssi_cms/src/taccsite_cms/settings_custom.py +++ b/matcssi_cms/src/taccsite_cms/settings_custom.py @@ -3,7 +3,7 @@ # *.MISE.TACC.UTEXAS.EDU ######################## -# DJANGO (EMAIL) +# DJANGO: EMAIL ######################## # Set on server, NOT here @@ -13,7 +13,7 @@ # DEFAULT_FROM_EMAIL = "..." ######################## -# TACC: LOGOS +# TACC: LOGO & FAVICON ######################## LOGO = [ @@ -29,4 +29,4 @@ FAVICON = { "img_file_src": "matcssi_cms/img/favicons/favicon.ico" -} \ No newline at end of file +} diff --git a/netsage_cms/src/taccsite_cms/settings_custom.py b/netsage_cms/src/taccsite_cms/settings_custom.py index a5b0f89b..a086cd39 100644 --- a/netsage_cms/src/taccsite_cms/settings_custom.py +++ b/netsage_cms/src/taccsite_cms/settings_custom.py @@ -1,37 +1,14 @@ # CUSTOM SETTINGS VALUES. -# TACC WMA CMS SITE: +# TACC WMA (SAD) CMS SITE: # *.NETSAGE.TACC.UTEXAS.EDU -######################## -# DJANGO (EMAIL) -######################## - -# Set on server, NOT here -# https://tacc-main.atlassian.net/wiki/x/ZhVv -# EMAIL_BACKEND = "..." -# EMAIL_HOST = "..." -# DEFAULT_FROM_EMAIL = "..." - -######################## -# DJANGO CMS SETTINGS -######################## - -CMS_TEMPLATES = ( - ('standard.html', 'Standard'), - ('fullwidth.html', 'Full Width'), - - ('guide.html', 'Guide'), - ('guides/getting_started.tam.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'), -) - ######################## # TACC: BRANDING ######################## -_NSF_BRANDING = [ +# NOTE: Variables NSF_BRANDING, TACC_BRANDING, and UTEXAS_BRANDING are duplicated from Core-CMS cuz current infrastructure lacks ability to reference default values. + +NSF_BRANDING = [ "nsf", "site_cms/img/org_logos/nsf-white.png", "branding-nsf", @@ -42,7 +19,7 @@ "True" ] -_TACC_BRANDING = [ +TACC_BRANDING = [ "tacc", "site_cms/img/org_logos/tacc-white.png", "branding-tacc", @@ -53,7 +30,7 @@ "True" ] -_UTEXAS_BRANDING = [ +UTEXAS_BRANDING = [ "utexas", "site_cms/img/org_logos/utaustin-white.png", "branding-utaustin", @@ -64,13 +41,13 @@ "True" ] -BRANDING = [_NSF_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING] +BRANDING = [ NSF_BRANDING, TACC_BRANDING, UTEXAS_BRANDING ] ######################## -# TACC: LOGOS +# TACC: LOGO & FAVICON ######################## -LOGO = [ +LOGO = [ "netsage", "netsage_cms/img/org_logos/netsage_logo_color.png", "", @@ -89,7 +66,6 @@ # TACC: PORTAL ######################## -# Does this CMS site have a portal? INCLUDES_CORE_PORTAL = False INCLUDES_PORTAL_NAV = False INCLUDES_SEARCH_BAR = False diff --git a/tapisproject_cms/src/taccsite_cms/settings_custom.py b/tapisproject_cms/src/taccsite_cms/settings_custom.py index 92869456..7ac9db08 100644 --- a/tapisproject_cms/src/taccsite_cms/settings_custom.py +++ b/tapisproject_cms/src/taccsite_cms/settings_custom.py @@ -1,15 +1,20 @@ # CUSTOM SETTINGS VALUES. -# TACC WMA CMS SITE: -# *.TAPIS-PROJECT.ORG +# TACC WMA (SAD) CMS SITE: +# *.TAPISPROJECT.TACC.UTEXAS.EDU -# FAQ: Some _VARIABLES are duplicated from settings.py (but prefixed with "_") -# because current infrastructure lacks ability to reference default values +######################## +# DJANGO: AUTH +######################## + +AUTH_LDAP_SERVER_URI = "ldap://cluster.ldap.tacc.utexas.edu" ######################## # TACC: BRANDING ######################## -_NSF_BRANDING = [ +# NOTE: Variables NSF_BRANDING, TACC_BRANDING, and UTEXAS_BRANDING are duplicated from Core-CMS cuz current infrastructure lacks ability to reference default values. + +NSF_BRANDING = [ "nsf", "site_cms/img/org_logos/nsf-white.png", "branding-nsf", @@ -20,7 +25,7 @@ "True" ] -_TACC_BRANDING = [ +TACC_BRANDING = [ "tacc", "site_cms/img/org_logos/tacc-white.png", "branding-tacc", @@ -31,7 +36,7 @@ "True" ] -_UTEXAS_BRANDING = [ +UTEXAS_BRANDING = [ "utexas", "site_cms/img/org_logos/utaustin-white.png", "branding-utaustin", @@ -53,13 +58,13 @@ "True" ] -BRANDING = [ _NSF_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING, UHAWAII_BRANDING ] +BRANDING = [ NSF_BRANDING, TACC_BRANDING, UTEXAS_BRANDING, UHAWAII_BRANDING ] ######################## -# TACC: LOGOS +# TACC: LOGO & FAVICON ######################## -LOGO = [ +LOGO = [ "tapis", "tapisproject_cms/img/org_logos/tapis-logo-navbar.png", "", @@ -81,9 +86,3 @@ INCLUDES_CORE_PORTAL = False INCLUDES_PORTAL_NAV = False INCLUDES_SEARCH_BAR = False - -######################## -# TACC: GOOGLE ANALYTICS -######################## - -GOOGLE_ANALYTICS_PROPERTY_ID = "G-5EQ8Y25ZTM" diff --git a/tapisproject_cms/src/taccsite_custom/tapisproject_cms/static/tapisproject_cms/img/favicons/favicon.ico b/tapisproject_cms/src/taccsite_custom/tapisproject_cms/static/tapisproject_cms/img/favicons/favicon.ico deleted file mode 100644 index 533966ed..00000000 Binary files a/tapisproject_cms/src/taccsite_custom/tapisproject_cms/static/tapisproject_cms/img/favicons/favicon.ico and /dev/null differ