diff --git a/.circleci/config.yml b/.circleci/config.yml index b0a2b0c3..e925bcfa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,6 @@ version: 2.1 orbs: slack: circleci/slack@2.5.0 - cla-end-to-end-tests: ministryofjustice/cla-end-to-end-tests@volatile aws-cli: circleci/aws-cli@4.1 # use v4 of this orb aws-ecr: circleci/aws-ecr@9 # this orb doesn't support OIDC v2, so we use aws-cli to authenticate @@ -215,20 +214,6 @@ jobs: bin/deploy.sh << parameters.environment >> - slack/status - behave: - executor: aws-ecr/default - steps: - - checkout: - path: fala - - run: | - cd fala - source .circleci/define_build_environment_variables - echo "export FALA_IMAGE=$ECR_DEPLOY_IMAGE" >> $BASH_ENV - echo "export A11Y_ENABLED=true" >> $BASH_ENV - echo "export FALA_TESTS_ONLY=true" >> $BASH_ENV - echo "Setting FALA image $ECR_DEPLOY_IMAGE" - - cla-end-to-end-tests/behave - playwright: docker: - image: cimg/python:3.12 @@ -279,10 +264,6 @@ workflows: requires: - build context: laa-fala - - behave: - requires: - - build - context: laa-fala - deploy_with_helm: name: UAT Ephemeral deploy diff --git a/.env.example b/.env.example index 876e0034..ee5ac2bc 100644 --- a/.env.example +++ b/.env.example @@ -4,8 +4,6 @@ DEBUG = True ALLOWED_HOSTS = ["localhost", '127.0.0.1'] LAALAA_API_HOST = "https://laa-legal-adviser-api-staging.apps.live-1.cloud-platform.service.justice.gov.uk" ENVIRONMENT = "dev" -FEATURE_FLAG_NO_MAP = False -FEATURE_FLAG_SURVEY_MONKEY = False # When using virtual.env, change this to "127.0.0.1". When using docker use "db". DB_HOST = "db" diff --git a/fala/apps/adviser/forms.py b/fala/apps/adviser/forms.py index acbe7fad..7d29dc33 100644 --- a/fala/apps/adviser/forms.py +++ b/fala/apps/adviser/forms.py @@ -92,16 +92,9 @@ def clean(self): if not postcode and not data.get("name"): raise forms.ValidationError(_("Enter a postcode or an organisation name")) else: - if settings.FEATURE_FLAG_NO_MAP: - if postcode and self.region == Region.ENGLAND_OR_WALES and not self._valid_postcode(postcode): - self.add_error("postcode", (_("Enter a valid postcode"))) - else: - region = self.region - if region != Region.ENGLAND_OR_WALES: - region_error = self.REGION_NAMES[region] - msg1 = "This service does not cover " - msg2 = "Try a postcode, town or city in England or Wales." - self.add_error("postcode", "%s %s" % (_(" ".join((msg1, region_error))), _(msg2))) + if postcode and self.region == Region.ENGLAND_OR_WALES and not self._valid_postcode(postcode): + self.add_error("postcode", (_("Enter a valid postcode"))) + return data @property diff --git a/fala/apps/adviser/tests/test_crown_dependencies_view.py b/fala/apps/adviser/tests/test_crown_dependencies_view.py index d2499e55..90c5b7da 100644 --- a/fala/apps/adviser/tests/test_crown_dependencies_view.py +++ b/fala/apps/adviser/tests/test_crown_dependencies_view.py @@ -1,9 +1,8 @@ -from django.test import SimpleTestCase, Client, override_settings +from django.test import SimpleTestCase, Client from django.urls import reverse import bs4 -@override_settings(FEATURE_FLAG_NO_MAP=True) class PostcodeValidationTest(SimpleTestCase): client = Client() url = reverse("search") @@ -45,7 +44,6 @@ def test_other_region_form_and_change_search_button_visible(self): self.assertEqual(change_search_button.text.strip(), "Change search") -@override_settings(FEATURE_FLAG_NO_MAP=True) class InvalidEnglishPostcodeTest(SimpleTestCase): client = Client() url = reverse("search") diff --git a/fala/apps/adviser/tests/test_search_view_function.py b/fala/apps/adviser/tests/test_search_view_function.py index 3da38e4b..88f26167 100644 --- a/fala/apps/adviser/tests/test_search_view_function.py +++ b/fala/apps/adviser/tests/test_search_view_function.py @@ -1,9 +1,8 @@ import bs4 -from django.test import SimpleTestCase, Client, override_settings +from django.test import SimpleTestCase, Client from django.urls import reverse -@override_settings(FEATURE_FLAG_NO_MAP=True) class SearchViewFunctionTest(SimpleTestCase): client = Client() @@ -14,7 +13,6 @@ def test_invalid_postcode_generates_error(self): self.assertEqual({"postcode": ["Enter a valid postcode"]}, response.context_data["form"].errors) -@override_settings(FEATURE_FLAG_NO_MAP=True) class ResultsPageWithBothOrgAndPostcodeTest(SimpleTestCase): client = Client() url = reverse("search") @@ -65,7 +63,6 @@ def test_category_search_has_no_previous_button(self): self.assertNotContains(response, '
') -@override_settings(FEATURE_FLAG_NO_MAP=True) class ResultsPageWithJustPostcodeTest(SimpleTestCase): client = Client() url = reverse("search") @@ -105,7 +102,6 @@ def test_search_parameters_box_contains_only_postcode_and_categories(self): self.assertEqual(content, "Postcode: PE30Categories: Debt Change search") -@override_settings(FEATURE_FLAG_NO_MAP=True) class ResearchBannerTest(SimpleTestCase): client = Client() url = reverse("search") @@ -114,18 +110,11 @@ class ResearchBannerTest(SimpleTestCase): research_message = "Help improve this legal adviser search" - @override_settings(FEATURE_FLAG_SURVEY_MONKEY=True) - def test_research_banner_present_when_flag_set(self): + def test_research_banner_present(self): response = self.client.get(self.url, self.data) self.assertContains(response, self.research_message) - @override_settings(FEATURE_FLAG_SURVEY_MONKEY=False) - def test_research_banner_absent_when_flag_unset(self): - response = self.client.get(self.url, self.data) - self.assertNotContains(response, self.research_message) - -@override_settings(FEATURE_FLAG_NO_MAP=True) class ResultsPageWithJustOrgTest(SimpleTestCase): client = Client() url = reverse("search") @@ -141,7 +130,6 @@ def test_search_parameters_box_contains_only_organisation_and_categories(self): self.assertEqual(content, "Organisation: fooCategories: Debt, Education Change search") -@override_settings(FEATURE_FLAG_NO_MAP=True) class NewSearchViewTemplate(SimpleTestCase): client = Client() @@ -157,7 +145,6 @@ def test_template_link_and_css(self): self.assertContains(response, "laa-fala__grey-box") -@override_settings(FEATURE_FLAG_NO_MAP=True) class NoResultsTest(SimpleTestCase): client = Client() @@ -174,13 +161,6 @@ class AccessibilityViewTest(SimpleTestCase): url = reverse("accessibility_statement") - @override_settings(FEATURE_FLAG_NO_MAP=True) def test_shows_new_accessibility_statement(self): response = self.client.get(self.url) self.assertContains(response, "Accessibility statement for Find a legal advisor") - - @override_settings(FEATURE_FLAG_NO_MAP=False) - def test_shows_old_accessibility_statement(self): - response = self.client.get(self.url) - self.assertContains(response, "Accessibility statement") - self.assertNotContains(response, "Accessibility statement for Find a legal advisor") diff --git a/fala/apps/adviser/views.py b/fala/apps/adviser/views.py index 2257fda0..ff3af870 100644 --- a/fala/apps/adviser/views.py +++ b/fala/apps/adviser/views.py @@ -10,12 +10,7 @@ class AdviserView(TemplateView): - def get_template_names(self) -> list[str]: - if settings.FEATURE_FLAG_NO_MAP: - template_name = "adviser/search.html" - else: - template_name = "adviser/search_old.html" - return [template_name] + template_name = "adviser/search.html" def get(self, request, *args, **kwargs): context = self.get_context_data(**kwargs) @@ -28,8 +23,6 @@ def get(self, request, *args, **kwargs): "form": form, "data": form.search(), "current_url": current_url, - "GOOGLE_MAPS_API_KEY": settings.GOOGLE_MAPS_API_KEY, - "FEATURE_FLAG_NO_MAP": settings.FEATURE_FLAG_NO_MAP, "CHECK_LEGAL_AID_URL": settings.CHECK_LEGAL_AID_URL, } ) @@ -38,12 +31,7 @@ def get(self, request, *args, **kwargs): class AccessibilityView(TemplateView): - def get_template_names(self) -> list[str]: - if settings.FEATURE_FLAG_NO_MAP: - template_name = "adviser/accessibility_statement.html" - else: - template_name = "adviser/accessibility-statement_old.html" - return [template_name] + template_name = "adviser/accessibility_statement.html" class PrivacyView(TemplateView): @@ -90,7 +78,6 @@ def get_context_data(self): "data": self._data, "pages": pages, "params": params, - "FEATURE_FLAG_SURVEY_MONKEY": settings.FEATURE_FLAG_SURVEY_MONKEY, "categories": categories, "category_selection": self._display_category(), } @@ -103,28 +90,6 @@ def _display_category(self): return formatted_categories return [] - class OldMapState(object): - def __init__(self, form, current_url): - self.current_url = current_url - self.form = form - - def get_queryset(self): - return [] - - @property - def template_name(self): - return "search_old.html" - - def get_context_data(self): - return { - "form": self.form, - "data": self.form.search(), - "current_url": self.current_url, - "GOOGLE_MAPS_API_KEY": settings.GOOGLE_MAPS_API_KEY, - "FEATURE_FLAG_NO_MAP": settings.FEATURE_FLAG_NO_MAP, - "CHECK_LEGAL_AID_URL": settings.CHECK_LEGAL_AID_URL, - } - class OtherJurisdictionState(object): REGION_TO_LINK = { Region.NI: { @@ -166,19 +131,15 @@ def get_context_data(self): def get(self, request, *args, **kwargs): form = AdviserSearchForm(data=request.GET or None) - if settings.FEATURE_FLAG_NO_MAP: - if form.is_valid(): - region = form.region - if region == Region.ENGLAND_OR_WALES or region == Region.SCOTLAND: - self.state = self.EnglandOrWalesState(form) - else: - self.state = self.OtherJurisdictionState(region, form.cleaned_data["postcode"]) + if form.is_valid(): + region = form.region + if region == Region.ENGLAND_OR_WALES or region == Region.SCOTLAND: + self.state = self.EnglandOrWalesState(form) else: - self.state = self.ErrorState(form) + self.state = self.OtherJurisdictionState(region, form.cleaned_data["postcode"]) else: - view_name = resolve(request.path_info).url_name - current_url = reverse(view_name) - self.state = self.OldMapState(form, current_url) + self.state = self.ErrorState(form) + return super().get(self, request, *args, **kwargs) def get_template_names(self): diff --git a/fala/assets-src/sass/main.scss b/fala/assets-src/sass/main.scss index fd6d218d..cac3c124 100644 --- a/fala/assets-src/sass/main.scss +++ b/fala/assets-src/sass/main.scss @@ -15,24 +15,6 @@ $laa-unknown-colour: govuk-colour("orange"); $laa-staging-colour: govuk-colour("turquoise"); $laa-dev-colour: govuk-colour("pink"); -.page-header { - margin: 2em 0; -} - -.form-action { - margin-top: 1em; -} - -body.govuk-template__body { - height: auto; - height: initial; - display: block; -} - -.laa-postcode { - text-transform: uppercase; -} - .fala-tickbox-columns_new { // Default for mobile (1 column) column-count: 1; @@ -58,20 +40,6 @@ body.govuk-template__body { } } -/*below override for archaic class*/ -p.govuk-body:last-child, -p.govuk-body-m:last-child { - margin-bottom:20px; -} - -p.govuk-body-l:last-child { - margin-bottom:30px; -} - -.gds-header__error { - border-bottom: 10px solid $govuk-error-colour; -} - .laa-cookie-banner { background: govuk-colour("white"); display: none; @@ -88,14 +56,6 @@ p.govuk-body-l:last-child { } } -.laa-hide-if-no-js { - display:none; -} - -.js-enabled .laa-hide-if-no-js { - display:initial; -} - body:not(.fala-production) { .govuk-header__container { border-bottom-color:$laa-unknown-colour; @@ -123,37 +83,7 @@ body.fala-dev { } } -.fala-header__logotype-crest { - position: relative; - top: -7px; - margin-right: 5px; - vertical-align: top; -} - -.govuk-header__logo, -.govuk-header__content { - display:inline-block; - float:none; - padding-left:0; - width:unset; -} - -.govuk-header__logo { - white-space: nowrap; - min-width: 33.33%; - margin-bottom: 0; -} - -.govuk-footer__copyright-logo { - max-width: 140px; -} - .laa-fala { - &__search { - margin-top:1em; - clear:both; - } - &__grey-box { background-color: govuk-colour("light-grey"); padding: 1em; diff --git a/fala/settings/base.py b/fala/settings/base.py index f0a11289..36c31a3e 100644 --- a/fala/settings/base.py +++ b/fala/settings/base.py @@ -219,8 +219,4 @@ def root(*x): ENVIRONMENT = os.environ.get("ENVIRONMENT", "unknown") -GOOGLE_MAPS_API_KEY = os.environ.get("GOOGLE_MAPS_API_KEY", "") - CHECK_LEGAL_AID_URL = "https://www.gov.uk/check-legal-aid" - -FEATURE_FLAG_SURVEY_MONKEY = os.environ.get("FEATURE_FLAG_SURVEY_MONKEY", "").lower() == "enabled" diff --git a/fala/settings/production.py b/fala/settings/production.py index d9f6cd97..6f9dbf30 100644 --- a/fala/settings/production.py +++ b/fala/settings/production.py @@ -3,7 +3,6 @@ settings_required = ( "SECRET_KEY", - "GOOGLE_MAPS_API_KEY", "LAALAA_API_HOST", ) diff --git a/fala/templates/500.html b/fala/templates/500.html index c0ec5750..5a6235ee 100644 --- a/fala/templates/500.html +++ b/fala/templates/500.html @@ -8,9 +8,7 @@ {% block content %}
-
-

Sorry, there is a problem with the service

-
+

Sorry, there is a problem with the service

Try again later.

You can also find a solicitor on the Law Society website.

Search using your location, then select ‘Accepts legal aid’ to show legal aid solicitors near you.

diff --git a/fala/templates/adviser/_results.html b/fala/templates/adviser/_results.html deleted file mode 100644 index 57681715..00000000 --- a/fala/templates/adviser/_results.html +++ /dev/null @@ -1,293 +0,0 @@ -{% if data and data.count and data.count > 0 %} - {% if data.origin.postcode %} - {# - These are repeated below - #} - {% if data.origin.postcode.startswith("IM") %} -
- - - Warning - Legal Aid is different on the Isle of Man. Visit - gov.im - for more information. - -
- {% elif data.origin.postcode.startswith("JE") %} -
- - - Warning - Legal Aid is different in Jersey. Visit - legalaid.je - for more information. - -
- {% elif data.origin.postcode.startswith("GY") %} -
- - - Warning - Legal Aid is different in Guernsey. Visit - gov.gg - for information about the process in Guernsey. - -
- {% elif data.origin.postcode.startswith("BT") %} -
- - - Warning - Legal Aid is different in Northern Ireland. Visit - nidirect.gov.uk - for more information. - -
- {% elif data.origin.postcode[:2] in ("AB","DD","DG","EH","FK","G1","G2","G3","G4","G5","G6","G7","G8","G9","G0","HS","IV","KA","KW","KY","ML","PA","PH","TD","ZE",) %} -
- - - Warning - Legal Aid is different in Scotland. Visit - mygov.scot - for more information. - -
- {% endif %} - {% endif %} -
-

_('Results')

-

- {% if data.origin %} - {% trans page_count=data.results|length, result_count=data.count %} - Showing {{ page_count }} results around - {% pluralize %} - {{ result_count }} results in total. Showing {{ page_count }} results around - {% endtrans %} - {{ data.origin.postcode }} - {%- if form.name.value() %} - {{ _('matching') }} {{ form.name.value() }}. - {%- else -%} - . - {% endif %} - {% elif request.GET.get('postcode','') %} - {% set city_list = [] %} - {% for item in data.results %} - {# - To prevent the same place appearing twice in the list, we harmonise the ones with commin misspellings. - All ones with a common middle element (e.g. by the) are hyphenated and lower cased (remove hyphens, change case, replace hyphens). - Thornton-Cleveleys is always hyphenated. - Hull is always Kingston upon Hull (not hyphenated). - #} - {% set location = item.location.city - |replace("-"," ") - |replace(" By The "," by the ") - |replace(" In The "," in the ") - |replace(" On The "," on the ") - |replace(" By "," by ") - |replace(" In "," in ") - |replace(" On "," on ") - |replace(" Cum "," cum ") - |replace(" Upon "," upon ") - |replace(" Under "," under ") - |replace(" Super "," super ") - |replace(" by the ","-by-the-") - |replace(" in the ","-in-the-") - |replace(" on the ","-on-the-") - |replace(" by ","-by-") - |replace(" in ","-in-") - |replace(" on ","-on-") - |replace(" cum ","-cum-") - |replace(" upon ","-upon-") - |replace(" under ","-under-") - |replace(" super ","-super-") - |replace("Thornton Cleveleys","Thornton-Cleveleys") - |replace("Hull","Kingston upon Hull") - |replace("Kingston-upon-Kingston upon Hull","Kingston upon Hull") - %} - {% if location not in city_list %} - {% do city_list.append( location ) %} - {% endif %} - {% endfor %} - {% set city_list = "" ~ city_list|join('; ') ~ "" %} - - {% if form.name.value() %} - {% trans result_count=data.count, page_count=data.results|length, org_name=form.name.value(), city_name=city_list|safe %} - Showing {{ page_count }} result matching {{ org_name }} for {{ city_name }}. - {% pluralize %} - {{ result_count }} results in total. Showing {{ page_count }} results marching {{ org_name }} for {{ city_name }}. - {% endtrans %} - {% else %} - {% trans result_count=data.count, page_count=data.results|length, city_name=city_list|safe %} - Showing {{ page_count }} result for {{ city_name }}. - {% pluralize %} - {{ result_count }} results in total. Showing {{ page_count }} results for {{ city_name }}. - {% endtrans %} - {% endif %} - {% else %} - {% trans result_count=data.count, page_count=data.results|length, org_name=form.name.value() %} - Showing {{ page_count }} result for {{ org_name }}. - {% pluralize %} - {{ result_count }} results in total. Showing {{ page_count }} results for {{ org_name }}. - {% endtrans %} - {% endif %} -

- -
-
- -
-
-
    - {% for item in data.results %} -
  • -
    -

    - {{ loop.index}} - {{ item.organisation.name }} -

    - {% if item.distance %} -
    - {{ _('Distance') }} - {% trans miles=item.distance|round(2) %}{{ miles }} miles{% endtrans %} -
    - {% endif %} -
    -
    - {% if item.location.type != 'Office' %} -
    {{ item.location.type|replace('Office', '') }}
    - {% endif %} -

    - {{ _('Address') }}: - - {{ item.location.address }} - {{ item.location.city }} - {{ item.location.postcode }} - -

    -

    - {{ _('Helpline') }}: - {{ item.telephone }} -

    - {% if item.organisation.website %} -

    - {{ _('Website') }}: - - {{ item.organisation.website|url_to_human }} - -

    - {% endif %} - {% if item.categories|length %} -

    {{ _('Categories of law covered') }}

    -
      - {% for cat in item.categories %} - {% if cat %} -
    • {{ cat }}
      • - {% endif %} - {% endfor %} -
    - {% endif %} -
    -
    • - {% endfor %} -
-
- - {% if data.previous or data.next %} - - {% endif %} -
-
-
-{% elif 'count' in data and data.count == 0 %} - {% from "macros/element.html" import alert %} - {% call alert(title=_('No results')) %} - {{ _('There are no results matching your search criteria.') }} - {% endcall %} -{% elif data|length == 0 %} - {# - This is a repeat of the above as the current data set throws an error for Crown Dependency postcodes, so the above code doesn't fire. - #} - {% set searched_postcode = request.GET.get('postcode','')[:2]|upper %} - {% if searched_postcode.startswith("IM") %} -
- - - Warning - Legal Aid is different on the Isle of Man. Visit - gov.im - for more information. - -
- {% elif searched_postcode.startswith("JE") %} -
- - - Warning - Legal Aid is different in Jersey. Visit - legalaid.je - for more information. - -
- {% elif searched_postcode.startswith("GY") %} -
- - - Warning - Legal Aid is different in Guernsey. Visit - gov.gg - for information about the process in Guernsey. - -
- {% elif searched_postcode.startswith("BT") %} -
- - - Warning - Legal Aid is different in Northern Ireland. Visit - nidirect.gov.uk - for more information. - -
- {% elif searched_postcode[:2] in ("AB","DD","DG","EH","FK","G1","G2","G3","G4","G5","G6","G7","G8","G9","G0","HS","IV","KA","KW","KY","ML","PA","PH","TD","ZE",) %} -
- - - Warning - Legal Aid is different in Scotland. Visit - mygov.scot - for more information. - -
- {% endif %} -{% endif %} diff --git a/fala/templates/adviser/accessibility-statement_old.html b/fala/templates/adviser/accessibility-statement_old.html deleted file mode 100644 index 84143528..00000000 --- a/fala/templates/adviser/accessibility-statement_old.html +++ /dev/null @@ -1,129 +0,0 @@ -{% extends 'base.html' %} - -{% block content %} -
-
- -

Accessibility statement

- -

- This accessibility statement applies to - https://find-legal-advice.justice.gov.uk/. The - Legal Aid Agency (LAA) is responsible for this service. -

- -

- We want as many people as possible to be able to use this service. For example, - that means you should be able to: -

- -
    -
  • change colours, contrast levels and fonts;
    • -
  • zoom in up to 300% without the text spilling off the screen, and
    • -
  • navigate the service using just a keyboard
    • -
- -

- AbilityNet has - advice on making your device easier to use if you have a disability. -

- -

Feedback and contact information

- -

- If you need information on this service in a different format, you can contact us at - . -

- -

Reporting accessibility problems

- -

- We’re always looking to improve the accessibility of this service. If you find any - problems that aren’t listed on this page or think we’re not meeting the requirements - of the accessibility regulations, contact - - giving details of the issue and any assistive technology you are using. -

- -

Enforcement procedure

- -

- The Equality and Human Rights Commission (EHRC) is responsible for enforcing the Public - Sector Bodies (Websites and Mobile Applications) (№ 2) Accessibility Regulations - 2018 (the ‘accessibility regulations’). If you’re not happy with how we respond to - your complaint, contact the Equality - Advisory and Support Service (EASS). -

- -

- Technical information about this service’s accessibility -

- -

- The Legal Aid Agency is committed to making its service accessible, in accordance with the - Public Sector Bodies (Websites and Mobile Applications) (№ 2) Accessibility Regulations - 2018. -

- -

Compliance status

- -

- This service is partially compliant with the - Web Content Accessibility Guidelines version 2.1 - AA standard, due to the exemptions listed below. -

- -

Non-accessible content

- -

Not applicable

- -

Disproportionate burden

- -

Not applicable

- -

- Content that’s not within the scope of the accessibility regulations -

- -

Google Maps

-

- Using embedded Google Maps has issues for users: -

- -
    -
  • Tab focus is not always visible in the map interface;
    • -
  • JAWS users have to tab through map links and buttons before they get to the search results, and
    • -
  • Navigation of the map is not always possible by voice.
    • -
-

- We will consider using an alternative map provider if the - service has a major redevelopment in the future. -

- -

What we’re doing to improve accessibility

- -

- We will monitor the accessibility of this website on an ongoing basis and fix any - accessibility issues reported to us. -

- -

Preparation of this accessibility statement

- -

- This statement was prepared on 11 November 2020. -

- -

- We have completed accessibility checks using core assistive technology applications - such as JAWS, Zoom Text, Dragon and Text Help. The tests were carried out by the - Ministry of Justice on 28 October 2020. -

- -

- Components of this service, such as the map functionality, were also tested on - 13 July 2020 during an audit of - https://checklegalaid.service.gov.uk/. - These tests were carried out by the Digital Accessibility Centre (DAC). -

-
-{% endblock %} diff --git a/fala/templates/adviser/results.html b/fala/templates/adviser/results.html index aec73a3a..fd722c95 100644 --- a/fala/templates/adviser/results.html +++ b/fala/templates/adviser/results.html @@ -4,9 +4,9 @@
- {% if FEATURE_FLAG_SURVEY_MONKEY %} - {% include 'research_banner.html' %} - {% endif %} + + {% include 'research_banner.html' %} +

Search results

diff --git a/fala/templates/adviser/search_old.html b/fala/templates/adviser/search_old.html deleted file mode 100644 index cc29339f..00000000 --- a/fala/templates/adviser/search_old.html +++ /dev/null @@ -1,76 +0,0 @@ -{% if request.headers.get('x-requested-with') == 'XMLHttpRequest' %} - {% extends 'ajax-base.html' %} -{% else %} - {% extends 'base.html' %} -{% endif %} - -{% import "macros/element.html" as Element %} -{% import "macros/forms.html" as Form %} - -{% block search_form %} -
-
- - {% set errorMessage = {'err': ""} %} - - {% if form.errors and form.errors['__all__'] %} - {% call Element.errorText() %} - {% for k, error in form.errors.items() %} - {% if errorMessage.update({'err': error | striptags}) %}{% endif %} - {% endfor %} - {% endcall %} - {% endif %} - - {% if (form.errors and form.errors['__all__']) %} - {% call Form.group(form.postcode, 'govuk-form-group', {'class':'govuk-input--error'}, hide_optional=True, global_error=errorMessage.err) %} - {% endcall %} - {% call Form.group(form.name, 'govuk-form-group', {'class':'govuk-input--error'}, hide_optional=True, max_length='100', global_error_hidden=errorMessage.err) %} - {% endcall %} - {% else %} - {% call Form.group(form.postcode, 'govuk-form-group', hide_optional=True) %} - {% endcall %} - {% call Form.group(form.name, 'govuk-form-group', hide_optional=True, max_length='100') %} - {% endcall %} - {% endif %} -
- - -
-
-
- -

- Filter by category -

- -
- {% for value, label_text in form.categories.field.choices %} -
- - -
- {% endfor %} -
-
-
- -
-
-{% endblock %} diff --git a/fala/templates/ajax-base.html b/fala/templates/ajax-base.html deleted file mode 100644 index 391794b3..00000000 --- a/fala/templates/ajax-base.html +++ /dev/null @@ -1,12 +0,0 @@ -
-
- {% block search_results %} - {% include 'adviser/_results.html' %} - {% endblock %} - {% block search_form %}{% endblock %} -
-
-

If you are a provider and your details are incorrect, please contact your contract manager.

-
-
- diff --git a/fala/templates/base.html b/fala/templates/base.html index ec21331e..521f6ed8 100644 --- a/fala/templates/base.html +++ b/fala/templates/base.html @@ -128,16 +128,6 @@

{% endblock %} -{% block before_main_js %} - {{ super() }} - - -{% endblock %} - {% block after_main_js %}