#446 remove crown

app/templates/components/uk_components/header/_header.scss

@@ -45,13 +45,7 @@
     margin-right: govuk-spacing(1);
   }
 
-  .govuk-header__logotype-crown {
-    margin-right: 1px;
-    fill: currentColor;
-    vertical-align: middle;
-  }
-
-  .govuk-header__logotype-crown-fallback-image {
+  .govuk-header__logotype-fallback-image {
     width: 36px;
     height: 32px;
     border: 0;
@@ -269,8 +263,7 @@
       background: transparent;
     }
 
-    // Hide the inverted crown when printing in browsers that don't support SVG.
-    .govuk-header__logotype-crown-fallback-image {
+    .govuk-header__logotype-fallback-image {
       display: none;
     }
 
@@ -289,7 +282,7 @@
 
   // Begin adjustments for font baseline offset
   // These should be removed when the font is updated with the correct baseline
-  .govuk-header__logotype-crown {
+  .govuk-header__logotype {
     position: relative;
     top: -4px;
   }

app/templates/components/uk_components/header/template.njk

@@ -5,7 +5,7 @@
     <div class="govuk-header__logo">
       <a href="{{ params.homepageUrl | default('/') }}" class="govuk-header__link govuk-header__link--homepage">
         <span class="govuk-header__logotype">
-            <image src="{{ params.assetsPath | default('/assets/images') }}/email-template/us-flag.png" alt="United States Flag" xlink:href="" class="govuk-header__logotype-crown-fallback-image" width="36" height="32"></image>
+            <image src="{{ params.assetsPath | default('/assets/images') }}/email-template/us-flag.png" alt="United States Flag" xlink:href="" class="govuk-header__logotype-fallback-image" width="36" height="32"></image>
           </svg>
           <span class="govuk-header__logotype-text">
             U.S.

app/templates/support-tickets/go-live-request.txt

@@ -9,7 +9,7 @@ Service: {{ service.name }}
 Organisation type: {{ service.organisation_type_label }}
 Agreement signed: {{ organisation.agreement_signed|format_yes_no(none='Can’t tell') }}
 {%- if organisation.agreement_signed %}, for {{ current_service.organisation.name }}
-{%- elif organisation.name %} (organisation is {{ organisation.name }}, {{ organisation.crown|format_yes_no(yes='a crown body', no='a non-crown body', none='crown status unknown') }})
+{%- elif organisation.name %} (organisation is {{ organisation.name }})
 {%- else %} (domain is {{ user.email_domain }})
 {%- endif %}.
 {%- if organisation.request_to_go_live_notes %} {{ organisation.request_to_go_live_notes }}{% endif %}

app/templates/views/agreement/service-agreement-choose.html

@@ -1,41 +0,0 @@
-{% extends "withnav_template.html" %}
-{% from "components/page-header.html" import page_header %}
-{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
-
-{% block service_page_title %}
-  Accept the data sharing and financial agreement
-{% endblock %}
-
-{% block backLink %}
-  {{ govukBackLink({ "href": url_for('main.request_to_go_live', service_id=current_service.id) }) }}
-{% endblock %}
-
-{% block maincolumn_content %}
-
-<div class="govuk-grid-row">
-  <div class="govuk-grid-column-five-sixths">
-
-    {{ page_header('Accept the data sharing and financial agreement')}}
-
-    <p class="govuk-body">
-      Before you can use U.S. Notify, you need to accept our data sharing and financial agreement.
-    </p>
-    <p class="govuk-body">
-      This must be done by, or on behalf of, someone with the authority to sign contracts for your organization.
-    </p>
-    <p class="govuk-body">
-      Once accepted, the agreement covers all Notify services from your organization.
-    </p>
-    <p class="govuk-body">
-      There are different agreements for crown and non-crown organizations.
-    </p>
-    <p class="govuk-body">
-      <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.support') }}">Contact us</a> to tell us
-      whether or not you work for a crown organization. If you’re not sure
-      we’ll help you work it out.
-    </p>
-
-  </div>
-</div>
-
-{% endblock %}

app/templates/views/organisations/add-organisation.html

@@ -26,7 +26,6 @@
             {% call form_wrapper() %}
               {{ form.name }}
               {{ form.organisation_type }}
-              {{ form.crown_status }}
               {{ page_footer('Save') }}
             {% endcall %}
           {% endblock %}

app/templates/views/organisations/organisation/settings/edit-crown-status.html

@@ -1,25 +0,0 @@
-{% extends "org_template.html" %}
-{% from "components/page-footer.html" import page_footer %}
-{% from "components/page-header.html" import page_header %}
-{% from "components/form.html" import form_wrapper %}
-{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
-
-{% block org_page_title %}
-  Crown organization
-{% endblock %}
-
-{% block backLink %}
-  {{ govukBackLink({ "href": url_for('.organisation_settings', org_id=current_org.id) }) }}
-{% endblock %}
-
-{% block maincolumn_content %}
-  {{ page_header("Crown organization") }}
-  <div class="govuk-grid-row">
-    <div class="govuk-grid-column-five-sixths">
-      {% call form_wrapper() %}
-        {{ form.crown_status }}
-        {{ page_footer('Save') }}
-      {% endcall %}
-    </div>
-  </div>
-{% endblock %}

app/templates/views/organisations/organisation/settings/index.html

@@ -34,22 +34,6 @@
           )
         }}
       {% endcall %}
-      {% call row() %}
-        {{ text_field('Crown organization') }}
-        {{ optional_text_field(
-            {
-              True: 'Yes',
-              False: 'No',
-            }.get(current_org.crown),
-            default='Not sure'
-        ) }}
-        {{ edit_field(
-            'Change',
-            url_for('.edit_organisation_crown_status', org_id=current_org.id),
-            suffix='organization crown status'
-          )
-        }}
-      {% endcall %}
       {% call row() %}
         {{ text_field('Data sharing and financial agreement') }}
         {{ text_field(