From a40fbde1c5186b02b729235103fb52394f432ac9 Mon Sep 17 00:00:00 2001
From: Wesley Bomar <wbomar@tacc.utexas.edu>
Date: Mon, 28 Aug 2023 23:20:32 -0500
Subject: [PATCH] chore: move favicon markup to core assets

In assets_custom, it was copied by CMS in Core-CMS-Custom and tup-ui.

Stop copying. No one ever changes it. Settings do that. Let Core lead.
---
 taccsite_cms/templates/assets_core.html   | 4 ++++
 taccsite_cms/templates/assets_custom.html | 7 -------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/taccsite_cms/templates/assets_core.html b/taccsite_cms/templates/assets_core.html
index 0546517c4..47554e114 100644
--- a/taccsite_cms/templates/assets_core.html
+++ b/taccsite_cms/templates/assets_core.html
@@ -8,3 +8,7 @@
   @import url("https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css") layer(foundation);
   @import url("{% static 'site_cms/css/build/core-styles.base.css' %}") layer(base);
 </style>
+
+{% with settings.FAVICON as favicon %}
+<link rel="icon" href="{% static favicon.img_file_src %}" type="image/x-icon" />
+{% endwith %}
diff --git a/taccsite_cms/templates/assets_custom.html b/taccsite_cms/templates/assets_custom.html
index 2b569fa45..d3cfb4e61 100644
--- a/taccsite_cms/templates/assets_custom.html
+++ b/taccsite_cms/templates/assets_custom.html
@@ -11,13 +11,6 @@
 
 
 
-<!-- Custom Site Assets: Favicon. -->
-{% with settings.FAVICON as favicon %}
-<link rel="icon" href="{% static favicon.img_file_src %}" type="image/x-icon" />
-{% endwith %}
-
-
-
 {# Do NOT directly load project-specific assets here; see `/taccsite_custom` #}
 
 {# Example #}