Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
3a1e28e
fix: inaccurate text picture template name (#967)
wesleyboar Jul 21, 2025
893a434
refactor: no_link_to_image
wesleyboar Jul 22, 2025
91cc70c
docs: simplify no_link_to_image/picture.html notes
wesleyboar Jul 22, 2025
8cbb4a9
docs: clarify no_link_to_image/picture.html notes
wesleyboar Jul 22, 2025
6d7b730
docs: djangocms_picture template indentation
wesleyboar Jul 22, 2025
7f3ec21
feat: support core-styles u-image-zoom (#968)
wesleyboar Jul 25, 2025
5ec5e02
refactor!: djangocms_picture extension (#969)
wesleyboar Jul 26, 2025
478ffb5
chore(README): new line (to get new main commit)
wesleyboar Jul 26, 2025
de1eacf
Merge branch 'main' of github.com:TACC/Core-CMS
wesleyboar Jul 26, 2025
df14ad6
refactor: u-image-zoom via core-styles (#970)
wesleyboar Jul 28, 2025
461ca3e
chore: v4.36.0
wesleyboar Jul 28, 2025
5c1886c
Merge branch 'main' of github.com:TACC/Core-CMS
wesleyboar Jul 28, 2025
34acc58
fix: u-image-zoom validation (#971)
wesleyboar Jul 28, 2025
b2993c0
fix: space under span.u-image-zoom img (#972)
wesleyboar Jul 28, 2025
86f76fb
fix: v4.36.1
wesleyboar Jul 28, 2025
9d80485
feat: snippet template to redirect external article (#973)
wesleyboar Jul 29, 2025
6913b38
chore: v4.36.2
wesleyboar Jul 29, 2025
04a54de
deps: djangocms-bootstrap4 v3 (#974)
wesleyboar Aug 4, 2025
ab22440
chore: move imports to function that uses them
wesleyboar Aug 4, 2025
4b72436
feat: let custom sites overwrite app templates (#975)
wesleyboar Aug 5, 2025
69dcb55
chore: v4.36.3
wesleyboar Aug 15, 2025
4a457ca
feat: new custom django command for devs (#728)
wesleyboar Sep 4, 2025
6661622
docs: we do not use Core-CMS-Resources
wesleyboar Sep 5, 2025
e064642
fix: allow short template paths in custom CMS apps
wesleyboar Sep 6, 2025
2bbaad0
Merge branch 'main' into fix/allow-custom-cms-apps-to-load-templates-…
wesleyboar Jul 27, 2026
d70881e
fix: bad merge conflict resolution
wesleyboar Jul 27, 2026
f229c44
fix: MORE bad merge conflict resolution
wesleyboar Jul 27, 2026
0f424e2
Merge branch 'main' into fix/allow-custom-cms-apps-to-load-templates-…
wesleyboar Jul 27, 2026
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
6 changes: 4 additions & 2 deletions taccsite_cms/settings/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -356,8 +356,10 @@ def gettext(s): return s
# FAQ: List custom directory first, so custom templates take precedence
# SEE: https://docs.djangoproject.com/en/2.2/topics/templates/#configuration
'DIRS': glob(
# XXX: Strange and from my ignorant implementation
os.path.join(BASE_DIR, 'taccsite_custom')
) + [
os.path.join(BASE_DIR, 'taccsite_custom', 'templates'),
os.path.join(BASE_DIR, 'taccsite_cms', 'templates')
],
'OPTIONS': {
Expand Down Expand Up @@ -531,9 +533,9 @@ def get_subdirs_as_module_names(path):
# Append CMS project paths as module names to INSTALLED_APPS
# FAQ: This automatically looks into `/taccsite_custom` and creates an "App" for each directory within
CUSTOM_CMS_DIR = os.path.join(BASE_DIR, 'taccsite_custom')

INSTALLED_APPS_APPEND = get_subdirs_as_module_names(CUSTOM_CMS_DIR)
INSTALLED_APPS = INSTALLED_APPS + INSTALLED_APPS_APPEND
CORE_CMS_INDEX = INSTALLED_APPS.index('taccsite_cms')
INSTALLED_APPS[CORE_CMS_INDEX:CORE_CMS_INDEX] = INSTALLED_APPS_APPEND

MIGRATION_MODULES = {}
LANGUAGE_CODE = 'en'
Expand Down
2 changes: 1 addition & 1 deletion taccsite_custom/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ A functional placeholder directory into which the original remaining custom inst
— add unique files and functionality. This directory has special logic and support in `settings.py`.

> [!NOTE]
> This directory is a vestige of archived [Core CMS Resources](https://github.com/TACC/Core-CMS-Resources/tree/151ef91f) and we may re-evaluate whether to continue to use it.
> This directory is a vestige of archived [Core CMS Resources](https://github.com/TACC/Core-CMS-Resources/tree/151ef91f).