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

Merge pull request #2718 from alphagov/sticky-footer-new-buttons

Browse Source 
Add sticky footer on letter contact details, fix issues
This commit is contained in:
Chris Hill-Scott
2019-02-01 16:11:28 +00:00
committed by GitHub
parent 7632e6b9d3 f55e2c06ef
commit 6b02775927
4 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/apiKey.js
View File

@@ -50,6 +50,10 @@
$component.html(states.keyVisible(key, thing)) $component.html(states.keyVisible(key, thing))
); );
if ('stickAtBottomWhenScrolling' in GOVUK) {
GOVUK.stickAtBottomWhenScrolling.recalculate();
}
}; };
}; };

19
app/templates/views/organisations/organisation/users/index.html
View File

@@ -11,16 +11,9 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<div class="grid-row bottom-gutter"> <h1 class="heading-large">
<div class="column-two-thirds"> Team members
<h1 class="heading-large"> </h1>
Team members
</h1>
</div>
<div class="column-one-third">
<a href="{{ url_for('.invite_org_user', org_id=current_org.id) }}" class="button align-with-heading">Invite team member</a>
</div>
</div>
{% if show_search_box %} {% if show_search_box %}
<div data-module="autofocus"> <div data-module="autofocus">
@@ -58,6 +51,8 @@
{% endfor %} {% endfor %}
</div> </div>
<div class="js-stick-at-bottom-when-scrolling">
<a href="{{ url_for('.invite_org_user', org_id=current_org.id) }}" class="button">Invite team member</a>
</div>
{% endblock %} {% endblock %}

14
app/templates/views/service-settings/letter-contact-details.html
View File

@@ -15,11 +15,6 @@
Sender addresses Sender addresses
</h1> </h1>
</div> </div>
{% if current_user.has_permissions('manage_service') %}
<div class="column-one-third">
<a href="{{ url_for('.service_add_letter_contact', service_id=current_service.id) }}" class="button align-with-heading">Add a new address</a>
</div>
{% endif %}
</div> </div>
<div class="user-list"> <div class="user-list">
{% if not letter_contact_details %} {% if not letter_contact_details %}
@@ -46,4 +41,13 @@
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
{% if current_user.has_permissions('manage_service') %}
<div class="grid-row">
<div class="column-whole">
<div class="js-stick-at-bottom-when-scrolling">
<a href="{{ url_for('.service_add_letter_contact', service_id=current_service.id) }}" class="button">Add a new address</a>
</div>
</div>
</div>
{% endif %}
{% endblock %} {% endblock %}

40
app/templates/views/service-settings/letter-contact/add.html
View File

@@ -14,26 +14,28 @@
Add a new address Add a new address
</h1> </h1>
<div class="grid-row"> <div class="grid-row">
{% call form_wrapper() %} <div class="column-whole">
{{ textbox( {% call form_wrapper() %}
form.letter_contact_block, {{ textbox(
label='This will appear as the ‘sender’ address on your letters.'|safe, form.letter_contact_block,
hint='10 lines maximum', label='This will appear as the ‘sender’ address on your letters.'|safe,
width='1-1', hint='10 lines maximum',
rows=10, width='1-2',
highlight_tags=True rows=10,
highlight_tags=True
) }}
{% if not first_contact_block %}
<div class="form-group">
{{ checkbox(form.is_default) }}
</div>
{% endif %}
{{ page_footer(
'Add',
back_link=None if request.args.get('from_template') else url_for('.service_letter_contact_details', service_id=current_service.id),
back_link_text='Back'
) }} ) }}
{% if not first_contact_block %} {% endcall %}
<div class="form-group"> </div>
{{ checkbox(form.is_default) }}
</div>
{% endif %}
{{ page_footer(
'Add',
back_link=None if request.args.get('from_template') else url_for('.service_letter_contact_details', service_id=current_service.id),
back_link_text='Back'
) }}
{% endcall %}
</div> </div>
{% endblock %} {% endblock %}