diff --git a/a2cps_cms/Dockerfile b/a2cps_cms/Dockerfile index b7634cce..a2053321 100644 --- a/a2cps_cms/Dockerfile +++ b/a2cps_cms/Dockerfile @@ -1,5 +1,4 @@ -# TACC/Core-CMS#v4.5.0 -FROM taccwma/core-cms:5473db7 +FROM taccwma/core-cms:v4.12.0 WORKDIR /code diff --git a/apcd-cms/Dockerfile b/apcd-cms/Dockerfile index 6cbbfc8d..2d1d6b33 100644 --- a/apcd-cms/Dockerfile +++ b/apcd-cms/Dockerfile @@ -1,5 +1,4 @@ -# TACC/Core-CMS#v4.5.0 -FROM taccwma/core-cms:5473db7 +FROM taccwma/core-cms:v4.12.0 WORKDIR /code diff --git a/apcd-cms/src/taccsite_custom/apcd_cms/templates/assets_custom.html b/apcd-cms/src/taccsite_custom/apcd_cms/templates/assets_custom.html index c60cbc26..830f1b70 100644 --- a/apcd-cms/src/taccsite_custom/apcd_cms/templates/assets_custom.html +++ b/apcd-cms/src/taccsite_custom/apcd_cms/templates/assets_custom.html @@ -10,8 +10,8 @@ {% load static %} -{% with settings.FAVICON as favicon %} - +{% with settings.PORTAL_FAVICON as favicon %} + {% endwith %} diff --git a/demdata_cms/Dockerfile b/demdata_cms/Dockerfile index 6cb853e0..a2053321 100644 --- a/demdata_cms/Dockerfile +++ b/demdata_cms/Dockerfile @@ -1,5 +1,4 @@ -# TACC/Core-CMS#782 (v4.4.0+) -FROM taccwma/core-cms:c82d56f +FROM taccwma/core-cms:v4.12.0 WORKDIR /code diff --git a/docs/develop-project.md b/docs/develop-project.md index 561d2bf6..e3a81072 100644 --- a/docs/develop-project.md +++ b/docs/develop-project.md @@ -48,7 +48,7 @@ Read [Django CMS User Guide] for CMS user instructions. 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`. +The settings usually edited are `PORTAL_LOGO` and `..._BRANDING`. ## Create a Custom App diff --git a/docs/port-project.md b/docs/port-project.md index b7b8e46e..6d9f1ebe 100644 --- a/docs/port-project.md +++ b/docs/port-project.md @@ -55,10 +55,10 @@ Follow [Core CMS: Upgrade Project: from v3.N to v3.12](https://github.com/TACC/C #### Has a [Core Portal] -**If** the custom project has a [Core Portal] i.e. settings has `FAVICON` and: +**If** the custom project has a [Core Portal] i.e. settings has `PORTAL_FAVICON` and: -- **either** settings has `INCLUDES_CORE_PORTAL = True` -- **or** settings does **not** have `INCLUDES_CORE_PORTAL` +- **either** settings has `PORTAL_IS_TACC_CORE_PORTAL = True` +- **or** settings does **not** have `PORTAL_IS_TACC_CORE_PORTAL` Then: @@ -68,8 +68,8 @@ Then: 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` | + | `False` | `/static/` **+** the `img_file_src` of `PORTAL_FAVICON` | + | `True` | the `img_file_src` of `PORTAL_FAVICON` | #### Expects CSS Build Step diff --git a/ecep_cms/Dockerfile b/ecep_cms/Dockerfile index 59096a3d..a2053321 100644 --- a/ecep_cms/Dockerfile +++ b/ecep_cms/Dockerfile @@ -1,5 +1,4 @@ -# TACC/Core-CMS#743 (v4.2.0 candidate) -FROM taccwma/core-cms:7cfefff +FROM taccwma/core-cms:v4.12.0 WORKDIR /code diff --git a/ecep_cms/src/taccsite_cms/templates/assets_custom.html b/ecep_cms/src/taccsite_cms/templates/assets_custom.html index 32eebb1a..dffdb1e5 100644 --- a/ecep_cms/src/taccsite_cms/templates/assets_custom.html +++ b/ecep_cms/src/taccsite_cms/templates/assets_custom.html @@ -10,8 +10,8 @@ {% load static %} -{% with settings.FAVICON as favicon %} - +{% with settings.PORTAL_FAVICON as favicon %} + {% endwith %} diff --git a/example_cms/Dockerfile b/example_cms/Dockerfile index 8cbc0924..2d1d6b33 100644 --- a/example_cms/Dockerfile +++ b/example_cms/Dockerfile @@ -1,5 +1,4 @@ -# v4.4.0 -FROM taccwma/core-cms:42b4a97 +FROM taccwma/core-cms:v4.12.0 WORKDIR /code diff --git a/matcssi_cms/Dockerfile b/matcssi_cms/Dockerfile index b7634cce..a2053321 100644 --- a/matcssi_cms/Dockerfile +++ b/matcssi_cms/Dockerfile @@ -1,5 +1,4 @@ -# TACC/Core-CMS#v4.5.0 -FROM taccwma/core-cms:5473db7 +FROM taccwma/core-cms:v4.12.0 WORKDIR /code diff --git a/netsage_cms/Dockerfile b/netsage_cms/Dockerfile index 3dabbebc..2d1d6b33 100644 --- a/netsage_cms/Dockerfile +++ b/netsage_cms/Dockerfile @@ -1,4 +1,4 @@ -FROM taccwma/core-cms:v4.8.0 +FROM taccwma/core-cms:v4.12.0 WORKDIR /code diff --git a/tapisproject_cms/Dockerfile b/tapisproject_cms/Dockerfile index ff9ebfe2..a2053321 100644 --- a/tapisproject_cms/Dockerfile +++ b/tapisproject_cms/Dockerfile @@ -1,4 +1,4 @@ -FROM taccwma/core-cms:v4.8.0 +FROM taccwma/core-cms:v4.12.0 WORKDIR /code diff --git a/tapisproject_cms/src/taccsite_cms/templates/assets_custom.html b/tapisproject_cms/src/taccsite_cms/templates/assets_custom.html index 2ccaacb6..ee27c0b4 100644 --- a/tapisproject_cms/src/taccsite_cms/templates/assets_custom.html +++ b/tapisproject_cms/src/taccsite_cms/templates/assets_custom.html @@ -10,8 +10,8 @@ {% load static %} -{% with settings.FAVICON as favicon %} - +{% with settings.PORTAL_FAVICON as favicon %} + {% endwith %}