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

Merge branch 'master' into features-content-updates

Browse Source
This commit is contained in:
karlchillmaid
2019-04-16 13:50:50 +01:00
committed by GitHub
parent 527d8ff10f d3cb5aa796
commit 0ee322f137
56 changed files with 894 additions and 5545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/templates/views/email-branding/manage-branding.html
View File

@@ -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',

7
app/templates/views/email-branding/select-branding.html
View File

@@ -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>

1
app/templates/views/letter-branding/manage-letter-branding.html
View File

@@ -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',

7
app/templates/views/letter-branding/select-letter-branding.html
View File

@@ -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>

11
app/templates/views/service-settings.html
View File

@@ -288,8 +288,13 @@
{% call row() %}
{{ text_field('Live')}}
{{ boolean_field(not current_service.trial_mode) }}
{{ edit_field('Change', url_for('.service_switch_live', service_id=current_service.id)) }}
{% if current_service.trial_mode and not current_service.organisation %}
{{ text_field('No (you need to assign this service to an organisation before you can make it live)') }}
{{ text_field('') }}
{% else %}
{{ boolean_field(not current_service.trial_mode) }}
{{ edit_field('Change', url_for('.service_switch_live', service_id=current_service.id)) }}
{% endif %}
{% endcall %}
{% call row() %}
@@ -300,7 +305,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() %}

14
app/templates/views/service-settings/request-to-go-live.html
View File

@@ -52,7 +52,15 @@
) }}
{% endif %}
{% endcall %}
{% if current_user.is_gov_user %}
{% if not current_user.is_gov_user %}
<p>
Only team members with a government email address can request to go live.
</p>
{% elif (not current_service.go_live_checklist_completed) or (show_agreement and not agreement_signed) %}
<p>
You must complete these steps before you can request to go live.
</p>
{% else %}
<p>
When we receive your request we’ll get back to you within one working day.
</p>
@@ -62,10 +70,6 @@
{% call form_wrapper() %}
{{ page_footer('Request to go live') }}
{% endcall %}
{% else %}
<p>
Only team members with a government email address can request to go live.
</p>
{% endif %}
</div>
</div>

6
app/templates/views/signedout.html
View File

@@ -115,17 +115,17 @@
</div>
</div>
<div class="product-page-section">
<div class="with-keyline bottom-gutter-2">
<div class="with-keyline bottom-gutter-2" id="whos-using-notify">
<h2>Who’s using GOV.UK Notify</h2>
<div class="grid-row bottom-gutter">
<div class="column-half">
<h3 class="visually-hidden">Services</h3>
<div class="product-page-big-number">745</div>
<div class="product-page-big-number">{{ counts.services }}</div>
services
</div>
<div class="column-half">
<h3 class="visually-hidden">Organisations</h3>
<div class="product-page-big-number">233</div>
<div class="product-page-big-number">{{ counts.organisations }}</div>
organisations
</div>
</div>

2
app/templates/views/terms-of-use.html
View File

@@ -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'),