Skip to content

fix: GH-999 CMS admin can change header logo #1142

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

Open
wesleyboar wants to merge 4 commits into
base: feat/GH-999-let-cms-admin-edit-header
Choose a base branch
from
Open

fix: GH-999 CMS admin can change header logo #1142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1218ff8
fix: load header_content_tags not header_logo_tags in picture.html
cursoragent Apr 2, 2026
83cb836
fix: correct is_picture_plugin check and is_remote detection
cursoragent Apr 2, 2026
418f9bb
fix: use site_id__isnull=True to match CMS-created static placeholders
cursoragent Apr 2, 2026
7249467
fix: use {% static_placeholder %} so header-content shows in sidebar
cursoragent Apr 3, 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
4 changes: 2 additions & 2 deletions taccsite_cms/settings/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,8 +563,8 @@ def get_subdirs_as_module_names(path):
CMS_PERMISSION = True
CMS_PLACEHOLDER_CONF = {
'header-content': {
'plugins': ['PicturePlugin'],
# One plugin with template "Header logo" = logo; any other content = bottom of header
# One PicturePlugin with template "Header logo" = custom logo
# Any other plugins render inline within the header nav
'limits': {'global': 10},
},
}
Expand Down
2 changes: 1 addition & 1 deletion taccsite_cms/templates/djangocms_picture/header_logo/picture.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{% load header_logo_tags %}
{% load header_content_tags %}
{% header_logo_from_picture instance picture_link as plugin_logo %}
{% include "header_logo.html" with plugin_logo=plugin_logo %}
18 changes: 3 additions & 15 deletions taccsite_cms/templates/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{# @var settings #}
{% load cms_tags header_content_tags %}
{% load cms_tags %}

{# WARNING: Some markup is duplicated in other repositories #}
{# SEE: https://confluence.tacc.utexas.edu/x/LoCnCQ #}
Expand All @@ -23,13 +23,9 @@
{% endif %}
">
<!-- Portal Logo -->
{% get_header_content_parsed "header-content" as header_content %}
{% if header_content.logo_plugin %}
{% header_logo_from_picture header_content.logo_plugin header_content.logo_link as plugin_logo %}
{% include "header_logo.html" with plugin_logo=plugin_logo %}
{% else %}
{% static_placeholder "header-content" or %}
{% include "header_logo.html" %}
{% endif %}
{% endstatic_placeholder %}

<!-- Navbar Accordian Toggle on Small Screens -->
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExpandTarget" aria-controls="navbarsExpandTarget" aria-expanded="false" aria-label="Toggle navigation">
Expand All @@ -51,14 +47,6 @@
{% endif %}
</div>
</nav>
{% if header_content.remaining_plugins %}
<div class="header-content-extra">
{% for plugin in header_content.remaining_plugins %}
{% render_plugin plugin %}
{% endfor %}
</div>
{% endif %}

{% endwith %}
{% endwith %}
{% endwith %}
8 changes: 4 additions & 4 deletions taccsite_cms/templatetags/header_content_tags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@ def _get_header_content_parsed(request, placeholder_name):
logo_link = None
remaining_plugins = []

site = getattr(request, 'site', None)
placeholder = StaticPlaceholder.objects.filter(
code=placeholder_name,
site=site
site_id__isnull=True
).first()

# Return NO content (if placeholder does not exist)
Expand All @@ -41,7 +40,7 @@ def _get_header_content_parsed(request, placeholder_name):
if len(plugin_list) == 1:
first_plugin = plugin_list[0]
instance, plugin_type = first_plugin.get_plugin_instance()
is_picture_plugin = getattr(plugin_type, '__name__', '') == 'PicturePlugin'
is_picture_plugin = type(plugin_type).__name__ == 'PicturePlugin'
uses_logo_template = getattr(instance, 'template', None) == 'header_logo'

if instance and is_picture_plugin:
Expand Down Expand Up @@ -111,9 +110,10 @@ def header_logo_from_picture(instance, picture_link):
alt = attrs.get('alt') or default_alt_text or ''
img_src = getattr(instance, 'img_src', None) or ''
link_target = getattr(instance, 'link_target', None)
is_remote = img_src.startswith('http://') or img_src.startswith('https://')

return {
'is_remote': False,
'is_remote': is_remote,
'img_file_src': img_src,
'img_class': '',
'link_href': picture_link or '/',
Expand Down