From cde3be7e8121dc68d40533533000b84b814c7490 Mon Sep 17 00:00:00 2001
From: Wesley Bomar <wbomar@tacc.utexas.edu>
Date: Wed, 14 Apr 2021 15:42:04 -0500
Subject: [PATCH] GH-191: Cleanup

---
 taccsite_cms/default_secrets.py    | 2 +-
 taccsite_cms/templates/base.html   | 5 ++++-
 taccsite_cms/templates/header.html | 2 --
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/taccsite_cms/default_secrets.py b/taccsite_cms/default_secrets.py
index 11bfcf07b..4baef22be 100644
--- a/taccsite_cms/default_secrets.py
+++ b/taccsite_cms/default_secrets.py
@@ -197,7 +197,7 @@
     "a_target_type",               # The target to open the new link in, use _blank for external links, _self for internal links.
     "alt_text",                    # The text to read or render for web assistance standards.
     "cors_setting",                # The CORS setting for the image, set to anonymous by default.
-    "visibility"                   # Whether to display element in template
+    "visibility"                   # Toggles wether or not to display the element in the template, use True to render, False to hide.
 ]
 
 Values to populate (for a dict):
diff --git a/taccsite_cms/templates/base.html b/taccsite_cms/templates/base.html
index e1bddb615..b7c7a3769 100755
--- a/taccsite_cms/templates/base.html
+++ b/taccsite_cms/templates/base.html
@@ -4,7 +4,10 @@
   id="page-{{ request.current_page.id }}"
   {# FAQ: Only available if set in page's "Advanced" settings #}
   data-page-id="{{ request.current_page.reverse_id }}"
-  class="t-{{settings.THEME}}  {% block template_class %}{% endblock template_class %}">
+  class="{% spaceless %}
+    {% if settings.THEME %}t-{{settings.THEME}}{% endif %}
+    {% block template_class %}{% endblock template_class %}
+  {% endspaceless %}">
 
 {% if settings.FEATURES.blog %}
   {# FAQ: Conditional includes are intentionally verbose #}
diff --git a/taccsite_cms/templates/header.html b/taccsite_cms/templates/header.html
index 266115de4..d02a41c53 100644
--- a/taccsite_cms/templates/header.html
+++ b/taccsite_cms/templates/header.html
@@ -1,13 +1,11 @@
 {# WARNING: Some markup is duplicated in other repositories #}
 {# SEE: https://confluence.tacc.utexas.edu/x/LoCnCQ #}
 {# FAQ: Extra lines exist to ease CMS/Portal/Guide template comparison #}
-{% load custom_portal_settings %}
 
 <!-- Sponsor Logos -->
 {% include "header_branding.html" %}
 
 <!-- Navigation Bar -->
-
 <nav id="s-header" class="s-header  navbar {% if settings.PORTAL %}navbar-expand-xl{% else %}navbar-expand-lg{% endif %} navbar-dark">
   <!-- Portal Logo -->
   {% include "header_logo.html" %}