Skip to content

Commit 6f6f2ac

Browse files
wesleyboarwesleyboar
authored
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
1 parent d44f77a commit 6f6f2ac

File tree

13 files changed

+20
-26
lines changed

13 files changed

+20
-26
lines changed

‎a2cps_cms/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# TACC/Core-CMS#v4.5.0
2-
FROM taccwma/core-cms:5473db7
1+
FROM taccwma/core-cms:v4.12.0
32

43
WORKDIR /code
54

‎apcd-cms/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# TACC/Core-CMS#v4.5.0
2-
FROM taccwma/core-cms:5473db7
1+
FROM taccwma/core-cms:v4.12.0
32

43
WORKDIR /code
54

‎apcd-cms/src/taccsite_custom/apcd_cms/templates/assets_custom.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
{% load static %}
1111

1212
<!-- Custom Site Assets: Favicon. -->
13-
{% with settings.FAVICON as favicon %}
14-
<link rel="icon" href="{% static favicon.img_file_src %}" type="image/x-icon" />
13+
{% with settings.PORTAL_FAVICON as favicon %}
14+
<link rel="icon" href="{% if favicon.is_remote %}{{ favicon.img_file_src }}{% else %}{% static favicon.img_file_src %}{% endif %}" type="image/x-icon" />
1515
{% endwith %}
1616

1717

‎demdata_cms/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# TACC/Core-CMS#782 (v4.4.0+)
2-
FROM taccwma/core-cms:c82d56f
1+
FROM taccwma/core-cms:v4.12.0
32

43
WORKDIR /code
54

‎docs/develop-project.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Read [Django CMS User Guide] for CMS user instructions.
4848

4949
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).
5050

51-
The settings usually edited are `LOGO` and `..._BRANDING`.
51+
The settings usually edited are `PORTAL_LOGO` and `..._BRANDING`.
5252

5353
## Create a Custom App
5454

‎docs/port-project.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ Follow [Core CMS: Upgrade Project: from v3.N to v3.12](https://github.com/TACC/C
5555

5656
#### Has a [Core Portal]
5757

58-
**If** the custom project has a [Core Portal] i.e. settings has `FAVICON` and:
58+
**If** the custom project has a [Core Portal] i.e. settings has `PORTAL_FAVICON` and:
5959

60-
- **either** settings has `INCLUDES_CORE_PORTAL = True`
61-
- **or** settings does **not** have `INCLUDES_CORE_PORTAL`
60+
- **either** settings has `PORTAL_IS_TACC_CORE_PORTAL = True`
61+
- **or** settings does **not** have `PORTAL_IS_TACC_CORE_PORTAL`
6262

6363
Then:
6464

@@ -68,8 +68,8 @@ Then:
6868
3. Update `_PORTAL_ICON_FILENAME`:
6969
| if `is_remote` is | then set value to |
7070
| - | - |
71-
| `False` | `/static/` **+** the `img_file_src` of `FAVICON` |
72-
| `True` | the `img_file_src` of `FAVICON` |
71+
| `False` | `/static/` **+** the `img_file_src` of `PORTAL_FAVICON` |
72+
| `True` | the `img_file_src` of `PORTAL_FAVICON` |
7373

7474
#### Expects CSS Build Step
7575

‎ecep_cms/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# TACC/Core-CMS#743 (v4.2.0 candidate)
2-
FROM taccwma/core-cms:7cfefff
1+
FROM taccwma/core-cms:v4.12.0
32

43
WORKDIR /code
54

‎ecep_cms/src/taccsite_cms/templates/assets_custom.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
{% load static %}
1111

1212
<!-- Custom Site Assets: Favicon. -->
13-
{% with settings.FAVICON as favicon %}
14-
<link rel="icon" href="{% static favicon.img_file_src %}" type="image/x-icon" />
13+
{% with settings.PORTAL_FAVICON as favicon %}
14+
<link rel="icon" href="{% if favicon.is_remote %}{{ favicon.img_file_src }}{% else %}{% static favicon.img_file_src %}{% endif %}" type="image/x-icon" />
1515
{% endwith %}
1616

1717

‎example_cms/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# v4.4.0
2-
FROM taccwma/core-cms:42b4a97
1+
FROM taccwma/core-cms:v4.12.0
32

43
WORKDIR /code
54

‎matcssi_cms/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# TACC/Core-CMS#v4.5.0
2-
FROM taccwma/core-cms:5473db7
1+
FROM taccwma/core-cms:v4.12.0
32

43
WORKDIR /code
54

‎netsage_cms/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM taccwma/core-cms:v4.8.0
1+
FROM taccwma/core-cms:v4.12.0
22

33
WORKDIR /code
44

‎tapisproject_cms/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM taccwma/core-cms:v4.8.0
1+
FROM taccwma/core-cms:v4.12.0
22

33
WORKDIR /code
44

‎tapisproject_cms/src/taccsite_cms/templates/assets_custom.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
{% load static %}
1111

1212
<!-- Custom Site Assets: Favicon. -->
13-
{% with settings.FAVICON as favicon %}
14-
<link rel="icon" href="{% static favicon.img_file_src %}" type="image/x-icon" />
13+
{% with settings.PORTAL_FAVICON as favicon %}
14+
<link rel="icon" href="{% if favicon.is_remote %}{{ favicon.img_file_src }}{% else %}{% static favicon.img_file_src %}{% endif %}" type="image/x-icon" />
1515
{% endwith %}
1616

1717

0 commit comments

Comments
 (0)