Skip to content

Commit

Permalink
Remove checks for feature flag that's always true
Browse files Browse the repository at this point in the history
  • Loading branch information
@kevincarrogan
kevincarrogan committed Nov 4, 2024
1 parent d0624b8 commit bd9bfdf
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 107 deletions.
131 changes: 44 additions & 87 deletions exporter/templates/core/hub.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,10 @@ <h2 class="govuk-!-margin-top-0">
{% lcs 'hub.Tiles.VIEW_AND_MANAGE_LICENCES' %}
</a>
</h2>
{% if FEATURE_FLAG_ONLY_ALLOW_SIEL %}
<p class="app-tile__body">View and manage your SIELs, including NLRs and unsuccessful applications.</p>
<div class="app-tile__body">
Use <a href="https://www.spire.trade.gov.uk">SPIRE – the online export licensing system</a>
to view and manage all other licences and clearances.</div>
{% else %}
<p class="app-tile__body">View and manage your licences and clearances, including NLRs and unsuccessful applications.</p>
{% endif %}
<p class="app-tile__body">View and manage your SIELs, including NLRs and unsuccessful applications.</p>
<div class="app-tile__body">
Use <a href="https://www.spire.trade.gov.uk">SPIRE – the online export licensing system</a>
to view and manage all other licences and clearances.</div>
<br>
<br>
<br>
Expand All @@ -129,22 +125,15 @@ <h2 class="govuk-!-margin-top-0">
{# End user query tile #}
<div class="app-tile">

{% if FEATURE_FLAG_ONLY_ALLOW_SIEL %}
<h2 class="govuk-!-margin-top-0">
<span class="govuk-heading-s" id="link-eua">
{% lcs 'hub.Tiles.END_USER_ADVISORIES' %}{% if notifications.notifications.end_user_advisory %}<span class="lite-notification-bubble" id="eua-notifications"><span class="govuk-visually-hidden"> (</span>{{ notifications.notifications.end_user_advisory }}<span class="govuk-visually-hidden"> notifications)</span></span>{% endif %}
</span>
</h2>
<div class="app-tile__body">
Use <a href="https://www.spire.trade.gov.uk">SPIRE – the online export licensing system</a>
to ask for advice about an overseas organisation, government or individual in your export of products that are not controlled.
</div>
{% else %}
<a href="{% url 'end_users:end_users' %}" class="app-tile__heading" id="link-eua">
<h2 class="govuk-!-margin-top-0">
<span class="govuk-heading-s" id="link-eua">
{% lcs 'hub.Tiles.END_USER_ADVISORIES' %}{% if notifications.notifications.end_user_advisory %}<span class="lite-notification-bubble" id="eua-notifications"><span class="govuk-visually-hidden"> (</span>{{ notifications.notifications.end_user_advisory }}<span class="govuk-visually-hidden"> notifications)</span></span>{% endif %}
</a>
<p class="app-tile__body">{% lcs 'hub.Tiles.EUA.ASK_FOR_ADVICE' %}</p>
{% endif %}
</span>
</h2>
<div class="app-tile__body">
Use <a href="https://www.spire.trade.gov.uk">SPIRE – the online export licensing system</a>
to ask for advice about an overseas organisation, government or individual in your export of products that are not controlled.
</div>


</div>
Expand Down Expand Up @@ -194,79 +183,47 @@ <h2 class="govuk-!-margin-top-0">
{% if organisation.type.key != 'hmrc' %}

<h2 class="govuk-heading-m govuk-!-margin-top-6 govuk-!-margin-bottom-3">{% lcs 'hub.Tiles.COMPLIANCE_HEADING' %}</h2>
{% if FEATURE_FLAG_ONLY_ALLOW_SIEL %}
<div class="govuk-!-margin-bottom-8 govuk-inset-text">
<div class="govuk-body">Use <a href="https://www.spire.trade.gov.uk">SPIRE – the online export licensing system</a>
to view and manage your:</div>
<ul class="govuk-list govuk-list--bullet govuk-!-margin-top-2">
<li>compliance visits</li>
<li>open licence returns</li>
</ul>
</div>
{% endif %}
<div class="govuk-!-margin-bottom-8 govuk-inset-text">
<div class="govuk-body">Use <a href="https://www.spire.trade.gov.uk">SPIRE – the online export licensing system</a>
to view and manage your:</div>
<ul class="govuk-list govuk-list--bullet govuk-!-margin-top-2">
<li>compliance visits</li>
<li>open licence returns</li>
</ul>
</div>

<div class="app-tiles" {% if FEATURE_FLAG_ONLY_ALLOW_SIEL %}aria-label="Content currently unavailable"{% endif %}>
<div class="app-tiles" aria-label="Content currently unavailable">
{# Compliance licence tile #}
<div class="app-tile{% if FEATURE_FLAG_ONLY_ALLOW_SIEL %} app-tile__disabled{% endif %}">
{% if FEATURE_FLAG_ONLY_ALLOW_SIEL %}
<h2 class="govuk-!-margin-top-0">
<span class="govuk-link app-tile__heading" id="link-compliance">
{% lcs 'hub.Tiles.Compliance.TITLE' %}
{% if notifications.notifications.compliance %}<span class="lite-notification-bubble" id="eua-notifications"><span class="govuk-visually-hidden"> (</span>{{ notifications.notifications.compliance }}<span class="govuk-visually-hidden"> notifications)</span></span>{% endif %}
</span>
</h2>
{% else %}
<h2 class="govuk-!-margin-top-0">
<a href="{% url 'compliance:compliance_list' %}" class="govuk-link app-tile__heading" id="link-compliance">
{% lcs 'hub.Tiles.Compliance.TITLE' %}
{% if notifications.notifications.compliance %}<span class="lite-notification-bubble" id="eua-notifications"><span class="govuk-visually-hidden"> (</span>{{ notifications.notifications.compliance }}<span class="govuk-visually-hidden"> notifications)</span></span>{% endif %}
</a>
</h2>
{% endif %}
<div class="app-tile app-tile__disabled">
<h2 class="govuk-!-margin-top-0">
<span class="govuk-link app-tile__heading" id="link-compliance">
{% lcs 'hub.Tiles.Compliance.TITLE' %}
{% if notifications.notifications.compliance %}<span class="lite-notification-bubble" id="eua-notifications"><span class="govuk-visually-hidden"> (</span>{{ notifications.notifications.compliance }}<span class="govuk-visually-hidden"> notifications)</span></span>{% endif %}
</span>
</h2>

<p class="app-tile__body">{% lcs 'hub.Tiles.Compliance.DESCRIPTION' %}</p>
</div>
{# Open licence returns tile #}
<div class="app-tile app-tile{% if FEATURE_FLAG_ONLY_ALLOW_SIEL %} app-tile__disabled{% endif %}">
{% if FEATURE_FLAG_ONLY_ALLOW_SIEL %}
<h2 class="govuk-!-margin-top-0">
<span class="app-tile__heading govuk-link govuk-link--no-visited-state" id="link-open-licence-returns">
{% lcs 'hub.Tiles.OPEN_LICENCE_RETURNS' %}
</span>
</h2>
{% else %}
<h2 class="govuk-!-margin-top-0">
<a href="{% url 'compliance:open_licence_returns_list' %}" class="app-tile__heading" id="link-open-licence-returns">
{% lcs 'hub.Tiles.OPEN_LICENCE_RETURNS' %}
</a>
</h2>
{% endif %}
<div class="app-tile app-tile app-tile__disabled">
<h2 class="govuk-!-margin-top-0">
<span class="app-tile__heading govuk-link govuk-link--no-visited-state" id="link-open-licence-returns">
{% lcs 'hub.Tiles.OPEN_LICENCE_RETURNS' %}
</span>
</h2>

<p class="app-tile__body">{% lcs 'hub.Tiles.OpenLicenceReturns.DESCRIPTION' %}</p>
<ol class="govuk-list govuk-!-font-size-16">
{% if FEATURE_FLAG_ONLY_ALLOW_SIEL %}
<li>
<span class="govuk-link govuk-link--no-visited-state">
{% lcs 'hub.Tiles.OpenLicenceReturns.ADD_LINK' %}
</span>
</li>
<li>
<span class="govuk-link govuk-link--no-visited-state">
{% lcs 'hub.Tiles.OpenLicenceReturns.VIEW_LINK' %}
</span>
</li>
{% else %}
<li>
<a href="{% url 'compliance:add_open_licence_return' %}" class="govuk-link govuk-link--no-visited-state">
{% lcs 'hub.Tiles.OpenLicenceReturns.ADD_LINK' %}
</a>
</li>
<li>
<a href="{% url 'compliance:open_licence_returns_list' %}" class="govuk-link govuk-link--no-visited-state">
{% lcs 'hub.Tiles.OpenLicenceReturns.VIEW_LINK' %}
</a>
</li>
{% endif %}
<li>
<span class="govuk-link govuk-link--no-visited-state">
{% lcs 'hub.Tiles.OpenLicenceReturns.ADD_LINK' %}
</span>
</li>
<li>
<span class="govuk-link govuk-link--no-visited-state">
{% lcs 'hub.Tiles.OpenLicenceReturns.VIEW_LINK' %}
</span>
</li>
</ol>
</div>
</div>
Expand Down
14 changes: 6 additions & 8 deletions exporter/templates/licences/licences.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,12 @@ <h1 class="govuk-heading-l">{% block title %}{% lcs "licences.LicencesList.TITLE

{% include 'includes/tabs.html' %}

{% if FEATURE_FLAG_ONLY_ALLOW_SIEL %}
{% block feture_flag_notice %}
<div class="govuk-inset-text govuk-!-margin-top-0">
Use <a href="https://www.spire.trade.gov.uk">SPIRE – the online export licensing system</a>
to view and manage your OIELs.
</div>
{% endblock %}
{% endif %}
{% block feture_flag_notice %}
<div class="govuk-inset-text govuk-!-margin-top-0">
Use <a href="https://www.spire.trade.gov.uk">SPIRE – the online export licensing system</a>
to view and manage your OIELs.
</div>
{% endblock %}
{% include 'filters.html' %}

{% if data.results %}
Expand Down
10 changes: 4 additions & 6 deletions exporter/templates/licences/nlrs.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,10 @@ <h1 class="govuk-heading-l">{% block title %}{% lcs "licences.LicencesList.TITLE

{% include 'includes/tabs.html' %}

{% if FEATURE_FLAG_ONLY_ALLOW_SIEL %}
<div class="govuk-inset-text govuk-!-margin-top-0">
Use <a href="https://www.spire.trade.gov.uk">SPIRE – the online export licensing system</a>
to view your OIEL, SIEL and MOD clearance NLRs.
</div>
{% endif %}
<div class="govuk-inset-text govuk-!-margin-top-0">
Use <a href="https://www.spire.trade.gov.uk">SPIRE – the online export licensing system</a>
to view your OIEL, SIEL and MOD clearance NLRs.
</div>

{% include "filters.html" %}

Expand Down
10 changes: 4 additions & 6 deletions exporter/templates/licences/open-general-licences.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,10 @@ <h1 class="govuk-heading-l">{% block title %}{% lcs "licences.LicencesList.TITLE
</div>

{% include 'includes/tabs.html' %}
{% if FEATURE_FLAG_ONLY_ALLOW_SIEL %}
<div class="govuk-inset-text govuk-!-margin-top-0">
Use <a href="https://www.spire.trade.gov.uk">SPIRE – the online export licensing system</a>
to view and manage your OGLs.
</div>
{% endif %}
<div class="govuk-inset-text govuk-!-margin-top-0">
Use <a href="https://www.spire.trade.gov.uk">SPIRE – the online export licensing system</a>
to view and manage your OGLs.
</div>
<div>
<p class="lite-filters__hint-text lite-filters__hint-text--warning">
Read <a class="govuk-link govuk-link--no-visited-state" rel="noreferrer noopener" target="_blank" href="https://www.gov.uk/government/publications/compliance-code-of-practice">
Expand Down

0 comments on commit bd9bfdf

Please sign in to comment.