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

chore: clean up templates for TACC/Core-CMS#710 #209

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

chore: clean up templates for TACC/Core-CMS#710 #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b9cf5de
chore: remove favicon, forget template inheritance
wesleyboar Aug 29, 2023
572e3ed
chore: delete unused template
wesleyboar Aug 29, 2023
81b7159
Merge branch 'main' into enhance/clean-up-templates
wesleyboar Sep 1, 2023
54b4234
style: remove extra newline
wesleyboar Sep 1, 2023
90e4c5d
chore: remove favicon, forget template inheritance
wesleyboar Sep 1, 2023
ec0aa9e
fix(ecep): needs core-cms v3.12 beta 4
wesleyboar Sep 1, 2023
ca8f921
Merge branch 'main' into enhance/clean-up-templates
wesleyboar Sep 18, 2023
1738ef3
Merge branch 'main' into enhance/clean-up-templates
wesleyboar Nov 13, 2023
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
4 changes: 2 additions & 2 deletions apcd-cms/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
19 changes: 0 additions & 19 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
@@ -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 %}

<!-- Custom Site Assets: Favicon. -->
{% with settings.FAVICON as favicon %}
<link rel="icon" href="{% static favicon.img_file_src %}" type="image/x-icon" />
{% endwith %}



{# NEW CODE #}

<!-- TUP CMS UI Styles -->
<style>
@import url("{% static 'apcd-cms/css/site.cms.css' %}");
</style>
5 changes: 0 additions & 5 deletions demdata_cms/src/taccsite_custom/demdata_cms/templates/nav_search.raw.html
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 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
@@ -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 %}

<!-- Custom Site Assets: Favicon. -->
{% with settings.FAVICON as favicon %}
<link rel="icon" href="{% static favicon.img_file_src %}" type="image/x-icon" />
{% endwith %}



{# NEW CODE #}

<!-- To style old CMS content on new CMS -->
<link rel="stylesheet" href="{% static 'ecep_cms/css/site.css' %}">
4 changes: 2 additions & 2 deletions tapisproject_cms/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
18 changes: 0 additions & 18 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
@@ -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 %}

<!-- Custom Site Assets: Favicon. -->
{% with settings.FAVICON as favicon %}
<link rel="icon" href="{% static favicon.img_file_src %}" type="image/x-icon" />
{% endwith %}



{# NEW CODE #}

<!-- To style old CMS content on new CMS -->
<link rel="stylesheet" href="{% static 'tapisproject_cms/css/migrate.to-v3.css' %}">