From b9cf5defb099624e7cdfb47980b4f648a073f4dd Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 28 Aug 2023 23:56:08 -0500 Subject: [PATCH 1/5] chore: remove favicon, forget template inheritance Core-CMS will load the favicon in assets_core. Core-CMS-Custom is not supposed to overwrite assets_core. https://github.com/TACC/Core-CMS/pull/710/commits/4086324 --- apcd-cms/Dockerfile | 4 ++-- .../apcd-cms/templates/assets_custom.html | 19 ------------------- tapisproject_cms/Dockerfile | 4 ++-- .../taccsite_cms/templates/assets_custom.html | 17 ----------------- 4 files changed, 4 insertions(+), 40 deletions(-) diff --git a/apcd-cms/Dockerfile b/apcd-cms/Dockerfile index bfaf254f..d593fe6e 100644 --- a/apcd-cms/Dockerfile +++ b/apcd-cms/Dockerfile @@ -1,5 +1,5 @@ -# TACC/Core-CMS#v3.11.6 -FROM taccwma/core-cms:c5bea4c +# TACC/Core-CMS#v3.12.0-beta.4 candidate +FROM taccwma/core-cms:4086324 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 f15a38fb..7cb99fac 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 @@ -1,24 +1,5 @@ -{# This template overwrites the original from TACC/Core-CMS #} -{# NOTE: This should extend taccsite_cms via taccsite_custom, not overwrite #} -{# FAQ: To extend, via app template inheritance, see TACC/Core-CMS#492 #} - - - -{# COPIED FROM CORE #} -{# https://github.com/TACC/Core-CMS/blob/64a72e2/taccsite_cms/templates/assets_custom.html #} - {% load staticfiles %} - -{% with settings.FAVICON as favicon %} - -{% endwith %} - - - -{# NEW CODE #} - - diff --git a/tapisproject_cms/Dockerfile b/tapisproject_cms/Dockerfile index 2adb5fc8..af0c298c 100644 --- a/tapisproject_cms/Dockerfile +++ b/tapisproject_cms/Dockerfile @@ -1,5 +1,5 @@ -# TACC/Core-CMS#v3.11.6 -FROM taccwma/core-cms:c5bea4c +# TACC/Core-CMS#v3.12.0-beta.4 candidate +FROM taccwma/core-cms:4086324 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..117ae375 100644 --- a/tapisproject_cms/src/taccsite_cms/templates/assets_custom.html +++ b/tapisproject_cms/src/taccsite_cms/templates/assets_custom.html @@ -1,22 +1,5 @@ -{# This template overwrites the original from TACC/Core-CMS #} -{# NOTE: This should extend taccsite_cms via taccsite_custom, not overwrite #} -{# FAQ: To extend, via app template inheritance, see TACC/Core-CMS#492 #} - - - -{# COPIED FROM CORE #} -{# https://github.com/TACC/Core-CMS/blob/c8844e1/taccsite_cms/templates/assets_custom.html #} - {% load static %} - -{% with settings.FAVICON as favicon %} - -{% endwith %} - - - -{# NEW CODE #} From 572e3ed2d521ab40dd74f51b764fdb0366709e19 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 29 Aug 2023 00:05:42 -0500 Subject: [PATCH 2/5] chore: delete unused template No reason to show the non-loading of a stylesheet. This template is not loaded, thus the stylesheet is not loaded. --- .../demdata_cms/templates/nav_search.raw.html | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 demdata_cms/src/taccsite_custom/demdata_cms/templates/nav_search.raw.html diff --git a/demdata_cms/src/taccsite_custom/demdata_cms/templates/nav_search.raw.html b/demdata_cms/src/taccsite_custom/demdata_cms/templates/nav_search.raw.html deleted file mode 100644 index 7c4aec3f..00000000 --- a/demdata_cms/src/taccsite_custom/demdata_cms/templates/nav_search.raw.html +++ /dev/null @@ -1,5 +0,0 @@ -{# To change tacc-search-bar styles to match theme #} -{# WARNING: File never loaded, so search bar is black even on light header #} -{# FAQ: TACC/Core-CMS-Resources sites cannot override templates #} -{# SEE: https://github.com/TACC/Core-CMS/pull/492 #} - From 54b42348c0d8059f3f797a2e469b89cf1945374e Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 1 Sep 2023 15:48:59 -0500 Subject: [PATCH 3/5] style: remove extra newline --- tapisproject_cms/src/taccsite_cms/templates/assets_custom.html | 1 - 1 file changed, 1 deletion(-) diff --git a/tapisproject_cms/src/taccsite_cms/templates/assets_custom.html b/tapisproject_cms/src/taccsite_cms/templates/assets_custom.html index 117ae375..3fe312ad 100644 --- a/tapisproject_cms/src/taccsite_cms/templates/assets_custom.html +++ b/tapisproject_cms/src/taccsite_cms/templates/assets_custom.html @@ -1,5 +1,4 @@ {% load static %} - From 90e4c5db68035596d965c3d5d155981741485070 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 1 Sep 2023 15:50:46 -0500 Subject: [PATCH 4/5] chore: remove favicon, forget template inheritance Core-CMS will load the favicon in assets_core. Core-CMS-Custom is not supposed to overwrite assets_core. https://github.com/TACC/Core-CMS/pull/710/commits/4086324 --- .../taccsite_cms/templates/assets_custom.html | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/ecep_cms/src/taccsite_cms/templates/assets_custom.html b/ecep_cms/src/taccsite_cms/templates/assets_custom.html index 32eebb1a..9be21415 100644 --- a/ecep_cms/src/taccsite_cms/templates/assets_custom.html +++ b/ecep_cms/src/taccsite_cms/templates/assets_custom.html @@ -1,22 +1,4 @@ -{# This template overwrites the original from TACC/Core-CMS #} -{# NOTE: This should extend taccsite_cms via taccsite_custom, not overwrite #} -{# FAQ: To extend, via app template inheritance, see TACC/Core-CMS#492 #} - - - -{# COPIED FROM CORE #} -{# https://github.com/TACC/Core-CMS/blob/c8844e1/taccsite_cms/templates/assets_custom.html #} - {% load static %} - -{% with settings.FAVICON as favicon %} - -{% endwith %} - - - -{# NEW CODE #} - From ec0aa9e20dd97c8718293408a6c5fa1891524682 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 1 Sep 2023 15:51:42 -0500 Subject: [PATCH 5/5] fix(ecep): needs core-cms v3.12 beta 4 --- ecep_cms/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ecep_cms/Dockerfile b/ecep_cms/Dockerfile index c68513f4..af0c298c 100644 --- a/ecep_cms/Dockerfile +++ b/ecep_cms/Dockerfile @@ -1,5 +1,5 @@ -# TACC/Core-CMS#v3.12.0-beta.3 -FROM taccwma/core-cms:aba079b +# TACC/Core-CMS#v3.12.0-beta.4 candidate +FROM taccwma/core-cms:4086324 WORKDIR /code