From e2f7c53ccda9f6fbde07687983b081c8d8d4fd0d Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Tue, 10 Feb 2026 20:11:23 -0600
Subject: [PATCH 1/7] feat: #999 only cms admin edit static placeholder

---
 taccsite_cms/_settings/djangocms_plugins.py |  1 +
 taccsite_cms/management/commands/util.py    | 31 +++++++++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/taccsite_cms/_settings/djangocms_plugins.py b/taccsite_cms/_settings/djangocms_plugins.py
index 21c8d6dec..20e375b1b 100644
--- a/taccsite_cms/_settings/djangocms_plugins.py
+++ b/taccsite_cms/_settings/djangocms_plugins.py
@@ -39,6 +39,7 @@
 ]
 DJANGOCMS_PICTURE_TEMPLATES = [
     ('no_link_to_ext_image', _('Do not link to external image')),
+    ('header_logo', _('Header logo')),
 ]
 
 ########################
diff --git a/taccsite_cms/management/commands/util.py b/taccsite_cms/management/commands/util.py
index 5540811ec..c00a61c4c 100644
--- a/taccsite_cms/management/commands/util.py
+++ b/taccsite_cms/management/commands/util.py
@@ -30,6 +30,25 @@ def add_perm(group, app_label, model_name, perm_name):
     else:
         group.permissions.add( Permission.objects.get( name=perm_name ))
 
+def del_perm(group, app_label, model_name, perm_name):
+    """
+    Delete specific permission from a given group
+    """
+    logger.debug(f'Removing permission ({app_label}.{model_name}) "{perm_name}"')
+    if app_label and model_name:
+        model = model_name.lower().replace(' ', '')
+        content_type = ContentType.objects.get(
+            app_label=app_label,
+            model=model
+        )
+        group.permissions.remove(
+            Permission.objects.get(
+                name=perm_name,
+                content_type=content_type
+            )
+        )
+    else:
+        group.permissions.remove(Permission.objects.get(name=perm_name))
 
 
 # Page
@@ -44,9 +63,15 @@ def let_view_page_and_structure(group):
     add_perm(group, 'cms', 'page', 'Can change page')
 
     add_perm(group, 'cms', 'placeholder', 'Can use Structure mode')
-    # HELP: Not necessary on TACC (as of Core-CMS v4.17.1)
-    #       Is necessary on WTCS (as of Core-CMS v4.20.2)
-    add_perm(group, 'cms', 'static placeholder', 'Can change static placeholder')
+    # To delete undesired permission from sites that still have it:
+    # ```py
+    # add_perm(group, 'cms', 'static placeholder', 'Can change static placeholder')
+    # ```
+    # HELP: Should "Sitewide Content Manager" keep this perm?
+    # SEE: https://weteachcs.org/admin/auth/group/9/change/
+    # FAQ: Only superuser may edit static placeholders (footer, header-logo)
+    # TODO: After this is deployed on all sites once, delete this code
+    del_perm(group, 'cms', 'static placeholder', 'Can change static placeholder')
 
 
 

From f52b8b27df14f9d680051d36af5bd462d2715859 Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Tue, 10 Feb 2026 20:11:47 -0600
Subject: [PATCH 2/7] feat: #999 add 'header-logo' placeholder

---
 taccsite_cms/settings/settings.py             |  9 ++++++-
 .../header_logo/picture.html                  |  4 +++
 taccsite_cms/templates/header.html            |  3 +++
 taccsite_cms/templates/header_logo.html       | 26 ++++++++++++++++--
 taccsite_cms/templatetags/header_logo_tags.py | 27 +++++++++++++++++++
 5 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 taccsite_cms/templates/djangocms_picture/header_logo/picture.html
 create mode 100644 taccsite_cms/templatetags/header_logo_tags.py

diff --git a/taccsite_cms/settings/settings.py b/taccsite_cms/settings/settings.py
index 47dd38e95..4f820ea25 100644
--- a/taccsite_cms/settings/settings.py
+++ b/taccsite_cms/settings/settings.py
@@ -558,7 +558,14 @@ def get_subdirs_as_module_names(path):
 }
 
 CMS_PERMISSION = True
-CMS_PLACEHOLDER_CONF = {}
+CMS_PLACEHOLDER_CONF = {
+    'header-logo': {
+        'plugins': ['PicturePlugin'],
+        'limits': {
+            'global': 1
+        },
+    },
+}
 
 THUMBNAIL_HIGH_RESOLUTION = True
 THUMBNAIL_PROCESSORS = (
diff --git a/taccsite_cms/templates/djangocms_picture/header_logo/picture.html b/taccsite_cms/templates/djangocms_picture/header_logo/picture.html
new file mode 100644
index 000000000..13ee2154a
--- /dev/null
+++ b/taccsite_cms/templates/djangocms_picture/header_logo/picture.html
@@ -0,0 +1,4 @@
+{# Header logo from Picture plugin: pass plugin_logo and use shared header_logo.html. #}
+{% load header_logo_tags %}
+{% header_logo_from_picture instance picture_link as plugin_logo %}
+{% include "header_logo.html" with plugin_logo=plugin_logo %}
diff --git a/taccsite_cms/templates/header.html b/taccsite_cms/templates/header.html
index 5da026b53..01222b02e 100644
--- a/taccsite_cms/templates/header.html
+++ b/taccsite_cms/templates/header.html
@@ -1,4 +1,5 @@
 {# @var settings #}
+{% load cms_tags %}
 
 {# WARNING: Some markup is duplicated in other repositories #}
 {# SEE: https://confluence.tacc.utexas.edu/x/LoCnCQ #}
@@ -22,7 +23,9 @@
   {% endif %}
 ">
   <!-- Portal Logo -->
+  {% static_placeholder "header-logo" or %}
   {% include "header_logo.html" %}
+  {% 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">
diff --git a/taccsite_cms/templates/header_logo.html b/taccsite_cms/templates/header_logo.html
index 798ef8936..68c33395d 100644
--- a/taccsite_cms/templates/header_logo.html
+++ b/taccsite_cms/templates/header_logo.html
@@ -1,7 +1,29 @@
-{# @var logo, className #}
+{# @var plugin_logo (optional), className #}
 {% load static custom_portal_settings %}
 
-{% if settings.LOGO %}
+{% if plugin_logo %}
+
+{% with plugin_logo as logo %}
+  <a
+    id="header-logo"
+    class="navbar-brand {{className}}"
+    href="{{ logo.link_href }}"
+    target="{{ logo.link_target }}"
+  >
+    <img
+      class="portal-logo {{ logo.img_class }}"
+      src="{% if logo.is_remote %}{{ logo.img_file_src }}{% else %}{% static logo.img_file_src %}{% endif %}"
+      {% if logo.img_crossorigin %}
+      crossorigin="{{ logo.img_crossorigin }}"
+      {% endif %}
+      {% if logo.img_alt_text %}
+      alt="{{ logo.img_alt_text }}"
+      {% endif %}
+    />
+  </a>
+{% endwith %}
+
+{% elif settings.LOGO %}
 
 {% with settings.LOGO as logo %}
   {% with filename=logo|index:1 selectors=logo|index:2 targeturl=logo|index:3 targettype=logo|index:4 accessibility=logo|index:5 corstype=logo|index:6 visibility=logo|index:7 %}
diff --git a/taccsite_cms/templatetags/header_logo_tags.py b/taccsite_cms/templatetags/header_logo_tags.py
new file mode 100644
index 000000000..7af276a32
--- /dev/null
+++ b/taccsite_cms/templatetags/header_logo_tags.py
@@ -0,0 +1,27 @@
+"""Template tags for header logo (e.g. building plugin_logo from Picture plugin)."""
+from django import template
+
+register = template.Library()
+
+
+@register.simple_tag
+def header_logo_from_picture(instance, picture_link):
+    """
+    Build a plugin_logo dict from a djangocms_picture instance for use in header_logo.html.
+
+    Usage: {% header_logo_from_picture instance picture_link as plugin_logo %}
+    Then:  {% include "header_logo.html" with plugin_logo=plugin_logo %}
+    """
+    attributes = getattr(instance, 'attributes', None) or {}
+    picture = getattr(instance, 'picture', None)
+    alt = attributes.get('alt') or (getattr(picture, 'default_alt_text', None) if picture else None) or ''
+    img_src = getattr(instance, 'img_src', None) or ''
+    return {
+        'link_href': picture_link or '#',
+        'link_target': getattr(instance, 'link_target', None) or '',
+        'img_class': '',
+        'img_file_src': img_src,
+        'is_remote': True,
+        'img_crossorigin': '',
+        'img_alt_text': alt,
+    }

From ead856928756fab9b40d8746c700b7fc98f11f8f Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Wed, 11 Feb 2026 12:52:20 -0600
Subject: [PATCH 3/7] refactor: simplify code and format docstring

---
 .../header_logo/picture.html                  |  1 -
 taccsite_cms/templatetags/header_logo_tags.py | 31 +++++++++++++------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/taccsite_cms/templates/djangocms_picture/header_logo/picture.html b/taccsite_cms/templates/djangocms_picture/header_logo/picture.html
index 13ee2154a..b0fa4002e 100644
--- a/taccsite_cms/templates/djangocms_picture/header_logo/picture.html
+++ b/taccsite_cms/templates/djangocms_picture/header_logo/picture.html
@@ -1,4 +1,3 @@
-{# Header logo from Picture plugin: pass plugin_logo and use shared header_logo.html. #}
 {% load header_logo_tags %}
 {% header_logo_from_picture instance picture_link as plugin_logo %}
 {% include "header_logo.html" with plugin_logo=plugin_logo %}
diff --git a/taccsite_cms/templatetags/header_logo_tags.py b/taccsite_cms/templatetags/header_logo_tags.py
index 7af276a32..c3e8f2e80 100644
--- a/taccsite_cms/templatetags/header_logo_tags.py
+++ b/taccsite_cms/templatetags/header_logo_tags.py
@@ -7,21 +7,32 @@
 @register.simple_tag
 def header_logo_from_picture(instance, picture_link):
     """
-    Build a plugin_logo dict from a djangocms_picture instance for use in header_logo.html.
+    Custom Template Tag `header_logo_from_picture`
 
-    Usage: {% header_logo_from_picture instance picture_link as plugin_logo %}
-    Then:  {% include "header_logo.html" with plugin_logo=plugin_logo %}
+    Use: Build plugin_logo from djangocms_picture instance for header_logo.
+
+    Load custom tag into template:
+        {% load header_logo_from_picture %}
+
+    Template inline usage:
+        {% header_logo_from_picture instance picture_link as plugin_logo %}
+        {% include "header_logo.html" with plugin_logo=plugin_logo %}
     """
-    attributes = getattr(instance, 'attributes', None) or {}
     picture = getattr(instance, 'picture', None)
-    alt = attributes.get('alt') or (getattr(picture, 'default_alt_text', None) if picture else None) or ''
+    attrs = getattr(instance, 'attributes', None) or {}
+
+    default_alt_text = getattr(picture, 'default_alt_text', None) if picture else None
+
+    alt = attrs.get('alt') or default_alt_text or ''
     img_src = getattr(instance, 'img_src', None) or ''
+    link_target = getattr(instance, 'link_target', None)
+
     return {
-        'link_href': picture_link or '#',
-        'link_target': getattr(instance, 'link_target', None) or '',
-        'img_class': '',
+        'is_remote': False,
         'img_file_src': img_src,
-        'is_remote': True,
-        'img_crossorigin': '',
+        'img_class': '',
+        'link_href': picture_link or '/',
+        'link_target': link_target or '',
         'img_alt_text': alt,
+        'img_crossorigin': 'anonymous',
     }

From 53cfef699b0f034edf3ded57b2fd09ffd8c65e62 Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Thu, 5 Mar 2026 12:21:15 -0600
Subject: [PATCH 4/7] =?UTF-8?q?refactor!:=20header-logo=20=E2=86=92=20head?=
 =?UTF-8?q?er-content?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changed `header-…` static placeholder to accept more than just a logo, and render intelligently.

WARNING: Introduces magic…
---
 taccsite_cms/management/commands/util.py      |   2 +-
 taccsite_cms/settings/settings.py             |   7 +-
 taccsite_cms/templates/header.html            |  19 ++-
 .../templatetags/header_content_tags.py       | 109 ++++++++++++++++++
 taccsite_cms/templatetags/header_logo_tags.py |  38 ------
 5 files changed, 128 insertions(+), 47 deletions(-)
 create mode 100644 taccsite_cms/templatetags/header_content_tags.py
 delete mode 100644 taccsite_cms/templatetags/header_logo_tags.py

diff --git a/taccsite_cms/management/commands/util.py b/taccsite_cms/management/commands/util.py
index c00a61c4c..6b1b8b137 100644
--- a/taccsite_cms/management/commands/util.py
+++ b/taccsite_cms/management/commands/util.py
@@ -69,7 +69,7 @@ def let_view_page_and_structure(group):
     # ```
     # HELP: Should "Sitewide Content Manager" keep this perm?
     # SEE: https://weteachcs.org/admin/auth/group/9/change/
-    # FAQ: Only superuser may edit static placeholders (footer, header-logo)
+    # FAQ: Only superuser may edit static placeholders (footer, header-content)
     # TODO: After this is deployed on all sites once, delete this code
     del_perm(group, 'cms', 'static placeholder', 'Can change static placeholder')
 
diff --git a/taccsite_cms/settings/settings.py b/taccsite_cms/settings/settings.py
index 4f820ea25..7714eeefc 100644
--- a/taccsite_cms/settings/settings.py
+++ b/taccsite_cms/settings/settings.py
@@ -559,11 +559,10 @@ def get_subdirs_as_module_names(path):
 
 CMS_PERMISSION = True
 CMS_PLACEHOLDER_CONF = {
-    'header-logo': {
+    'header-content': {
         'plugins': ['PicturePlugin'],
-        'limits': {
-            'global': 1
-        },
+        # One plugin with template "Header logo" = logo; any other content = bottom of header
+        'limits': {'global': 10},
     },
 }
 
diff --git a/taccsite_cms/templates/header.html b/taccsite_cms/templates/header.html
index 01222b02e..6c42a9373 100644
--- a/taccsite_cms/templates/header.html
+++ b/taccsite_cms/templates/header.html
@@ -1,5 +1,5 @@
 {# @var settings #}
-{% load cms_tags %}
+{% load cms_tags header_content_tags %}
 
 {# WARNING: Some markup is duplicated in other repositories #}
 {# SEE: https://confluence.tacc.utexas.edu/x/LoCnCQ #}
@@ -23,9 +23,13 @@
   {% endif %}
 ">
   <!-- Portal Logo -->
-  {% static_placeholder "header-logo" or %}
-  {% include "header_logo.html" %}
-  {% endstatic_placeholder %}
+  {% 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 %}
+    {% include "header_logo.html" %}
+  {% endif %}
 
   <!-- 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">
@@ -47,6 +51,13 @@
     {% 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 %}
diff --git a/taccsite_cms/templatetags/header_content_tags.py b/taccsite_cms/templatetags/header_content_tags.py
new file mode 100644
index 000000000..c87a4b1f3
--- /dev/null
+++ b/taccsite_cms/templatetags/header_content_tags.py
@@ -0,0 +1,109 @@
+"""Template tags for header logo (e.g. building plugin_logo from Picture plugin)."""
+from django import template
+
+from cms.models import StaticPlaceholder
+
+register = template.Library()
+
+
+def _get_header_content_parsed(request, placeholder_name):
+    """
+    Return (logo_plugin, logo_link, remaining_plugins).
+    If placeholder has just 1 Picture w/ template "header_logo", treat as logo.
+    Otherwise, remaining_plugins are shown at bottom of header.
+    """
+    site = getattr(request, 'site', None)
+    placeholder = StaticPlaceholder.objects.filter(
+        code=placeholder_name,
+        site=site
+    ).first()
+    no_content = (None, None, [])
+
+    if not placeholder:
+        return no_content
+
+    placeholder_instance = placeholder.public
+
+    if not placeholder_instance:
+        return no_content
+
+    plugin_list = placeholder_instance.get_plugins_list(language=request.LANGUAGE_CODE)
+    no_logo_content = (None, None, list(plugin_list))
+
+    if len(plugin_list) == 1:
+        first_plugin = plugin_list[0]
+        instance, plugin_type = first_plugin.get_plugin_instance()
+        is_picture_pluign = getattr(plugin_type, '__name__', '') == 'PicturePlugin'
+        uses_logo_template = getattr(instance, 'template', None) == 'header_logo'
+
+        if instance and is_picture_pluign:
+            if uses_logo_template:
+                link = getattr(instance, 'get_link', lambda: None)()
+                logo_content = (instance, link or '#', [])
+
+                return logo_content
+
+    return no_logo_content
+
+
+@register.simple_tag(takes_context=True)
+def get_header_content_parsed(context, placeholder_name):
+    """
+    Parse static placeholder for header: single "Header logo" Picture = logo; else all plugins = remaining.
+    Returns object with .logo_plugin, .logo_link, .remaining_plugins.
+    """
+    request = context.get('request')
+    content_default = type('HeaderContent', (), {
+        'logo_plugin': None,
+        'logo_link': None,
+        'remaining_plugins': []
+    })()
+
+    if not request:
+        return content_default
+
+    logo_plugin, logo_link, remaining_plugins = _get_header_content_parsed(
+        request,
+        placeholder_name
+    )
+    content_parsed = type('HeaderContent', (), {
+        'logo_plugin': logo_plugin,
+        'logo_link': logo_link,
+        'remaining_plugins': remaining_plugins
+    })()
+
+    return content_parsed
+
+
+@register.simple_tag
+def header_logo_from_picture(instance, picture_link):
+    """
+    Custom Template Tag `header_logo_from_picture`
+
+    Use: Build plugin_logo from djangocms_picture instance for header_logo.
+
+    Load custom tag into template:
+        {% load header_logo_from_picture %}
+
+    Template inline usage:
+        {% header_logo_from_picture instance picture_link as plugin_logo %}
+        {% include "header_logo.html" with plugin_logo=plugin_logo %}
+    """
+    picture = getattr(instance, 'picture', None)
+    attrs = getattr(instance, 'attributes', None) or {}
+
+    default_alt_text = getattr(picture, 'default_alt_text', None) if picture else None
+
+    alt = attrs.get('alt') or default_alt_text or ''
+    img_src = getattr(instance, 'img_src', None) or ''
+    link_target = getattr(instance, 'link_target', None)
+
+    return {
+        'is_remote': False,
+        'img_file_src': img_src,
+        'img_class': '',
+        'link_href': picture_link or '/',
+        'link_target': link_target or '',
+        'img_alt_text': alt,
+        'img_crossorigin': 'anonymous',
+    }
diff --git a/taccsite_cms/templatetags/header_logo_tags.py b/taccsite_cms/templatetags/header_logo_tags.py
deleted file mode 100644
index c3e8f2e80..000000000
--- a/taccsite_cms/templatetags/header_logo_tags.py
+++ /dev/null
@@ -1,38 +0,0 @@
-"""Template tags for header logo (e.g. building plugin_logo from Picture plugin)."""
-from django import template
-
-register = template.Library()
-
-
-@register.simple_tag
-def header_logo_from_picture(instance, picture_link):
-    """
-    Custom Template Tag `header_logo_from_picture`
-
-    Use: Build plugin_logo from djangocms_picture instance for header_logo.
-
-    Load custom tag into template:
-        {% load header_logo_from_picture %}
-
-    Template inline usage:
-        {% header_logo_from_picture instance picture_link as plugin_logo %}
-        {% include "header_logo.html" with plugin_logo=plugin_logo %}
-    """
-    picture = getattr(instance, 'picture', None)
-    attrs = getattr(instance, 'attributes', None) or {}
-
-    default_alt_text = getattr(picture, 'default_alt_text', None) if picture else None
-
-    alt = attrs.get('alt') or default_alt_text or ''
-    img_src = getattr(instance, 'img_src', None) or ''
-    link_target = getattr(instance, 'link_target', None)
-
-    return {
-        'is_remote': False,
-        'img_file_src': img_src,
-        'img_class': '',
-        'link_href': picture_link or '/',
-        'link_target': link_target or '',
-        'img_alt_text': alt,
-        'img_crossorigin': 'anonymous',
-    }

From 7459528af396b06ef4e043801199c81ec618a060 Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Thu, 2 Apr 2026 14:12:54 -0500
Subject: [PATCH 5/7] docs: heaader_logo comments

---
 taccsite_cms/templates/header_logo.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/taccsite_cms/templates/header_logo.html b/taccsite_cms/templates/header_logo.html
index 2b1ef290b..0d08e5d0e 100644
--- a/taccsite_cms/templates/header_logo.html
+++ b/taccsite_cms/templates/header_logo.html
@@ -3,6 +3,7 @@
 
 {% if plugin_logo %}
 
+{# via Picture plugin (e.g. CMS editor uploads logo image) #}
 {% with plugin_logo as logo %}
   <a
     id="header-logo"
@@ -25,6 +26,7 @@
 
 {% elif settings.LOGO %}
 
+{# via deprecated CMS setting (e.g. CMS developer sets logo image) #}
 {% with settings.LOGO as logo %}
   {% with filename=logo|index:1 selectors=logo|index:2 targeturl=logo|index:3 targettype=logo|index:4 accessibility=logo|index:5 corstype=logo|index:6 visibility=logo|index:7 %}
     {% if visibility == "True" %}
@@ -37,6 +39,7 @@
 
 {% else %}
 
+{# via CMS setting (e.g. CMS developer sets logo image) #}
 {% with settings.PORTAL_LOGO as logo %}
   <a
     id="header-logo"

From d156af6978bb726e541392e19f30359d2aa5baf6 Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Thu, 2 Apr 2026 15:04:31 -0500
Subject: [PATCH 6/7] refactor: legible header content parsing logic

- Enhanced the `_get_header_content_parsed` function to clarify the handling of logo and remaining plugins.
- Updated comments for better understanding of the logic flow.
- Fixed a typo in the variable name `is_picture_plugin`.
- Adjusted return statements to ensure consistent output structure.
---
 .../templatetags/header_content_tags.py       | 44 ++++++++++++-------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/taccsite_cms/templatetags/header_content_tags.py b/taccsite_cms/templatetags/header_content_tags.py
index c87a4b1f3..a8be7b2c6 100644
--- a/taccsite_cms/templatetags/header_content_tags.py
+++ b/taccsite_cms/templatetags/header_content_tags.py
@@ -8,48 +8,62 @@
 
 def _get_header_content_parsed(request, placeholder_name):
     """
+    Parse content of static placeholder `placeholder_name`:
+
+    * (if present) single "Header logo" Picture as logo
+    * (if present) link for logo
+    * (if present) remaining plugins
+
     Return (logo_plugin, logo_link, remaining_plugins).
-    If placeholder has just 1 Picture w/ template "header_logo", treat as logo.
-    Otherwise, remaining_plugins are shown at bottom of header.
     """
+    logo_plugin = None
+    logo_link = None
+    remaining_plugins = []
+
     site = getattr(request, 'site', None)
     placeholder = StaticPlaceholder.objects.filter(
         code=placeholder_name,
         site=site
     ).first()
-    no_content = (None, None, [])
 
+    # Return NO content (if placeholder does not exist)
     if not placeholder:
-        return no_content
+        return (logo_plugin, logo_link, remaining_plugins)
 
     placeholder_instance = placeholder.public
-
+    # Return NO content (if placeholder is not public)
     if not placeholder_instance:
-        return no_content
+        return (logo_plugin, logo_link, remaining_plugins)
 
     plugin_list = placeholder_instance.get_plugins_list(language=request.LANGUAGE_CODE)
-    no_logo_content = (None, None, list(plugin_list))
+    remaining_plugins = list(plugin_list)
 
     if len(plugin_list) == 1:
         first_plugin = plugin_list[0]
         instance, plugin_type = first_plugin.get_plugin_instance()
-        is_picture_pluign = getattr(plugin_type, '__name__', '') == 'PicturePlugin'
+        is_picture_plugin = getattr(plugin_type, '__name__', '') == 'PicturePlugin'
         uses_logo_template = getattr(instance, 'template', None) == 'header_logo'
 
-        if instance and is_picture_pluign:
+        if instance and is_picture_plugin:
             if uses_logo_template:
                 link = getattr(instance, 'get_link', lambda: None)()
-                logo_content = (instance, link or '#', [])
+                logo_plugin = instance
+                logo_link = link or '#'
+                remaining_plugins = []
 
-                return logo_content
-
-    return no_logo_content
+    # Return ALL content (that is available from placeholder)
+    return (logo_plugin, logo_link, remaining_plugins)
 
 
 @register.simple_tag(takes_context=True)
 def get_header_content_parsed(context, placeholder_name):
     """
-    Parse static placeholder for header: single "Header logo" Picture = logo; else all plugins = remaining.
+    Parse content of static placeholder `placeholder_name`:
+
+    * (if present) single "Header logo" Picture as logo
+    * (if present) link for logo
+    * (if present) remaining plugins
+
     Returns object with .logo_plugin, .logo_link, .remaining_plugins.
     """
     request = context.get('request')
@@ -83,7 +97,7 @@ def header_logo_from_picture(instance, picture_link):
     Use: Build plugin_logo from djangocms_picture instance for header_logo.
 
     Load custom tag into template:
-        {% load header_logo_from_picture %}
+        {% load header_content_tags %}
 
     Template inline usage:
         {% header_logo_from_picture instance picture_link as plugin_logo %}

From d5b2a362ea322bde0819dc0e3f920de33cb5e339 Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Tue, 21 Apr 2026 15:00:07 -0500
Subject: [PATCH 7/7] fix: GH-999 CMS admin can change header logo (#1142)

Fix misc. bugs in https://github.com/TACC/Core-CMS/pull/1083/.

| default logo | custom logo |
| - | - |
| <img width="1280" height="400" alt="edit header - default image"
src="https://github.com/user-attachments/assets/ef119dcc-e49a-460e-9853-06ef9a1521ee"
/> | <img width="1280" height="400" alt="edit header - custom logo"
src="https://github.com/user-attachments/assets/1759ecf7-458d-4ca2-bc26-1f3957973a54"
/> |

---------

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Wesley B <wesleyboar@users.noreply.github.com>
---
 taccsite_cms/settings/settings.py              |  4 ++--
 .../djangocms_picture/header_logo/picture.html |  2 +-
 taccsite_cms/templates/header.html             | 18 +++---------------
 .../templatetags/header_content_tags.py        |  8 ++++----
 4 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/taccsite_cms/settings/settings.py b/taccsite_cms/settings/settings.py
index 5a494768f..4758d380b 100644
--- a/taccsite_cms/settings/settings.py
+++ b/taccsite_cms/settings/settings.py
@@ -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},
     },
 }
diff --git a/taccsite_cms/templates/djangocms_picture/header_logo/picture.html b/taccsite_cms/templates/djangocms_picture/header_logo/picture.html
index b0fa4002e..919f259f9 100644
--- a/taccsite_cms/templates/djangocms_picture/header_logo/picture.html
+++ b/taccsite_cms/templates/djangocms_picture/header_logo/picture.html
@@ -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 %}
diff --git a/taccsite_cms/templates/header.html b/taccsite_cms/templates/header.html
index 4d48df637..9062397bb 100644
--- a/taccsite_cms/templates/header.html
+++ b/taccsite_cms/templates/header.html
@@ -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 #}
@@ -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">
@@ -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 %}
diff --git a/taccsite_cms/templatetags/header_content_tags.py b/taccsite_cms/templatetags/header_content_tags.py
index a8be7b2c6..01ddb1dcf 100644
--- a/taccsite_cms/templatetags/header_content_tags.py
+++ b/taccsite_cms/templatetags/header_content_tags.py
@@ -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)
@@ -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:
@@ -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 '/',