Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: cmd-79 rename tacc cms settings #265

Merged
merged 17 commits into from
Jul 3, 2024
Merged

refactor: cmd-79 rename tacc cms settings #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
abfe50a
docs: cmd-79/tv3-181 LOGO FAVICON TACC_ → PORTAL_…
wesleyboar Jan 31, 2024
576fb16
feat: cmd-79/tv3-181 LOGO FAVICON TACC_ → PORTAL_…
wesleyboar Jan 31, 2024
07c5c0a
test: cmd-79/tv3-181 LOGO FAVICON TACC_ → PORTAL_…
wesleyboar Jan 31, 2024
803f4aa
feat: cmd-79/tv3-181 FAVICON → PORTAL_FAVICON
wesleyboar Jan 31, 2024
f892d90
feat!: cmd-79/tv3-181 new v4.7 cand. CMS images
wesleyboar Feb 6, 2024
106c7ef
style: consistent settings headers
wesleyboar Feb 12, 2024
2b37c61
fix: rename INCLUDES_ and SEARCH_ settings
wesleyboar Jun 28, 2024
e5ba860
refactor: …_MANAGES_AUTH → …_IS_TACC_CORE_PORTAL
wesleyboar Jun 28, 2024
490d359
Merge branch 'main' into feat/cmd-79-support-new-core-cms-settings-pr…
wesleyboar Jun 28, 2024
643c5f0
feat: update CMS images
wesleyboar Jun 28, 2024
0e01199
feat: update CMS images to v4.12.0-beta.1
wesleyboar Jun 28, 2024
009e8cd
fix: update CMS images to v4.12.0-beta.2
wesleyboar Jun 28, 2024
774dcaf
fix(ecep): update CMS image to v4.12.0-beta.4
wesleyboar Jul 3, 2024
3c954cf
fix(ecep): update CMS image to v4.12.0-beta.5
wesleyboar Jul 3, 2024
2d6bdc9
Merge branch 'main' into feat/cmd-79-support-new-core-cms-settings-pr…
wesleyboar Jul 3, 2024
4b26a7d
fix: update CMS image to v4.12.0
wesleyboar Jul 3, 2024
697829b
Merge branch 'feat/cmd-79-support-new-core-cms-settings-prefix' of gi…
wesleyboar Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions a2cps_cms/Dockerfile
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions apcd-cms/src/taccsite_custom/apcd_cms/templates/assets_custom.html
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions tapisproject_cms/src/taccsite_cms/templates/assets_custom.html
View file
Open in desktop
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