Merge pull request #2896 from alphagov/remove-domains-yml

Use organisations from database rather than YAML file

app/templates/views/email-branding/manage-branding.html

@@ -28,7 +28,6 @@
           <div style='margin-top:15px;'>{{textbox(form.name)}}</div>
           <div style='margin-top:15px;'>{{textbox(form.text)}}</div>
           {{ textbox(form.colour, width='1-4', colour_preview=True) }}
-           <div style='margin-top:15px;'>{{textbox(form.domain)}}</div>
            {{ radios(form.brand_type) }}
           {{ page_footer(
             'Save',

app/templates/views/email-branding/select-branding.html

@@ -24,13 +24,6 @@
             {{ brand.name or 'Unnamed' }}
           </a>
         </div>
-        <p class="message-type">
-          {% if brand.domain %}
-            Default for {{ brand.domain }}
-          {% else %}
-            –
-          {% endif %}
-        </p>
       </div>
     {% endfor %}
   </nav>

app/templates/views/letter-branding/manage-letter-branding.html

@@ -25,7 +25,6 @@
       {% call form_wrapper() %}
         <div class="form-group">
           <div style='margin-top:15px;'>{{textbox(letter_branding_details_form.name)}}</div>
-          <div style='margin-top:15px;'>{{textbox(letter_branding_details_form.domain)}}</div>
           {{ page_footer(
             'Save',
             button_name='operation',

app/templates/views/letter-branding/select-letter-branding.html

@@ -24,13 +24,6 @@
             {{ brand.name }}
           </a>
         </div>
-        <p class="message-type">
-          {% if brand.domain %}
-            Default for {{ brand.domain }}
-          {% else %}
-            –
-          {% endif %}
-        </p>
       </div>
     {% endfor %}
   </nav>

app/templates/views/pricing.html

@@ -123,7 +123,7 @@
     <h2 class="heading-medium" id="paying">How to pay</h2>
     <p>You can find details of how to pay for Notify in our data sharing and financial agreement.</p>
     <p>
-      {{ agreement_info.as_pricing_paragraph(
+      {{ current_user.default_organisation.as_pricing_paragraph(
         pricing_link=url_for('main.sign_in', next=url_for('main.pricing', _anchor='paying')),
         download_link=url_for('main.agreement'),
         support_link=url_for('.feedback', ticket_type='ask-question-give-feedback', body='agreement'),

app/templates/views/service-settings.html

@@ -300,7 +300,7 @@
 
         {% call row() %}
           {{ text_field('Organisation')}}
-          {{ optional_text_field(current_service.organisation_name) }}
+          {{ optional_text_field(current_service.organisation.name) }}
           {{ edit_field('Change', url_for('.link_service_to_organisation', service_id=current_service.id)) }}
         {% endcall %}
         {% call row() %}

app/templates/views/terms-of-use.html

@@ -21,7 +21,7 @@ Terms of use
     </p>
 
     <p>
-      {{ agreement_info.as_terms_of_use_paragraph(
+      {{ current_user.default_organisation.as_terms_of_use_paragraph(
         terms_link=url_for('main.sign_in', next=url_for('main.terms')),
         download_link=url_for('.agreement'),
         support_link=url_for('.feedback', ticket_type='ask-question-give-feedback', body='agreement'),