refactor: cmd-79 rename tacc cms settings (#265)

* docs: cmd-79/tv3-181 LOGO FAVICON TACC_ → PORTAL_… * feat: cmd-79/tv3-181 LOGO FAVICON TACC_ → PORTAL_… * test: cmd-79/tv3-181 LOGO FAVICON TACC_ → PORTAL_… ⚠️ Wait for WP-132 to finish, so CMS upgrade is unlikely to break. * feat: cmd-79/tv3-181 FAVICON → PORTAL_FAVICON * feat!: cmd-79/tv3-181 new v4.7 cand. CMS images ⚠️ This competes with WP-132 CMS upgrade! * style: consistent settings headers * fix: rename INCLUDES_ and SEARCH_ settings * refactor: …_MANAGES_AUTH → …_IS_TACC_CORE_PORTAL * feat: update CMS images * feat: update CMS images to v4.12.0-beta.1 * fix: update CMS images to v4.12.0-beta.2 * fix(ecep): update CMS image to v4.12.0-beta.4 News layout was broekn. This should fix it (and update it slightly). * fix(ecep): update CMS image to v4.12.0-beta.5 I hope this package.json version change busts suspected CSS cache. * fix: update CMS image to v4.12.0
TACC · Jul 3, 2024 · 6f6f2ac · 6f6f2ac
1 parent d44f77a
commit 6f6f2ac
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 26 deletions.
diff --git 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
@@ -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
@@ -10,8 +10,8 @@
 {% load static %}
 
 <!-- Custom Site Assets: Favicon. -->
-{% with settings.FAVICON as favicon %}
-<link rel="icon" href="{% static favicon.img_file_src %}" type="image/x-icon" />
+{% with settings.PORTAL_FAVICON as favicon %}
+<link rel="icon" href="{% if favicon.is_remote %}{{ favicon.img_file_src }}{% else %}{% static favicon.img_file_src %}{% endif %}" type="image/x-icon" />
 {% endwith %}
 
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -10,8 +10,8 @@
 {% load static %}
 
 <!-- Custom Site Assets: Favicon. -->
-{% with settings.FAVICON as favicon %}
-<link rel="icon" href="{% static favicon.img_file_src %}" type="image/x-icon" />
+{% with settings.PORTAL_FAVICON as favicon %}
+<link rel="icon" href="{% if favicon.is_remote %}{{ favicon.img_file_src }}{% else %}{% static favicon.img_file_src %}{% endif %}" type="image/x-icon" />
 {% endwith %}
 
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -10,8 +10,8 @@
 {% load static %}
 
 <!-- Custom Site Assets: Favicon. -->
-{% with settings.FAVICON as favicon %}
-<link rel="icon" href="{% static favicon.img_file_src %}" type="image/x-icon" />
+{% with settings.PORTAL_FAVICON as favicon %}
+<link rel="icon" href="{% if favicon.is_remote %}{{ favicon.img_file_src }}{% else %}{% static favicon.img_file_src %}{% endif %}" type="image/x-icon" />
 {% endwith %}