From 17640a400be6628ae91436d783ce91f7cb91b570 Mon Sep 17 00:00:00 2001
From: Wesley Bomar <wbomar@tacc.utexas.edu>
Date: Tue, 16 Jul 2024 16:17:37 -0500
Subject: [PATCH 01/39] refactor: CMD-97 breadcrumbs for news via 1 template

---
 taccsite_cms/templates/base.html                       |  2 ++
 taccsite_cms/templates/djangocms_blog/base.html        | 10 ++++++++--
 taccsite_cms/templates/djangocms_blog/post_detail.html |  8 --------
 taccsite_cms/templates/djangocms_blog/post_list.html   |  7 -------
 4 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/taccsite_cms/templates/base.html b/taccsite_cms/templates/base.html
index 161a10bb7..ae89e1d59 100755
--- a/taccsite_cms/templates/base.html
+++ b/taccsite_cms/templates/base.html
@@ -82,6 +82,8 @@
     </div>
 
   {% endblock content %}
+  {% block more_content %}
+  {% endblock more_content %}
   </main>
 
   <footer class="c-footer  s-footer">
diff --git a/taccsite_cms/templates/djangocms_blog/base.html b/taccsite_cms/templates/djangocms_blog/base.html
index 4e4688fb7..e6f6cda73 100644
--- a/taccsite_cms/templates/djangocms_blog/base.html
+++ b/taccsite_cms/templates/djangocms_blog/base.html
@@ -13,7 +13,10 @@
     {% endif %}
 {% endblock meta %}
 
-{% block content %}
+{% block more_content %}
+{# TACC (wrap list in container to mimic other page layouts): #}
+<div class="container">
+{# /TACC #}
 
 {% if settings.TACC_CORE_STYLES_VERSION == 0 %}
 <link rel="stylesheet" href="{% static 'site_cms/css/build/site.app.blog.css' %}">
@@ -33,4 +36,7 @@
     {% block content_blog %}{% endblock %}
 </div>
 
-{% endblock content %}
+{# TACC (wrap list in container to mimic other page layouts): #}
+</div>
+{# /TACC #}
+{% endblock more_content %}
diff --git a/taccsite_cms/templates/djangocms_blog/post_detail.html b/taccsite_cms/templates/djangocms_blog/post_detail.html
index 28929a86f..87add62d3 100644
--- a/taccsite_cms/templates/djangocms_blog/post_detail.html
+++ b/taccsite_cms/templates/djangocms_blog/post_detail.html
@@ -3,12 +3,7 @@
 {% load i18n easy_thumbnails_tags cms_tags blog_post_use_custom_media blog_post_is_show_abstract %}
 
 {% block content_blog %}{% spaceless %}
-{# TACC (wrap and add breadcrumbs): #}
 
-<section class="container">
-{% include "nav_cms_breadcrumbs.html" %}
-
-{# /TACC #}
 {# TACC (define whether this is a special post): #}
 {% blog_post_use_custom_media post settings.PORTAL_BLOG_CUSTOM_MEDIA_POST_CATEGORY as use_custom_media %}
 {% blog_post_is_show_abstract post settings.PORTAL_BLOG_SHOW_ABSTRACT_TAG as is_show_abstract_post %}
@@ -88,9 +83,6 @@ <h3>{% render_model post "subtitle" %}</h3>
     {% endif %}
 </article>
 {# TACC (end wrap and end spaceless-ness later than source): #}
-
-</section>
 {% endspaceless %}
-
 {# /TACC #}
 {% endblock content_blog %}
diff --git a/taccsite_cms/templates/djangocms_blog/post_list.html b/taccsite_cms/templates/djangocms_blog/post_list.html
index 921ec7cb5..1d7aa3010 100644
--- a/taccsite_cms/templates/djangocms_blog/post_list.html
+++ b/taccsite_cms/templates/djangocms_blog/post_list.html
@@ -5,10 +5,6 @@
 {% block canonical_url %}<link rel="canonical" href="{{ view.get_view_url }}"/>{% endblock canonical_url %}
 
 {% block content_blog %}
-{# TACC (wrap list in container w/ breadcrumbs to mimic other page layouts): #}
-<div class="container">
-{% include "nav_cms_breadcrumbs.html" %}
-{# /TACC #}
 
 <section class="blog-list">
     {% block blog_title %}
@@ -82,8 +78,5 @@ <h2>
     {% endif %}
 </section>
 
-{# TACC (wrap list in container w/ breadcrumbs to mimic other page layouts): #}
-</div>
-{# /TACC #}
 {% endblock %}
 {% endspaceless %}

From 55dc4317c7e27f4518d461e25612004ec6a8df40 Mon Sep 17 00:00:00 2001
From: Wesley Bomar <wbomar@tacc.utexas.edu>
Date: Fri, 19 Jul 2024 17:44:10 -0500
Subject: [PATCH 02/39] =?UTF-8?q?idea:=20TUP-706=204.a.i=20change=20RSS=20?=
 =?UTF-8?q?feed=20render=20=E2=9A=A0=EF=B8=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

NOT WORKING! Fails with:

> NoReverseMatch at /feed/
> '' is not a registered namespace
---
 apps/djangocms_blog_customizations/__init__.py |  0
 apps/djangocms_blog_customizations/apps.py     |  6 ++++++
 apps/djangocms_blog_customizations/feeds.py    | 17 +++++++++++++++++
 apps/djangocms_blog_customizations/urls.py     |  7 +++++++
 taccsite_cms/custom_app_settings.example.py    |  2 +-
 5 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 apps/djangocms_blog_customizations/__init__.py
 create mode 100644 apps/djangocms_blog_customizations/apps.py
 create mode 100644 apps/djangocms_blog_customizations/feeds.py
 create mode 100644 apps/djangocms_blog_customizations/urls.py

diff --git a/apps/djangocms_blog_customizations/__init__.py b/apps/djangocms_blog_customizations/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/apps/djangocms_blog_customizations/apps.py b/apps/djangocms_blog_customizations/apps.py
new file mode 100644
index 000000000..b4c46995b
--- /dev/null
+++ b/apps/djangocms_blog_customizations/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class customBlogAppConfig(AppConfig):
+    verbose_name = _("django CMS Blog customizations")
+    app_name = 'apps.djangocms_blog_customizations'
diff --git a/apps/djangocms_blog_customizations/feeds.py b/apps/djangocms_blog_customizations/feeds.py
new file mode 100644
index 000000000..87454766d
--- /dev/null
+++ b/apps/djangocms_blog_customizations/feeds.py
@@ -0,0 +1,17 @@
+from html import unescape
+from io import BytesIO
+
+from aldryn_apphooks_config.utils import get_app_instance
+from django.contrib.sites.models import Site
+from django.urls import reverse
+from django.utils.feedgenerator import Rss201rev2Feed
+from django.utils.translation import gettext as _
+
+from djangocms_blog.feeds import LatestEntriesFeed as DjangoCMSBlogLatestEntriesFeed
+from djangocms_blog.settings import get_setting
+from djangocms_blog.models import Post
+
+
+class LatestEntriesFeed(DjangoCMSBlogLatestEntriesFeed):
+    feed_type = Rss201rev2Feed
+    feed_items_number = get_setting("FEED_LATEST_ITEMS")
diff --git a/apps/djangocms_blog_customizations/urls.py b/apps/djangocms_blog_customizations/urls.py
new file mode 100644
index 000000000..532f76b10
--- /dev/null
+++ b/apps/djangocms_blog_customizations/urls.py
@@ -0,0 +1,7 @@
+from django.urls import path
+from .feeds import LatestEntriesFeed
+
+app_name = 'djangocms_blog_customizations'
+urlpatterns = [
+    path('', LatestEntriesFeed(), name="custom-posts-latest-feed"),
+]
diff --git a/taccsite_cms/custom_app_settings.example.py b/taccsite_cms/custom_app_settings.example.py
index 3ac04c50d..fb9165c55 100644
--- a/taccsite_cms/custom_app_settings.example.py
+++ b/taccsite_cms/custom_app_settings.example.py
@@ -1,3 +1,3 @@
-CUSTOM_APPS = ['apps.custom_example']
+CUSTOM_APPS = ['apps.custom_example', 'apps.djangocms_blog_customizations']
 CUSTOM_MIDDLEWARE = []
 STATICFILES_DIRS = ()

From de81256c7a07b5d6798c32bbe982df569f6e9687 Mon Sep 17 00:00:00 2001
From: Wesley Bomar <wbomar@tacc.utexas.edu>
Date: Mon, 22 Jul 2024 11:04:53 -0500
Subject: [PATCH 03/39] refactor: TUP-706 rename and document blog block

---
 taccsite_cms/templates/base.html                | 5 +++--
 taccsite_cms/templates/djangocms_blog/base.html | 8 ++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/taccsite_cms/templates/base.html b/taccsite_cms/templates/base.html
index ae89e1d59..dc8ccaa42 100755
--- a/taccsite_cms/templates/base.html
+++ b/taccsite_cms/templates/base.html
@@ -82,8 +82,9 @@
     </div>
 
   {% endblock content %}
-  {% block more_content %}
-  {% endblock more_content %}
+  {# To isolate content with a layout that admin can not change e.g. Blog #}
+  {% block fixed_content %}
+  {% endblock fixed_content %}
   </main>
 
   <footer class="c-footer  s-footer">
diff --git a/taccsite_cms/templates/djangocms_blog/base.html b/taccsite_cms/templates/djangocms_blog/base.html
index e6f6cda73..d35314ae4 100644
--- a/taccsite_cms/templates/djangocms_blog/base.html
+++ b/taccsite_cms/templates/djangocms_blog/base.html
@@ -13,7 +13,9 @@
     {% endif %}
 {% endblock meta %}
 
-{% block more_content %}
+{# TACC (do not let blog usurp Content placeholder): #}
+{% block fixed_content %}
+{# /TACC #}
 {# TACC (wrap list in container to mimic other page layouts): #}
 <div class="container">
 {# /TACC #}
@@ -39,4 +41,6 @@
 {# TACC (wrap list in container to mimic other page layouts): #}
 </div>
 {# /TACC #}
-{% endblock more_content %}
+{# TACC (do not let blog usurp Content placeholder): #}
+{% endblock fixed_content %}
+{# /TACC #}

From 463871fa96dd3eebb571aefb7fd31340a0eba330 Mon Sep 17 00:00:00 2001
From: Wesley Bomar <wbomar@tacc.utexas.edu>
Date: Mon, 22 Jul 2024 11:09:17 -0500
Subject: [PATCH 04/39] feat: TUP-706 render page with only (*_)content

---
 taccsite_cms/templates/raw.html | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100755 taccsite_cms/templates/raw.html

diff --git a/taccsite_cms/templates/raw.html b/taccsite_cms/templates/raw.html
new file mode 100755
index 000000000..9ec1f522a
--- /dev/null
+++ b/taccsite_cms/templates/raw.html
@@ -0,0 +1,8 @@
+{# To reduce output to only content #}
+{% load cms_tags %}
+
+{% block content %}
+{% placeholder "content" %}
+{% endblock content %}
+{% block fixed_content %}
+{% endblock fixed_content %}

From 8038de703bbbce7e31511c6975e212e34f13c314 Mon Sep 17 00:00:00 2001
From: Wesley Bomar <wbomar@tacc.utexas.edu>
Date: Mon, 22 Jul 2024 11:54:46 -0500
Subject: [PATCH 05/39] =?UTF-8?q?fix:=20TUP-706=20disable=20failed=20djang?=
 =?UTF-8?q?ocms=5Fblog=5Fc=E2=80=A6=20url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/djangocms_blog_customizations/urls.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/djangocms_blog_customizations/urls.py b/apps/djangocms_blog_customizations/urls.py
index 532f76b10..cf9b581ae 100644
--- a/apps/djangocms_blog_customizations/urls.py
+++ b/apps/djangocms_blog_customizations/urls.py
@@ -1,7 +1,9 @@
 from django.urls import path
 from .feeds import LatestEntriesFeed
 
+
 app_name = 'djangocms_blog_customizations'
 urlpatterns = [
-    path('', LatestEntriesFeed(), name="custom-posts-latest-feed"),
+    # Fails with `NoReverseMatch`
+    # path('feed', LatestEntriesFeed(), name="djangocms_blog_customizations_feed"),
 ]

From 89a160c006e7541fb5b0318f12b1019f11dc269b Mon Sep 17 00:00:00 2001
From: Wesley Bomar <wbomar@tacc.utexas.edu>
Date: Mon, 22 Jul 2024 11:58:11 -0500
Subject: [PATCH 06/39] idea!: TUP-706 render blog base via custom app

Fails, because it renders nothing.
---
 apps/djangocms_blog_customizations/urls.py  | 3 +++
 apps/djangocms_blog_customizations/views.py | 5 +++++
 2 files changed, 8 insertions(+)
 create mode 100644 apps/djangocms_blog_customizations/views.py

diff --git a/apps/djangocms_blog_customizations/urls.py b/apps/djangocms_blog_customizations/urls.py
index cf9b581ae..b479aafa4 100644
--- a/apps/djangocms_blog_customizations/urls.py
+++ b/apps/djangocms_blog_customizations/urls.py
@@ -1,9 +1,12 @@
 from django.urls import path
 from .feeds import LatestEntriesFeed
+from .views import BlogView
 
 
 app_name = 'djangocms_blog_customizations'
 urlpatterns = [
     # Fails with `NoReverseMatch`
     # path('feed', LatestEntriesFeed(), name="djangocms_blog_customizations_feed"),
+
+    path('', BlogView, name='djangocms_blog_customizations_base'),
 ]
diff --git a/apps/djangocms_blog_customizations/views.py b/apps/djangocms_blog_customizations/views.py
new file mode 100644
index 000000000..6d35bdd92
--- /dev/null
+++ b/apps/djangocms_blog_customizations/views.py
@@ -0,0 +1,5 @@
+from django.shortcuts import render
+
+
+def BlogView(request):
+    return render(request, 'djangocms_blog/base.html')

From db234df5aa7cc9d0e892d3c7c45231fb218db83f Mon Sep 17 00:00:00 2001
From: Wesley Bomar <wbomar@tacc.utexas.edu>
Date: Mon, 22 Jul 2024 12:10:12 -0500
Subject: [PATCH 07/39] feat!: TUP-706 render remote url content

Load `/blog/remote`.

BREAKING CHANGE: Changed `/blog` to `/blog/local`
---
 apps/djangocms_blog_customizations/urls.py  | 5 +++--
 apps/djangocms_blog_customizations/views.py | 9 +++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps/djangocms_blog_customizations/urls.py b/apps/djangocms_blog_customizations/urls.py
index b479aafa4..32cee5df0 100644
--- a/apps/djangocms_blog_customizations/urls.py
+++ b/apps/djangocms_blog_customizations/urls.py
@@ -1,6 +1,6 @@
 from django.urls import path
 from .feeds import LatestEntriesFeed
-from .views import BlogView
+from .views import BlogView, BlogRemoteView
 
 
 app_name = 'djangocms_blog_customizations'
@@ -8,5 +8,6 @@
     # Fails with `NoReverseMatch`
     # path('feed', LatestEntriesFeed(), name="djangocms_blog_customizations_feed"),
 
-    path('', BlogView, name='djangocms_blog_customizations_base'),
+    path('local', BlogView, name='djangocms_blog_customizations_base'),
+    path('remote', BlogRemoteView, name='djangocms_blog_customizations_remote'),
 ]
diff --git a/apps/djangocms_blog_customizations/views.py b/apps/djangocms_blog_customizations/views.py
index 6d35bdd92..841967d03 100644
--- a/apps/djangocms_blog_customizations/views.py
+++ b/apps/djangocms_blog_customizations/views.py
@@ -1,5 +1,14 @@
+from django.http import HttpResponse
+from django.template import Template, Context
 from django.shortcuts import render
+import requests
 
 
 def BlogView(request):
     return render(request, 'djangocms_blog/base.html')
+
+def BlogRemoteView(request):
+    request = requests.get('https://www.example.com/')
+    request.text
+
+    return HttpResponse(Template(request.text).render(Context({})))

From d7f10ae32b7936117725660af7398cec8f192c56 Mon Sep 17 00:00:00 2001
From: Wesley Bomar <wbomar@tacc.utexas.edu>
Date: Mon, 22 Jul 2024 12:23:02 -0500
Subject: [PATCH 08/39] chore: TUP-706 move an import higher in file

---
 apps/djangocms_blog_customizations/views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/djangocms_blog_customizations/views.py b/apps/djangocms_blog_customizations/views.py
index 841967d03..da772e086 100644
--- a/apps/djangocms_blog_customizations/views.py
+++ b/apps/djangocms_blog_customizations/views.py
@@ -1,8 +1,8 @@
+import requests
+
 from django.http import HttpResponse
 from django.template import Template, Context
 from django.shortcuts import render
-import requests
-
 
 def BlogView(request):
     return render(request, 'djangocms_blog/base.html')

From ec10c853ce5f7f3a010014d7bf7231055a415859 Mon Sep 17 00:00:00 2001
From: Wesley Bomar <wbomar@tacc.utexas.edu>
Date: Mon, 22 Jul 2024 12:35:09 -0500
Subject: [PATCH 09/39] feat: TUP-706 render remote url via setting

---
 apps/djangocms_blog_customizations/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/djangocms_blog_customizations/views.py b/apps/djangocms_blog_customizations/views.py
index da772e086..46d85b035 100644
--- a/apps/djangocms_blog_customizations/views.py
+++ b/apps/djangocms_blog_customizations/views.py
@@ -1,5 +1,6 @@
 import requests
 
+from django.conf import settings
 from django.http import HttpResponse
 from django.template import Template, Context
 from django.shortcuts import render
@@ -8,7 +9,7 @@ def BlogView(request):
     return render(request, 'djangocms_blog/base.html')
 
 def BlogRemoteView(request):
-    request = requests.get('https://www.example.com/')
+    request = requests.get(settings.PORTAL_BLOG_REMOTE_URL)
     request.text
 
     return HttpResponse(Template(request.text).render(Context({})))

From 223b72aede2c83632276de483982bae450357920 Mon Sep 17 00:00:00 2001
From: Wesley Bomar <wbomar@tacc.utexas.edu>
Date: Mon, 22 Jul 2024 13:17:23 -0500
Subject: [PATCH 10/39] fix: TUP-706 render blog customizations

---
 apps/djangocms_blog_customizations/apps.py | 5 ++---
 apps/djangocms_blog_customizations/urls.py | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/djangocms_blog_customizations/apps.py b/apps/djangocms_blog_customizations/apps.py
index b4c46995b..90394df2f 100644
--- a/apps/djangocms_blog_customizations/apps.py
+++ b/apps/djangocms_blog_customizations/apps.py
@@ -1,6 +1,5 @@
 from django.apps import AppConfig
-
+from django.utils.translation import gettext_lazy as _
 
 class customBlogAppConfig(AppConfig):
-    verbose_name = _("django CMS Blog customizations")
-    app_name = 'apps.djangocms_blog_customizations'
+    name = 'apps.djangocms_blog_customizations'
diff --git a/apps/djangocms_blog_customizations/urls.py b/apps/djangocms_blog_customizations/urls.py
index 32cee5df0..712c92f0d 100644
--- a/apps/djangocms_blog_customizations/urls.py
+++ b/apps/djangocms_blog_customizations/urls.py
@@ -1,4 +1,4 @@
-from django.urls import path
+from django.urls import re_path
 from .feeds import LatestEntriesFeed
 from .views import BlogView, BlogRemoteView
 
@@ -8,6 +8,6 @@
     # Fails with `NoReverseMatch`
     # path('feed', LatestEntriesFeed(), name="djangocms_blog_customizations_feed"),
 
-    path('local', BlogView, name='djangocms_blog_customizations_base'),
-    path('remote', BlogRemoteView, name='djangocms_blog_customizations_remote'),
+    re_path(r'^local/', BlogView, name='djangocms_blog_customizations_base'),
+    re_path(r'^remote/', BlogRemoteView, name='djangocms_blog_customizations_remote'),
 ]

From 646b26db8b2d377286323a11f8b9709933640870 Mon Sep 17 00:00:00 2001
From: Wesley Bomar <wbomar@tacc.utexas.edu>
Date: Mon, 22 Jul 2024 15:20:20 -0500
Subject: [PATCH 11/39] =?UTF-8?q?fix:=20TUP-706=20render=20feed=20?=
 =?UTF-8?q?=E2=9A=A0=EF=B8=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

⚠️ Does NOT render feed items.
---
 apps/djangocms_blog_customizations/feeds.py | 29 ++++++++++++++++-----
 apps/djangocms_blog_customizations/urls.py  |  5 ++--
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/apps/djangocms_blog_customizations/feeds.py b/apps/djangocms_blog_customizations/feeds.py
index 87454766d..a281c9567 100644
--- a/apps/djangocms_blog_customizations/feeds.py
+++ b/apps/djangocms_blog_customizations/feeds.py
@@ -1,17 +1,32 @@
-from html import unescape
-from io import BytesIO
-
 from aldryn_apphooks_config.utils import get_app_instance
-from django.contrib.sites.models import Site
-from django.urls import reverse
 from django.utils.feedgenerator import Rss201rev2Feed
-from django.utils.translation import gettext as _
 
 from djangocms_blog.feeds import LatestEntriesFeed as DjangoCMSBlogLatestEntriesFeed
 from djangocms_blog.settings import get_setting
-from djangocms_blog.models import Post
+from djangocms_blog.cms_appconfig import BlogConfig
+
+import logging
 
+logger = logging.getLogger(f"portal.{__name__}")
 
 class LatestEntriesFeed(DjangoCMSBlogLatestEntriesFeed):
     feed_type = Rss201rev2Feed
     feed_items_number = get_setting("FEED_LATEST_ITEMS")
+
+    link = "/blog/"
+
+    def __call__(self, request, *args, **kwargs):
+        namespace = get_setting("AUTO_NAMESPACE")
+
+        self.request = request
+        self.namespace = get_setting("AUTO_NAMESPACE")
+        self.config = BlogConfig.objects.get(namespace=namespace)
+
+        logger.debug(f"CUSTOM FEED | NAMESPACE: {self.namespace}, CONFIG: {self.config}")
+
+        return super().__call__(request, *args, **kwargs)
+
+    def items(self):
+        items = super().items()
+        logging.debug(f"CUSTOM FEED | FEED ITEMS: {items}")
+        return items
diff --git a/apps/djangocms_blog_customizations/urls.py b/apps/djangocms_blog_customizations/urls.py
index 712c92f0d..cecb67aff 100644
--- a/apps/djangocms_blog_customizations/urls.py
+++ b/apps/djangocms_blog_customizations/urls.py
@@ -1,12 +1,13 @@
 from django.urls import re_path
+
 from .feeds import LatestEntriesFeed
 from .views import BlogView, BlogRemoteView
 
 
 app_name = 'djangocms_blog_customizations'
 urlpatterns = [
-    # Fails with `NoReverseMatch`
-    # path('feed', LatestEntriesFeed(), name="djangocms_blog_customizations_feed"),
+    # WARNING: Renders feed, but does nto render items within the feed
+    re_path(r'^feed/', LatestEntriesFeed(), name='djangocms_blog_customizations_feed'),
 
     re_path(r'^local/', BlogView, name='djangocms_blog_customizations_base'),
     re_path(r'^remote/', BlogRemoteView, name='djangocms_blog_customizations_remote'),

From aa709fddb6074ce1e878495fb3ffe1325de6bd9b Mon Sep 17 00:00:00 2001
From: Wesley Bomar <wbomar@tacc.utexas.edu>
Date: Mon, 22 Jul 2024 15:29:09 -0500
Subject: [PATCH 12/39] docs: TUP-706 describe each URL's problem

---
 apps/djangocms_blog_customizations/urls.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/djangocms_blog_customizations/urls.py b/apps/djangocms_blog_customizations/urls.py
index cecb67aff..faee6bfb2 100644
--- a/apps/djangocms_blog_customizations/urls.py
+++ b/apps/djangocms_blog_customizations/urls.py
@@ -6,9 +6,12 @@
 
 app_name = 'djangocms_blog_customizations'
 urlpatterns = [
-    # WARNING: Renders feed, but does nto render items within the feed
-    re_path(r'^feed/', LatestEntriesFeed(), name='djangocms_blog_customizations_feed'),
+    # XXX: Does NOT render items within the feed
+    re_path(r'^feed/', LatestEntriesFeed(), name='feed'),
 
-    re_path(r'^local/', BlogView, name='djangocms_blog_customizations_base'),
-    re_path(r'^remote/', BlogRemoteView, name='djangocms_blog_customizations_remote'),
+    # XXX: Does not render blog content
+    re_path(r'^local/', BlogView, name='base'),
+
+    # XXX: URLs are still local
+    re_path(r'^remote/', BlogRemoteView, name='remote'),
 ]

From 26a9412949f4d519a1167f495fd99fc7a5ee2497 Mon Sep 17 00:00:00 2001
From: Wesley Bomar <wbomar@tacc.utexas.edu>
Date: Mon, 22 Jul 2024 15:36:10 -0500
Subject: [PATCH 13/39] docs: TUP-706 describe each URL goal and status

---
 apps/djangocms_blog_customizations/urls.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/djangocms_blog_customizations/urls.py b/apps/djangocms_blog_customizations/urls.py
index faee6bfb2..7f9b6a05e 100644
--- a/apps/djangocms_blog_customizations/urls.py
+++ b/apps/djangocms_blog_customizations/urls.py
@@ -6,12 +6,18 @@
 
 app_name = 'djangocms_blog_customizations'
 urlpatterns = [
+    # To render styled Blog feed
+    # XXX: Does NOT style the feed
     # XXX: Does NOT render items within the feed
     re_path(r'^feed/', LatestEntriesFeed(), name='feed'),
 
-    # XXX: Does not render blog content
+    # To render current blog, content only (no Core-CMS base.html)
+    # XXX: Does NOT render blog content
+    # XXX: Does NOT escape Core-CMS base.html
     re_path(r'^local/', BlogView, name='base'),
 
+    # To render a blog (or any page) from another website
     # XXX: URLs are still local
+    # XXX: Is NOT blog-specific, so should be a generic feature
     re_path(r'^remote/', BlogRemoteView, name='remote'),
 ]

From 4e780387dd0673dd1b62c03de845e3d9ad6636d6 Mon Sep 17 00:00:00 2001
From: Wesley Bomar <wbomar@tacc.utexas.edu>
Date: Mon, 22 Jul 2024 17:49:38 -0500
Subject: [PATCH 14/39] feat: TUP-706 A.1+3.c remote markup via template

---
 .../djangocms_blog_customizations/remote.html    |  1 +
 apps/djangocms_blog_customizations/urls.py       |  2 +-
 apps/djangocms_blog_customizations/views.py      | 16 +++++++++++-----
 3 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 apps/djangocms_blog_customizations/templates/djangocms_blog_customizations/remote.html

diff --git a/apps/djangocms_blog_customizations/templates/djangocms_blog_customizations/remote.html b/apps/djangocms_blog_customizations/templates/djangocms_blog_customizations/remote.html
new file mode 100644
index 000000000..c73b79ae6
--- /dev/null
+++ b/apps/djangocms_blog_customizations/templates/djangocms_blog_customizations/remote.html
@@ -0,0 +1 @@
+{{ markup|safe }}
diff --git a/apps/djangocms_blog_customizations/urls.py b/apps/djangocms_blog_customizations/urls.py
index 7f9b6a05e..d00a52e22 100644
--- a/apps/djangocms_blog_customizations/urls.py
+++ b/apps/djangocms_blog_customizations/urls.py
@@ -19,5 +19,5 @@
     # To render a blog (or any page) from another website
     # XXX: URLs are still local
     # XXX: Is NOT blog-specific, so should be a generic feature
-    re_path(r'^remote/', BlogRemoteView, name='remote'),
+    re_path(r'^remote/', BlogRemoteView.as_view(), name='remote'),
 ]
diff --git a/apps/djangocms_blog_customizations/views.py b/apps/djangocms_blog_customizations/views.py
index 46d85b035..b60cf1383 100644
--- a/apps/djangocms_blog_customizations/views.py
+++ b/apps/djangocms_blog_customizations/views.py
@@ -1,15 +1,21 @@
 import requests
 
 from django.conf import settings
-from django.http import HttpResponse
+from django.http import request
 from django.template import Template, Context
 from django.shortcuts import render
+from django.views.generic.base import TemplateView
 
 def BlogView(request):
     return render(request, 'djangocms_blog/base.html')
 
-def BlogRemoteView(request):
-    request = requests.get(settings.PORTAL_BLOG_REMOTE_URL)
-    request.text
+class BlogRemoteView(TemplateView):
+    template_name = 'djangocms_blog_customizations/remote.html'
 
-    return HttpResponse(Template(request.text).render(Context({})))
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        remote_page = requests.get(settings.PORTAL_BLOG_REMOTE_URL)
+
+        context['markup'] = remote_page.text
+
+        return context

From a461693154a1b53376199d86912d3de2de6b97a2 Mon Sep 17 00:00:00 2001
From: Wesley Bomar <wbomar@tacc.utexas.edu>
Date: Tue, 23 Jul 2024 16:20:05 -0500
Subject: [PATCH 15/39] feat: TUP-706 A.1.a. support BLOG_MULTISITE

---
 taccsite_cms/custom_app_settings.example.py |  2 +-
 taccsite_cms/middleware/settings.py         | 20 ++++++++++++++++++++
 taccsite_cms/settings_local.example.py      |  4 ++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 taccsite_cms/middleware/settings.py

diff --git a/taccsite_cms/custom_app_settings.example.py b/taccsite_cms/custom_app_settings.example.py
index fb9165c55..8f58b8a1a 100644
--- a/taccsite_cms/custom_app_settings.example.py
+++ b/taccsite_cms/custom_app_settings.example.py
@@ -1,3 +1,3 @@
 CUSTOM_APPS = ['apps.custom_example', 'apps.djangocms_blog_customizations']
-CUSTOM_MIDDLEWARE = []
+CUSTOM_MIDDLEWARE = ['taccsite_cms.middleware.settings.DynamicSiteIdMiddleware']
 STATICFILES_DIRS = ()
diff --git a/taccsite_cms/middleware/settings.py b/taccsite_cms/middleware/settings.py
new file mode 100644
index 000000000..f96761211
--- /dev/null
+++ b/taccsite_cms/middleware/settings.py
@@ -0,0 +1,20 @@
+from django.conf import settings
+from urllib.parse import urlparse
+from django.contrib.sites.models import Site
+
+class DynamicSiteIdMiddleware:
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        # One-time configuration and initialization.
+        try:
+            current_site = Site.objects.get(domain=request.get_host())
+        except Site.DoesNotExist:
+            current_site = Site.objects.get(id=settings.DEFAULT_SITE_ID)
+
+        request.current_site = current_site
+        settings.SITE_ID = current_site.id
+
+        response = self.get_response(request)
+        return response
diff --git a/taccsite_cms/settings_local.example.py b/taccsite_cms/settings_local.example.py
index be1e69618..5f3b637ac 100644
--- a/taccsite_cms/settings_local.example.py
+++ b/taccsite_cms/settings_local.example.py
@@ -11,3 +11,7 @@
 # To disable the Core-Portal integration
 PORTAL_IS_TACC_CORE_PORTAL = False
 PORTAL_HAS_LOGIN = False
+
+# To allow login in unique situations
+# FAQ: If `BLOG_MULTISITE = True`, set `SESSION_COOKIE_SECURE=False` to be able to log in to CMS Admin at different domain (e.g. 0.0.0.0)
+SESSION_COOKIE_SECURE = False

From 6bece398c8d86beeee6b7852f5889cad6eb55480 Mon Sep 17 00:00:00 2001
From: Wesley Bomar <wbomar@tacc.utexas.edu>
Date: Tue, 23 Jul 2024 17:06:25 -0500
Subject: [PATCH 16/39] fix: TUP-706 A.1.a. cannot login to site 2

---
 taccsite_cms/middleware/settings.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/taccsite_cms/middleware/settings.py b/taccsite_cms/middleware/settings.py
index f96761211..04a2964af 100644
--- a/taccsite_cms/middleware/settings.py
+++ b/taccsite_cms/middleware/settings.py
@@ -14,7 +14,11 @@ def __call__(self, request):
             current_site = Site.objects.get(id=settings.DEFAULT_SITE_ID)
 
         request.current_site = current_site
+        current_domain = urlparse('//' + current_site.domain)
+
         settings.SITE_ID = current_site.id
+        settings.SESSION_COOKIE_NAME = f"sessionid_site{current_site.id}"
+        settings.SESSION_COOKIE_DOMAIN = current_domain.hostname
 
         response = self.get_response(request)
         return response

From e6bdbbf1e6d941e1439cd99ba18cf35e877f11a6 Mon Sep 17 00:00:00 2001
From: Wesley Bomar <wbomar@tacc.utexas.edu>
Date: Tue, 23 Jul 2024 17:06:54 -0500
Subject: [PATCH 17/39] Revert "fix: TUP-706 A.1.a. cannot login to site 2"

This reverts commit 6bece398c8d86beeee6b7852f5889cad6eb55480.

This did not fix anything. `SESSION_COOKIE_SECURE=False` is still required locally.
---
 taccsite_cms/middleware/settings.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/taccsite_cms/middleware/settings.py b/taccsite_cms/middleware/settings.py
index 04a2964af..f96761211 100644
--- a/taccsite_cms/middleware/settings.py
+++ b/taccsite_cms/middleware/settings.py
@@ -14,11 +14,7 @@ def __call__(self, request):
             current_site = Site.objects.get(id=settings.DEFAULT_SITE_ID)
 
         request.current_site = current_site
-        current_domain = urlparse('//' + current_site.domain)
-
         settings.SITE_ID = current_site.id
-        settings.SESSION_COOKIE_NAME = f"sessionid_site{current_site.id}"
-        settings.SESSION_COOKIE_DOMAIN = current_domain.hostname
 
         response = self.get_response(request)
         return response

From 104fe715a0377db1a0b931a30526281174dfdd7f Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Tue, 10 Sep 2024 13:48:37 -0500
Subject: [PATCH 18/39] docs: TUP-706 feed status (ineffectual)

---
 apps/djangocms_blog_customizations/feeds.py | 14 +++++++-------
 apps/djangocms_blog_customizations/urls.py  |  4 +++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/apps/djangocms_blog_customizations/feeds.py b/apps/djangocms_blog_customizations/feeds.py
index a281c9567..da8c65bc8 100644
--- a/apps/djangocms_blog_customizations/feeds.py
+++ b/apps/djangocms_blog_customizations/feeds.py
@@ -5,15 +5,13 @@
 from djangocms_blog.settings import get_setting
 from djangocms_blog.cms_appconfig import BlogConfig
 
-import logging
-
-logger = logging.getLogger(f"portal.{__name__}")
-
+# XXX: This file is loaded, but it does NOT override the feed
+# XXX: Logging via logger fails anywhere; via print fails inside any method
 class LatestEntriesFeed(DjangoCMSBlogLatestEntriesFeed):
     feed_type = Rss201rev2Feed
     feed_items_number = get_setting("FEED_LATEST_ITEMS")
 
-    link = "/blog/"
+    print(f"CUSTOM FEED | FEED_LATEST_ITEMS: {feed_items_number}")
 
     def __call__(self, request, *args, **kwargs):
         namespace = get_setting("AUTO_NAMESPACE")
@@ -22,11 +20,13 @@ def __call__(self, request, *args, **kwargs):
         self.namespace = get_setting("AUTO_NAMESPACE")
         self.config = BlogConfig.objects.get(namespace=namespace)
 
-        logger.debug(f"CUSTOM FEED | NAMESPACE: {self.namespace}, CONFIG: {self.config}")
+        print(f"CUSTOM FEED | NAMESPACE: {self.namespace}, CONFIG: {self.config}")
 
         return super().__call__(request, *args, **kwargs)
 
     def items(self):
         items = super().items()
-        logging.debug(f"CUSTOM FEED | FEED ITEMS: {items}")
+
+        print(f"CUSTOM FEED | FEED ITEMS: {items}")
+
         return items
diff --git a/apps/djangocms_blog_customizations/urls.py b/apps/djangocms_blog_customizations/urls.py
index d00a52e22..b3692c024 100644
--- a/apps/djangocms_blog_customizations/urls.py
+++ b/apps/djangocms_blog_customizations/urls.py
@@ -8,7 +8,9 @@
 urlpatterns = [
     # To render styled Blog feed
     # XXX: Does NOT style the feed
-    # XXX: Does NOT render items within the feed
+    # XXX: Does NOT customize the feed
+    # FAQ: See errors at `/blog/feed/`, items at `/blog/feed/fb`
+    # FAQ: See Blog app feed root at `/news/feed/`, items at `/news/feed/fb`
     re_path(r'^feed/', LatestEntriesFeed(), name='feed'),
 
     # To render current blog, content only (no Core-CMS base.html)

From dfc9fa4aa9f3f44212a2a29c2b8d11a370c7a116 Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Tue, 10 Sep 2024 18:18:08 -0500
Subject: [PATCH 19/39] docs: tup-706 urls for local and remote

---
 apps/djangocms_blog_customizations/urls.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/djangocms_blog_customizations/urls.py b/apps/djangocms_blog_customizations/urls.py
index b3692c024..8db4596ce 100644
--- a/apps/djangocms_blog_customizations/urls.py
+++ b/apps/djangocms_blog_customizations/urls.py
@@ -16,10 +16,12 @@
     # To render current blog, content only (no Core-CMS base.html)
     # XXX: Does NOT render blog content
     # XXX: Does NOT escape Core-CMS base.html
+    # FAQ: URL is `/blog/local`
     re_path(r'^local/', BlogView, name='base'),
 
     # To render a blog (or any page) from another website
     # XXX: URLs are still local
     # XXX: Is NOT blog-specific, so should be a generic feature
+    # FAQ: URL is `/blog/remote`
     re_path(r'^remote/', BlogRemoteView.as_view(), name='remote'),
 ]

From cd59bf932e61677863705b494f7937c5a1a62b76 Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Tue, 10 Sep 2024 19:15:17 -0500
Subject: [PATCH 20/39] feat(poc): TUP-706 get news from remote url

Messy but functional!
---
 apps/djangocms_blog_customizations/urls.py  |  7 ++++++-
 apps/djangocms_blog_customizations/views.py | 23 ++++++++++++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/apps/djangocms_blog_customizations/urls.py b/apps/djangocms_blog_customizations/urls.py
index 8db4596ce..4eee7b1c5 100644
--- a/apps/djangocms_blog_customizations/urls.py
+++ b/apps/djangocms_blog_customizations/urls.py
@@ -1,10 +1,15 @@
+import re
+
 from django.urls import re_path
+# from django.conf import settings
 
 from .feeds import LatestEntriesFeed
 from .views import BlogView, BlogRemoteView
 
 
 app_name = 'djangocms_blog_customizations'
+
+# blogRemoteUrlPattern = r'^' + re.escape(settings.PORTAL_BLOG_REMOTE_CLIENT_PATH)
 urlpatterns = [
     # To render styled Blog feed
     # XXX: Does NOT style the feed
@@ -22,6 +27,6 @@
     # To render a blog (or any page) from another website
     # XXX: URLs are still local
     # XXX: Is NOT blog-specific, so should be a generic feature
-    # FAQ: URL is `/blog/remote`
+    # TODO: Use settings.PORTAL_BLOG_REMOTE_CLIENT_PATH
     re_path(r'^remote/', BlogRemoteView.as_view(), name='remote'),
 ]
diff --git a/apps/djangocms_blog_customizations/views.py b/apps/djangocms_blog_customizations/views.py
index b60cf1383..53aebec43 100644
--- a/apps/djangocms_blog_customizations/views.py
+++ b/apps/djangocms_blog_customizations/views.py
@@ -1,7 +1,6 @@
 import requests
 
 from django.conf import settings
-from django.http import request
 from django.template import Template, Context
 from django.shortcuts import render
 from django.views.generic.base import TemplateView
@@ -9,13 +8,31 @@
 def BlogView(request):
     return render(request, 'djangocms_blog/base.html')
 
+def get_remote_content(url):
+    print("BLOGREMOTEVIEW | url", url)
+
+    response = requests.get(url)
+
+    if response.status_code == 200:
+        return response.text
+    else:
+        return None
+
 class BlogRemoteView(TemplateView):
     template_name = 'djangocms_blog_customizations/remote.html'
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        remote_page = requests.get(settings.PORTAL_BLOG_REMOTE_URL)
+        remote_path = self.request.path.replace(
+            settings.PORTAL_BLOG_REMOTE_CLIENT_PATH, ''
+        )
+        remote_url = settings.PORTAL_BLOG_REMOTE_SOURCE_ROOT + remote_path
+
+        print("BLOGREMOTEVIEW | remote_path", remote_path)
+        print("BLOGREMOTEVIEW | remote_url", remote_url)
+
+        remote_content = get_remote_content(remote_url)
 
-        context['markup'] = remote_page.text
+        context['markup'] = remote_content
 
         return context

From 6995c44b3085f9f5695ec23cd01d1511f70a7755 Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Wed, 11 Sep 2024 10:22:45 -0500
Subject: [PATCH 21/39] chore: remove test print statements from feeds

---
 apps/djangocms_blog_customizations/feeds.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/apps/djangocms_blog_customizations/feeds.py b/apps/djangocms_blog_customizations/feeds.py
index da8c65bc8..a1d008ece 100644
--- a/apps/djangocms_blog_customizations/feeds.py
+++ b/apps/djangocms_blog_customizations/feeds.py
@@ -11,8 +11,6 @@ class LatestEntriesFeed(DjangoCMSBlogLatestEntriesFeed):
     feed_type = Rss201rev2Feed
     feed_items_number = get_setting("FEED_LATEST_ITEMS")
 
-    print(f"CUSTOM FEED | FEED_LATEST_ITEMS: {feed_items_number}")
-
     def __call__(self, request, *args, **kwargs):
         namespace = get_setting("AUTO_NAMESPACE")
 
@@ -20,13 +18,9 @@ def __call__(self, request, *args, **kwargs):
         self.namespace = get_setting("AUTO_NAMESPACE")
         self.config = BlogConfig.objects.get(namespace=namespace)
 
-        print(f"CUSTOM FEED | NAMESPACE: {self.namespace}, CONFIG: {self.config}")
-
         return super().__call__(request, *args, **kwargs)
 
     def items(self):
         items = super().items()
 
-        print(f"CUSTOM FEED | FEED ITEMS: {items}")
-
         return items

From db793974addc7bd586c107dced22242222758582 Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Wed, 11 Sep 2024 10:23:01 -0500
Subject: [PATCH 22/39] core: clean up views

---
 apps/djangocms_blog_customizations/views.py | 24 ++++++++-------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/apps/djangocms_blog_customizations/views.py b/apps/djangocms_blog_customizations/views.py
index 53aebec43..74cb72ca1 100644
--- a/apps/djangocms_blog_customizations/views.py
+++ b/apps/djangocms_blog_customizations/views.py
@@ -8,16 +8,6 @@
 def BlogView(request):
     return render(request, 'djangocms_blog/base.html')
 
-def get_remote_content(url):
-    print("BLOGREMOTEVIEW | url", url)
-
-    response = requests.get(url)
-
-    if response.status_code == 200:
-        return response.text
-    else:
-        return None
-
 class BlogRemoteView(TemplateView):
     template_name = 'djangocms_blog_customizations/remote.html'
 
@@ -27,12 +17,16 @@ def get_context_data(self, **kwargs):
             settings.PORTAL_BLOG_REMOTE_CLIENT_PATH, ''
         )
         remote_url = settings.PORTAL_BLOG_REMOTE_SOURCE_ROOT + remote_path
-
-        print("BLOGREMOTEVIEW | remote_path", remote_path)
-        print("BLOGREMOTEVIEW | remote_url", remote_url)
-
-        remote_content = get_remote_content(remote_url)
+        remote_content = self.get_remote_content(remote_url)
 
         context['markup'] = remote_content
 
         return context
+
+    def get_remote_content(self, url):
+        response = requests.get(url)
+
+        if response.status_code == 200:
+            return response.text
+        else:
+            return None

From a6d8551b5cbd63f6c1ffdd307515a84ffdf5240c Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Wed, 11 Sep 2024 10:28:13 -0500
Subject: [PATCH 23/39] core: clean up views more

---
 apps/djangocms_blog_customizations/views.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/apps/djangocms_blog_customizations/views.py b/apps/djangocms_blog_customizations/views.py
index 74cb72ca1..37a089752 100644
--- a/apps/djangocms_blog_customizations/views.py
+++ b/apps/djangocms_blog_customizations/views.py
@@ -13,10 +13,7 @@ class BlogRemoteView(TemplateView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        remote_path = self.request.path.replace(
-            settings.PORTAL_BLOG_REMOTE_CLIENT_PATH, ''
-        )
-        remote_url = settings.PORTAL_BLOG_REMOTE_SOURCE_ROOT + remote_path
+        remote_url = self.get_remote_url()
         remote_content = self.get_remote_content(remote_url)
 
         context['markup'] = remote_content
@@ -30,3 +27,15 @@ def get_remote_content(self, url):
             return response.text
         else:
             return None
+
+    def get_remote_url(self):
+        path = self.request.path.replace(
+            settings.PORTAL_BLOG_REMOTE_CLIENT_PATH,
+            ''
+        )
+        url = (
+            settings.PORTAL_BLOG_REMOTE_SOURCE_ROOT
+            + path
+        )
+
+        return url

From 82027fed4df4fe8fa9ef971b210d9422fb07f5a3 Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Wed, 11 Sep 2024 10:28:53 -0500
Subject: [PATCH 24/39] refactor: switch order of methods in view class

---
 apps/djangocms_blog_customizations/views.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/djangocms_blog_customizations/views.py b/apps/djangocms_blog_customizations/views.py
index 37a089752..da2a377ba 100644
--- a/apps/djangocms_blog_customizations/views.py
+++ b/apps/djangocms_blog_customizations/views.py
@@ -20,14 +20,6 @@ def get_context_data(self, **kwargs):
 
         return context
 
-    def get_remote_content(self, url):
-        response = requests.get(url)
-
-        if response.status_code == 200:
-            return response.text
-        else:
-            return None
-
     def get_remote_url(self):
         path = self.request.path.replace(
             settings.PORTAL_BLOG_REMOTE_CLIENT_PATH,
@@ -39,3 +31,11 @@ def get_remote_url(self):
         )
 
         return url
+
+    def get_remote_content(self, url):
+        response = requests.get(url)
+
+        if response.status_code == 200:
+            return response.text
+        else:
+            return None

From 0c9440160ef381a8dcfc82ebfd81bf14180f3693 Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Wed, 11 Sep 2024 13:28:09 -0500
Subject: [PATCH 25/39] feat: TUP-706 edit links via get_client_markup()

---
 apps/djangocms_blog_customizations/views.py | 34 ++++++++++++---------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/apps/djangocms_blog_customizations/views.py b/apps/djangocms_blog_customizations/views.py
index da2a377ba..85b168cb9 100644
--- a/apps/djangocms_blog_customizations/views.py
+++ b/apps/djangocms_blog_customizations/views.py
@@ -13,29 +13,35 @@ class BlogRemoteView(TemplateView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        remote_url = self.get_remote_url()
-        remote_content = self.get_remote_content(remote_url)
+        source_url = self.get_source_url()
+        source_markup = self.get_source_markup(source_url)
+        client_markup = self.get_client_markup(source_markup)
 
-        context['markup'] = remote_content
+        context['markup'] = client_markup
 
         return context
 
-    def get_remote_url(self):
-        path = self.request.path.replace(
-            settings.PORTAL_BLOG_REMOTE_CLIENT_PATH,
-            ''
-        )
-        url = (
-            settings.PORTAL_BLOG_REMOTE_SOURCE_ROOT
-            + path
-        )
+    def get_source_url(self):
+        client_path = settings.PORTAL_BLOG_REMOTE_CLIENT_PATH
+        source_host = settings.PORTAL_BLOG_REMOTE_SOURCE_ROOT
+        source_path = self.request.path.replace(client_path, '')
 
-        return url
+        return source_host + source_path
 
-    def get_remote_content(self, url):
+    def get_source_markup(self, url):
         response = requests.get(url)
 
         if response.status_code == 200:
             return response.text
         else:
             return None
+
+    # CAVEAT: Causes request to PORTAL_BLOG_REMOTE_CLIENT_PATH for every 'href'
+    def get_client_markup(self, source_markup):
+        client_path_prefix = settings.PORTAL_BLOG_REMOTE_CLIENT_PATH
+
+        # FAQ: No markup for bad URL or a resource specific to source wesbite
+        if source_markup:
+            return source_markup.replace('href="', 'href="' + client_path_prefix)
+        else:
+            return None

From 49edd04b8884375e8830aacf444cc13705e9c18d Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Wed, 11 Sep 2024 19:38:57 -0500
Subject: [PATCH 26/39] fix: TUP-706 broken links
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ✓ fix links to articles
- ✓ fix pagination links
---
 apps/djangocms_blog_customizations/views.py | 26 ++++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/apps/djangocms_blog_customizations/views.py b/apps/djangocms_blog_customizations/views.py
index 85b168cb9..823a086f3 100644
--- a/apps/djangocms_blog_customizations/views.py
+++ b/apps/djangocms_blog_customizations/views.py
@@ -1,5 +1,7 @@
 import requests
 
+from urllib.parse import urlparse
+
 from django.conf import settings
 from django.template import Template, Context
 from django.shortcuts import render
@@ -23,10 +25,18 @@ def get_context_data(self, **kwargs):
 
     def get_source_url(self):
         client_path = settings.PORTAL_BLOG_REMOTE_CLIENT_PATH
-        source_host = settings.PORTAL_BLOG_REMOTE_SOURCE_ROOT
-        source_path = self.request.path.replace(client_path, '')
+        source_root = settings.PORTAL_BLOG_REMOTE_SOURCE_ROOT
+        client = urlparse(self.request.build_absolute_uri())
+        source = urlparse(source_root)
+
+        source_path = source.path + client.path.replace(client_path, '')
+        source_url = client._replace(
+            scheme=source.scheme,
+            netloc=source.netloc,
+            path=source_path,
+        ).geturl()
 
-        return source_host + source_path
+        return source_url
 
     def get_source_markup(self, url):
         response = requests.get(url)
@@ -36,12 +46,16 @@ def get_source_markup(self, url):
         else:
             return None
 
-    # CAVEAT: Causes request to PORTAL_BLOG_REMOTE_CLIENT_PATH for every 'href'
+    # CAVEAT: Causes a view request for every resource (img/script/stylesheet)
     def get_client_markup(self, source_markup):
-        client_path_prefix = settings.PORTAL_BLOG_REMOTE_CLIENT_PATH
+        source = urlparse(settings.PORTAL_BLOG_REMOTE_SOURCE_ROOT)
+        client_path = settings.PORTAL_BLOG_REMOTE_CLIENT_PATH
 
         # FAQ: No markup for bad URL or a resource specific to source wesbite
         if source_markup:
-            return source_markup.replace('href="', 'href="' + client_path_prefix)
+            return source_markup.replace(
+                'href="' + source.path,
+                'href="' + client_path
+            )
         else:
             return None

From 70e51118f97a31774295d23ab65ca5ba0ec66eb6 Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Thu, 12 Sep 2024 17:08:01 -0500
Subject: [PATCH 27/39] feat: isolate breadcrumbs from content and news

---
 taccsite_cms/templates/base.html              | 23 +++++++++++--------
 .../templates/djangocms_blog/base.html        | 16 ++++++++-----
 taccsite_cms/templates/fullwidth.html         |  1 +
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/taccsite_cms/templates/base.html b/taccsite_cms/templates/base.html
index dc8ccaa42..5019f6230 100755
--- a/taccsite_cms/templates/base.html
+++ b/taccsite_cms/templates/base.html
@@ -68,23 +68,28 @@
   </header>
 
   <main id="cms-content">
-  {% block content %}
 
-    {# To allow extra Container in page structure by hiding extra padding #}
+  {% block breadcrumbs %}
+    <div class="container">
+      {% include "nav_cms_breadcrumbs.html" %}
+    </div>
+  {% endblock breadcrumbs %}
+
+  {% block content %}
+    {# To hide extra space that a nested/redundant Container would add #}
     <style type="text/css">
-      .container > .s-breadcrumbs + .container { padding-inline: 0; }
+      #cms-content-placeholder.container .container { padding-inline: 0; }
     </style>
 
-    {# To wrap breadcrumbs in Container without relying on CMS editor #}
-    <div class="container">
-      {% include "nav_cms_breadcrumbs.html" %}
+    {# To wrap content in Container without relying on CMS editor #}
+    <div class="container" id="cms-content-placeholder">
       {% placeholder "content" %}
     </div>
 
   {% endblock content %}
-  {# To isolate content with a layout that admin can not change e.g. Blog #}
-  {% block fixed_content %}
-  {% endblock fixed_content %}
+
+  {# To isolate content that has a layout an editor cannot change e.g. Blog #}
+  {% block app_content %}{% endblock app_content %}
   </main>
 
   <footer class="c-footer  s-footer">
diff --git a/taccsite_cms/templates/djangocms_blog/base.html b/taccsite_cms/templates/djangocms_blog/base.html
index d35314ae4..79f8d6af7 100644
--- a/taccsite_cms/templates/djangocms_blog/base.html
+++ b/taccsite_cms/templates/djangocms_blog/base.html
@@ -13,10 +13,14 @@
     {% endif %}
 {% endblock meta %}
 
-{# TACC (do not let blog usurp Content placeholder): #}
-{% block fixed_content %}
+{# TACC (to not let editor add Content to every blog page): #}
+{% block content %}{% endblock content %}
 {# /TACC #}
-{# TACC (wrap list in container to mimic other page layouts): #}
+
+{# TACC (to let blog have breadcrumbs via `{% block "breadcrumbs" %}`): #}
+{% block app_content %}
+{# /TACC #}
+{# TACC (to mimic `{% block "content" %}` layouts): #}
 <div class="container">
 {# /TACC #}
 
@@ -38,9 +42,9 @@
     {% block content_blog %}{% endblock %}
 </div>
 
-{# TACC (wrap list in container to mimic other page layouts): #}
+{# TACC (to mimic `{% block "content" %}` layouts): #}
 </div>
 {# /TACC #}
-{# TACC (do not let blog usurp Content placeholder): #}
-{% endblock fixed_content %}
+{# TACC (to let blog have breadcrumbs via `{% block "breadcrumbs" %}`): #}
+{% endblock app_content %}
 {# /TACC #}
diff --git a/taccsite_cms/templates/fullwidth.html b/taccsite_cms/templates/fullwidth.html
index 9d9155095..42ab71174 100755
--- a/taccsite_cms/templates/fullwidth.html
+++ b/taccsite_cms/templates/fullwidth.html
@@ -4,6 +4,7 @@
 {% block title %}{% page_attribute "page_title" %}{% endblock title %}
 
 {# To remove container and breadcrumbs #}
+{% block breadcrumbs %}{% endblock breadcrumbs %}
 {% block content %}
 {% placeholder "content" %}
 {% endblock content %}

From 4f7b76178215239618518e7fa4e109e01a8fdfe7 Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Thu, 12 Sep 2024 17:20:00 -0500
Subject: [PATCH 28/39] chore: remove unnecessary app

This app is fom a different branch.
---
 .../djangocms_blog_customizations/__init__.py |  0
 apps/djangocms_blog_customizations/apps.py    |  5 --
 apps/djangocms_blog_customizations/feeds.py   | 26 --------
 .../djangocms_blog_customizations/remote.html |  1 -
 apps/djangocms_blog_customizations/urls.py    | 32 ----------
 apps/djangocms_blog_customizations/views.py   | 61 -------------------
 6 files changed, 125 deletions(-)
 delete mode 100644 apps/djangocms_blog_customizations/__init__.py
 delete mode 100644 apps/djangocms_blog_customizations/apps.py
 delete mode 100644 apps/djangocms_blog_customizations/feeds.py
 delete mode 100644 apps/djangocms_blog_customizations/templates/djangocms_blog_customizations/remote.html
 delete mode 100644 apps/djangocms_blog_customizations/urls.py
 delete mode 100644 apps/djangocms_blog_customizations/views.py

diff --git a/apps/djangocms_blog_customizations/__init__.py b/apps/djangocms_blog_customizations/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/apps/djangocms_blog_customizations/apps.py b/apps/djangocms_blog_customizations/apps.py
deleted file mode 100644
index 90394df2f..000000000
--- a/apps/djangocms_blog_customizations/apps.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-from django.utils.translation import gettext_lazy as _
-
-class customBlogAppConfig(AppConfig):
-    name = 'apps.djangocms_blog_customizations'
diff --git a/apps/djangocms_blog_customizations/feeds.py b/apps/djangocms_blog_customizations/feeds.py
deleted file mode 100644
index a1d008ece..000000000
--- a/apps/djangocms_blog_customizations/feeds.py
+++ /dev/null
@@ -1,26 +0,0 @@
-from aldryn_apphooks_config.utils import get_app_instance
-from django.utils.feedgenerator import Rss201rev2Feed
-
-from djangocms_blog.feeds import LatestEntriesFeed as DjangoCMSBlogLatestEntriesFeed
-from djangocms_blog.settings import get_setting
-from djangocms_blog.cms_appconfig import BlogConfig
-
-# XXX: This file is loaded, but it does NOT override the feed
-# XXX: Logging via logger fails anywhere; via print fails inside any method
-class LatestEntriesFeed(DjangoCMSBlogLatestEntriesFeed):
-    feed_type = Rss201rev2Feed
-    feed_items_number = get_setting("FEED_LATEST_ITEMS")
-
-    def __call__(self, request, *args, **kwargs):
-        namespace = get_setting("AUTO_NAMESPACE")
-
-        self.request = request
-        self.namespace = get_setting("AUTO_NAMESPACE")
-        self.config = BlogConfig.objects.get(namespace=namespace)
-
-        return super().__call__(request, *args, **kwargs)
-
-    def items(self):
-        items = super().items()
-
-        return items
diff --git a/apps/djangocms_blog_customizations/templates/djangocms_blog_customizations/remote.html b/apps/djangocms_blog_customizations/templates/djangocms_blog_customizations/remote.html
deleted file mode 100644
index c73b79ae6..000000000
--- a/apps/djangocms_blog_customizations/templates/djangocms_blog_customizations/remote.html
+++ /dev/null
@@ -1 +0,0 @@
-{{ markup|safe }}
diff --git a/apps/djangocms_blog_customizations/urls.py b/apps/djangocms_blog_customizations/urls.py
deleted file mode 100644
index 4eee7b1c5..000000000
--- a/apps/djangocms_blog_customizations/urls.py
+++ /dev/null
@@ -1,32 +0,0 @@
-import re
-
-from django.urls import re_path
-# from django.conf import settings
-
-from .feeds import LatestEntriesFeed
-from .views import BlogView, BlogRemoteView
-
-
-app_name = 'djangocms_blog_customizations'
-
-# blogRemoteUrlPattern = r'^' + re.escape(settings.PORTAL_BLOG_REMOTE_CLIENT_PATH)
-urlpatterns = [
-    # To render styled Blog feed
-    # XXX: Does NOT style the feed
-    # XXX: Does NOT customize the feed
-    # FAQ: See errors at `/blog/feed/`, items at `/blog/feed/fb`
-    # FAQ: See Blog app feed root at `/news/feed/`, items at `/news/feed/fb`
-    re_path(r'^feed/', LatestEntriesFeed(), name='feed'),
-
-    # To render current blog, content only (no Core-CMS base.html)
-    # XXX: Does NOT render blog content
-    # XXX: Does NOT escape Core-CMS base.html
-    # FAQ: URL is `/blog/local`
-    re_path(r'^local/', BlogView, name='base'),
-
-    # To render a blog (or any page) from another website
-    # XXX: URLs are still local
-    # XXX: Is NOT blog-specific, so should be a generic feature
-    # TODO: Use settings.PORTAL_BLOG_REMOTE_CLIENT_PATH
-    re_path(r'^remote/', BlogRemoteView.as_view(), name='remote'),
-]
diff --git a/apps/djangocms_blog_customizations/views.py b/apps/djangocms_blog_customizations/views.py
deleted file mode 100644
index 823a086f3..000000000
--- a/apps/djangocms_blog_customizations/views.py
+++ /dev/null
@@ -1,61 +0,0 @@
-import requests
-
-from urllib.parse import urlparse
-
-from django.conf import settings
-from django.template import Template, Context
-from django.shortcuts import render
-from django.views.generic.base import TemplateView
-
-def BlogView(request):
-    return render(request, 'djangocms_blog/base.html')
-
-class BlogRemoteView(TemplateView):
-    template_name = 'djangocms_blog_customizations/remote.html'
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        source_url = self.get_source_url()
-        source_markup = self.get_source_markup(source_url)
-        client_markup = self.get_client_markup(source_markup)
-
-        context['markup'] = client_markup
-
-        return context
-
-    def get_source_url(self):
-        client_path = settings.PORTAL_BLOG_REMOTE_CLIENT_PATH
-        source_root = settings.PORTAL_BLOG_REMOTE_SOURCE_ROOT
-        client = urlparse(self.request.build_absolute_uri())
-        source = urlparse(source_root)
-
-        source_path = source.path + client.path.replace(client_path, '')
-        source_url = client._replace(
-            scheme=source.scheme,
-            netloc=source.netloc,
-            path=source_path,
-        ).geturl()
-
-        return source_url
-
-    def get_source_markup(self, url):
-        response = requests.get(url)
-
-        if response.status_code == 200:
-            return response.text
-        else:
-            return None
-
-    # CAVEAT: Causes a view request for every resource (img/script/stylesheet)
-    def get_client_markup(self, source_markup):
-        source = urlparse(settings.PORTAL_BLOG_REMOTE_SOURCE_ROOT)
-        client_path = settings.PORTAL_BLOG_REMOTE_CLIENT_PATH
-
-        # FAQ: No markup for bad URL or a resource specific to source wesbite
-        if source_markup:
-            return source_markup.replace(
-                'href="' + source.path,
-                'href="' + client_path
-            )
-        else:
-            return None

From c346a8814539f656bc6bd4f87b01f434ac180a96 Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Thu, 12 Sep 2024 17:20:55 -0500
Subject: [PATCH 29/39] chore: remove unnecessary middleware

This middleware is fom a different branch.
---
 taccsite_cms/middleware/settings.py | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 taccsite_cms/middleware/settings.py

diff --git a/taccsite_cms/middleware/settings.py b/taccsite_cms/middleware/settings.py
deleted file mode 100644
index f96761211..000000000
--- a/taccsite_cms/middleware/settings.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from django.conf import settings
-from urllib.parse import urlparse
-from django.contrib.sites.models import Site
-
-class DynamicSiteIdMiddleware:
-    def __init__(self, get_response):
-        self.get_response = get_response
-
-    def __call__(self, request):
-        # One-time configuration and initialization.
-        try:
-            current_site = Site.objects.get(domain=request.get_host())
-        except Site.DoesNotExist:
-            current_site = Site.objects.get(id=settings.DEFAULT_SITE_ID)
-
-        request.current_site = current_site
-        settings.SITE_ID = current_site.id
-
-        response = self.get_response(request)
-        return response

From e5dae76ec21c644cfa1e93bf36fad87e871a8968 Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Thu, 12 Sep 2024 17:21:06 -0500
Subject: [PATCH 30/39] fix: do not load missing app and middleware

---
 taccsite_cms/custom_app_settings.example.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/taccsite_cms/custom_app_settings.example.py b/taccsite_cms/custom_app_settings.example.py
index 8f58b8a1a..3ac04c50d 100644
--- a/taccsite_cms/custom_app_settings.example.py
+++ b/taccsite_cms/custom_app_settings.example.py
@@ -1,3 +1,3 @@
-CUSTOM_APPS = ['apps.custom_example', 'apps.djangocms_blog_customizations']
-CUSTOM_MIDDLEWARE = ['taccsite_cms.middleware.settings.DynamicSiteIdMiddleware']
+CUSTOM_APPS = ['apps.custom_example']
+CUSTOM_MIDDLEWARE = []
 STATICFILES_DIRS = ()

From ca7a1c65ce5041b8b0a8c9f7388c38f445629a0f Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Thu, 12 Sep 2024 17:22:05 -0500
Subject: [PATCH 31/39] fix: remove unnecessary setting

This setting is from another branch.
---
 taccsite_cms/settings_local.example.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/taccsite_cms/settings_local.example.py b/taccsite_cms/settings_local.example.py
index 22774e8fe..016656def 100644
--- a/taccsite_cms/settings_local.example.py
+++ b/taccsite_cms/settings_local.example.py
@@ -22,7 +22,3 @@
 # To disable the Core-Portal integration
 PORTAL_IS_TACC_CORE_PORTAL = False
 PORTAL_HAS_LOGIN = False
-
-# To allow login in unique situations
-# FAQ: If `BLOG_MULTISITE = True`, set `SESSION_COOKIE_SECURE=False` to be able to log in to CMS Admin at different domain (e.g. 0.0.0.0)
-SESSION_COOKIE_SECURE = False

From d1680ee978af93a5dd8856ea27f014dd277e1b89 Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Thu, 12 Sep 2024 17:22:58 -0500
Subject: [PATCH 32/39] fix: use correct name for app_content

---
 taccsite_cms/templates/raw.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/taccsite_cms/templates/raw.html b/taccsite_cms/templates/raw.html
index 9ec1f522a..cc4598eb4 100755
--- a/taccsite_cms/templates/raw.html
+++ b/taccsite_cms/templates/raw.html
@@ -2,7 +2,6 @@
 {% load cms_tags %}
 
 {% block content %}
-{% placeholder "content" %}
+  {% placeholder "content" %}
 {% endblock content %}
-{% block fixed_content %}
-{% endblock fixed_content %}
+{% block app_content %}{% endblock app_content %}

From c756e030b7ff1fd17ad922b6cdcc3456b8b746a3 Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Thu, 12 Sep 2024 17:23:18 -0500
Subject: [PATCH 33/39] style: new line

---
 taccsite_cms/templates/raw.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/taccsite_cms/templates/raw.html b/taccsite_cms/templates/raw.html
index cc4598eb4..30b3179a9 100755
--- a/taccsite_cms/templates/raw.html
+++ b/taccsite_cms/templates/raw.html
@@ -4,4 +4,5 @@
 {% block content %}
   {% placeholder "content" %}
 {% endblock content %}
+
 {% block app_content %}{% endblock app_content %}

From 53beba4d13347dee3ca1dce5dbf9b7fec64db3f8 Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Thu, 12 Sep 2024 19:19:01 -0500
Subject: [PATCH 34/39] fix: raw template logic outdated

---
 taccsite_cms/templates/raw.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/taccsite_cms/templates/raw.html b/taccsite_cms/templates/raw.html
index 30b3179a9..f4df3983f 100755
--- a/taccsite_cms/templates/raw.html
+++ b/taccsite_cms/templates/raw.html
@@ -1,8 +1,10 @@
 {# To reduce output to only content #}
 {% load cms_tags %}
 
+{# To remove container and breadcrumbs #}
 {% block content %}
-  {% placeholder "content" %}
+  {% block cms_content %}
+    {% placeholder "content" %}
+  {% endblock cms_content %}
+  {% block app_content %}{% endblock app_content %}
 {% endblock content %}
-
-{% block app_content %}{% endblock app_content %}

From c7a4c96737594186d5d785a9ef33319784e33e73 Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Thu, 12 Sep 2024 19:19:35 -0500
Subject: [PATCH 35/39] fix: bad merge resolution

---
 taccsite_cms/templates/base.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/taccsite_cms/templates/base.html b/taccsite_cms/templates/base.html
index 54042b05b..e8fea82a3 100755
--- a/taccsite_cms/templates/base.html
+++ b/taccsite_cms/templates/base.html
@@ -68,6 +68,7 @@
   </header>
 
   <main id="cms-content">
+  {% block content %}
 
     {# To hide extra space that a nested/redundant Container would add #}
     <style type="text/css">
@@ -88,9 +89,6 @@
     </div>
 
   {% endblock content %}
-
-  {# To isolate content that has a layout an editor cannot change e.g. Blog #}
-  {% block app_content %}{% endblock app_content %}
   </main>
 
   <footer class="c-footer  s-footer">

From 299d51baf146d2dac484870e71e385db73722789 Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Thu, 12 Sep 2024 19:20:07 -0500
Subject: [PATCH 36/39] fix: bad merge resolution

---
 taccsite_cms/templates/fullwidth.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/taccsite_cms/templates/fullwidth.html b/taccsite_cms/templates/fullwidth.html
index 0bbc3cd5b..57d83af0e 100755
--- a/taccsite_cms/templates/fullwidth.html
+++ b/taccsite_cms/templates/fullwidth.html
@@ -4,7 +4,6 @@
 {% block title %}{% page_attribute "page_title" %}{% endblock title %}
 
 {# To remove container and breadcrumbs #}
-{% block breadcrumbs %}{% endblock breadcrumbs %}
 {% block content %}
   {% block cms_content %}
     {% placeholder "content" %}

From ba50574cfb0df74ef95da474d88c861110c21c7f Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Thu, 12 Sep 2024 19:25:17 -0500
Subject: [PATCH 37/39] docs: how to serve raw content

---
 taccsite_cms/settings_custom.example.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/taccsite_cms/settings_custom.example.py b/taccsite_cms/settings_custom.example.py
index 5ad8ff017..e347a3447 100644
--- a/taccsite_cms/settings_custom.example.py
+++ b/taccsite_cms/settings_custom.example.py
@@ -40,6 +40,10 @@
     ('guides/data_transfer.html', 'Guide: Data Transfer'),
     ('guides/data_transfer.globus.html', 'Guide: Globus Data Transfer'),
     ('guides/portal_technology.html', 'Guide: Portal Technology Stack'),
+
+    # WARNING: Not intuitive to unset, so only enable as needed e.g.
+    #          - serve Blog such that it can be injected into another CMS
+    # ('raw.html', 'Raw'),
 )
 
 ########################

From 12c02eaac1ab72ec39ff7a3915b0759abac3b263 Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Fri, 13 Sep 2024 14:20:05 -0500
Subject: [PATCH 38/39] feat: tup-706 conditionally serve raw content

---
 taccsite_cms/custom_app_settings.example.py   |  2 +-
 .../middleware/cms_template_middleware.py     | 49 +++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 taccsite_cms/middleware/cms_template_middleware.py

diff --git a/taccsite_cms/custom_app_settings.example.py b/taccsite_cms/custom_app_settings.example.py
index 3ac04c50d..389b61807 100644
--- a/taccsite_cms/custom_app_settings.example.py
+++ b/taccsite_cms/custom_app_settings.example.py
@@ -1,3 +1,3 @@
 CUSTOM_APPS = ['apps.custom_example']
-CUSTOM_MIDDLEWARE = []
+CUSTOM_MIDDLEWARE = ['taccsite_cms.middleware.cms_template_middleware.CMSTemplateMiddleware']
 STATICFILES_DIRS = ()
diff --git a/taccsite_cms/middleware/cms_template_middleware.py b/taccsite_cms/middleware/cms_template_middleware.py
new file mode 100644
index 000000000..6d5ffee70
--- /dev/null
+++ b/taccsite_cms/middleware/cms_template_middleware.py
@@ -0,0 +1,49 @@
+"""Change CMS page template at runtime"""
+import os
+
+from cms.middleware.toolbar import ToolbarMiddleware
+from cms.models.pagemodel import Page as CMS_Page
+
+BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+TEMPLATE_DIR = os.path.join(BASE_DIR, 'templates')
+
+class CMSTemplateMiddleware(ToolbarMiddleware):
+    """
+    Use a different CMS template than is set for the current page
+
+    Usage:
+        http://0.0.0.0:8000/news/?raw
+        http://0.0.0.0:8000/news/?template=raw.html
+        Applies `raw.html` template
+
+        http://0.0.0.0:8000/news/?template=fullwidth.html
+        Applies `fulwidth.html` template
+
+        http://0.0.0.0:8000/news/?template=misspelling.html
+        Raises `TemplateDoesNotExist` error
+
+        http://0.0.0.0:8000/news/?rawng
+        http://0.0.0.0:8000/news/?template
+        http://0.0.0.0:8000/news/?template=s
+        No effect
+    """
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        if (
+            hasattr(request, 'current_page') and
+            isinstance(request.current_page, CMS_Page)
+        ):
+            page = request.current_page
+            query_params = request.GET
+            query_template = query_params.get('template', '')
+
+            if 'raw' in query_params:
+                page.template = os.path.join(TEMPLATE_DIR, 'raw.html')
+            if query_template.endswith('.html'):
+                page.template = os.path.join(TEMPLATE_DIR, query_template)
+
+        response = self.get_response(request)
+
+        return response

From 9e68a761de3b7b5dd62b71fdbad37dbfc11b144e Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Fri, 13 Sep 2024 16:28:35 -0500
Subject: [PATCH 39/39] reactor: rename middlewar

---
 taccsite_cms/custom_app_settings.example.py                     | 2 +-
 .../middleware/{cms_template_middleware.py => cms_template.py}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename taccsite_cms/middleware/{cms_template_middleware.py => cms_template.py} (100%)

diff --git a/taccsite_cms/custom_app_settings.example.py b/taccsite_cms/custom_app_settings.example.py
index 389b61807..e86966eb6 100644
--- a/taccsite_cms/custom_app_settings.example.py
+++ b/taccsite_cms/custom_app_settings.example.py
@@ -1,3 +1,3 @@
 CUSTOM_APPS = ['apps.custom_example']
-CUSTOM_MIDDLEWARE = ['taccsite_cms.middleware.cms_template_middleware.CMSTemplateMiddleware']
+CUSTOM_MIDDLEWARE = ['taccsite_cms.middleware.cms_template.CMSTemplateMiddleware']
 STATICFILES_DIRS = ()
diff --git a/taccsite_cms/middleware/cms_template_middleware.py b/taccsite_cms/middleware/cms_template.py
similarity index 100%
rename from taccsite_cms/middleware/cms_template_middleware.py
rename to taccsite_cms/middleware/cms_template.py