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..33bf2d6 100644 --- a/browser/templates/browser/browse_base.html +++ b/browser/templates/browser/browse_base.html @@ -70,8 +70,8 @@

Bulk Download Options

{% block breadcrumbs %}
-
-
{% endblock %}
-
+
+
+ + + +
{% if agg_info %} {% if agg_info.total_size <= 1000000000 %} {% if agg_info.item_types.0.1 <= 5000 %} - + {% endif %} {% endif %} {% endif %} - -
- - - - -
{% if agg_info %} - 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