From 1d971611ff7db52675625395d97d2d99d311dfe4 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Thu, 21 Mar 2024 17:08:04 -0500 Subject: [PATCH] feat: WI-71 remove/migrate settings_custom.py (#278) * feat: WI-71 remove/migrate settings_custom.py * feat: WI-71 restore empty taccsite_cms dirs * docs(netsage): fix inaccurate CMS tag comment * feat(ptdatax): remove build workflow no need, it just houses assets * docs: WI-71 settings_custom from Core-Portal-Deployments * ci: WI-71 ignore settings_custom --- .github/workflows/ptdatax-cms.yml | 41 ------ .gitignore | 3 +- a2cps_cms/src/taccsite_cms/README.md | 3 + a2cps_cms/src/taccsite_cms/settings_custom.py | 38 ------ apcd-cms/src/taccsite_cms/settings_custom.py | 46 ------- demdata_cms/src/taccsite_cms/README.md | 3 + .../src/taccsite_cms/settings_custom.py | 57 -------- docs/develop-project.md | 8 +- docs/port-project.md | 28 ++-- docs/upgrade-project.md | 6 +- ecep_cms/src/taccsite_cms/settings_custom.py | 127 ------------------ .../src/taccsite_cms/settings_custom.py | 77 ----------- matcssi_cms/src/taccsite_cms/README.md | 3 + .../src/taccsite_cms/settings_custom.py | 32 ----- netsage_cms/Dockerfile | 2 +- netsage_cms/src/taccsite_cms/README.md | 3 + .../src/taccsite_cms/custom_app_settings.py | 3 - .../src/taccsite_cms/settings_custom.py | 77 ----------- netsage_cms/src/taccsite_cms/urls_custom.py | 3 - .../src/taccsite_cms/settings_custom.py | 88 ------------ 20 files changed, 46 insertions(+), 602 deletions(-) delete mode 100644 .github/workflows/ptdatax-cms.yml create mode 100644 a2cps_cms/src/taccsite_cms/README.md delete mode 100644 a2cps_cms/src/taccsite_cms/settings_custom.py delete mode 100644 apcd-cms/src/taccsite_cms/settings_custom.py create mode 100644 demdata_cms/src/taccsite_cms/README.md delete mode 100644 demdata_cms/src/taccsite_cms/settings_custom.py delete mode 100644 ecep_cms/src/taccsite_cms/settings_custom.py delete mode 100644 example_cms/src/taccsite_cms/settings_custom.py create mode 100644 matcssi_cms/src/taccsite_cms/README.md delete mode 100644 matcssi_cms/src/taccsite_cms/settings_custom.py create mode 100644 netsage_cms/src/taccsite_cms/README.md delete mode 100644 netsage_cms/src/taccsite_cms/custom_app_settings.py delete mode 100644 netsage_cms/src/taccsite_cms/settings_custom.py delete mode 100644 netsage_cms/src/taccsite_cms/urls_custom.py delete mode 100644 tapisproject_cms/src/taccsite_cms/settings_custom.py diff --git a/.github/workflows/ptdatax-cms.yml b/.github/workflows/ptdatax-cms.yml deleted file mode 100644 index f1f8a8b2..00000000 --- a/.github/workflows/ptdatax-cms.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: PTDataX CMS Builds -on: - workflow_dispatch: - push: - branches: [ main ] - paths: - - 'ptdatax_cms/**' - -jobs: - build_commit: - runs-on: ubuntu-latest - defaults: - run: - working-directory: ptdatax_cms - steps: - - uses: actions/checkout@v2 - - name: Get shortsha - id: vars - run: | - if [ -z "$EVENT_SHA" ]; then SHORT_SHA=${GITHUB_SHA::8}; else SHORT_SHA=${EVENT_SHA::8}; fi - echo ::set-output name=sha_short::${SHORT_SHA} - env: - EVENT_SHA: ${{ github.event.client_payload.sha }} - - name: Print shortsha - run: | - echo $SHORTSHA - env: - SHORTSHA: ${{ steps.vars.outputs.sha_short }} - - uses: docker/setup-buildx-action@v2 - name: Setup Docker Builds - - uses: docker/login-action@v2 - name: Log in to docker - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - uses: docker/build-push-action@v3 - name: Build & push commit tagged Docker image - with: - context: ptdatax_cms - push: true - tags: taccwma/ptdatax-cms:${{ steps.vars.outputs.sha_short }} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 0bf6a439..cf0b3e10 100644 --- a/.gitignore +++ b/.gitignore @@ -5,8 +5,9 @@ .DS_Store # ignore secrets & settings +## so dev learns those should not be committed in this repo *secrets.py -*settings_secret.py +*settings_custom.py *settings_local.py # no node modules diff --git a/a2cps_cms/src/taccsite_cms/README.md b/a2cps_cms/src/taccsite_cms/README.md new file mode 100644 index 00000000..efec6909 --- /dev/null +++ b/a2cps_cms/src/taccsite_cms/README.md @@ -0,0 +1,3 @@ +# `taccsite_cms/` + +Add files to overwrite those in this directory within [Core-CMS](https://github.com/TACC/Core-CMS). diff --git a/a2cps_cms/src/taccsite_cms/settings_custom.py b/a2cps_cms/src/taccsite_cms/settings_custom.py deleted file mode 100644 index ad65510d..00000000 --- a/a2cps_cms/src/taccsite_cms/settings_custom.py +++ /dev/null @@ -1,38 +0,0 @@ -# CUSTOM SETTINGS VALUES. -# TACC WMA CMS SITE: -# *.A2CPS.TACC.UTEXAS.EDU - -######################## -# DJANGO_CMS -######################## - -CMS_TEMPLATES = ( - ('a2cps_cms/templates/standard.html', 'Standard'), - ('a2cps_cms/templates/fullwidth.html', 'Full Width'), - ('a2cps-cms/templates/standard.html', 'DEPRECATED Standard'), - ('a2cps-cms/templates/fullwidth.html', 'DEPRECATED 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: LOGO & FAVICON -######################## - -LOGO = [ - "a2cps", - "a2cps_cms/img/org_logos/a2cps.png", - "", - "/", - "_self", - "A2CPS: Acute to Chronic Pain Signatures", - "anonymous", - "True" -] - -FAVICON = { - "img_file_src": "a2cps_cms/img/org_logos/favicon.ico" -} diff --git a/apcd-cms/src/taccsite_cms/settings_custom.py b/apcd-cms/src/taccsite_cms/settings_custom.py deleted file mode 100644 index 9ccb2082..00000000 --- a/apcd-cms/src/taccsite_cms/settings_custom.py +++ /dev/null @@ -1,46 +0,0 @@ -# CUSTOM SETTINGS VALUES. -# TACC WMA CMS SITE: -# *.APCD.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 -######################## - -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: LOGO & FAVICON -######################## - -LOGO = [ - "tacc", - "apcd-cms/img/org_logos/apcd-white.png", - "", - "/", - "_self", - "APCD: All-Payer Claims Database", - "anonymous", - "True" -] - -FAVICON = { - "img_file_src": "apcd-cms/img/favicons/favicon.ico" -} diff --git a/demdata_cms/src/taccsite_cms/README.md b/demdata_cms/src/taccsite_cms/README.md new file mode 100644 index 00000000..efec6909 --- /dev/null +++ b/demdata_cms/src/taccsite_cms/README.md @@ -0,0 +1,3 @@ +# `taccsite_cms/` + +Add files to overwrite those in this directory within [Core-CMS](https://github.com/TACC/Core-CMS). diff --git a/demdata_cms/src/taccsite_cms/settings_custom.py b/demdata_cms/src/taccsite_cms/settings_custom.py deleted file mode 100644 index cce3d602..00000000 --- a/demdata_cms/src/taccsite_cms/settings_custom.py +++ /dev/null @@ -1,57 +0,0 @@ -# CUSTOM SETTINGS VALUES. -# TACC WMA CMS SITE: -# *.DEMOCTRATIZING-SITE.TACC.UTEXAS.EDU - -######################## -# 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)'), - ('demdata-cms/templates/fullwidth.html', 'DEPRECATED Full Width (with CSS from TUP)'), -) - -######################## -# TACC: BRANDING -######################## - -BRANDING = False - -######################## -# TACC: LOGO & FAVICON -######################## - -LOGO = [ - "demdata", - "demdata_cms/img/org_logos/demdata.svg", - "", - "/", - "_self", - "Democratizing Data Logo", - "anonymous", - "True" -] - -FAVICON = { - "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 -######################## - -# Only use integer numbers (not "v1", not "0.11.0") -TACC_CORE_STYLES_VERSION = 2 diff --git a/docs/develop-project.md b/docs/develop-project.md index 1a1746ef..561d2bf6 100644 --- a/docs/develop-project.md +++ b/docs/develop-project.md @@ -41,9 +41,12 @@ Read [Django CMS User Guide] for CMS user instructions. ## Customize Project -Edit `./src/taccsite_cms/settings_custom.py`. +| Purpose | File to Update | +| - | - | +| Test | `/custom_project_dir/src/taccsite_cms/settings_custom.py` | +| Commit | [TACC/Core-Portal-Deployments][Core Portal Deployments]:`/project_dir/camino/settings_custom.py` | -To know what settings are available, see [Core-CMS `settings.py`](https://github.com/TACC/Core-CMS/blob/main/taccsite_cms/settings.py). +To know what settings are available, see [TACC/Core-CMS:`/taccsite_cms/settings.py`](https://github.com/TACC/Core-CMS/blob/main/taccsite_cms/settings.py). The settings usually edited are `LOGO` and `..._BRANDING`. @@ -72,6 +75,7 @@ If there is a change that should be made in all CMS projects, consider whether i [Core CMS]: https://github.com/TACC/Core-CMS [Core Portal]: https://github.com/TACC/Core-Portal [Core Styles]: https://github.com/TACC/Core-Styles +[Core Portal Deployments]: https://github.com/TACC/Core-Portal-Deployments [TACC UI Patterns]: https://tacc.utexas.edu/static/ui/ diff --git a/docs/port-project.md b/docs/port-project.md index 12c24c7c..b7b8e46e 100644 --- a/docs/port-project.md +++ b/docs/port-project.md @@ -26,19 +26,27 @@ Follow steps in [Create a New Project](./develop-project.md#create-a-new-project
Reminders -1. From [Core CMS Resources] `/taccsite_custom/custom_project_dir`.\ - To `/custom_project_dir/src/taccsite_custom/custom_project_dir`. +1. | Move | Content | + | - | - | + | From | [Core CMS Resources] `/taccsite_custom/custom_project_dir`. | + | To | `/custom_project_dir/src/taccsite_custom/custom_project_dir` | -2. From `/taccsite_custom/custom_project_dir/settings_custom.py`.\ - To `/custom_project_dir/src/taccsite_cms/settings_custom.py`. +2. | Copy | Settings | + | - | - | + | From | [TACC/Core-Portal-Deployments][Core Portal Deployments]:`/project_dir/camino/settings_custom.py`. | + | To | `/custom_project_dir/src/taccsite_cms/settings_custom.py`.[^1] | -3. The name `custom_project_dir` **must** use underscores, **not** dashes. +3. | Use | Not | + | - | - | + | `custom_project_dir` | `custom-project-dir` | > **Important** > A valid Python application uses underscores.
+[^1]: The `cms.settings_custom.py` is committed in [Core Portal Deployments]. A `settings_custom.py` in [Core CMS Custom] is `.gitignore`'d. + ### Migrate Project to [Core CMS] v3.12 Follow [Core CMS: Upgrade Project: from v3.N to v3.12](https://github.com/TACC/Core-CMS/blob/main/docs/upgrade-project.md#from-v3n-to-v312). @@ -55,9 +63,13 @@ Follow [Core CMS: Upgrade Project: from v3.N to v3.12](https://github.com/TACC/C Then: 1. You must edit [Core Portal Deployments]. -2. Edit `custom_project_dir/camino/___.settings_custom.py` (not `___.cms.…`). -3. Change `_PORTAL_ICON_FILENAME` to:\ - `/static/` + ( the `img_file_src` of `FAVICON` ) +2. Edit Portal settings for the appropriate server.\ + E.g. `project_dir/camino/___.settings_custom.py` where `___` is `dev`, `pprd`, `prod` as appropriate (**not** `cms`). +3. Update `_PORTAL_ICON_FILENAME`: + | if `is_remote` is | then set value to | + | - | - | + | `False` | `/static/` **+** the `img_file_src` of `FAVICON` | + | `True` | the `img_file_src` of `FAVICON` | #### Expects CSS Build Step diff --git a/docs/upgrade-project.md b/docs/upgrade-project.md index 4de14a02..a47b10f3 100644 --- a/docs/upgrade-project.md +++ b/docs/upgrade-project.md @@ -83,9 +83,13 @@ Simplify image paths. | to | `taccsite_custom/static/custom_project_dir/img/...` | 2. Rename **all** references to the previous image paths e.g. - - in `settings_custom.py` + - `/custom_project_dir/taccsite_cms/settings_custom.py` [^1] + - [Core Portal Deployments]:`/project_dir/camino/cms.settings_custom.py` [^1] +[^1]: The `cms.settings_custom.py` is committed in [Core Portal Deployments]. A `settings_custom.py` in [Core CMS Custom] is `.gitignore`'d. [Core CMS]: https://github.com/TACC/Core-CMS +[Core CMS Custom]: https://github.com/TACC/Core-CMS-Custom +[Core Portal Deployments]: https://github.com/TACC/Core-Portal-Deployments diff --git a/ecep_cms/src/taccsite_cms/settings_custom.py b/ecep_cms/src/taccsite_cms/settings_custom.py deleted file mode 100644 index 261c7ae8..00000000 --- a/ecep_cms/src/taccsite_cms/settings_custom.py +++ /dev/null @@ -1,127 +0,0 @@ -# CUSTOM SETTINGS VALUES. -# TACC WMA CMS SITE: -# *.ECEP.TACC.UTEXAS.EDU - -######################## -# DJANGO_CMS -######################## - -CMS_TEMPLATES = ( - ('standard.html', 'Standard'), - ('fullwidth.html', 'Full Width'), -) - -######################## -# 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 -######################## - -# 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", - "https://www.nsf.gov/", - "_blank", - "NSF Logo", - "anonymous", - "True" -] - -TACC_BRANDING = [ - "tacc", - "site_cms/img/tacc-white.png", - "branding-tacc", - "https://www.tacc.utexas.edu/", - "_blank", - "TACC Logo", - "anonymous", - "True" -] - -UTEXAS_BRANDING = [ - "utexas", - "site_cms/img/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 ] - -######################## -# TACC: LOGO & FAVICON -######################## - -LOGO = [ - "ecep", - "ecep_cms/img/ecep-white-no_words.svg", - "", - "/", - "_self", - "ECEP Logo", - "anonymous", - "True" -] - -FAVICON = { - "img_file_src": "ecep_cms/img/favicon.ico" -} - -######################## -# TACC: PORTAL -######################## - -INCLUDES_CORE_PORTAL = False -INCLUDES_PORTAL_NAV = False -INCLUDES_SEARCH_BAR = True - -######################## -# DJANGOCMS_BLOG -######################## - -# REQ: Assumes various "NEWS / BLOG" are installed via `custom_app_settings.py` - -# Paths for alternate templates that user can choose for blog-specific plugin -# - Devs can customize core templates at `templates/djangocms_blog/`. -# - Users can choose alt. templates from `templates/djangocms_blog/plugins/*`. -# - Devs can customize alt. templates at `templates/djangocms_blog/plugins/*`. -BLOG_PLUGIN_TEMPLATE_FOLDERS = ( - ('plugins', 'Default'), - # ('plugins/alternate', 'Alternate'), -) - -# Change default values for the auto-setup of one `BlogConfig` -# SEE: https://github.com/nephila/djangocms-blog/issues/629 -BLOG_AUTO_SETUP = False # Set to False after setup (to minimize server overhead) -BLOG_AUTO_HOME_TITLE ='Home' -BLOG_AUTO_BLOG_TITLE = 'News' -BLOG_AUTO_APP_TITLE = 'News' -BLOG_AUTO_NAMESPACE = 'News' - -# Miscellaneous settings -BLOG_ENABLE_COMMENTS = False - -######################## -# DJANGOCMS_BLOG: TACC -######################## - -TACC_BLOG_SHOW_CATEGORIES = False -TACC_BLOG_SHOW_TAGS = False - -######################## -# TACC: CORE STYLES -######################## - -TACC_CORE_STYLES_VERSION = 0 diff --git a/example_cms/src/taccsite_cms/settings_custom.py b/example_cms/src/taccsite_cms/settings_custom.py deleted file mode 100644 index 2f424b2c..00000000 --- a/example_cms/src/taccsite_cms/settings_custom.py +++ /dev/null @@ -1,77 +0,0 @@ -# CUSTOM SETTINGS VALUES. -# TACC WMA CMS SITE: -# *.PROJECT_DOMAIN.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 -######################## - -# CMS_TEMPLATES = ( -# ('standard.html', 'Standard'), -# ('fullwidth.html', 'Full Width'), - -# ('guide.html', 'Guide'), -# ('guides/portal_technology.html', 'Guide: Portal Technology Stack'), -# } - -######################## -# TACC: BRANDING -######################## - -# from taccsite_cms.settings import TACC_BRANDING, UTEXAS_BRANDING, NSF_BRANDING -# -# _CUSTOM_BRANDING = [ -# "example", -# "example_cms/img/some-logo.png", -# "", -# "https://example.com", -# "_blank", -# "Example Logo", -# "anonymous", -# "True" -# ] - -# BRANDING = [ TACC_BRANDING, UTEXAS_BRANDING, NSF_BRANDING, _CUSTOM_BRANDING ] - -######################## -# TACC: LOGO & FAVICON -######################## - -LOGO = [ - "example", - "example_cms/img/portal.png", - "", - "/", - "_self", - "Placeholder Logo for CMS/Portal", - "anonymous", - "True" -] - -FAVICON = { - "img_file_src": "example_cms/img/favicon.ico" -} - -######################## -# TACC: PORTAL -######################## - -# INCLUDES_CORE_PORTAL = False -# INCLUDES_PORTAL_NAV = False -# INCLUDES_SEARCH_BAR = False - -######################## -# TACC: CORE STYLES -######################## - -TACC_CORE_STYLES_VERSION = 2 diff --git a/matcssi_cms/src/taccsite_cms/README.md b/matcssi_cms/src/taccsite_cms/README.md new file mode 100644 index 00000000..efec6909 --- /dev/null +++ b/matcssi_cms/src/taccsite_cms/README.md @@ -0,0 +1,3 @@ +# `taccsite_cms/` + +Add files to overwrite those in this directory within [Core-CMS](https://github.com/TACC/Core-CMS). diff --git a/matcssi_cms/src/taccsite_cms/settings_custom.py b/matcssi_cms/src/taccsite_cms/settings_custom.py deleted file mode 100644 index dce03a14..00000000 --- a/matcssi_cms/src/taccsite_cms/settings_custom.py +++ /dev/null @@ -1,32 +0,0 @@ -# CUSTOM SETTINGS VALUES. -# TACC WMA CMS SITE: -# *.MISE.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 = "..." - -######################## -# TACC: LOGO & FAVICON -######################## - -LOGO = [ - "matcssi", - "matcssi_cms/img/org_logos/matcssi.png", - "", - "/", - "_self", - "MATCSSI Logo for CMS/Portal", - "anonymous", - "True" -] - -FAVICON = { - "img_file_src": "matcssi_cms/img/favicons/favicon.ico" -} diff --git a/netsage_cms/Dockerfile b/netsage_cms/Dockerfile index 83dc28da..2042bddf 100644 --- a/netsage_cms/Dockerfile +++ b/netsage_cms/Dockerfile @@ -1,4 +1,4 @@ -# v3.9.3 +# v3.12.0-beta.3 FROM taccwma/core-cms:aba079b WORKDIR /code diff --git a/netsage_cms/src/taccsite_cms/README.md b/netsage_cms/src/taccsite_cms/README.md new file mode 100644 index 00000000..efec6909 --- /dev/null +++ b/netsage_cms/src/taccsite_cms/README.md @@ -0,0 +1,3 @@ +# `taccsite_cms/` + +Add files to overwrite those in this directory within [Core-CMS](https://github.com/TACC/Core-CMS). diff --git a/netsage_cms/src/taccsite_cms/custom_app_settings.py b/netsage_cms/src/taccsite_cms/custom_app_settings.py deleted file mode 100644 index a1a905ca..00000000 --- a/netsage_cms/src/taccsite_cms/custom_app_settings.py +++ /dev/null @@ -1,3 +0,0 @@ -CUSTOM_APPS = [] -CUSTOM_MIDDLEWARE = [] -STATICFILES_DIRS = () diff --git a/netsage_cms/src/taccsite_cms/settings_custom.py b/netsage_cms/src/taccsite_cms/settings_custom.py deleted file mode 100644 index a086cd39..00000000 --- a/netsage_cms/src/taccsite_cms/settings_custom.py +++ /dev/null @@ -1,77 +0,0 @@ -# CUSTOM SETTINGS VALUES. -# TACC WMA (SAD) CMS SITE: -# *.NETSAGE.TACC.UTEXAS.EDU - -######################## -# TACC: 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", - "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 ] - -######################## -# TACC: LOGO & FAVICON -######################## - -LOGO = [ - "netsage", - "netsage_cms/img/org_logos/netsage_logo_color.png", - "", - "/", - "_self", - "Netsage Logo", - "anonymous", - "True" -] - -FAVICON = { - "img_file_src": "netsage_cms/img/favicons/netsage_icon.ico" -} - -######################## -# TACC: PORTAL -######################## - -INCLUDES_CORE_PORTAL = False -INCLUDES_PORTAL_NAV = False -INCLUDES_SEARCH_BAR = False - -######################## -# TACC: CORE STYLES -######################## - -TACC_CORE_STYLES_VERSION = 0 diff --git a/netsage_cms/src/taccsite_cms/urls_custom.py b/netsage_cms/src/taccsite_cms/urls_custom.py deleted file mode 100644 index 03805aef..00000000 --- a/netsage_cms/src/taccsite_cms/urls_custom.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.urls import path, include - -custom_urls = [] diff --git a/tapisproject_cms/src/taccsite_cms/settings_custom.py b/tapisproject_cms/src/taccsite_cms/settings_custom.py deleted file mode 100644 index 7ac9db08..00000000 --- a/tapisproject_cms/src/taccsite_cms/settings_custom.py +++ /dev/null @@ -1,88 +0,0 @@ -# CUSTOM SETTINGS VALUES. -# TACC WMA (SAD) CMS SITE: -# *.TAPISPROJECT.TACC.UTEXAS.EDU - -######################## -# DJANGO: AUTH -######################## - -AUTH_LDAP_SERVER_URI = "ldap://cluster.ldap.tacc.utexas.edu" - -######################## -# TACC: 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", - "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" -] - -UHAWAII_BRANDING = [ - "uhawaii", - "tapisproject_cms/img/org_logos/hawaii-header-trimmed.png", - "branding-uhawaii", - "https://www.hawaii.edu/", - "_blank", - "University of Hawaii Logo", - "anonymous", - "True" -] - -BRANDING = [ NSF_BRANDING, TACC_BRANDING, UTEXAS_BRANDING, UHAWAII_BRANDING ] - -######################## -# TACC: LOGO & FAVICON -######################## - -LOGO = [ - "tapis", - "tapisproject_cms/img/org_logos/tapis-logo-navbar.png", - "", - "/", - "_self", - "Tapis Logo", - "anonymous", - "True" -] - -FAVICON = { - "img_file_src": "site_cms/img/favicons/favicon.ico" -} - -######################## -# TACC: PORTAL -######################## - -INCLUDES_CORE_PORTAL = False -INCLUDES_PORTAL_NAV = False -INCLUDES_SEARCH_BAR = False