Merge pull request #893 from uktrade/release

UAT/prod release
uktrade · Nov 22, 2022 · 51d70d3 · 51d70d3
2 parents b243462 + 1383a6c
commit 51d70d3
Show file tree

Hide file tree

Showing 29 changed files with 115 additions and 96 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,10 +5,14 @@
 ### Hotfix
 
 ### Fixed bugs
-* Upgrade to django 3.2.16
-
+- Revert django back to 2.2.28 (temporarily)
+- KLS-27 - Display intro video on investment opportunity pages
 ### Implemented enhancements
 
+## [3.9.2](https://github.com/uktrade/great-international-ui/releases/tag/3.9.2)
+### Fixed bugs
+* Upgrade to django 3.2.16
+
 ## [3.9.1](https://github.com/uktrade/great-international-ui/releases/tag/3.9.1)
 ### Hotfix
 - GLS-435 - Remove emergency banner

diff --git a/contact/templates/contact/base.html b/contact/templates/contact/base.html
@@ -1,5 +1,5 @@
 {% extends 'core/base.html' %}
-{% load static %}
+{% load static from staticfiles %}
 
 {% block head_other %}
     {{ block.super }}

diff --git a/contact/templates/contact/contact.html b/contact/templates/contact/contact.html
@@ -1,5 +1,5 @@
 {% extends 'contact/base.html' %}
-{% load static %}
+{% load static from staticfiles %}
 {% load i18n %}
 {% load ga360_data hero from directory_components %}
 

diff --git a/core/sass/atlas/components/_images.scss b/core/sass/atlas/components/_images.scss
@@ -8,6 +8,23 @@
 
 .atlas-video__transcript {
   max-height: 9em;
-  overflow: scroll;
+  overflow-y: scroll;
   white-space: pre-line;
 }
+
+// The following three blocks set scrollbar to always appear
+// The styling recreates that of the default scrollbar
+
+.atlas-video__transcript::-webkit-scrollbar:vertical {
+  width: 11px;
+}
+
+.atlas-video__transcript::-webkit-scrollbar {
+  -webkit-appearance: none;
+}
+
+.atlas-video__transcript::-webkit-scrollbar-thumb {
+  border-radius: 8px;
+  border: 2px solid white;
+  background-color: rgba(0, 0, 0, .5);
+}
diff --git a/core/static/core/styles/atlas.css b/core/static/core/styles/atlas.css
diff --git a/core/templates/core/base.html b/core/templates/core/base.html
@@ -7,7 +7,7 @@
 - elements-components
 {% endcomment %}
 
-{% load static %}
+{% load static from staticfiles %}
 {% load i18n %}
 {% get_current_language_bidi as LANGUAGE_BIDI %}
 {% get_current_language as LANGUAGE %}

diff --git a/core/templates/core/capital_invest/capital_invest_contact_form.html b/core/templates/core/capital_invest/capital_invest_contact_form.html
@@ -1,5 +1,5 @@
 {% extends 'core/base_cms.html' %}
-{% load static %}
+{% load static from staticfiles %}
 {% load i18n %}
 {% load ga360_data add_export_elements_classes from directory_components %}
 {% load breadcrumbs from directory_components %}

diff --git a/core/templates/core/companies/base-case-study.html b/core/templates/core/companies/base-case-study.html
@@ -1,6 +1,6 @@
 {% extends 'core/base.html' %}
 
-{% load static %}
+{% load static from staticfiles %}
 {% load thumbnail %}
 
 {% block head_title %}Find a UK supplier - great.gov.uk{% endblock %}

diff --git a/core/templates/core/companies/base-contact.html b/core/templates/core/companies/base-contact.html
@@ -1,5 +1,5 @@
 {% extends 'core/companies/base.html' %}
-{% load static %}
+{% load staticfiles %}
 {% load breadcrumbs from directory_components %}
 
 {% block css_layout_class %}investment-support-directory-contact-page{% endblock %}

diff --git a/core/templates/core/companies/base-profile.html b/core/templates/core/companies/base-profile.html
@@ -1,5 +1,5 @@
 {% extends 'core/companies/base.html' %}
-{% load static %}
+{% load static from staticfiles %}
 
 {% load breadcrumbs card from directory_components %}
 {% load thumbnail %}

diff --git a/core/templates/core/companies/base-search.html b/core/templates/core/companies/base-search.html
@@ -1,5 +1,5 @@
 {% extends 'core/companies/base.html' %}
-{% load static %}
+{% load static from staticfiles %}
 {% load thumbnail %}
 {% load ga360_data from directory_components %}
 
@@ -30,8 +30,8 @@
                 <div class="grid-row">
                     <div class="column-two-thirds">
                         {% if pagination.paginator.count %}
-                            <h2 class="heading-medium margin-top-45 margin-bottom-15">{{ pagination.paginator.count }} {{pagination.paginator.count|pluralize:'result,results'}} found
-                              {% if form.q.value %}for
+                            <h2 class="heading-medium margin-top-45 margin-bottom-15">{{ pagination.paginator.count }} {{pagination.paginator.count|pluralize:'result,results'}} found 
+                              {% if form.q.value %}for 
                                 <mark>
                                   {% filter force_escape %}
                                     {{ form.q.value }}

diff --git a/core/templates/core/companies/base-sent.html b/core/templates/core/companies/base-sent.html
@@ -1,5 +1,5 @@
 {% extends "core/companies/base.html" %}
-{% load static %}
+{% load static from staticfiles %}
 {% load breadcrumbs success_box from directory_components %}
 
 {% block css_layout_class %}investment-support-directory-success-page{% endblock %}

diff --git a/core/templates/core/contact_international_triage.html b/core/templates/core/contact_international_triage.html
@@ -1,5 +1,5 @@
 {% extends 'core/base.html' %}
-{% load static %}
+{% load static from staticfiles %}
 {% load i18n %}
 {% get_current_language as LANGUAGE %}
 {% load filter_by_active_language from cms_tags %}

diff --git a/core/templates/core/contact_page.html b/core/templates/core/contact_page.html
@@ -1,5 +1,5 @@
 {% extends 'core/base.html' %}
-{% load static %}
+{% load static from staticfiles %}
 {% load trans from i18n %}
 {% load breadcrumbs banner from directory_components %}
 

diff --git a/find_a_supplier/templates/find_a_supplier/buy_from_the_uk_form.html b/find_a_supplier/templates/find_a_supplier/buy_from_the_uk_form.html
@@ -1,5 +1,5 @@
 {% extends 'core/base_cms.html' %}
-{% load static %}
+{% load static from staticfiles %}
 {% load add_href_target from cms_tags %}
 {% load add_export_elements_classes ga360_data from directory_components %}
 

diff --git a/find_a_supplier/templates/find_a_supplier/buy_from_the_uk_form_success.html b/find_a_supplier/templates/find_a_supplier/buy_from_the_uk_form_success.html
@@ -1,5 +1,5 @@
 {% extends 'core/base_cms.html' %}
-{% load static %}
+{% load static from staticfiles %}
 {% load trans from i18n %}
 {% load search_url from industry_tags %}
 {% load add_export_elements_classes ga360_data from directory_components %}

diff --git a/find_a_supplier/templates/find_a_supplier/landing_page.html b/find_a_supplier/templates/find_a_supplier/landing_page.html
@@ -1,6 +1,6 @@
 {% extends 'find_a_supplier/base.html' %}
 
-{% load static %}
+{% load static from staticfiles %}
 {% load first_paragraph filter_by_active_language from cms_tags %}
 {% load directory_components %}
 
@@ -74,7 +74,7 @@
     </div>
 </section>
 
-{% comment "This does work with the new Sector setup in Atlas, but has been disabled for now" %}
+{% comment "This does work with the new Sector setup in Atlas, but has been disabled for now" %}    
 <section id="industries-section" class="padding-bottom-60-m padding-bottom-30 background-stone-30">
     <div class="container">
         <div class="heading-large">

diff --git a/find_a_supplier/templates/find_a_supplier/subscribe.html b/find_a_supplier/templates/find_a_supplier/subscribe.html
@@ -1,5 +1,5 @@
 {% extends 'core/base.html' %}
-{% load static %}
+{% load static from staticfiles %}
 {% load breadcrumbs from directory_components %}
 
 {% block css_layout_class %}find-a-supplier-subscribe-page{% endblock %}

diff --git a/investment_atlas/templates/investment_atlas/fdi_opportunities_form.html b/investment_atlas/templates/investment_atlas/fdi_opportunities_form.html
@@ -1,5 +1,5 @@
 {% extends 'core/base.html' %}
-{% load static %}
+{% load static from staticfiles %}
 {% load i18n %}
 
 {% load add_export_elements_classes from directory_components %}

diff --git a/investment_atlas/templates/investment_atlas/fdi_opportunities_form_success.html b/investment_atlas/templates/investment_atlas/fdi_opportunities_form_success.html
@@ -1,5 +1,5 @@
 {% extends 'core/base.html' %}
-{% load static %}
+{% load static from staticfiles %}
 
 {% load add_export_elements_classes from directory_components %}
 

diff --git a/investment_atlas/templates/investment_atlas/includes/hero_intro.html b/investment_atlas/templates/investment_atlas/includes/hero_intro.html
@@ -6,12 +6,16 @@
                 {{ page.introduction|safe }}
             </div>
         </div>
-        {% if page.intro_image %}
-            <div class="atlas-grid__column atlas-grid__column--6-12-m">
+        <div class="atlas-grid__column atlas-grid__column--6-12-m atlas-m-b-m">
+            {% if page.intro_video %}
+                {% with video=page.intro_video %}
+                    {% include 'investment_atlas/includes/video.html' %}
+                {% endwith %}
+            {% elif page.intro_image %}
                 <img src="{{ page.intro_image.url }}"
-                     alt="{{ page.intro_image.alt }}"
-                     class="atlas-image atlas-m-b-m">
-            </div>
-        {% endif %}
+                    alt="{{ page.intro_image.alt }}"
+                    class="atlas-image">
+            {% endif %}
+        </div>
     </div>
 </div>
diff --git a/investment_atlas/templates/investment_atlas/opportunity_listing_page.html b/investment_atlas/templates/investment_atlas/opportunity_listing_page.html
@@ -1,5 +1,5 @@
 {% extends 'investment_atlas/base_cms.html' %}
-{% load static %}
+{% load static from staticfiles %}
 {% load i18n %}
 {% load update_query_params chosen_filters from atlas_tags %}
 

diff --git a/investment_support_directory/templates/investment_support_directory/home.html b/investment_support_directory/templates/investment_support_directory/home.html
@@ -1,5 +1,5 @@
 {% extends 'core/companies/base.html' %}
-{% load static %}
+{% load static from staticfiles %}
 {% load breadcrumbs ga360_data from directory_components %}
 
 {% block css_layout_class %}investment-support-directory-home{% endblock %}

diff --git a/investment_support_directory/templates/investment_support_directory/profile.html b/investment_support_directory/templates/investment_support_directory/profile.html
@@ -1,7 +1,7 @@
 {% extends 'core/companies/base-profile.html' %}
 
 {% load breadcrumbs from directory_components %}
-{% load static %}
+{% load static from staticfiles %}
 
 {% block breadcrumbs %}
     {% url 'investment-support-directory:search' as search_url %}

diff --git a/requirements.in b/requirements.in
@@ -1,28 +1,28 @@
 boto3==1.17.90
 dateparser==0.7.0
-directory-api-client==25.1.0
-directory-cms-client==12.0.0
-directory-components==38.0.0
-directory-forms-api-client==7.1.0
-directory-healthcheck==3.0.0
-directory-validators==9.2.1
+directory-api-client==24.0.0
+directory-cms-client==10.2.0
+directory-components==37.2.2
+directory-forms-api-client==5.1.0
+directory-healthcheck==2.0.0
+directory-validators==8.0.0
 django-countries==5.5
 django-environ==0.4.5
 django-formtools==2.1
 django-ipware==2.1.0
-django-recaptcha==3.0.0
-django-redis==5.2.*
-django-storages==1.13.1
-Django==3.2.16
+django-recaptcha==2.0.5
+django-redis==4.10.0
+django-storages==1.7.2
+Django==2.2.28
 djangorestframework==3.11.2
 elastic-apm==6.1.*
 pir-client==1.1.0
 requests[security]==2.25.1
 sentry-sdk==0.13.4
-sorl-thumbnail==12.9.0
+sorl-thumbnail==12.5.0
 urllib3>=1.24.2,<2.0.0
 waitress==2.1.2
-whitenoise==6.2.0
+whitenoise==4.1.3
 gunicorn==20.1.0
 psycogreen==1.0.2
 psycopg2==2.8.5