Skip to content

Commit

Permalink
refactor: cmd-79 rename tacc cms settings (#265)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
wesleyboar authored Jul 3, 2024
1 parent d44f77a commit 6f6f2ac
Show file tree
Hide file tree
Showing 13 changed files with 20 additions and 26 deletions.
3 changes: 1 addition & 2 deletions a2cps_cms/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# TACC/Core-CMS#v4.5.0
FROM taccwma/core-cms:5473db7
FROM taccwma/core-cms:v4.12.0

WORKDIR /code

Expand Down
3 changes: 1 addition & 2 deletions apcd-cms/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# TACC/Core-CMS#v4.5.0
FROM taccwma/core-cms:5473db7
FROM taccwma/core-cms:v4.12.0

WORKDIR /code

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}


Expand Down
3 changes: 1 addition & 2 deletions demdata_cms/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/develop-project.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions docs/port-project.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -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

Expand Down
3 changes: 1 addition & 2 deletions ecep_cms/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions ecep_cms/src/taccsite_cms/templates/assets_custom.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}


Expand Down
3 changes: 1 addition & 2 deletions example_cms/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# v4.4.0
FROM taccwma/core-cms:42b4a97
FROM taccwma/core-cms:v4.12.0

WORKDIR /code

Expand Down
3 changes: 1 addition & 2 deletions matcssi_cms/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# TACC/Core-CMS#v4.5.0
FROM taccwma/core-cms:5473db7
FROM taccwma/core-cms:v4.12.0

WORKDIR /code

Expand Down
2 changes: 1 addition & 1 deletion netsage_cms/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM taccwma/core-cms:v4.8.0
FROM taccwma/core-cms:v4.12.0

WORKDIR /code

Expand Down
2 changes: 1 addition & 1 deletion tapisproject_cms/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM taccwma/core-cms:v4.8.0
FROM taccwma/core-cms:v4.12.0

WORKDIR /code

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}


Expand Down

0 comments on commit 6f6f2ac

Please sign in to comment.