darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-06 00:08:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename some of the settings

Browse Source 
This reflects the language we use for these things when talking about
them amongst ourselves.
This commit is contained in:
Chris Hill-Scott
2019-06-03 13:34:50 +01:00
parent 80e6c1654b
commit 6fc1635266
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/templates/views/organisations/organisation/settings/edit-type.html
View File

@@ -1,21 +1,18 @@
{% from "components/radios.html" import radios %} {% from "components/radios.html" import radios %}
{% from "components/page-footer.html" import page_footer %} {% 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/form.html" import form_wrapper %}
{% extends "org_template.html" %} {% extends "org_template.html" %}
{% block org_page_title %} {% block org_page_title %}
Organisation type Organisation sector
{% endblock %} {% endblock %}
{% block maincolumn_content %} {% block maincolumn_content %}
<h1 class="heading-large">Organisation type</h1> {{ page_header("Organisation sector") }}
<div class="grid-row"> {% call form_wrapper() %}
<div class="column-five-sixths"> {{ radios(form.organisation_type) }}
{% call form_wrapper() %} {{ page_footer('Save') }}
{{ radios(form.organisation_type) }} {% endcall %}
{{ page_footer('Save') }}
{% endcall %}
</div>
</div>
{% endblock %} {% endblock %}

4
app/templates/views/organisations/organisation/settings/index.html
View File

@@ -15,7 +15,7 @@
caption_visible=False caption_visible=False
) %} ) %}
{% call row() %} {% call row() %}
{{ text_field('Organisation name') }} {{ text_field('Name') }}
{{ text_field(current_org.name) }} {{ text_field(current_org.name) }}
{{ edit_field( {{ edit_field(
'Change', 'Change',
@@ -24,7 +24,7 @@
}} }}
{% endcall %} {% endcall %}
{% call row() %} {% call row() %}
{{ text_field('Organisation type') }} {{ text_field('Sector') }}
{{ optional_text_field({ {{ optional_text_field({
'central': 'Central government', 'central': 'Central government',
'local': 'Local government', 'local': 'Local government',

4
tests/app/main/views/organisations/test_organisation.py
View File

@@ -181,8 +181,8 @@ def test_organisation_settings_for_platform_admin(
): ):
expected_rows = [ expected_rows = [
'Label Value Action', 'Label Value Action',
'Organisation name Org 1 Change', 'Name Org 1 Change',
'Organisation type Not set Change', 'Sector Not set Change',
'Crown organisation Yes Change', 'Crown organisation Yes Change',
'Data sharing and financial agreement Not signed Change', 'Data sharing and financial agreement Not signed Change',
'Request to go live notes None Change', 'Request to go live notes None Change',