From 87c9f1520a2d733606f887c673479540c1c0ed24 Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Fri, 5 Apr 2024 15:42:22 +0100
Subject: [PATCH 01/29] update view based on flag

---
 fala/apps/adviser/views.py |  1 +
 fala/templates/base.html   | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/fala/apps/adviser/views.py b/fala/apps/adviser/views.py
index 2d945fc4..fd4d8ef2 100644
--- a/fala/apps/adviser/views.py
+++ b/fala/apps/adviser/views.py
@@ -22,6 +22,7 @@ def get(self, request, *args, **kwargs):
                 "current_url": current_url,
                 "GOOGLE_MAPS_API_KEY": settings.GOOGLE_MAPS_API_KEY,
                 "LAALAA_API_HOST": settings.LAALAA_API_HOST,
+                "FEATURE_FLAG_NO_MAP": settings.FEATURE_FLAG_NO_MAP,
             }
         )
 
diff --git a/fala/templates/base.html b/fala/templates/base.html
index 6ea4e8cb..35fd7063 100644
--- a/fala/templates/base.html
+++ b/fala/templates/base.html
@@ -105,10 +105,16 @@ <h2 class="govuk-error-summary__title" id="error-summary-title">
         </div>
       </div>
     {% endif %}
-    <h1 class="govuk-heading-xl govuk-!-margin-top-7">
-      Find a legal aid adviser <br />
-      <span class="govuk-!-font-weight-regular govuk-!-font-size-36">or family mediator</span>
-    </h1>
+    {% if FEATURE_FLAG_NO_MAP %}
+      <h1 class="govuk-heading-xl govuk-!-margin-top-7">
+        Find a legal aid adviser or family mediator
+      </h1>
+    {% else %}
+      <h1 class="govuk-heading-xl govuk-!-margin-top-7">
+        Find a legal aid adviser <br />
+        <span class="govuk-!-font-weight-regular govuk-!-font-size-36">or family mediator</span>
+      </h1>
+    {% endif %}
   </div>
   <div class="govuk-grid-column-two-thirds">
     <p class="govuk-body-l">Search for a legal adviser or family mediator with a legal aid contract in England and Wales.</p>

From af5355764fbb3fd3dc6adbde9bf22062fca8849b Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Fri, 5 Apr 2024 15:55:53 +0100
Subject: [PATCH 02/29] make feature flag live in staging

---
 kubernetes_deploy/staging/deployment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes_deploy/staging/deployment.yml b/kubernetes_deploy/staging/deployment.yml
index 86f78a59..b5091c02 100644
--- a/kubernetes_deploy/staging/deployment.yml
+++ b/kubernetes_deploy/staging/deployment.yml
@@ -68,4 +68,4 @@ spec:
               name: s3
               key: bucket_name
         - name: FEATURE_FLAG_NO_MAP
-          value: "false"
+          value: "true"

From 8ca5a0720d891128e25aa6989ca2e20dca879fa4 Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Mon, 8 Apr 2024 17:14:14 +0100
Subject: [PATCH 03/29] update

---
 fala/apps/adviser/forms.py             |   4 +-
 fala/apps/adviser/forms_old.py         | 100 +++++++++++++
 fala/apps/adviser/views.py             |  11 +-
 fala/templates/adviser/search.html     |  22 ++-
 fala/templates/adviser/search_old.html |  76 ++++++++++
 fala/templates/base.html               |  77 ----------
 fala/templates/base_old.html           | 189 +++++++++++++++++++++++++
 7 files changed, 393 insertions(+), 86 deletions(-)
 create mode 100644 fala/apps/adviser/forms_old.py
 create mode 100644 fala/templates/adviser/search_old.html
 create mode 100644 fala/templates/base_old.html

diff --git a/fala/apps/adviser/forms.py b/fala/apps/adviser/forms.py
index c9289cc0..0b9d5424 100644
--- a/fala/apps/adviser/forms.py
+++ b/fala/apps/adviser/forms.py
@@ -27,9 +27,9 @@ class AdviserSearchForm(forms.Form):
     page = forms.IntegerField(required=False, widget=forms.HiddenInput())
 
     postcode = forms.CharField(
-        label=_("Enter postcode"),
+        label=_("Postcode"),
         max_length=30,
-        help_text=_("For example, <span class='notranslate' translate='no'>SW1H 9AJ</span>"),
+        help_text=_("For example, <span class='notranslate' translate='no'>SW1H</span>"),
         required=False,
         widget=FalaTextInput(),
     )
diff --git a/fala/apps/adviser/forms_old.py b/fala/apps/adviser/forms_old.py
new file mode 100644
index 00000000..c9289cc0
--- /dev/null
+++ b/fala/apps/adviser/forms_old.py
@@ -0,0 +1,100 @@
+# coding=utf-8
+from django import forms
+from django.utils.translation import gettext_lazy as _
+
+import laalaa.api as laalaa
+import re
+
+SEARCH_TYPE_CHOICES = [("location", _("Location")), ("organisation", _("Organisation"))]
+
+ORGANISATION_TYPES_CHOICES = [
+    ("Charity or Voluntary Org", "Charity or Voluntary Organisations"),
+    ("Mediation", "Mediation Service"),
+    ("Private Company", "Private Company"),
+    ("Solicitor", "Solicitor"),
+]
+
+
+class FalaTextInput(forms.TextInput):
+    def __init__(self, attrs={}):
+        class_attr = " ".join([c for c in ["govuk-input govuk-!-width-one-third", attrs.get("class")] if c])
+        attrs.update({"class": class_attr})
+
+        super(FalaTextInput, self).__init__(attrs)
+
+
+class AdviserSearchForm(forms.Form):
+    page = forms.IntegerField(required=False, widget=forms.HiddenInput())
+
+    postcode = forms.CharField(
+        label=_("Enter postcode"),
+        max_length=30,
+        help_text=_("For example, <span class='notranslate' translate='no'>SW1H 9AJ</span>"),
+        required=False,
+        widget=FalaTextInput(),
+    )
+
+    name = forms.CharField(label=_("Organisation name"), max_length=100, required=False, widget=FalaTextInput())
+
+    type = forms.MultipleChoiceField(
+        label=_("Organisation type"),
+        choices=ORGANISATION_TYPES_CHOICES,
+        widget=forms.CheckboxSelectMultiple(),
+        required=False,
+    )
+
+    categories = forms.MultipleChoiceField(
+        label=_("Category"),
+        choices=laalaa.PROVIDER_CATEGORY_CHOICES,
+        widget=forms.CheckboxSelectMultiple(),
+        required=False,
+    )
+
+    def __init__(self, *args, **kwargs):
+        kwargs.setdefault("label_suffix", "")
+        super(AdviserSearchForm, self).__init__(*args, **kwargs)
+
+    def clean(self):
+        data = self.cleaned_data
+        if not data.get("postcode") and not data.get("name"):
+            raise forms.ValidationError(_("Enter a postcode or an organisation name"))
+        else:
+            postcodeNoSpace = data.get("postcode").replace(" ", "")
+            msg1 = "This service does not cover "
+            msg2 = "Try a postcode, town or city in England or Wales."
+            region = "England or Wales. "
+            if re.search(r"^BT[0-9]", postcodeNoSpace, flags=re.IGNORECASE):
+                region = "Northern Ireland. "
+            elif re.search(r"^IM[0-9]", postcodeNoSpace, flags=re.IGNORECASE):
+                region = "the Isle of Man. "
+            elif re.search(r"^JE[0-9]", postcodeNoSpace, flags=re.IGNORECASE):
+                region = "Jersey. "
+            elif re.search(r"^GY[1][0]", postcodeNoSpace, flags=re.IGNORECASE):
+                region = "Sark or Guernsey. "
+            elif re.search(r"^GY[9]", postcodeNoSpace, flags=re.IGNORECASE):
+                region = "Alderney or Guernsey. "
+            elif re.search(r"^GY[0-8]", postcodeNoSpace, flags=re.IGNORECASE):
+                region = "Guernsey. "
+            if region != "England or Wales. ":
+                self.add_error("postcode", "%s %s" % (_(" ".join((msg1, region))), _(msg2)))
+        return data
+
+    def search(self):
+        if self.is_valid():
+            try:
+                data = laalaa.find(
+                    postcode=self.cleaned_data.get("postcode"),
+                    categories=self.cleaned_data.get("categories"),
+                    page=self.cleaned_data.get("page", 1),
+                    organisation_types=self.cleaned_data.get("type"),
+                    organisation_name=self.cleaned_data.get("name"),
+                )
+                if "error" in data:
+                    self.add_error("postcode", (data["error"]))
+                    return {}
+                return data
+            except laalaa.LaaLaaError:
+                self.add_error(
+                    "postcode", "%s %s" % (_("Error looking up legal advisers."), _("Please try again later."))
+                )
+        return {}
diff --git a/fala/apps/adviser/views.py b/fala/apps/adviser/views.py
index fd4d8ef2..724591fc 100644
--- a/fala/apps/adviser/views.py
+++ b/fala/apps/adviser/views.py
@@ -3,11 +3,18 @@
 from django.urls import resolve, reverse
 from django.views.generic import TemplateView
 
-from .forms import AdviserSearchForm
+if settings.FEATURE_FLAG_NO_MAP:
+    from .forms import AdviserSearchForm
+else:
+    from .forms_old import AdviserSearchForm
 
 
 class AdviserView(TemplateView):
-    template_name = "adviser/search.html"
+    # https://docs.djangoproject.com/en/5.0/topics/class-based-views/#usage-in-your-urlconf - this is how `template_name`
+    if settings.FEATURE_FLAG_NO_MAP:
+        template_name = "adviser/search.html"
+    else:
+        template_name = "adviser/search-old.html"
 
     def get(self, request, *args, **kwargs):
         context = self.get_context_data(**kwargs)
diff --git a/fala/templates/adviser/search.html b/fala/templates/adviser/search.html
index 2fc64fb0..1c2b9294 100644
--- a/fala/templates/adviser/search.html
+++ b/fala/templates/adviser/search.html
@@ -7,6 +7,14 @@
 {% import "macros/element.html" as Element %}
 {% import "macros/forms.html" as Form %}
 
+{% block content %}
+  <div class="govuk-grid-column-two-thirds">
+    <div id="google_translate_element" class="govuk-!-margin-bottom-6"></div>
+    <h1 class="govuk-heading-xl"> Find a legal aid adviser or family mediator </h1>
+    <p class="govuk-body">You need to provide information about your finances to find out if you qualify for legal aid.</p>
+    <p class="govuk-body"><a class="govuk-link" href="https://www.gov.uk/check-legal-aid" target="_blank">Check if you qualify for legal aid (opens in a new tab)</a></p>
+  </div>
+
 {% block search_form %}
   <form action="" class="laa-fala__search" novalidate>
     <div
@@ -39,15 +47,14 @@
         {% endcall %}
       {% endif %}
     </div>
-    <button type="submit" class="govuk-button" id="searchButton" name="search">Search</button>
 
     <div class="form-group filters">
       <div class="govuk-form-group">
         <fieldset class="govuk-fieldset">
           <legend class="govuk-fieldset__legend govuk-fieldset__legend--m">
-            <h2 class="govuk-fieldset__heading">
-              Filter by category
-            </h2>
+            <label class="govuk-label govuk-label--s">
+              Catgories of law (optional)
+            </label>
           </legend>
           <div class="govuk-checkboxes govuk-checkboxes--small fala-tickbox-columns">
             {% for value, label_text in form.categories.field.choices %}
@@ -70,7 +77,12 @@ <h2 class="govuk-fieldset__heading">
           </div>
         </fieldset>
       </div>
-      <button type="submit" class="govuk-button govuk-button--secondary" name="filter">Apply filter</button>
+      <button type="submit" class="govuk-button" id="searchButton" name="search">Search</button>
     </div>
   </form>
 {% endblock %}
+
+
+{% endblock %}
+
+
diff --git a/fala/templates/adviser/search_old.html b/fala/templates/adviser/search_old.html
new file mode 100644
index 00000000..9147ccc0
--- /dev/null
+++ b/fala/templates/adviser/search_old.html
@@ -0,0 +1,76 @@
+{% if request.headers.get('x-requested-with') == 'XMLHttpRequest' %}
+  {% extends 'ajax-base.html' %}
+{% else %}
+  {% extends 'base_old.html' %}
+{% endif %}
+
+{% import "macros/element.html" as Element %}
+{% import "macros/forms.html" as Form %}
+
+{% block search_form %}
+  <form action="" class="laa-fala__search" novalidate>
+    <div
+      class="govuk-form-group
+        {% if (form.errors and form.errors['__all__']) %}
+          govuk-form-group--error
+        {% endif %}
+        "
+      id="fala_questions">
+
+      {% 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 %}
+    </div>
+    <button type="submit" class="govuk-button" id="searchButton" name="search">Search</button>
+
+    <div class="form-group filters">
+      <div class="govuk-form-group">
+        <fieldset class="govuk-fieldset">
+          <legend class="govuk-fieldset__legend govuk-fieldset__legend--m">
+            <h2 class="govuk-fieldset__heading">
+              Filter by category
+            </h2>
+          </legend>
+          <div class="govuk-checkboxes govuk-checkboxes--small fala-tickbox-columns">
+            {% for value, label_text in form.categories.field.choices %}
+              <div class="govuk-checkboxes__item">
+                <input
+                  class="govuk-checkboxes__input"
+                  id="id_categories_{{ loop.index0 }}"
+                  name="categories"
+                  type="checkbox"
+                  value="{{ value }}"
+                  {% if value in request.GET.getlist('categories','') %}
+                    checked
+                  {% endif %}
+                >
+                <label class="govuk-label govuk-checkboxes__label" for="id_categories_{{ loop.index0 }}">
+                  {{ label_text }}
+                </label>
+              </div>
+            {% endfor %}
+          </div>
+        </fieldset>
+      </div>
+      <button type="submit" class="govuk-button govuk-button--secondary" name="filter">Apply filter</button>
+    </div>
+  </form>
+{% endblock %}
diff --git a/fala/templates/base.html b/fala/templates/base.html
index 35fd7063..480cff9f 100644
--- a/fala/templates/base.html
+++ b/fala/templates/base.html
@@ -64,73 +64,6 @@
       </span>
     </p>
   </div>
-
-{% endblock %}
-
-{% block content %}
-  <div class="govuk-grid-column-full">
-    <div id="google_translate_element" class="govuk-!-margin-bottom-6"></div>
-
-    {% if form.errors and form.errors['__all__'] %}
-      {% call Element.error('error', title='There is a problem') %}
-        <ul class="govuk-list govuk-error-summary__list">
-          {% for k, error in form.errors.items() %}
-            <li>
-              {% if "Enter a postcode or an organisation name" == error | striptags %}
-                <a href="#id_postcode" onclick="errorScroll(&quot;fala_questions&quot;,&quot;id_postcode&quot;);return false;" >
-                  Enter a postcode</a>
-                <b>or</b>
-                <a href="#id_name" onclick="errorScroll(&quot;fala_questions&quot;,&quot;id_name&quot;);return false;" >
-                  an organisation name
-                </a>
-              {% else %}
-                <a href="#id_postcode" onclick="errorScroll(&quot;fala_questions&quot;,&quot;id_postcode&quot;);return false;" >
-                  {{ error | striptags }}
-                </a>
-              {% endif %}
-            </li>
-          {% endfor %}
-        </ul>
-      {% endcall %}
-    {% elif (form.postcode and form.postcode.errors) or (form.name and form.name.errors) %}
-      <div class="govuk-error-summary" aria-labelledby="error-summary-title" role="alert" tabindex="-1" data-module="govuk-error-summary">
-        <h2 class="govuk-error-summary__title" id="error-summary-title">
-          There is a problem
-        </h2>
-        <div class="govuk-error-summary__body">
-          <ul class="govuk-list govuk-error-summary__list">
-            {{ Form.render_field_errors_for_summary(form.postcode) }}
-            {{ Form.render_field_errors_for_summary(form.name) }}
-          </ul>
-        </div>
-      </div>
-    {% endif %}
-    {% if FEATURE_FLAG_NO_MAP %}
-      <h1 class="govuk-heading-xl govuk-!-margin-top-7">
-        Find a legal aid adviser or family mediator
-      </h1>
-    {% else %}
-      <h1 class="govuk-heading-xl govuk-!-margin-top-7">
-        Find a legal aid adviser <br />
-        <span class="govuk-!-font-weight-regular govuk-!-font-size-36">or family mediator</span>
-      </h1>
-    {% endif %}
-  </div>
-  <div class="govuk-grid-column-two-thirds">
-    <p class="govuk-body-l">Search for a legal adviser or family mediator with a legal aid contract in England and Wales.</p>
-  </div>
-
-  <div class="find-legal-adviser">
-    <div class="govuk-grid-column-full">
-      {% block search_results %}
-        {% include 'adviser/_results.html' %}
-      {% endblock %}
-      {% block search_form %}{% endblock %}
-    </div>
-    <div class="govuk-grid-column-two-thirds">
-      <p class="govuk-body">If you are a provider and your details are incorrect, please contact your contract manager.</p>
-    </div>
-  </div>
 {% endblock %}
 
 {% block support_links_items %}
@@ -164,16 +97,6 @@ <h1 class="govuk-heading-xl govuk-!-margin-top-7">
   </li>
 {% endblock %}
 
-{% block before_main_js %}
-  {{ super() }}
-  <script src="//maps.googleapis.com/maps/api/js?key={{ GOOGLE_MAPS_API_KEY }}"></script>
-  <script nonce="{{request.csp_nonce}}">
-    window.LABELS = {
-      loading: "{{ _('Loading…') }}"
-    };
-  </script>
-{% endblock %}
-
 {% block after_main_js %}
   <script  nonce="{{request.csp_nonce}}">
     function googleTranslateElementInit() {
diff --git a/fala/templates/base_old.html b/fala/templates/base_old.html
new file mode 100644
index 00000000..e93c7639
--- /dev/null
+++ b/fala/templates/base_old.html
@@ -0,0 +1,189 @@
+{% extends 'external.html' %}
+
+{% import "macros/forms.html" as Form %}
+{% import "macros/element.html" as Element %}
+
+{% set title = _('Find a legal aid adviser or family mediator') %}
+
+{% block head %}
+  {{ super() }}
+  {% if request %}
+    <style media="print">
+      a[href^="/"]:after {
+        content: ' ({{ request.META.HTTP_HOST }}' attr(href) ')';
+      }
+    </style>
+  {% endif %}
+  <script nonce="{{request.csp_nonce}}">
+  function tagMan() {  // Activate Google Tag Manager
+    (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+    new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+    j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+    'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+    })(window,document,'script','dataLayer','GTM-WDJLHSKL');
+  }
+  </script>
+  
+  {% if (request.COOKIES.get('cookiePermission') == 'Allowed') %}
+  <script nonce="{{request.csp_nonce}}">tagMan();</script>
+  {% endif %}
+  <script nonce="{{request.csp_nonce}}">
+    /* Modernizr 2.8.3 (Custom Build) | MIT & BSD
+     * Build: http://modernizr.com/download/#-mq-teststyles
+     */
+    window.Modernizr=function(a,b,c){function v(a){i.cssText=a}function w(a,b){return v(prefixes.join(a+";")+(b||""))}function x(a,b){return typeof a===b}function y(a,b){return!!~(""+a).indexOf(b)}function z(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:x(f,"function")?f.bind(d||b):f}return!1}var d="2.8.3",e={},f=b.documentElement,g="modernizr",h=b.createElement(g),i=h.style,j,k={}.toString,l={},m={},n={},o=[],p=o.slice,q,r=function(a,c,d,e){var h,i,j,k,l=b.createElement("div"),m=b.body,n=m||b.createElement("body");if(parseInt(d,10))while(d--)j=b.createElement("div"),j.id=e?e[d]:g+(d+1),l.appendChild(j);return h=["&#173;",'<style id="s',g,'">',a,"</style>"].join(""),l.id=g,(m?l:n).innerHTML+=h,n.appendChild(l),m||(n.style.background="",n.style.overflow="hidden",k=f.style.overflow,f.style.overflow="hidden",f.appendChild(n)),i=c(l,a),m?l.parentNode.removeChild(l):(n.parentNode.removeChild(n),f.style.overflow=k),!!i},s=function(b){var c=a.matchMedia||a.msMatchMedia;if(c)return c(b)&&c(b).matches||!1;var d;return r("@media "+b+" { #"+g+" { position: absolute; } }",function(b){d=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle)["position"]=="absolute"}),d},t={}.hasOwnProperty,u;!x(t,"undefined")&&!x(t.call,"undefined")?u=function(a,b){return t.call(a,b)}:u=function(a,b){return b in a&&x(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=p.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(p.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(p.call(arguments)))};return e});for(var A in l)u(l,A)&&(q=A.toLowerCase(),e[q]=l[A](),o.push((e[q]?"":"no-")+q));return e.addTest=function(a,b){if(typeof a=="object")for(var d in a)u(a,d)&&e.addTest(d,a[d]);else{a=a.toLowerCase();if(e[a]!==c)return e;b=typeof b=="function"?b():b,typeof enableClasses!="undefined"&&enableClasses&&(f.className+=" "+(b?"":"no-")+a),e[a]=b}return e},v(""),h=j=null,e._version=d,e.mq=s,e.testStyles=r,e}(this,this.document);
+  </script>
+{% endblock %}
+
+{% block stylesheets %}
+  <link href="{{ static('css/main.css') }}" rel="stylesheet">
+{% endblock %}
+
+{% block page_title %}{{ title }}{% endblock %}
+
+{% block proposition %}
+  <a href="{{ url('adviser') }}" class="govuk-header__link govuk-header__link--service-name">{{ title }}</a>
+{% endblock %}
+
+{% block global_subheader %}
+  <div class="govuk-phase-banner">
+    <p class="govuk-phase-banner__content">
+      <strong class="govuk-tag govuk-phase-banner__content__tag">
+        {% if ENVIRONMENT == "dev" %}
+          Development
+        {% elif ENVIRONMENT == "staging" %}
+          Staging
+        {% elif ENVIRONMENT == "production" %}
+          Beta
+        {% else %}
+          {{ ENVIRONMENT.title() }}
+        {% endif %}
+      </strong>
+      <span class="govuk-phase-banner__text">
+        This is a new service – your <a class="govuk-link" href="https://eu.surveymonkey.com/r/GLHPMFX">feedback</a> will help us to improve it.
+      </span>
+    </p>
+  </div>
+
+{% endblock %}
+
+{% block content %}
+  <div class="govuk-grid-column-full">
+    <div id="google_translate_element" class="govuk-!-margin-bottom-6"></div>
+
+    {% if form.errors and form.errors['__all__'] %}
+      {% call Element.error('error', title='There is a problem') %}
+        <ul class="govuk-list govuk-error-summary__list">
+          {% for k, error in form.errors.items() %}
+            <li>
+              {% if "Enter a postcode or an organisation name" == error | striptags %}
+                <a href="#id_postcode" onclick="errorScroll(&quot;fala_questions&quot;,&quot;id_postcode&quot;);return false;" >
+                  Enter a postcode</a>
+                <b>or</b>
+                <a href="#id_name" onclick="errorScroll(&quot;fala_questions&quot;,&quot;id_name&quot;);return false;" >
+                  an organisation name
+                </a>
+              {% else %}
+                <a href="#id_postcode" onclick="errorScroll(&quot;fala_questions&quot;,&quot;id_postcode&quot;);return false;" >
+                  {{ error | striptags }}
+                </a>
+              {% endif %}
+            </li>
+          {% endfor %}
+        </ul>
+      {% endcall %}
+    {% elif (form.postcode and form.postcode.errors) or (form.name and form.name.errors) %}
+      <div class="govuk-error-summary" aria-labelledby="error-summary-title" role="alert" tabindex="-1" data-module="govuk-error-summary">
+        <h2 class="govuk-error-summary__title" id="error-summary-title">
+          There is a problem
+        </h2>
+        <div class="govuk-error-summary__body">
+          <ul class="govuk-list govuk-error-summary__list">
+            {{ Form.render_field_errors_for_summary(form.postcode_old) }}
+            {{ Form.render_field_errors_for_summary(form.name) }}
+          </ul>
+        </div>
+      </div>
+    {% endif %}
+    <h1 class="govuk-heading-xl govuk-!-margin-top-7">
+      Find a legal aid adviser <br />
+      <span class="govuk-!-font-weight-regular govuk-!-font-size-36">or family mediator</span>
+    </h1>
+  </div>
+  <div class="govuk-grid-column-two-thirds">
+    <p class="govuk-body-l">Search for a legal adviser or family mediator with a legal aid contract in England and Wales.</p>
+  </div>
+
+  <div class="find-legal-adviser">
+    <div class="govuk-grid-column-full">
+      {% block search_results %}
+        {% include 'adviser/_results.html' %}
+      {% endblock %}
+      {% block search_form %}{% endblock %}
+    </div>
+    <div class="govuk-grid-column-two-thirds">
+      <p class="govuk-body">If you are a provider and your details are incorrect, please contact your contract manager.</p>
+    </div>
+  </div>
+{% endblock %}
+
+{% block support_links_items %}
+  <li class="govuk-footer__inline-list-item laa-hide-if-no-js">
+    <a id="cookieReview" class="govuk-footer__link" href="#top">
+      Cookies
+    </a>
+  </li>
+  <noscript>
+    <li class="govuk-footer__inline-list-item">
+      <a class="govuk-footer__link" href="https://www.gov.uk/help/cookies">
+        Cookies
+      </a>
+    </li>
+  </noscript>
+  <li class="govuk-footer__inline-list-item">
+    <a class="govuk-footer__link"  href="https://www.gov.uk/government/organisations/legal-aid-agency">
+      Legal Aid Agency
+    </a>
+  </li>
+  <li class="govuk-footer__inline-list-item">
+    <a class="govuk-footer__link"  href="/accessibility-statement">
+      Accessibility statement
+    </a>
+  </li>
+  <li class="govuk-footer__inline-list-item">
+    Built by
+    <a class="govuk-footer__link" href="https://mojdigital.blog.gov.uk/">
+      <abbr title="Ministry of Justice">MoJ</abbr> Digital Services
+    </a>
+  </li>
+{% endblock %}
+
+{% block before_main_js %}
+  {{ super() }}
+  <script src="//maps.googleapis.com/maps/api/js?key={{ GOOGLE_MAPS_API_KEY }}"></script>
+  <script nonce="{{request.csp_nonce}}">
+    window.LABELS = {
+      loading: "{{ _('Loading…') }}"
+    };
+  </script>
+{% endblock %}
+
+{% block after_main_js %}
+  <script  nonce="{{request.csp_nonce}}">
+    function googleTranslateElementInit() {
+      new google.translate.TranslateElement(
+        {
+          pageLanguage: 'en',
+          layout: google.translate.TranslateElement.FloatPosition.TOP_LEFT
+        },
+        'google_translate_element');
+    }
+  </script>
+  <script src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
+  <script  nonce="{{request.csp_nonce}}">
+    function errorScroll(s,f) {
+      document.getElementById(s).scrollIntoView();
+      document.getElementById(f).focus();
+    }
+  </script>
+{% endblock %}

From ccf26051b6059b135af15a3660447db8d7cd3e08 Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Tue, 9 Apr 2024 14:52:02 +0100
Subject: [PATCH 04/29] update to stylings and layout

---
 fala/apps/adviser/forms.py         |   9 +-
 fala/assets-src/sass/main.scss     |   1 -
 fala/templates/adviser/search.html | 138 +++++++++++++++--------------
 3 files changed, 79 insertions(+), 69 deletions(-)

diff --git a/fala/apps/adviser/forms.py b/fala/apps/adviser/forms.py
index 0b9d5424..3e061347 100644
--- a/fala/apps/adviser/forms.py
+++ b/fala/apps/adviser/forms.py
@@ -27,14 +27,19 @@ class AdviserSearchForm(forms.Form):
     page = forms.IntegerField(required=False, widget=forms.HiddenInput())
 
     postcode = forms.CharField(
-        label=_("Postcode"),
+        label=_("<label class='govuk-label govuk-label--s'>Postcode</label>"),
         max_length=30,
         help_text=_("For example, <span class='notranslate' translate='no'>SW1H</span>"),
         required=False,
         widget=FalaTextInput(),
     )
 
-    name = forms.CharField(label=_("Organisation name"), max_length=100, required=False, widget=FalaTextInput())
+    name = forms.CharField(
+        label=_("<label class='govuk-label govuk-label--s'>Organisation name</label>"),
+        max_length=100,
+        required=False,
+        widget=FalaTextInput(),
+    )
 
     type = forms.MultipleChoiceField(
         label=_("Organisation type"),
diff --git a/fala/assets-src/sass/main.scss b/fala/assets-src/sass/main.scss
index b5eee84f..13b984a1 100644
--- a/fala/assets-src/sass/main.scss
+++ b/fala/assets-src/sass/main.scss
@@ -54,7 +54,6 @@ body.govuk-template__body {
   height: auto;
   height: initial;
   display: block;
-  font-family: GDS Transport, Arial, sans-serif; /*temp - remove when all classes updated*/
 }
 
 .govuk-footer__copyright-logo,
diff --git a/fala/templates/adviser/search.html b/fala/templates/adviser/search.html
index 1c2b9294..82f12640 100644
--- a/fala/templates/adviser/search.html
+++ b/fala/templates/adviser/search.html
@@ -9,80 +9,86 @@
 
 {% block content %}
   <div class="govuk-grid-column-two-thirds">
-    <div id="google_translate_element" class="govuk-!-margin-bottom-6"></div>
-    <h1 class="govuk-heading-xl"> Find a legal aid adviser or family mediator </h1>
-    <p class="govuk-body">You need to provide information about your finances to find out if you qualify for legal aid.</p>
-    <p class="govuk-body"><a class="govuk-link" href="https://www.gov.uk/check-legal-aid" target="_blank">Check if you qualify for legal aid (opens in a new tab)</a></p>
+      <div id="google_translate_element" class="govuk-!-margin-bottom-6"></div>
+      <h1 class="govuk-heading-xl"> Find a legal aid adviser or family mediator </h1>
+      <p class="govuk-body">You need to provide information about your finances to find out if you qualify for legal aid.</p>
+      <p class="govuk-body"><a class="govuk-link" href="https://www.gov.uk/check-legal-aid" target="_blank" rel="noopener">Check if you qualify for legal aid (opens in a new tab)</a></p>
   </div>
 
-{% block search_form %}
-  <form action="" class="laa-fala__search" novalidate>
-    <div
-      class="govuk-form-group
-        {% if (form.errors and form.errors['__all__']) %}
-          govuk-form-group--error
-        {% endif %}
-        "
-      id="fala_questions">
+  {% block search_form %}
+      <div class="govuk-grid-column-full" style="background-color: #f3f2f1; padding: 1em; margin: 0.5em;">
+        <form action="" novalidate>
+          <div
+            class="govuk-form-group
+              {% if (form.errors and form.errors['__all__']) %}
+                govuk-form-group--error
+              {% endif %}
+              "
+            id="fala_questions">
 
-      {% set errorMessage = {'err': ""} %}
+            {% 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 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 %}
-    </div>
-
-    <div class="form-group filters">
-      <div class="govuk-form-group">
-        <fieldset class="govuk-fieldset">
-          <legend class="govuk-fieldset__legend govuk-fieldset__legend--m">
-            <label class="govuk-label govuk-label--s">
-              Catgories of law (optional)
-            </label>
-          </legend>
-          <div class="govuk-checkboxes govuk-checkboxes--small fala-tickbox-columns">
-            {% for value, label_text in form.categories.field.choices %}
-              <div class="govuk-checkboxes__item">
-                <input
-                  class="govuk-checkboxes__input"
-                  id="id_categories_{{ loop.index0 }}"
-                  name="categories"
-                  type="checkbox"
-                  value="{{ value }}"
-                  {% if value in request.GET.getlist('categories','') %}
-                    checked
-                  {% endif %}
-                >
-                <label class="govuk-label govuk-checkboxes__label" for="id_categories_{{ loop.index0 }}">
-                  {{ label_text }}
-                </label>
-              </div>
-            {% endfor %}
+            {% 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 %}
+              <p class="govuk-body">Or</p>
+              {% 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 %}
+              <p class="govuk-body">Or</p>
+              {% call Form.group(form.name, 'govuk-form-group', hide_optional=True, max_length='100') %}
+              {% endcall %}
+            {% endif %}
           </div>
-        </fieldset>
+          
+          <div class="form-group filters">
+            <div class="govuk-form-group">
+              <fieldset class="govuk-fieldset">
+                <legend class="govuk-fieldset__legend govuk-fieldset__legend--m">
+                  <label class="govuk-label govuk-label--s">
+                    Catgories of law (optional)
+                  </label>
+                </legend>
+                <div class="govuk-checkboxes govuk-checkboxes--small fala-tickbox-columns">
+                  {% for value, label_text in form.categories.field.choices %}
+                    <div class="govuk-checkboxes__item">
+                      <input
+                        class="govuk-checkboxes__input"
+                        id="id_categories_{{ loop.index0 }}"
+                        name="categories"
+                        type="checkbox"
+                        value="{{ value }}"
+                        {% if value in request.GET.getlist('categories','') %}
+                          checked
+                        {% endif %}
+                      >
+                      <label class="govuk-label govuk-checkboxes__label" for="id_categories_{{ loop.index0 }}">
+                        {{ label_text }}
+                      </label>
+                    </div>
+                  {% endfor %}
+                </div>
+              </fieldset>
+            </div>
+            <button type="submit" class="govuk-button govuk-!-margin-bottom-2" id="searchButton" name="search">Search</button>
+          </div>
+        </form>
       </div>
-      <button type="submit" class="govuk-button" id="searchButton" name="search">Search</button>
-    </div>
-  </form>
-{% endblock %}
-
+  {% endblock %}
 
+    <div class="govuk-grid-column-full">
+      <p class="govuk-body">If you are a provider and your details are incorrect, please contact your contract manager.</p>
+    </div>
 {% endblock %}
 
 

From 4b4dcfdae9d889ca3eb2e009057c9fd833a638cb Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Thu, 11 Apr 2024 10:39:52 +0100
Subject: [PATCH 05/29] updates from review comments

---
 fala/apps/adviser/forms.py | 7 ++++---
 fala/apps/adviser/views.py | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/fala/apps/adviser/forms.py b/fala/apps/adviser/forms.py
index 3e061347..4866b8ff 100644
--- a/fala/apps/adviser/forms.py
+++ b/fala/apps/adviser/forms.py
@@ -1,6 +1,7 @@
 # coding=utf-8
 from django import forms
 from django.utils.translation import gettext_lazy as _
+from django.utils.safestring import mark_safe
 
 import laalaa.api as laalaa
 import re
@@ -27,15 +28,15 @@ class AdviserSearchForm(forms.Form):
     page = forms.IntegerField(required=False, widget=forms.HiddenInput())
 
     postcode = forms.CharField(
-        label=_("<label class='govuk-label govuk-label--s'>Postcode</label>"),
+        label=_(mark_safe("<label class='govuk-label govuk-label--s'>Postcode</label>")),
         max_length=30,
-        help_text=_("For example, <span class='notranslate' translate='no'>SW1H</span>"),
+        help_text=_(mark_safe("For example, <span class='notranslate' translate='no'>SW1H</span>")),
         required=False,
         widget=FalaTextInput(),
     )
 
     name = forms.CharField(
-        label=_("<label class='govuk-label govuk-label--s'>Organisation name</label>"),
+        label=_(mark_safe("<label class='govuk-label govuk-label--s'>Organisation name</label>")),
         max_length=100,
         required=False,
         widget=FalaTextInput(),
diff --git a/fala/apps/adviser/views.py b/fala/apps/adviser/views.py
index 724591fc..730e22fc 100644
--- a/fala/apps/adviser/views.py
+++ b/fala/apps/adviser/views.py
@@ -14,7 +14,7 @@ class AdviserView(TemplateView):
     if settings.FEATURE_FLAG_NO_MAP:
         template_name = "adviser/search.html"
     else:
-        template_name = "adviser/search-old.html"
+        template_name = "adviser/search_old.html"
 
     def get(self, request, *args, **kwargs):
         context = self.get_context_data(**kwargs)

From 9980598eda77265084ea20421cd8ecf5c5eb01e0 Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Thu, 11 Apr 2024 11:37:18 +0100
Subject: [PATCH 06/29] updates from review comments

---
 fala/apps/adviser/forms.py           |   4 +-
 fala/apps/adviser/views.py           |   1 +
 fala/assets-src/sass/main.scss       |  11 +-
 fala/settings/base.py                |   2 +
 fala/templates/adviser/search.html   |   4 +-
 fala/templates/macros/forms.html     |   2 +-
 fala/templates/macros/forms_old.html | 208 +++++++++++++++++++++++++++
 7 files changed, 226 insertions(+), 6 deletions(-)
 create mode 100644 fala/templates/macros/forms_old.html

diff --git a/fala/apps/adviser/forms.py b/fala/apps/adviser/forms.py
index 4866b8ff..310fe3ed 100644
--- a/fala/apps/adviser/forms.py
+++ b/fala/apps/adviser/forms.py
@@ -28,7 +28,7 @@ class AdviserSearchForm(forms.Form):
     page = forms.IntegerField(required=False, widget=forms.HiddenInput())
 
     postcode = forms.CharField(
-        label=_(mark_safe("<label class='govuk-label govuk-label--s'>Postcode</label>")),
+        label=_("Postcode"),
         max_length=30,
         help_text=_(mark_safe("For example, <span class='notranslate' translate='no'>SW1H</span>")),
         required=False,
@@ -36,7 +36,7 @@ class AdviserSearchForm(forms.Form):
     )
 
     name = forms.CharField(
-        label=_(mark_safe("<label class='govuk-label govuk-label--s'>Organisation name</label>")),
+        label=_("Organisation name"),
         max_length=100,
         required=False,
         widget=FalaTextInput(),
diff --git a/fala/apps/adviser/views.py b/fala/apps/adviser/views.py
index 730e22fc..5f5135c4 100644
--- a/fala/apps/adviser/views.py
+++ b/fala/apps/adviser/views.py
@@ -30,6 +30,7 @@ def get(self, request, *args, **kwargs):
                 "GOOGLE_MAPS_API_KEY": settings.GOOGLE_MAPS_API_KEY,
                 "LAALAA_API_HOST": settings.LAALAA_API_HOST,
                 "FEATURE_FLAG_NO_MAP": settings.FEATURE_FLAG_NO_MAP,
+                "CHECK_LEGAL_AID_URL": settings.CHECK_LEGAL_AID_URL,
             }
         )
 
diff --git a/fala/assets-src/sass/main.scss b/fala/assets-src/sass/main.scss
index 13b984a1..f6bcfc64 100644
--- a/fala/assets-src/sass/main.scss
+++ b/fala/assets-src/sass/main.scss
@@ -182,7 +182,16 @@ body.fala-dev {
   max-width: 140px;
 }
 
-.laa-fala__search {
+.laa-fala {
+  &__search {
   margin-top:1em;
   clear:both;
+  }
+
+  &__grey-box {
+    background-color: #f3f2f1; 
+    padding: 1em; 
+    margin: 0.5em; 
+  }
+  
 }
diff --git a/fala/settings/base.py b/fala/settings/base.py
index 45b5c2eb..3edad684 100644
--- a/fala/settings/base.py
+++ b/fala/settings/base.py
@@ -228,6 +228,8 @@ def root(*x):
 
 GOOGLE_MAPS_API_KEY = os.environ.get("GOOGLE_MAPS_API_KEY", "")
 
+CHECK_LEGAL_AID_URL = "https://www.gov.uk/check-legal-aid"
+
 # .local.py overrides all the common settings.
 try:
     from .local import *  # noqa: F401,F403
diff --git a/fala/templates/adviser/search.html b/fala/templates/adviser/search.html
index 82f12640..57846b6b 100644
--- a/fala/templates/adviser/search.html
+++ b/fala/templates/adviser/search.html
@@ -12,11 +12,11 @@
       <div id="google_translate_element" class="govuk-!-margin-bottom-6"></div>
       <h1 class="govuk-heading-xl"> Find a legal aid adviser or family mediator </h1>
       <p class="govuk-body">You need to provide information about your finances to find out if you qualify for legal aid.</p>
-      <p class="govuk-body"><a class="govuk-link" href="https://www.gov.uk/check-legal-aid" target="_blank" rel="noopener">Check if you qualify for legal aid (opens in a new tab)</a></p>
+      <p class="govuk-body"><a class="govuk-link" href="{{ CHECK_LEGAL_AID_URL }}" target="_blank" rel="noopener">Check if you qualify for legal aid (opens in a new tab)</a></p>
   </div>
 
   {% block search_form %}
-      <div class="govuk-grid-column-full" style="background-color: #f3f2f1; padding: 1em; margin: 0.5em;">
+      <div class="govuk-grid-column-full laa-fala__grey-box">
         <form action="" novalidate>
           <div
             class="govuk-form-group
diff --git a/fala/templates/macros/forms.html b/fala/templates/macros/forms.html
index cac88145..b25cba57 100644
--- a/fala/templates/macros/forms.html
+++ b/fala/templates/macros/forms.html
@@ -90,7 +90,7 @@
     {% endif %}
 
     <div class="form-group-label{{ (' govuk-visually-hidden' if hide_label else '') }}">
-      <label class="govuk-label" for="{{ field.id_for_label }}">{{ label_text|safe }}</label>
+      <label class="govuk-label govuk-label--s" for="{{ field.id_for_label }}">{{ label_text|safe }}</label>
     </div>
   {% endif %}
 {% endmacro %}
diff --git a/fala/templates/macros/forms_old.html b/fala/templates/macros/forms_old.html
new file mode 100644
index 00000000..cac88145
--- /dev/null
+++ b/fala/templates/macros/forms_old.html
@@ -0,0 +1,208 @@
+{#
+  Renders `form-group` wrapper for form fields
+
+  Params:
+    - field <object> (optional)
+        Form field
+    - class_ <string> (default: '')
+        Additional CSS class (all form group wrappers get 'govuk-form-group' CSS class)
+    - field_attrs <object> (default: {})
+        Custom HTML attributes for field
+    - controlled_by <string> (default: None)
+        name of the field that controls the visibility of this container
+    - control_value <string> (default: None)
+        value of the field that controls the visibility of this field
+    - row_class <string> (default: '')
+        Optional CSS class for `form-row` element
+#}
+{% macro group(field=None, class_='', field_attrs={}) %}
+  {% set controlled_by = kwargs.controlled_by %}
+  {% set control_value = kwargs.control_value if kwargs.control_value else '1' %}
+  {% set use_row = kwargs.use_row if kwargs.use_row is defined else True %}
+  {% set group_class = class_ if class_.startswith('govuk-form-group ') else 'govuk-form-group %s' % class_ %}
+
+  <div class="
+      {{- group_class -}}
+      {%- if field and field.errors %} govuk-form-group--error{% endif -%}
+      {%- if controlled_by and control_value %} s-hidden{% endif -%}
+    "
+    {% if controlled_by %}data-controlled-by="{{ controlled_by.name }}" data-control-value="{{ control_value }}"{% endif %}
+    {% if field %}id="field-{{ field.html_name }}"{% endif %}
+  >
+
+    {% if kwargs.global_error %}
+      <div aria-hidden="true" class="govuk-!-margin-bottom-4 govuk-error-message">
+        {{ kwargs.global_error }}
+      </div>
+    {% endif %}
+
+    {{ render_field_label(field, kwargs.hide_label, kwargs.hide_optional) }}
+
+    {{ render_field_description(field) }}
+
+    {% if field and (field.errors and controlled_by and not controlled_by.errors or field.errors and not controlled_by) %}
+      {{ render_field_errors(field) }}
+    {% endif %}
+
+    {% if kwargs.global_error %}
+      <span class="govuk-visually-hidden">Error: {{ kwargs.global_error }}</span>
+    {% elif kwargs.global_error_hidden %}
+      <span class="govuk-visually-hidden">Error: {{ kwargs.global_error_hidden }}</span>
+    {% endif %}
+
+    {% if use_row and (field or caller) %}
+      <div class="form-row {{ kwargs.row_class or '' }}">
+        {% if field %}
+          {% if field.errors and controlled_by and not controlled_by.errors or field.errors and not controlled_by %}
+            <input type="text" name="{{ field.name }}" value="{{ field.data or '' }}" class="govuk-input govuk-input--error govuk-!-width-one-third {{ field_attrs.class or '' }}" maxlength="{{ kwargs.max_length or '30' }}" id="id_{{ field.name }}">
+          {% else %}
+            <input type="text" name="{{ field.name }}" value="{{ field.data or '' }}" class="govuk-input govuk-!-width-one-third {{ field_attrs.class or '' }}" maxlength="{{ kwargs.max_length or '30' }}" id="id_{{ field.name }}">
+          {% endif %}
+        {% endif %}
+        {% if caller %}
+          {{ caller() }}
+        {% endif %}
+      </div>
+    {% elif caller %}
+      {{ caller() }}
+    {% elif field %}
+      {{ field }}
+    {% endif %}
+  </div>
+{% endmacro %}
+
+
+{#
+  Renders field label (if exists)
+
+  Params:
+    - field <object>
+        Form field
+    - hide_label <boolean> (default: False)
+        Whether to hide the label visually (still available for screen readers)
+#}
+{% macro render_field_label(field, hide_label=False, hide_optional=False) %}
+  {% if field %}
+    {% if field.field.required or hide_optional %}
+      {% set label_text = field.label %}
+    {% else %}
+      {% set label_text = field.label + ' <span class="form-optional">optional</span>' %}
+    {% endif %}
+
+    <div class="form-group-label{{ (' govuk-visually-hidden' if hide_label else '') }}">
+      <label class="govuk-label" for="{{ field.id_for_label }}">{{ label_text|safe }}</label>
+    </div>
+  {% endif %}
+{% endmacro %}
+
+
+{#
+  Renders field description (if exists)
+
+  Params:
+    - field <object>
+        Form field
+#}
+{% macro render_field_description(field) %}
+  {% if field and field.help_text %}
+    <span class="govuk-hint" id="field-description-{{ field.name }}">
+      {{- field.help_text | safe -}}
+    </span>
+  {%- endif -%}
+{% endmacro %}
+
+
+{#
+  Render field errors
+  (including mutli-fields)
+
+  Params:
+    - field <object> Form field
+#}
+{% macro render_field_errors(field) %}
+  {% if field and field.errors %}
+    {% set errors = field.errors.values() if field.errors is mapping else field.errors %}
+    <div class="form-row govuk-error-message">
+      {% for error in errors %}
+        {% if error is string or error == error|string %}
+          <span class="govuk-visually-hidden">Error:</span> {{error}}
+        {% else %}
+          {% for line in error %}
+            <span class="govuk-visually-hidden">Error:</span> {{ line }}
+          {% endfor %}
+        {% endif %}
+      {% endfor %}
+    </div>
+  {% endif %}
+{% endmacro %}
+
+{% macro render_field_errors_for_summary(field, id) %}
+  {% if field and field.errors %}
+    {% set errors = field.errors.values() if field.errors is mapping else field.errors %}
+    {% for error in errors %}
+      {% if error is string or error == error|string %}
+        <li>
+          <a href="#id_{{ field.name }}" onclick='errorScroll("fala_questions","id_{{ field.name }}");return false;'>{{ error }}</a>
+        </li>
+      {% else %}
+        {% for line in error %}
+           <li>
+            <a href="#id_{{ field.name }}" onclick='errorScroll("fala_questions","id_{{ field.name }}");return false;'>{{ line }}</a>
+          </li>
+        {% endfor %}
+      {% endif %}
+    {% endfor %}
+  {% endif %}
+{% endmacro %}
+
+
+{#
+  Renders form fieldset. Used as container for form fields.
+  Fieldset have `legend` element with optional `label` for single input
+  elements (such as text input)
+
+  Params:
+    - field <object>
+        Form field (optional)
+    - class_ <string> (default: 'fieldset-group')
+        CSS class for fieldset element
+    - legend <string> (default: None)
+        Custom legend text (if field is not provided)
+    - attrs <object> (default: None)
+        Custom HTML attributes for fieldset element
+#}
+{% macro fieldset(field=None, class_='form-group fieldset-group', legend=None, field_attrs={}) %}
+  {% set legend_ = field.label.text if field else legend %}
+  {% set controlled_by = kwargs.controlled_by %}
+  {% set control_value = kwargs.control_value if kwargs.control_value else '1' %}
+
+  <fieldset class="
+      {{- class_ -}}
+      {%- if field and field.errors %} form-error{% endif -%}
+      {%- if controlled_by and control_value %} s-hidden{% endif -%}
+    "
+    {%- if kwargs.attrs %}{{ kwargs.attrs|xmlattr }}{% endif -%}
+    {% if controlled_by %}data-controlled-by="{{ controlled_by.name }}" data-control-value="{{ control_value }}"{% endif %}
+    {%- if field %}id="field-{{ field.id_for_label }}"{% endif -%}
+  >
+    {% if legend_ %}
+      <legend class="form-group-label" {% if field %} id="field-label-{{ field.id }}"{% endif %}>
+        <span>{{ legend_ }}</span>
+      </legend>
+    {% endif %}
+
+    {{ render_field_description(field) }}
+    {{ render_field_errors(field) }}
+
+    {% if field or caller %}
+      <div class="form-row {{ kwargs.row_class }}">
+        {% if field and not kwargs.field_as_label %}
+          {{ field }}
+        {% endif %}
+        {% if caller %}
+          {{ caller() }}
+        {% endif %}
+      </div>
+    {% endif %}
+  </fieldset>
+{% endmacro %}

From 95e08becccd18f48cb0713d30ccc68e3ea25e029 Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Thu, 11 Apr 2024 12:32:39 +0100
Subject: [PATCH 07/29] last bits of from review commets

---
 fala/assets-src/sass/main.scss     | 10 ++++++++--
 fala/templates/adviser/search.html |  7 ++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/fala/assets-src/sass/main.scss b/fala/assets-src/sass/main.scss
index f6bcfc64..affcbe97 100644
--- a/fala/assets-src/sass/main.scss
+++ b/fala/assets-src/sass/main.scss
@@ -92,6 +92,12 @@ body.govuk-template__body {
   min-width:100%;
 }
 
+.govuk-checkboxes__label {
+  &::before {
+    background-color: govuk-colour("white");
+  }
+}
+
 /*below override for archaic class*/
 p.govuk-body:last-child,
 p.govuk-body-m:last-child {
@@ -189,9 +195,9 @@ body.fala-dev {
   }
 
   &__grey-box {
-    background-color: #f3f2f1; 
+    background-color: govuk-colour("light-grey"); 
     padding: 1em; 
     margin: 0.5em; 
   }
-  
+
 }
diff --git a/fala/templates/adviser/search.html b/fala/templates/adviser/search.html
index 57846b6b..04301c86 100644
--- a/fala/templates/adviser/search.html
+++ b/fala/templates/adviser/search.html
@@ -5,7 +5,12 @@
 {% endif %}
 
 {% import "macros/element.html" as Element %}
-{% import "macros/forms.html" as Form %}
+
+{% if FEATURE_FLAG_NO_MAP %}
+  {% import "macros/forms.html" as Form %}
+{% else %}
+  {% import "macros/forms_old.html" as Form %}
+{% endif %}
 
 {% block content %}
   <div class="govuk-grid-column-two-thirds">

From 9f9e5011bcc26ea8d56094b6d119e5427aa612cf Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Thu, 11 Apr 2024 13:22:45 +0100
Subject: [PATCH 08/29] remove duplicates

---
 fala/apps/adviser/forms.py             |  24 ++++--
 fala/apps/adviser/forms_old.py         | 100 -------------------------
 fala/apps/adviser/views.py             |   5 +-
 fala/templates/adviser/search.html     |   7 +-
 fala/templates/adviser/search_old.html |   2 +-
 fala/templates/base_old.html           |   2 +-
 6 files changed, 21 insertions(+), 119 deletions(-)
 delete mode 100644 fala/apps/adviser/forms_old.py

diff --git a/fala/apps/adviser/forms.py b/fala/apps/adviser/forms.py
index 310fe3ed..0facecfb 100644
--- a/fala/apps/adviser/forms.py
+++ b/fala/apps/adviser/forms.py
@@ -2,6 +2,7 @@
 from django import forms
 from django.utils.translation import gettext_lazy as _
 from django.utils.safestring import mark_safe
+from django.conf import settings
 
 import laalaa.api as laalaa
 import re
@@ -27,13 +28,22 @@ def __init__(self, attrs={}):
 class AdviserSearchForm(forms.Form):
     page = forms.IntegerField(required=False, widget=forms.HiddenInput())
 
-    postcode = forms.CharField(
-        label=_("Postcode"),
-        max_length=30,
-        help_text=_(mark_safe("For example, <span class='notranslate' translate='no'>SW1H</span>")),
-        required=False,
-        widget=FalaTextInput(),
-    )
+    if settings.FEATURE_FLAG_NO_MAP:
+        postcode = forms.CharField(
+            label=_("Postcode"),
+            max_length=30,
+            help_text=_(mark_safe("For example, <span class='notranslate' translate='no'>SW1H</span>")),
+            required=False,
+            widget=FalaTextInput(),
+        )
+    else:
+        postcode = forms.CharField(
+            label=_("Enter postcode"),
+            max_length=30,
+            help_text=_("For example, <span class='notranslate' translate='no'>SW1H 9AJ</span>"),
+            required=False,
+            widget=FalaTextInput(),
+        )
 
     name = forms.CharField(
         label=_("Organisation name"),
diff --git a/fala/apps/adviser/forms_old.py b/fala/apps/adviser/forms_old.py
deleted file mode 100644
index c9289cc0..00000000
--- a/fala/apps/adviser/forms_old.py
+++ /dev/null
@@ -1,100 +0,0 @@
-# coding=utf-8
-from django import forms
-from django.utils.translation import gettext_lazy as _
-
-import laalaa.api as laalaa
-import re
-
-SEARCH_TYPE_CHOICES = [("location", _("Location")), ("organisation", _("Organisation"))]
-
-ORGANISATION_TYPES_CHOICES = [
-    ("Charity or Voluntary Org", "Charity or Voluntary Organisations"),
-    ("Mediation", "Mediation Service"),
-    ("Private Company", "Private Company"),
-    ("Solicitor", "Solicitor"),
-]
-
-
-class FalaTextInput(forms.TextInput):
-    def __init__(self, attrs={}):
-        class_attr = " ".join([c for c in ["govuk-input govuk-!-width-one-third", attrs.get("class")] if c])
-        attrs.update({"class": class_attr})
-
-        super(FalaTextInput, self).__init__(attrs)
-
-
-class AdviserSearchForm(forms.Form):
-    page = forms.IntegerField(required=False, widget=forms.HiddenInput())
-
-    postcode = forms.CharField(
-        label=_("Enter postcode"),
-        max_length=30,
-        help_text=_("For example, <span class='notranslate' translate='no'>SW1H 9AJ</span>"),
-        required=False,
-        widget=FalaTextInput(),
-    )
-
-    name = forms.CharField(label=_("Organisation name"), max_length=100, required=False, widget=FalaTextInput())
-
-    type = forms.MultipleChoiceField(
-        label=_("Organisation type"),
-        choices=ORGANISATION_TYPES_CHOICES,
-        widget=forms.CheckboxSelectMultiple(),
-        required=False,
-    )
-
-    categories = forms.MultipleChoiceField(
-        label=_("Category"),
-        choices=laalaa.PROVIDER_CATEGORY_CHOICES,
-        widget=forms.CheckboxSelectMultiple(),
-        required=False,
-    )
-
-    def __init__(self, *args, **kwargs):
-        kwargs.setdefault("label_suffix", "")
-        super(AdviserSearchForm, self).__init__(*args, **kwargs)
-
-    def clean(self):
-        data = self.cleaned_data
-        if not data.get("postcode") and not data.get("name"):
-            raise forms.ValidationError(_("Enter a postcode or an organisation name"))
-        else:
-            postcodeNoSpace = data.get("postcode").replace(" ", "")
-            msg1 = "This service does not cover "
-            msg2 = "Try a postcode, town or city in England or Wales."
-            region = "England or Wales. "
-            if re.search(r"^BT[0-9]", postcodeNoSpace, flags=re.IGNORECASE):
-                region = "Northern Ireland. "
-            elif re.search(r"^IM[0-9]", postcodeNoSpace, flags=re.IGNORECASE):
-                region = "the Isle of Man. "
-            elif re.search(r"^JE[0-9]", postcodeNoSpace, flags=re.IGNORECASE):
-                region = "Jersey. "
-            elif re.search(r"^GY[1][0]", postcodeNoSpace, flags=re.IGNORECASE):
-                region = "Sark or Guernsey. "
-            elif re.search(r"^GY[9]", postcodeNoSpace, flags=re.IGNORECASE):
-                region = "Alderney or Guernsey. "
-            elif re.search(r"^GY[0-8]", postcodeNoSpace, flags=re.IGNORECASE):
-                region = "Guernsey. "
-            if region != "England or Wales. ":
-                self.add_error("postcode", "%s %s" % (_(" ".join((msg1, region))), _(msg2)))
-        return data
-
-    def search(self):
-        if self.is_valid():
-            try:
-                data = laalaa.find(
-                    postcode=self.cleaned_data.get("postcode"),
-                    categories=self.cleaned_data.get("categories"),
-                    page=self.cleaned_data.get("page", 1),
-                    organisation_types=self.cleaned_data.get("type"),
-                    organisation_name=self.cleaned_data.get("name"),
-                )
-                if "error" in data:
-                    self.add_error("postcode", (data["error"]))
-                    return {}
-                return data
-            except laalaa.LaaLaaError:
-                self.add_error(
-                    "postcode", "%s %s" % (_("Error looking up legal advisers."), _("Please try again later."))
-                )
-        return {}
diff --git a/fala/apps/adviser/views.py b/fala/apps/adviser/views.py
index 5f5135c4..8204dfad 100644
--- a/fala/apps/adviser/views.py
+++ b/fala/apps/adviser/views.py
@@ -3,10 +3,7 @@
 from django.urls import resolve, reverse
 from django.views.generic import TemplateView
 
-if settings.FEATURE_FLAG_NO_MAP:
-    from .forms import AdviserSearchForm
-else:
-    from .forms_old import AdviserSearchForm
+from .forms import AdviserSearchForm
 
 
 class AdviserView(TemplateView):
diff --git a/fala/templates/adviser/search.html b/fala/templates/adviser/search.html
index 04301c86..57846b6b 100644
--- a/fala/templates/adviser/search.html
+++ b/fala/templates/adviser/search.html
@@ -5,12 +5,7 @@
 {% endif %}
 
 {% import "macros/element.html" as Element %}
-
-{% if FEATURE_FLAG_NO_MAP %}
-  {% import "macros/forms.html" as Form %}
-{% else %}
-  {% import "macros/forms_old.html" as Form %}
-{% endif %}
+{% import "macros/forms.html" as Form %}
 
 {% block content %}
   <div class="govuk-grid-column-two-thirds">
diff --git a/fala/templates/adviser/search_old.html b/fala/templates/adviser/search_old.html
index 9147ccc0..4fde293d 100644
--- a/fala/templates/adviser/search_old.html
+++ b/fala/templates/adviser/search_old.html
@@ -5,7 +5,7 @@
 {% endif %}
 
 {% import "macros/element.html" as Element %}
-{% import "macros/forms.html" as Form %}
+{% import "macros/forms_old.html" as Form %}
 
 {% block search_form %}
   <form action="" class="laa-fala__search" novalidate>
diff --git a/fala/templates/base_old.html b/fala/templates/base_old.html
index e93c7639..04e5d8ee 100644
--- a/fala/templates/base_old.html
+++ b/fala/templates/base_old.html
@@ -1,6 +1,6 @@
 {% extends 'external.html' %}
 
-{% import "macros/forms.html" as Form %}
+{% import "macros/forms_old.html" as Form %}
 {% import "macros/element.html" as Element %}
 
 {% set title = _('Find a legal aid adviser or family mediator') %}

From 9f0c7042b8bf795a0d16ef6093568f4d925163d1 Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Thu, 11 Apr 2024 15:53:50 +0100
Subject: [PATCH 09/29] removing more duplicaation and addng in extra CSS

---
 fala/assets-src/sass/main.scss         |   2 +
 fala/templates/adviser/search_old.html |   4 +-
 fala/templates/base.html               |  71 +++++++++
 fala/templates/base_old.html           | 189 ----------------------
 fala/templates/macros/forms_old.html   | 208 -------------------------
 5 files changed, 75 insertions(+), 399 deletions(-)
 delete mode 100644 fala/templates/base_old.html
 delete mode 100644 fala/templates/macros/forms_old.html

diff --git a/fala/assets-src/sass/main.scss b/fala/assets-src/sass/main.scss
index affcbe97..1555fe61 100644
--- a/fala/assets-src/sass/main.scss
+++ b/fala/assets-src/sass/main.scss
@@ -90,6 +90,8 @@ body.govuk-template__body {
 
 .fala-tickbox-columns .govuk-checkboxes__item label.govuk-checkboxes__label {
   min-width:100%;
+  inline-size: 150px;
+  overflow-wrap: break-word;
 }
 
 .govuk-checkboxes__label {
diff --git a/fala/templates/adviser/search_old.html b/fala/templates/adviser/search_old.html
index 4fde293d..2fc64fb0 100644
--- a/fala/templates/adviser/search_old.html
+++ b/fala/templates/adviser/search_old.html
@@ -1,11 +1,11 @@
 {% if request.headers.get('x-requested-with') == 'XMLHttpRequest' %}
   {% extends 'ajax-base.html' %}
 {% else %}
-  {% extends 'base_old.html' %}
+  {% extends 'base.html' %}
 {% endif %}
 
 {% import "macros/element.html" as Element %}
-{% import "macros/forms_old.html" as Form %}
+{% import "macros/forms.html" as Form %}
 
 {% block search_form %}
   <form action="" class="laa-fala__search" novalidate>
diff --git a/fala/templates/base.html b/fala/templates/base.html
index 480cff9f..e93c7639 100644
--- a/fala/templates/base.html
+++ b/fala/templates/base.html
@@ -64,6 +64,67 @@
       </span>
     </p>
   </div>
+
+{% endblock %}
+
+{% block content %}
+  <div class="govuk-grid-column-full">
+    <div id="google_translate_element" class="govuk-!-margin-bottom-6"></div>
+
+    {% if form.errors and form.errors['__all__'] %}
+      {% call Element.error('error', title='There is a problem') %}
+        <ul class="govuk-list govuk-error-summary__list">
+          {% for k, error in form.errors.items() %}
+            <li>
+              {% if "Enter a postcode or an organisation name" == error | striptags %}
+                <a href="#id_postcode" onclick="errorScroll(&quot;fala_questions&quot;,&quot;id_postcode&quot;);return false;" >
+                  Enter a postcode</a>
+                <b>or</b>
+                <a href="#id_name" onclick="errorScroll(&quot;fala_questions&quot;,&quot;id_name&quot;);return false;" >
+                  an organisation name
+                </a>
+              {% else %}
+                <a href="#id_postcode" onclick="errorScroll(&quot;fala_questions&quot;,&quot;id_postcode&quot;);return false;" >
+                  {{ error | striptags }}
+                </a>
+              {% endif %}
+            </li>
+          {% endfor %}
+        </ul>
+      {% endcall %}
+    {% elif (form.postcode and form.postcode.errors) or (form.name and form.name.errors) %}
+      <div class="govuk-error-summary" aria-labelledby="error-summary-title" role="alert" tabindex="-1" data-module="govuk-error-summary">
+        <h2 class="govuk-error-summary__title" id="error-summary-title">
+          There is a problem
+        </h2>
+        <div class="govuk-error-summary__body">
+          <ul class="govuk-list govuk-error-summary__list">
+            {{ Form.render_field_errors_for_summary(form.postcode_old) }}
+            {{ Form.render_field_errors_for_summary(form.name) }}
+          </ul>
+        </div>
+      </div>
+    {% endif %}
+    <h1 class="govuk-heading-xl govuk-!-margin-top-7">
+      Find a legal aid adviser <br />
+      <span class="govuk-!-font-weight-regular govuk-!-font-size-36">or family mediator</span>
+    </h1>
+  </div>
+  <div class="govuk-grid-column-two-thirds">
+    <p class="govuk-body-l">Search for a legal adviser or family mediator with a legal aid contract in England and Wales.</p>
+  </div>
+
+  <div class="find-legal-adviser">
+    <div class="govuk-grid-column-full">
+      {% block search_results %}
+        {% include 'adviser/_results.html' %}
+      {% endblock %}
+      {% block search_form %}{% endblock %}
+    </div>
+    <div class="govuk-grid-column-two-thirds">
+      <p class="govuk-body">If you are a provider and your details are incorrect, please contact your contract manager.</p>
+    </div>
+  </div>
 {% endblock %}
 
 {% block support_links_items %}
@@ -97,6 +158,16 @@
   </li>
 {% endblock %}
 
+{% block before_main_js %}
+  {{ super() }}
+  <script src="//maps.googleapis.com/maps/api/js?key={{ GOOGLE_MAPS_API_KEY }}"></script>
+  <script nonce="{{request.csp_nonce}}">
+    window.LABELS = {
+      loading: "{{ _('Loading…') }}"
+    };
+  </script>
+{% endblock %}
+
 {% block after_main_js %}
   <script  nonce="{{request.csp_nonce}}">
     function googleTranslateElementInit() {
diff --git a/fala/templates/base_old.html b/fala/templates/base_old.html
deleted file mode 100644
index 04e5d8ee..00000000
--- a/fala/templates/base_old.html
+++ /dev/null
@@ -1,189 +0,0 @@
-{% extends 'external.html' %}
-
-{% import "macros/forms_old.html" as Form %}
-{% import "macros/element.html" as Element %}
-
-{% set title = _('Find a legal aid adviser or family mediator') %}
-
-{% block head %}
-  {{ super() }}
-  {% if request %}
-    <style media="print">
-      a[href^="/"]:after {
-        content: ' ({{ request.META.HTTP_HOST }}' attr(href) ')';
-      }
-    </style>
-  {% endif %}
-  <script nonce="{{request.csp_nonce}}">
-  function tagMan() {  // Activate Google Tag Manager
-    (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-    new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-    j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-    'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-    })(window,document,'script','dataLayer','GTM-WDJLHSKL');
-  }
-  </script>
-  
-  {% if (request.COOKIES.get('cookiePermission') == 'Allowed') %}
-  <script nonce="{{request.csp_nonce}}">tagMan();</script>
-  {% endif %}
-  <script nonce="{{request.csp_nonce}}">
-    /* Modernizr 2.8.3 (Custom Build) | MIT & BSD
-     * Build: http://modernizr.com/download/#-mq-teststyles
-     */
-    window.Modernizr=function(a,b,c){function v(a){i.cssText=a}function w(a,b){return v(prefixes.join(a+";")+(b||""))}function x(a,b){return typeof a===b}function y(a,b){return!!~(""+a).indexOf(b)}function z(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:x(f,"function")?f.bind(d||b):f}return!1}var d="2.8.3",e={},f=b.documentElement,g="modernizr",h=b.createElement(g),i=h.style,j,k={}.toString,l={},m={},n={},o=[],p=o.slice,q,r=function(a,c,d,e){var h,i,j,k,l=b.createElement("div"),m=b.body,n=m||b.createElement("body");if(parseInt(d,10))while(d--)j=b.createElement("div"),j.id=e?e[d]:g+(d+1),l.appendChild(j);return h=["&#173;",'<style id="s',g,'">',a,"</style>"].join(""),l.id=g,(m?l:n).innerHTML+=h,n.appendChild(l),m||(n.style.background="",n.style.overflow="hidden",k=f.style.overflow,f.style.overflow="hidden",f.appendChild(n)),i=c(l,a),m?l.parentNode.removeChild(l):(n.parentNode.removeChild(n),f.style.overflow=k),!!i},s=function(b){var c=a.matchMedia||a.msMatchMedia;if(c)return c(b)&&c(b).matches||!1;var d;return r("@media "+b+" { #"+g+" { position: absolute; } }",function(b){d=(a.getComputedStyle?getComputedStyle(b,null):b.currentStyle)["position"]=="absolute"}),d},t={}.hasOwnProperty,u;!x(t,"undefined")&&!x(t.call,"undefined")?u=function(a,b){return t.call(a,b)}:u=function(a,b){return b in a&&x(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=p.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(p.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(p.call(arguments)))};return e});for(var A in l)u(l,A)&&(q=A.toLowerCase(),e[q]=l[A](),o.push((e[q]?"":"no-")+q));return e.addTest=function(a,b){if(typeof a=="object")for(var d in a)u(a,d)&&e.addTest(d,a[d]);else{a=a.toLowerCase();if(e[a]!==c)return e;b=typeof b=="function"?b():b,typeof enableClasses!="undefined"&&enableClasses&&(f.className+=" "+(b?"":"no-")+a),e[a]=b}return e},v(""),h=j=null,e._version=d,e.mq=s,e.testStyles=r,e}(this,this.document);
-  </script>
-{% endblock %}
-
-{% block stylesheets %}
-  <link href="{{ static('css/main.css') }}" rel="stylesheet">
-{% endblock %}
-
-{% block page_title %}{{ title }}{% endblock %}
-
-{% block proposition %}
-  <a href="{{ url('adviser') }}" class="govuk-header__link govuk-header__link--service-name">{{ title }}</a>
-{% endblock %}
-
-{% block global_subheader %}
-  <div class="govuk-phase-banner">
-    <p class="govuk-phase-banner__content">
-      <strong class="govuk-tag govuk-phase-banner__content__tag">
-        {% if ENVIRONMENT == "dev" %}
-          Development
-        {% elif ENVIRONMENT == "staging" %}
-          Staging
-        {% elif ENVIRONMENT == "production" %}
-          Beta
-        {% else %}
-          {{ ENVIRONMENT.title() }}
-        {% endif %}
-      </strong>
-      <span class="govuk-phase-banner__text">
-        This is a new service – your <a class="govuk-link" href="https://eu.surveymonkey.com/r/GLHPMFX">feedback</a> will help us to improve it.
-      </span>
-    </p>
-  </div>
-
-{% endblock %}
-
-{% block content %}
-  <div class="govuk-grid-column-full">
-    <div id="google_translate_element" class="govuk-!-margin-bottom-6"></div>
-
-    {% if form.errors and form.errors['__all__'] %}
-      {% call Element.error('error', title='There is a problem') %}
-        <ul class="govuk-list govuk-error-summary__list">
-          {% for k, error in form.errors.items() %}
-            <li>
-              {% if "Enter a postcode or an organisation name" == error | striptags %}
-                <a href="#id_postcode" onclick="errorScroll(&quot;fala_questions&quot;,&quot;id_postcode&quot;);return false;" >
-                  Enter a postcode</a>
-                <b>or</b>
-                <a href="#id_name" onclick="errorScroll(&quot;fala_questions&quot;,&quot;id_name&quot;);return false;" >
-                  an organisation name
-                </a>
-              {% else %}
-                <a href="#id_postcode" onclick="errorScroll(&quot;fala_questions&quot;,&quot;id_postcode&quot;);return false;" >
-                  {{ error | striptags }}
-                </a>
-              {% endif %}
-            </li>
-          {% endfor %}
-        </ul>
-      {% endcall %}
-    {% elif (form.postcode and form.postcode.errors) or (form.name and form.name.errors) %}
-      <div class="govuk-error-summary" aria-labelledby="error-summary-title" role="alert" tabindex="-1" data-module="govuk-error-summary">
-        <h2 class="govuk-error-summary__title" id="error-summary-title">
-          There is a problem
-        </h2>
-        <div class="govuk-error-summary__body">
-          <ul class="govuk-list govuk-error-summary__list">
-            {{ Form.render_field_errors_for_summary(form.postcode_old) }}
-            {{ Form.render_field_errors_for_summary(form.name) }}
-          </ul>
-        </div>
-      </div>
-    {% endif %}
-    <h1 class="govuk-heading-xl govuk-!-margin-top-7">
-      Find a legal aid adviser <br />
-      <span class="govuk-!-font-weight-regular govuk-!-font-size-36">or family mediator</span>
-    </h1>
-  </div>
-  <div class="govuk-grid-column-two-thirds">
-    <p class="govuk-body-l">Search for a legal adviser or family mediator with a legal aid contract in England and Wales.</p>
-  </div>
-
-  <div class="find-legal-adviser">
-    <div class="govuk-grid-column-full">
-      {% block search_results %}
-        {% include 'adviser/_results.html' %}
-      {% endblock %}
-      {% block search_form %}{% endblock %}
-    </div>
-    <div class="govuk-grid-column-two-thirds">
-      <p class="govuk-body">If you are a provider and your details are incorrect, please contact your contract manager.</p>
-    </div>
-  </div>
-{% endblock %}
-
-{% block support_links_items %}
-  <li class="govuk-footer__inline-list-item laa-hide-if-no-js">
-    <a id="cookieReview" class="govuk-footer__link" href="#top">
-      Cookies
-    </a>
-  </li>
-  <noscript>
-    <li class="govuk-footer__inline-list-item">
-      <a class="govuk-footer__link" href="https://www.gov.uk/help/cookies">
-        Cookies
-      </a>
-    </li>
-  </noscript>
-  <li class="govuk-footer__inline-list-item">
-    <a class="govuk-footer__link"  href="https://www.gov.uk/government/organisations/legal-aid-agency">
-      Legal Aid Agency
-    </a>
-  </li>
-  <li class="govuk-footer__inline-list-item">
-    <a class="govuk-footer__link"  href="/accessibility-statement">
-      Accessibility statement
-    </a>
-  </li>
-  <li class="govuk-footer__inline-list-item">
-    Built by
-    <a class="govuk-footer__link" href="https://mojdigital.blog.gov.uk/">
-      <abbr title="Ministry of Justice">MoJ</abbr> Digital Services
-    </a>
-  </li>
-{% endblock %}
-
-{% block before_main_js %}
-  {{ super() }}
-  <script src="//maps.googleapis.com/maps/api/js?key={{ GOOGLE_MAPS_API_KEY }}"></script>
-  <script nonce="{{request.csp_nonce}}">
-    window.LABELS = {
-      loading: "{{ _('Loading…') }}"
-    };
-  </script>
-{% endblock %}
-
-{% block after_main_js %}
-  <script  nonce="{{request.csp_nonce}}">
-    function googleTranslateElementInit() {
-      new google.translate.TranslateElement(
-        {
-          pageLanguage: 'en',
-          layout: google.translate.TranslateElement.FloatPosition.TOP_LEFT
-        },
-        'google_translate_element');
-    }
-  </script>
-  <script src="//translate.google.com/translate_a/element.js?cb=googleTranslateElementInit"></script>
-  <script  nonce="{{request.csp_nonce}}">
-    function errorScroll(s,f) {
-      document.getElementById(s).scrollIntoView();
-      document.getElementById(f).focus();
-    }
-  </script>
-{% endblock %}
diff --git a/fala/templates/macros/forms_old.html b/fala/templates/macros/forms_old.html
deleted file mode 100644
index cac88145..00000000
--- a/fala/templates/macros/forms_old.html
+++ /dev/null
@@ -1,208 +0,0 @@
-{#
-  Renders `form-group` wrapper for form fields
-
-  Params:
-    - field <object> (optional)
-        Form field
-    - class_ <string> (default: '')
-        Additional CSS class (all form group wrappers get 'govuk-form-group' CSS class)
-    - field_attrs <object> (default: {})
-        Custom HTML attributes for field
-    - controlled_by <string> (default: None)
-        name of the field that controls the visibility of this container
-    - control_value <string> (default: None)
-        value of the field that controls the visibility of this field
-    - row_class <string> (default: '')
-        Optional CSS class for `form-row` element
-#}
-{% macro group(field=None, class_='', field_attrs={}) %}
-  {% set controlled_by = kwargs.controlled_by %}
-  {% set control_value = kwargs.control_value if kwargs.control_value else '1' %}
-  {% set use_row = kwargs.use_row if kwargs.use_row is defined else True %}
-  {% set group_class = class_ if class_.startswith('govuk-form-group ') else 'govuk-form-group %s' % class_ %}
-
-  <div class="
-      {{- group_class -}}
-      {%- if field and field.errors %} govuk-form-group--error{% endif -%}
-      {%- if controlled_by and control_value %} s-hidden{% endif -%}
-    "
-    {% if controlled_by %}data-controlled-by="{{ controlled_by.name }}" data-control-value="{{ control_value }}"{% endif %}
-    {% if field %}id="field-{{ field.html_name }}"{% endif %}
-  >
-
-    {% if kwargs.global_error %}
-      <div aria-hidden="true" class="govuk-!-margin-bottom-4 govuk-error-message">
-        {{ kwargs.global_error }}
-      </div>
-    {% endif %}
-
-    {{ render_field_label(field, kwargs.hide_label, kwargs.hide_optional) }}
-
-    {{ render_field_description(field) }}
-
-    {% if field and (field.errors and controlled_by and not controlled_by.errors or field.errors and not controlled_by) %}
-      {{ render_field_errors(field) }}
-    {% endif %}
-
-    {% if kwargs.global_error %}
-      <span class="govuk-visually-hidden">Error: {{ kwargs.global_error }}</span>
-    {% elif kwargs.global_error_hidden %}
-      <span class="govuk-visually-hidden">Error: {{ kwargs.global_error_hidden }}</span>
-    {% endif %}
-
-    {% if use_row and (field or caller) %}
-      <div class="form-row {{ kwargs.row_class or '' }}">
-        {% if field %}
-          {% if field.errors and controlled_by and not controlled_by.errors or field.errors and not controlled_by %}
-            <input type="text" name="{{ field.name }}" value="{{ field.data or '' }}" class="govuk-input govuk-input--error govuk-!-width-one-third {{ field_attrs.class or '' }}" maxlength="{{ kwargs.max_length or '30' }}" id="id_{{ field.name }}">
-          {% else %}
-            <input type="text" name="{{ field.name }}" value="{{ field.data or '' }}" class="govuk-input govuk-!-width-one-third {{ field_attrs.class or '' }}" maxlength="{{ kwargs.max_length or '30' }}" id="id_{{ field.name }}">
-          {% endif %}
-        {% endif %}
-        {% if caller %}
-          {{ caller() }}
-        {% endif %}
-      </div>
-    {% elif caller %}
-      {{ caller() }}
-    {% elif field %}
-      {{ field }}
-    {% endif %}
-  </div>
-{% endmacro %}
-
-
-{#
-  Renders field label (if exists)
-
-  Params:
-    - field <object>
-        Form field
-    - hide_label <boolean> (default: False)
-        Whether to hide the label visually (still available for screen readers)
-#}
-{% macro render_field_label(field, hide_label=False, hide_optional=False) %}
-  {% if field %}
-    {% if field.field.required or hide_optional %}
-      {% set label_text = field.label %}
-    {% else %}
-      {% set label_text = field.label + ' <span class="form-optional">optional</span>' %}
-    {% endif %}
-
-    <div class="form-group-label{{ (' govuk-visually-hidden' if hide_label else '') }}">
-      <label class="govuk-label" for="{{ field.id_for_label }}">{{ label_text|safe }}</label>
-    </div>
-  {% endif %}
-{% endmacro %}
-
-
-{#
-  Renders field description (if exists)
-
-  Params:
-    - field <object>
-        Form field
-#}
-{% macro render_field_description(field) %}
-  {% if field and field.help_text %}
-    <span class="govuk-hint" id="field-description-{{ field.name }}">
-      {{- field.help_text | safe -}}
-    </span>
-  {%- endif -%}
-{% endmacro %}
-
-
-{#
-  Render field errors
-  (including mutli-fields)
-
-  Params:
-    - field <object> Form field
-#}
-{% macro render_field_errors(field) %}
-  {% if field and field.errors %}
-    {% set errors = field.errors.values() if field.errors is mapping else field.errors %}
-    <div class="form-row govuk-error-message">
-      {% for error in errors %}
-        {% if error is string or error == error|string %}
-          <span class="govuk-visually-hidden">Error:</span> {{error}}
-        {% else %}
-          {% for line in error %}
-            <span class="govuk-visually-hidden">Error:</span> {{ line }}
-          {% endfor %}
-        {% endif %}
-      {% endfor %}
-    </div>
-  {% endif %}
-{% endmacro %}
-
-{% macro render_field_errors_for_summary(field, id) %}
-  {% if field and field.errors %}
-    {% set errors = field.errors.values() if field.errors is mapping else field.errors %}
-    {% for error in errors %}
-      {% if error is string or error == error|string %}
-        <li>
-          <a href="#id_{{ field.name }}" onclick='errorScroll("fala_questions","id_{{ field.name }}");return false;'>{{ error }}</a>
-        </li>
-      {% else %}
-        {% for line in error %}
-           <li>
-            <a href="#id_{{ field.name }}" onclick='errorScroll("fala_questions","id_{{ field.name }}");return false;'>{{ line }}</a>
-          </li>
-        {% endfor %}
-      {% endif %}
-    {% endfor %}
-  {% endif %}
-{% endmacro %}
-
-
-{#
-  Renders form fieldset. Used as container for form fields.
-  Fieldset have `legend` element with optional `label` for single input
-  elements (such as text input)
-
-  Params:
-    - field <object>
-        Form field (optional)
-    - class_ <string> (default: 'fieldset-group')
-        CSS class for fieldset element
-    - legend <string> (default: None)
-        Custom legend text (if field is not provided)
-    - attrs <object> (default: None)
-        Custom HTML attributes for fieldset element
-#}
-{% macro fieldset(field=None, class_='form-group fieldset-group', legend=None, field_attrs={}) %}
-  {% set legend_ = field.label.text if field else legend %}
-  {% set controlled_by = kwargs.controlled_by %}
-  {% set control_value = kwargs.control_value if kwargs.control_value else '1' %}
-
-  <fieldset class="
-      {{- class_ -}}
-      {%- if field and field.errors %} form-error{% endif -%}
-      {%- if controlled_by and control_value %} s-hidden{% endif -%}
-    "
-    {%- if kwargs.attrs %}{{ kwargs.attrs|xmlattr }}{% endif -%}
-    {% if controlled_by %}data-controlled-by="{{ controlled_by.name }}" data-control-value="{{ control_value }}"{% endif %}
-    {%- if field %}id="field-{{ field.id_for_label }}"{% endif -%}
-  >
-    {% if legend_ %}
-      <legend class="form-group-label" {% if field %} id="field-label-{{ field.id }}"{% endif %}>
-        <span>{{ legend_ }}</span>
-      </legend>
-    {% endif %}
-
-    {{ render_field_description(field) }}
-    {{ render_field_errors(field) }}
-
-    {% if field or caller %}
-      <div class="form-row {{ kwargs.row_class }}">
-        {% if field and not kwargs.field_as_label %}
-          {{ field }}
-        {% endif %}
-        {% if caller %}
-          {{ caller() }}
-        {% endif %}
-      </div>
-    {% endif %}
-  </fieldset>
-{% endmacro %}

From ef0d4e6b44a15f4df207fb359f7c88aed5455110 Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Thu, 11 Apr 2024 15:59:44 +0100
Subject: [PATCH 10/29] typo

---
 fala/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fala/templates/base.html b/fala/templates/base.html
index e93c7639..6ea4e8cb 100644
--- a/fala/templates/base.html
+++ b/fala/templates/base.html
@@ -99,7 +99,7 @@ <h2 class="govuk-error-summary__title" id="error-summary-title">
         </h2>
         <div class="govuk-error-summary__body">
           <ul class="govuk-list govuk-error-summary__list">
-            {{ Form.render_field_errors_for_summary(form.postcode_old) }}
+            {{ Form.render_field_errors_for_summary(form.postcode) }}
             {{ Form.render_field_errors_for_summary(form.name) }}
           </ul>
         </div>

From 6202cbb7739aeedd42f0701183580bf48a0647b2 Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Thu, 11 Apr 2024 16:04:11 +0100
Subject: [PATCH 11/29] update views.py

---
 fala/apps/adviser/views.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fala/apps/adviser/views.py b/fala/apps/adviser/views.py
index 8204dfad..ec3860a1 100644
--- a/fala/apps/adviser/views.py
+++ b/fala/apps/adviser/views.py
@@ -26,7 +26,6 @@ def get(self, request, *args, **kwargs):
                 "current_url": current_url,
                 "GOOGLE_MAPS_API_KEY": settings.GOOGLE_MAPS_API_KEY,
                 "LAALAA_API_HOST": settings.LAALAA_API_HOST,
-                "FEATURE_FLAG_NO_MAP": settings.FEATURE_FLAG_NO_MAP,
                 "CHECK_LEGAL_AID_URL": settings.CHECK_LEGAL_AID_URL,
             }
         )

From eb58ed11985959cae436255fe0db46062d83a447 Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Fri, 12 Apr 2024 10:22:35 +0100
Subject: [PATCH 12/29] update to stylings

---
 fala/assets-src/sass/main.scss      |   4 +-
 fala/templates/adviser/search.html  | 130 ++++++++++++++--------------
 fala/templates/generic-py-base.html |   2 +-
 3 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/fala/assets-src/sass/main.scss b/fala/assets-src/sass/main.scss
index 1555fe61..79f8ce7c 100644
--- a/fala/assets-src/sass/main.scss
+++ b/fala/assets-src/sass/main.scss
@@ -198,8 +198,6 @@ body.fala-dev {
 
   &__grey-box {
     background-color: govuk-colour("light-grey"); 
-    padding: 1em; 
-    margin: 0.5em; 
+    padding: 1em;
   }
-
 }
diff --git a/fala/templates/adviser/search.html b/fala/templates/adviser/search.html
index 57846b6b..8b7bb8ab 100644
--- a/fala/templates/adviser/search.html
+++ b/fala/templates/adviser/search.html
@@ -16,78 +16,80 @@ <h1 class="govuk-heading-xl"> Find a legal aid adviser or family mediator </h1>
   </div>
 
   {% block search_form %}
-      <div class="govuk-grid-column-full laa-fala__grey-box">
-        <form action="" novalidate>
-          <div
-            class="govuk-form-group
-              {% if (form.errors and form.errors['__all__']) %}
-                govuk-form-group--error
-              {% endif %}
-              "
-            id="fala_questions">
+      <div class="govuk-grid-column-full">
+        <div class="laa-fala__grey-box">
+          <form action="" novalidate>
+            <div
+              class="govuk-form-group
+                {% if (form.errors and form.errors['__all__']) %}
+                  govuk-form-group--error
+                {% endif %}
+                "
+              id="fala_questions">
 
-            {% set errorMessage = {'err': ""} %}
+              {% 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 %}
-              <p class="govuk-body">Or</p>
-              {% 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 %}
-              <p class="govuk-body">Or</p>
-              {% call Form.group(form.name, 'govuk-form-group', hide_optional=True, max_length='100') %}
-              {% endcall %}
-            {% endif %}
-          </div>
-          
-          <div class="form-group filters">
-            <div class="govuk-form-group">
-              <fieldset class="govuk-fieldset">
-                <legend class="govuk-fieldset__legend govuk-fieldset__legend--m">
-                  <label class="govuk-label govuk-label--s">
-                    Catgories of law (optional)
-                  </label>
-                </legend>
-                <div class="govuk-checkboxes govuk-checkboxes--small fala-tickbox-columns">
-                  {% for value, label_text in form.categories.field.choices %}
-                    <div class="govuk-checkboxes__item">
-                      <input
-                        class="govuk-checkboxes__input"
-                        id="id_categories_{{ loop.index0 }}"
-                        name="categories"
-                        type="checkbox"
-                        value="{{ value }}"
-                        {% if value in request.GET.getlist('categories','') %}
-                          checked
-                        {% endif %}
-                      >
-                      <label class="govuk-label govuk-checkboxes__label" for="id_categories_{{ loop.index0 }}">
-                        {{ label_text }}
-                      </label>
-                    </div>
+              {% 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 %}
-                </div>
-              </fieldset>
+                {% 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 %}
+                <p class="govuk-body">Or</p>
+                {% 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 %}
+                <p class="govuk-body">Or</p>
+                {% call Form.group(form.name, 'govuk-form-group', hide_optional=True, max_length='100') %}
+                {% endcall %}
+              {% endif %}
+            </div>
+            
+            <div class="form-group filters">
+              <div class="govuk-form-group">
+                <fieldset class="govuk-fieldset">
+                  <legend class="govuk-fieldset__legend govuk-fieldset__legend--m">
+                    <label class="govuk-label govuk-label--s">
+                      Catgories of law (optional)
+                    </label>
+                  </legend>
+                  <div class="govuk-checkboxes govuk-checkboxes--small fala-tickbox-columns">
+                    {% for value, label_text in form.categories.field.choices %}
+                      <div class="govuk-checkboxes__item">
+                        <input
+                          class="govuk-checkboxes__input"
+                          id="id_categories_{{ loop.index0 }}"
+                          name="categories"
+                          type="checkbox"
+                          value="{{ value }}"
+                          {% if value in request.GET.getlist('categories','') %}
+                            checked
+                          {% endif %}
+                        >
+                        <label class="govuk-label govuk-checkboxes__label" for="id_categories_{{ loop.index0 }}">
+                          {{ label_text }}
+                        </label>
+                      </div>
+                    {% endfor %}
+                  </div>
+                </fieldset>
+              </div>
+              <button type="submit" class="govuk-button govuk-!-margin-bottom-2" id="searchButton" name="search">Search</button>
             </div>
-            <button type="submit" class="govuk-button govuk-!-margin-bottom-2" id="searchButton" name="search">Search</button>
-          </div>
-        </form>
+          </form>
+        </div>
       </div>
   {% endblock %}
 
     <div class="govuk-grid-column-full">
-      <p class="govuk-body">If you are a provider and your details are incorrect, please contact your contract manager.</p>
+      <p class="govuk-body govuk-!-margin-top-5">If you are a provider and your details are incorrect, please contact your contract manager.</p>
     </div>
 {% endblock %}
 
diff --git a/fala/templates/generic-py-base.html b/fala/templates/generic-py-base.html
index 3db96159..f5e39827 100644
--- a/fala/templates/generic-py-base.html
+++ b/fala/templates/generic-py-base.html
@@ -72,7 +72,7 @@
     <div class="govuk-width-container">
       {% block global_subheader %}{% endblock %}
       <main id="main-content" class="govuk-main-wrapper" role="main">
-        <div class="container govuk-grid-row">
+        <div class="govuk-grid-row">
           {% block content %}{% endblock %}
         </div>
       </main>

From 01db1056265b481bc58d0e97167c4afe9c218745 Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Tue, 16 Apr 2024 14:56:11 +0100
Subject: [PATCH 13/29] Update to test and template

---
 .../tests/test_search_view_function.py        | 29 +++++++++++++++++++
 fala/templates/adviser/search.html            | 10 +++++++
 fala/urls.py                                  |  2 +-
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 fala/apps/adviser/tests/test_search_view_function.py

diff --git a/fala/apps/adviser/tests/test_search_view_function.py b/fala/apps/adviser/tests/test_search_view_function.py
new file mode 100644
index 00000000..35db0b07
--- /dev/null
+++ b/fala/apps/adviser/tests/test_search_view_function.py
@@ -0,0 +1,29 @@
+from django.test import SimpleTestCase, Client
+from django.urls import reverse
+
+
+class SearchViewFunctionTest(SimpleTestCase):
+    client = Client()
+
+    url = reverse("adviser")
+
+    def test_postcode_search(self):
+        response = self.client.get(self.url, {"postcode": "PE31"})
+        self.assertEqual(200, response.status_code)
+
+    def test_invalid_postcode_generates_error(self):
+        response = self.client.get(self.url, {"postcode": "ZZZ"})
+        self.assertEqual({"postcode": ["Postcode not found"]}, response.context_data["form"].errors)
+
+
+class NewSearchViewTemplate(SimpleTestCase):
+    client = Client()
+
+    def test_url_link_is_in_DOM(self):
+        response = self.client.get(reverse("adviser"))
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(
+            response,
+            '<a href="https://www.gov.uk/check-legal-aid">Check if you qualify for legal aid (opens in a new tab)</a>',
+        )
+        self.assertTemplateUsed(response, "search.html")
diff --git a/fala/templates/adviser/search.html b/fala/templates/adviser/search.html
index 8b7bb8ab..c8c748b2 100644
--- a/fala/templates/adviser/search.html
+++ b/fala/templates/adviser/search.html
@@ -15,6 +15,16 @@ <h1 class="govuk-heading-xl"> Find a legal aid adviser or family mediator </h1>
       <p class="govuk-body"><a class="govuk-link" href="{{ CHECK_LEGAL_AID_URL }}" target="_blank" rel="noopener">Check if you qualify for legal aid (opens in a new tab)</a></p>
   </div>
 
+  <!-- Take below out when merging with EL-1434 -->
+  <div class="find-legal-adviser">
+    <div class="govuk-grid-column-full">
+      {% block search_results %}
+        {% include 'adviser/_results.html' %}
+      {% endblock %}
+    </div>
+  </div>
+  <!-- Take above out when merging with EL-1434 -->
+
   {% block search_form %}
       <div class="govuk-grid-column-full">
         <div class="laa-fala__grey-box">
diff --git a/fala/urls.py b/fala/urls.py
index 57f1d27d..56e1d871 100644
--- a/fala/urls.py
+++ b/fala/urls.py
@@ -2,7 +2,7 @@
 from django.conf import settings
 from django.conf.urls.static import static
 from django.urls import re_path
-from adviser.views import AdviserView, AccessibilityView
+from fala.apps.adviser.views import AdviserView, AccessibilityView
 from django.views.static import serve
 
 urlpatterns = [

From 4d3aaaf664586f53bdd41e2f20dd4bf638e41934 Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Tue, 16 Apr 2024 15:14:52 +0100
Subject: [PATCH 14/29] remove results template

---
 fala/templates/adviser/search.html | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/fala/templates/adviser/search.html b/fala/templates/adviser/search.html
index c8c748b2..8b7bb8ab 100644
--- a/fala/templates/adviser/search.html
+++ b/fala/templates/adviser/search.html
@@ -15,16 +15,6 @@ <h1 class="govuk-heading-xl"> Find a legal aid adviser or family mediator </h1>
       <p class="govuk-body"><a class="govuk-link" href="{{ CHECK_LEGAL_AID_URL }}" target="_blank" rel="noopener">Check if you qualify for legal aid (opens in a new tab)</a></p>
   </div>
 
-  <!-- Take below out when merging with EL-1434 -->
-  <div class="find-legal-adviser">
-    <div class="govuk-grid-column-full">
-      {% block search_results %}
-        {% include 'adviser/_results.html' %}
-      {% endblock %}
-    </div>
-  </div>
-  <!-- Take above out when merging with EL-1434 -->
-
   {% block search_form %}
       <div class="govuk-grid-column-full">
         <div class="laa-fala__grey-box">

From e8bc7934f34f51b0e2fa6d5a0593f58b8a0302ac Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Tue, 16 Apr 2024 16:27:36 +0100
Subject: [PATCH 15/29] update tests

---
 .../apps/adviser/tests/test_search_view_function.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/fala/apps/adviser/tests/test_search_view_function.py b/fala/apps/adviser/tests/test_search_view_function.py
index 35db0b07..1ea134df 100644
--- a/fala/apps/adviser/tests/test_search_view_function.py
+++ b/fala/apps/adviser/tests/test_search_view_function.py
@@ -1,7 +1,8 @@
-from django.test import SimpleTestCase, Client
+from django.test import SimpleTestCase, Client, override_settings
 from django.urls import reverse
 
 
+@override_settings(FEATURE_FLAG_NO_MAP=True)
 class SearchViewFunctionTest(SimpleTestCase):
     client = Client()
 
@@ -16,14 +17,20 @@ def test_invalid_postcode_generates_error(self):
         self.assertEqual({"postcode": ["Postcode not found"]}, response.context_data["form"].errors)
 
 
+@override_settings(FEATURE_FLAG_NO_MAP=True)
 class NewSearchViewTemplate(SimpleTestCase):
     client = Client()
 
     def test_url_link_is_in_DOM(self):
         response = self.client.get(reverse("adviser"))
         self.assertEqual(response.status_code, 200)
+
+        # Ensure URL link is in DOM
         self.assertContains(
             response,
-            '<a href="https://www.gov.uk/check-legal-aid">Check if you qualify for legal aid (opens in a new tab)</a>',
+            '<a class="govuk-link" href="https://www.gov.uk/check-legal-aid" target="_blank" rel="noopener">Check if you qualify for legal aid (opens in a new tab)</a>',
+            html=True,
         )
-        self.assertTemplateUsed(response, "search.html")
+
+        # Ensure CSS class is visible in DOM
+        self.assertContains(response, '<div class="laa-fala__grey-box">')

From 15b44501dd5888d68e536410a491f7ff5f96125b Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Tue, 16 Apr 2024 16:42:41 +0100
Subject: [PATCH 16/29] test update

---
 fala/apps/adviser/tests/test_search_view_function.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fala/apps/adviser/tests/test_search_view_function.py b/fala/apps/adviser/tests/test_search_view_function.py
index 1ea134df..3b45e0c2 100644
--- a/fala/apps/adviser/tests/test_search_view_function.py
+++ b/fala/apps/adviser/tests/test_search_view_function.py
@@ -29,7 +29,6 @@ def test_url_link_is_in_DOM(self):
         self.assertContains(
             response,
             '<a class="govuk-link" href="https://www.gov.uk/check-legal-aid" target="_blank" rel="noopener">Check if you qualify for legal aid (opens in a new tab)</a>',
-            html=True,
         )
 
         # Ensure CSS class is visible in DOM

From 40f9c777a50027b1f425567d6bd42281a3790db6 Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Tue, 16 Apr 2024 16:43:38 +0100
Subject: [PATCH 17/29] revert changes

---
 fala/apps/adviser/tests/test_search_view_function.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fala/apps/adviser/tests/test_search_view_function.py b/fala/apps/adviser/tests/test_search_view_function.py
index 3b45e0c2..1ea134df 100644
--- a/fala/apps/adviser/tests/test_search_view_function.py
+++ b/fala/apps/adviser/tests/test_search_view_function.py
@@ -29,6 +29,7 @@ def test_url_link_is_in_DOM(self):
         self.assertContains(
             response,
             '<a class="govuk-link" href="https://www.gov.uk/check-legal-aid" target="_blank" rel="noopener">Check if you qualify for legal aid (opens in a new tab)</a>',
+            html=True,
         )
 
         # Ensure CSS class is visible in DOM

From 0a9a19a685203b2d889b3a54781acf3f54d7a07f Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Wed, 17 Apr 2024 11:09:30 +0100
Subject: [PATCH 18/29] add `LAALAA_API_HOST` variable in CircleCi config

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8b96cf8e..322bc82f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -92,6 +92,8 @@ jobs:
           command: |
             source env/bin/activate
             python manage.py test
+          environment:
+            LAALAA_API_HOST: "https://laa-legal-adviser-api-staging.apps.live-1.cloud-platform.service.justice.gov.uk"
 
   build:
     executor: aws-ecr/default # use the aws-ecr/default executor to start the docker daemon

From 96fbb4420abbf5b0b0995bd6d7f18f384118db58 Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Wed, 17 Apr 2024 11:43:15 +0100
Subject: [PATCH 19/29] refactor test's

---
 .../adviser/tests/test_search_view_function.py | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/fala/apps/adviser/tests/test_search_view_function.py b/fala/apps/adviser/tests/test_search_view_function.py
index 1ea134df..8d14d2eb 100644
--- a/fala/apps/adviser/tests/test_search_view_function.py
+++ b/fala/apps/adviser/tests/test_search_view_function.py
@@ -19,18 +19,14 @@ def test_invalid_postcode_generates_error(self):
 
 @override_settings(FEATURE_FLAG_NO_MAP=True)
 class NewSearchViewTemplate(SimpleTestCase):
-    client = Client()
+    def test_tempalte_link_and_css(self):
+        client = Client()
+        response = client.get(reverse("adviser"))
 
-    def test_url_link_is_in_DOM(self):
-        response = self.client.get(reverse("adviser"))
         self.assertEqual(response.status_code, 200)
 
-        # Ensure URL link is in DOM
-        self.assertContains(
-            response,
-            '<a class="govuk-link" href="https://www.gov.uk/check-legal-aid" target="_blank" rel="noopener">Check if you qualify for legal aid (opens in a new tab)</a>',
-            html=True,
-        )
+        # Ensure URL link is in response content
+        self.assertContains(response, "https://www.gov.uk/check-legal-aid")
 
-        # Ensure CSS class is visible in DOM
-        self.assertContains(response, '<div class="laa-fala__grey-box">')
+        # Ensure CSS class is in response content
+        self.assertContains(response, "laa-fala__grey-box")

From 548de2500d726a534dcf0341c14b5b3523e2b7e3 Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Wed, 17 Apr 2024 12:11:47 +0100
Subject: [PATCH 20/29] refactor of tests - chaneg the scope.

---
 fala/apps/adviser/tests/test_search_view_function.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fala/apps/adviser/tests/test_search_view_function.py b/fala/apps/adviser/tests/test_search_view_function.py
index 8d14d2eb..592e996d 100644
--- a/fala/apps/adviser/tests/test_search_view_function.py
+++ b/fala/apps/adviser/tests/test_search_view_function.py
@@ -19,9 +19,10 @@ def test_invalid_postcode_generates_error(self):
 
 @override_settings(FEATURE_FLAG_NO_MAP=True)
 class NewSearchViewTemplate(SimpleTestCase):
+    client = Client()
+
     def test_tempalte_link_and_css(self):
-        client = Client()
-        response = client.get(reverse("adviser"))
+        response = self.client.get(reverse("adviser"))
 
         self.assertEqual(response.status_code, 200)
 

From 0821056b51eb6ee95fa6eb4c8ad474be575a37f3 Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Wed, 17 Apr 2024 13:15:31 +0100
Subject: [PATCH 21/29] typo in test method

---
 fala/apps/adviser/tests/test_search_view_function.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fala/apps/adviser/tests/test_search_view_function.py b/fala/apps/adviser/tests/test_search_view_function.py
index 592e996d..e24db047 100644
--- a/fala/apps/adviser/tests/test_search_view_function.py
+++ b/fala/apps/adviser/tests/test_search_view_function.py
@@ -21,7 +21,7 @@ def test_invalid_postcode_generates_error(self):
 class NewSearchViewTemplate(SimpleTestCase):
     client = Client()
 
-    def test_tempalte_link_and_css(self):
+    def test_template_link_and_css(self):
         response = self.client.get(reverse("adviser"))
 
         self.assertEqual(response.status_code, 200)

From 0e5b15bd46ec93ecfc11f72f39154919b97d3546 Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Wed, 17 Apr 2024 14:10:28 +0100
Subject: [PATCH 22/29] use `LiveServerTestCase` class

---
 fala/apps/adviser/tests/test_search_view_function.py | 4 ++--
 fala/settings/base.py                                | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fala/apps/adviser/tests/test_search_view_function.py b/fala/apps/adviser/tests/test_search_view_function.py
index e24db047..a1fff10f 100644
--- a/fala/apps/adviser/tests/test_search_view_function.py
+++ b/fala/apps/adviser/tests/test_search_view_function.py
@@ -1,4 +1,4 @@
-from django.test import SimpleTestCase, Client, override_settings
+from django.test import SimpleTestCase, Client, LiveServerTestCase, override_settings
 from django.urls import reverse
 
 
@@ -18,7 +18,7 @@ def test_invalid_postcode_generates_error(self):
 
 
 @override_settings(FEATURE_FLAG_NO_MAP=True)
-class NewSearchViewTemplate(SimpleTestCase):
+class NewSearchViewTemplate(LiveServerTestCase):
     client = Client()
 
     def test_template_link_and_css(self):
diff --git a/fala/settings/base.py b/fala/settings/base.py
index 3edad684..a7b885ba 100644
--- a/fala/settings/base.py
+++ b/fala/settings/base.py
@@ -230,6 +230,9 @@ def root(*x):
 
 CHECK_LEGAL_AID_URL = "https://www.gov.uk/check-legal-aid"
 
+# We need a default database in order to run a LiveServerTestCase test.
+DATABASES = {"default": {"ENGINE": "django.db.backends.sqlite3"}}
+
 # .local.py overrides all the common settings.
 try:
     from .local import *  # noqa: F401,F403

From fc196b6c08cde420549c943322585349809da2f1 Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Wed, 17 Apr 2024 15:58:20 +0100
Subject: [PATCH 23/29] reformatted views, test, and base.py

---
 fala/apps/adviser/tests/test_search_view_function.py |  4 ++--
 fala/apps/adviser/views.py                           | 11 +++++++----
 fala/settings/base.py                                |  3 ---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/fala/apps/adviser/tests/test_search_view_function.py b/fala/apps/adviser/tests/test_search_view_function.py
index a1fff10f..e24db047 100644
--- a/fala/apps/adviser/tests/test_search_view_function.py
+++ b/fala/apps/adviser/tests/test_search_view_function.py
@@ -1,4 +1,4 @@
-from django.test import SimpleTestCase, Client, LiveServerTestCase, override_settings
+from django.test import SimpleTestCase, Client, override_settings
 from django.urls import reverse
 
 
@@ -18,7 +18,7 @@ def test_invalid_postcode_generates_error(self):
 
 
 @override_settings(FEATURE_FLAG_NO_MAP=True)
-class NewSearchViewTemplate(LiveServerTestCase):
+class NewSearchViewTemplate(SimpleTestCase):
     client = Client()
 
     def test_template_link_and_css(self):
diff --git a/fala/apps/adviser/views.py b/fala/apps/adviser/views.py
index ec3860a1..2cee512c 100644
--- a/fala/apps/adviser/views.py
+++ b/fala/apps/adviser/views.py
@@ -8,10 +8,13 @@
 
 class AdviserView(TemplateView):
     # https://docs.djangoproject.com/en/5.0/topics/class-based-views/#usage-in-your-urlconf - this is how `template_name`
-    if settings.FEATURE_FLAG_NO_MAP:
-        template_name = "adviser/search.html"
-    else:
-        template_name = "adviser/search_old.html"
+
+    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]
 
     def get(self, request, *args, **kwargs):
         context = self.get_context_data(**kwargs)
diff --git a/fala/settings/base.py b/fala/settings/base.py
index a7b885ba..3edad684 100644
--- a/fala/settings/base.py
+++ b/fala/settings/base.py
@@ -230,9 +230,6 @@ def root(*x):
 
 CHECK_LEGAL_AID_URL = "https://www.gov.uk/check-legal-aid"
 
-# We need a default database in order to run a LiveServerTestCase test.
-DATABASES = {"default": {"ENGINE": "django.db.backends.sqlite3"}}
-
 # .local.py overrides all the common settings.
 try:
     from .local import *  # noqa: F401,F403

From c36a629f47100b45b3bc2e0927c01a7bbc5aaa71 Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Wed, 17 Apr 2024 17:18:13 +0100
Subject: [PATCH 24/29] revert change to `urls.py` as `adviser` already
 installed in `base.py`

---
 fala/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fala/urls.py b/fala/urls.py
index 56e1d871..57f1d27d 100644
--- a/fala/urls.py
+++ b/fala/urls.py
@@ -2,7 +2,7 @@
 from django.conf import settings
 from django.conf.urls.static import static
 from django.urls import re_path
-from fala.apps.adviser.views import AdviserView, AccessibilityView
+from adviser.views import AdviserView, AccessibilityView
 from django.views.static import serve
 
 urlpatterns = [

From f980038bc14d5597b815807113a32a6575ec6006 Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Thu, 18 Apr 2024 10:16:51 +0100
Subject: [PATCH 25/29] update to the way we populate a form filed via a
 feature flag - based on review comment.

---
 fala/apps/adviser/forms.py | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/fala/apps/adviser/forms.py b/fala/apps/adviser/forms.py
index 0facecfb..82a3da4d 100644
--- a/fala/apps/adviser/forms.py
+++ b/fala/apps/adviser/forms.py
@@ -28,22 +28,13 @@ def __init__(self, attrs={}):
 class AdviserSearchForm(forms.Form):
     page = forms.IntegerField(required=False, widget=forms.HiddenInput())
 
-    if settings.FEATURE_FLAG_NO_MAP:
-        postcode = forms.CharField(
-            label=_("Postcode"),
-            max_length=30,
-            help_text=_(mark_safe("For example, <span class='notranslate' translate='no'>SW1H</span>")),
-            required=False,
-            widget=FalaTextInput(),
-        )
-    else:
-        postcode = forms.CharField(
-            label=_("Enter postcode"),
-            max_length=30,
-            help_text=_("For example, <span class='notranslate' translate='no'>SW1H 9AJ</span>"),
-            required=False,
-            widget=FalaTextInput(),
-        )
+    postcode = forms.CharField(
+        label=_("Enter postcode"),
+        max_length=30,
+        help_text=_("For example, <span class='notranslate' translate='no'>SW1H 9AJ</span>"),
+        required=False,
+        widget=FalaTextInput(),
+    )
 
     name = forms.CharField(
         label=_("Organisation name"),
@@ -69,6 +60,11 @@ class AdviserSearchForm(forms.Form):
     def __init__(self, *args, **kwargs):
         kwargs.setdefault("label_suffix", "")
         super(AdviserSearchForm, self).__init__(*args, **kwargs)
+        if settings.FEATURE_FLAG_NO_MAP:
+            self.fields["postcode"].label = _("Postcode")
+            self.fields["postcode"].help_text = _(
+                mark_safe("For example, <span class='notranslate' translate='no'>SW1H</span>")
+            )
 
     def clean(self):
         data = self.cleaned_data

From 37f65b64648487129c18d4ec87441a279acc0ca3 Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Thu, 18 Apr 2024 10:23:04 +0100
Subject: [PATCH 26/29] switch around what is shown on conditional

---
 fala/apps/adviser/forms.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fala/apps/adviser/forms.py b/fala/apps/adviser/forms.py
index 82a3da4d..7173500d 100644
--- a/fala/apps/adviser/forms.py
+++ b/fala/apps/adviser/forms.py
@@ -29,9 +29,9 @@ class AdviserSearchForm(forms.Form):
     page = forms.IntegerField(required=False, widget=forms.HiddenInput())
 
     postcode = forms.CharField(
-        label=_("Enter postcode"),
+        label=_("Postcode"),
         max_length=30,
-        help_text=_("For example, <span class='notranslate' translate='no'>SW1H 9AJ</span>"),
+        help_text=_(mark_safe("For example, <span class='notranslate' translate='no'>SW1H</span>")),
         required=False,
         widget=FalaTextInput(),
     )
@@ -60,10 +60,10 @@ class AdviserSearchForm(forms.Form):
     def __init__(self, *args, **kwargs):
         kwargs.setdefault("label_suffix", "")
         super(AdviserSearchForm, self).__init__(*args, **kwargs)
-        if settings.FEATURE_FLAG_NO_MAP:
-            self.fields["postcode"].label = _("Postcode")
+        if not settings.FEATURE_FLAG_NO_MAP:
+            self.fields["postcode"].label = _("Enter postcode")
             self.fields["postcode"].help_text = _(
-                mark_safe("For example, <span class='notranslate' translate='no'>SW1H</span>")
+                "For example, <span class='notranslate' translate='no'>SW1H 9AJ</span>"
             )
 
     def clean(self):

From 571026d9b22e0d0aba0b9454a3afa52da2850e71 Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Fri, 19 Apr 2024 09:37:42 +0100
Subject: [PATCH 27/29] update on comment, on where to find documentation

---
 fala/apps/adviser/views.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fala/apps/adviser/views.py b/fala/apps/adviser/views.py
index 2cee512c..1ff617aa 100644
--- a/fala/apps/adviser/views.py
+++ b/fala/apps/adviser/views.py
@@ -6,9 +6,8 @@
 from .forms import AdviserSearchForm
 
 
+# https://docs.djangoproject.com/en/5.0/topics/class-based-views - documentation on Class-based views
 class AdviserView(TemplateView):
-    # https://docs.djangoproject.com/en/5.0/topics/class-based-views/#usage-in-your-urlconf - this is how `template_name`
-
     def get_template_names(self) -> list[str]:
         if settings.FEATURE_FLAG_NO_MAP:
             template_name = "adviser/search.html"

From f85d46031294801f87ba0f4d4824ca7fe671adeb Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Fri, 19 Apr 2024 11:06:03 +0100
Subject: [PATCH 28/29] update CSS

---
 fala/assets-src/sass/main.scss     | 15 +++++++++++++--
 fala/templates/adviser/search.html |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/fala/assets-src/sass/main.scss b/fala/assets-src/sass/main.scss
index 79f8ce7c..221a024c 100644
--- a/fala/assets-src/sass/main.scss
+++ b/fala/assets-src/sass/main.scss
@@ -70,6 +70,18 @@ body.govuk-template__body {
   text-transform: uppercase;
 }
 
+.fala-tickbox-columns_new .govuk-checkboxes__item {
+  clear:none;
+  min-width:44.63%;
+}
+
+.fala-tickbox-columns_new .govuk-checkboxes__item label.govuk-checkboxes__label {
+  min-width:100%;
+  inline-size: 150px;
+  overflow-wrap: break-word;
+}
+
+// Remove below CSS once `FEATURE_FLAG_NO_MAP` is removed
 .fala-tickbox-columns .govuk-checkboxes__item {
   clear:none;
   min-width:44.63%;
@@ -90,9 +102,8 @@ body.govuk-template__body {
 
 .fala-tickbox-columns .govuk-checkboxes__item label.govuk-checkboxes__label {
   min-width:100%;
-  inline-size: 150px;
-  overflow-wrap: break-word;
 }
+// Remove above CSS once `FEATURE_FLAG_NO_MAP` is removed
 
 .govuk-checkboxes__label {
   &::before {
diff --git a/fala/templates/adviser/search.html b/fala/templates/adviser/search.html
index 8b7bb8ab..20053b38 100644
--- a/fala/templates/adviser/search.html
+++ b/fala/templates/adviser/search.html
@@ -60,7 +60,7 @@ <h1 class="govuk-heading-xl"> Find a legal aid adviser or family mediator </h1>
                       Catgories of law (optional)
                     </label>
                   </legend>
-                  <div class="govuk-checkboxes govuk-checkboxes--small fala-tickbox-columns">
+                  <div class="govuk-checkboxes govuk-checkboxes--small fala-tickbox-columns_new">
                     {% for value, label_text in form.categories.field.choices %}
                       <div class="govuk-checkboxes__item">
                         <input

From 0a60189e573612093122f1f064af40f9b26d235a Mon Sep 17 00:00:00 2001
From: MazOneTwoOne <76905544+MazOneTwoOne@users.noreply.github.com>
Date: Fri, 19 Apr 2024 11:34:12 +0100
Subject: [PATCH 29/29] update CSS

---
 fala/assets-src/sass/main.scss | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/fala/assets-src/sass/main.scss b/fala/assets-src/sass/main.scss
index 221a024c..fd4f47ff 100644
--- a/fala/assets-src/sass/main.scss
+++ b/fala/assets-src/sass/main.scss
@@ -77,10 +77,17 @@ body.govuk-template__body {
 
 .fala-tickbox-columns_new .govuk-checkboxes__item label.govuk-checkboxes__label {
   min-width:100%;
-  inline-size: 150px;
   overflow-wrap: break-word;
 }
 
+@media only screen and (min-width: 730px) {
+  .fala-tickbox-columns_new .govuk-checkboxes__item label.govuk-checkboxes__label {
+    min-width:100%;
+    inline-size: 150px;
+  }
+}
+
+
 // Remove below CSS once `FEATURE_FLAG_NO_MAP` is removed
 .fala-tickbox-columns .govuk-checkboxes__item {
   clear:none;