Skip to content

Fixing old theme versions #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
watucker wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixing old theme versions #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88f7371
Fixing old theme versions
watucker Mar 11, 2026
0e346bc
Updates to support bootstrap 5
watucker Mar 11, 2026
2a9644e
Button position tweak
watucker Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion archive_browser/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
]
Expand Down Expand Up @@ -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 *

Expand Down
30 changes: 13 additions & 17 deletions browser/templates/browser/browse_base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -80,47 +80,43 @@ <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">
<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 %}
<span data-toggle="tooltip" title="View bulk download information">
<button class="btn btn-primary mt-1" type="button" data-bs-toggle="collapse"
<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>
<div class="float-left">
<a href="{% url 'timelines' path=request.path %}" class="btn btn-outline-warning m-1" role="button"
title="Experimental: Timelines for files in this directory and below">
<i class="fa-solid fa-timeline"></i>
</a>
</button>
</div>
{% 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>
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down