From 88f7371d1f448f35d2eb6adf7150c44de0d5ccfb Mon Sep 17 00:00:00 2001
From: William Tucker <william.tucker@stfc.ac.uk>
Date: Wed, 11 Mar 2026 16:00:03 +0000
Subject: [PATCH 1/3] Fixing old theme versions

---
 requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 07ef99e..30ede23 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,8 +13,8 @@ django-classy-tags==2.0.0
 django-cookie-law==2.2.0
 django-cors-headers==3.14.0
 git+https://github.com/cedadev/django-flexi-settings.git@0.2.0
-git+https://github.com/cedadev/fwtheme-django.git@1.0.1
-git+https://github.com/cedadev/fwtheme-django-ceda-serv.git@4653d07
+git+https://github.com/cedadev/fwtheme-django.git@786021bdb6f34cf693d44e96803a5df7d88b76fd
+git+https://github.com/cedadev/fwtheme-django-ceda-serv.git@1174dae805fbc3e5ec48f1f81c28ed39a5872fdc
 idna==2.10
 pycparser==2.20
 pytest-runner==5.2

From 0e346bc06c51e8cd42e66b320a6acd851525bce9 Mon Sep 17 00:00:00 2001
From: watucker <william.tucker@stfc.ac.uk>
Date: Wed, 11 Mar 2026 17:09:15 +0000
Subject: [PATCH 2/3] Updates to support bootstrap 5

---
 archive_browser/settings.py                |  2 +-
 browser/templates/browser/browse_base.html | 28 ++++++++++------------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/archive_browser/settings.py b/archive_browser/settings.py
index f978921..d6145b7 100644
--- a/archive_browser/settings.py
+++ b/archive_browser/settings.py
@@ -35,7 +35,6 @@
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'dj_security_middleware.middleware.DJSecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
 ]
@@ -97,6 +96,7 @@
 DO_NOT_DISPLAY = ["/edc", "/sparc"]
 ACCESSCTL_URL = "https://accessctl.ceda.ac.uk/api/v1/rules/bypath/?format=json&path="
 ACCOUNT_COOKIE_NAME=''
+ARTEFACT_URL="https://cdn.jsdelivr.net/gh/cedadev/orgtheme-ceda-serv@bootstrap533/orgtheme_ceda_serv/static/orgtheme/"
 
 from archive_browser.settings_local import *
 
diff --git a/browser/templates/browser/browse_base.html b/browser/templates/browser/browse_base.html
index 8dc218b..72834ce 100644
--- a/browser/templates/browser/browse_base.html
+++ b/browser/templates/browser/browse_base.html
@@ -70,8 +70,8 @@ <h3>Bulk Download Options</h3>
 
         {% block breadcrumbs %}
         <div class="col-8">
-            <div class="float-left">
-                <ol class="breadcrumb">
+            <div class="d-grid d-md-flex justify-content-md-start pb-2">
+                <ol class="breadcrumb p-2 m-2 bg-light border-0 rounded">
                     {% for dir in index_list %}
                         {% if forloop.last %}
                         <li class="breadcrumb-item active text-grey">{{ dir.dir }}</li>
@@ -80,22 +80,19 @@ <h3>Bulk Download Options</h3>
                         {% endif %}
                     {% endfor %}
                 </ol>
-            </div>
-            <div>
                 <div class="float-left">
-                <button type="button" id="copy" class="btn btn-outline-primary mt-1 ml-1" data-bs-toggle="tooltip" onclick="copyPath()"
+                <button type="button" id="copy" class="btn btn-outline-primary mt-2 ml-2" data-bs-toggle="tooltip" onclick="copyPath()"
                         data-original-title="Copy directory path" title="Copy directory path">
                     <i class="fa-regular fa-copy" aria-hidden="true"></i>
                 </button>
                 </div>
-
             </div>
 
         </div>
         {% endblock %}
 
         <div class="col-4">
-            <div class="float-right">
+            <div class="d-grid gap-1 d-md-flex justify-content-md-end py-2">
                 {% if agg_info %}
                     {% if agg_info.total_size <= 1000000000 %}
                         {% if agg_info.item_types.0.1 <= 5000 %}
@@ -105,22 +102,21 @@ <h3>Bulk Download Options</h3>
                         {% endif %}
                     {% endif %}
                 {% endif %}
-                <span data-toggle="tooltip" title="View bulk download information">
-                    <button class="btn btn-primary mt-1" type="button" data-bs-toggle="collapse"
-                           data-bs-target="#collapseBulkDownload" aria-expanded="false" aria-controls="collapseExample">
-                           <span class="fas fa-cart-arrow-down"></span>
-                    </button>
-                </span>
                 <div class="float-left">
-                    <a href="{% url 'timelines' path=request.path %}" class="btn btn-outline-warning m-1" role="button" 
+                    <a href="{% url 'timelines' path=request.path %}" class="btn btn-outline-warning" role="button" 
                        title="Experimental: Timelines for files in this directory and below">
                                 <i class="fa-solid fa-timeline"></i>
                             </a>
-                </button>
                 </div>
+                <span data-toggle="tooltip" title="View bulk download information">
+                    <button class="btn btn-primary" type="button" data-bs-toggle="collapse"
+                           data-bs-target="#collapseBulkDownload" aria-expanded="false" aria-controls="collapseExample">
+                           <span class="fas fa-cart-arrow-down"></span>
+                    </button>
+                </span>
                 {% if  agg_info %}
                 <span data-toggle="tooltip" title="Archive contents summary from current location">
-                    <button type="button" class="btn btn-primary mt-1" data-bs-toggle="collapse" data-bs-target="#aggs"><small>
+                    <button type="button" class="btn btn-primary" data-bs-toggle="collapse" data-bs-target="#aggs"><small>
                         {{agg_info.total_size|filesizeformat}} | {{agg_info.item_types.0.1 | intword| intcomma}} files | mostly {{agg_info.exts.0.0}}
                     </small></button>
                 </span>

From 2a9644e9d2a42ddb0ddccb5d9caf8c51eaa2bdb5 Mon Sep 17 00:00:00 2001
From: William Tucker <william.tucker@stfc.ac.uk>
Date: Thu, 12 Mar 2026 10:29:43 +0000
Subject: [PATCH 3/3] Button position tweak

---
 browser/templates/browser/browse_base.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/browser/templates/browser/browse_base.html b/browser/templates/browser/browse_base.html
index 72834ce..33bf2d6 100644
--- a/browser/templates/browser/browse_base.html
+++ b/browser/templates/browser/browse_base.html
@@ -93,21 +93,21 @@ <h3>Bulk Download Options</h3>
 
         <div class="col-4">
             <div class="d-grid gap-1 d-md-flex justify-content-md-end py-2">
+                <div class="float-left">
+                    <a href="{% url 'timelines' path=request.path %}" class="btn btn-outline-warning" role="button" 
+                       title="Experimental: Timelines for files in this directory and below">
+                                <i class="fa-solid fa-timeline"></i>
+                            </a>
+                </div>
                 {% if agg_info %}
                     {% if agg_info.total_size <= 1000000000 %}
                         {% if agg_info.item_types.0.1 <= 5000 %}
-                            <a href="{% url 'download' %}?path={{request.path}}" class="btn btn-primary mt-1" role="button" title="This is a small directory - Download as a ZIP file?">
+                            <a href="{% url 'download' %}?path={{request.path}}" class="btn btn-primary" role="button" title="This is a small directory - Download as a ZIP file?">
                                 <i class="fa-solid fa-download"></i>
                             </a>
                         {% endif %}
                     {% endif %}
                 {% endif %}
-                <div class="float-left">
-                    <a href="{% url 'timelines' path=request.path %}" class="btn btn-outline-warning" role="button" 
-                       title="Experimental: Timelines for files in this directory and below">
-                                <i class="fa-solid fa-timeline"></i>
-                            </a>
-                </div>
                 <span data-toggle="tooltip" title="View bulk download information">
                     <button class="btn btn-primary" type="button" data-bs-toggle="collapse"
                            data-bs-target="#collapseBulkDownload" aria-expanded="false" aria-controls="collapseExample">