darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-26 14:58:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1673 from alphagov/rationalise-top-nav

Browse Source 
Rationalise top navigation and footer
This commit is contained in:
Chris Hill-Scott
2017-12-01 10:44:01 +00:00
committed by GitHub
parent 413e7d4689 4cc455a7cc
commit 3c057a5131
3 changed files with 20 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/main/views/sub_navigation_dictionaries.py
View File

@@ -12,11 +12,6 @@ def features_nav():
"name": "Security",
"link": "main.security",
},
{
"name": "Performance",
"link": "https://www.gov.uk/performance/govuk-notify",
"external_link": True,
},
{
"name": "Terms of use",
"link": "main.terms",

36
app/templates/admin_template.html
View File

@@ -44,6 +44,8 @@
<nav id="proposition-menu">
<ul id="proposition-links">
<li><a href="{{ url_for('main.support') }}">Support</a></li>
<li><a href="{{ url_for('main.features') }}">Features</a></li>
<li><a href="{{ url_for('main.documentation') }}">Documentation</a></li>
{% if current_user.is_authenticated %}
<li><a href="{{ url_for('main.user_profile') }}">{{ current_user.name }}</a></li>
{% if current_user.has_permissions(admin_override=True) %}
@@ -51,9 +53,7 @@
{% endif %}
<li><a href="{{ url_for('main.sign_out')}}">Sign out</a></li>
{% else %}
<li><a href="{{ url_for('main.features' )}}">Features</a></li>
<li><a href="{{ url_for('main.pricing' )}}">Pricing</a></li>
<li><a href="{{ url_for('main.documentation' )}}">Documentation</a></li>
<li><a href="{{ url_for('main.sign_in' )}}">Sign in</a></li>
{% endif %}
</ul>
@@ -75,39 +75,31 @@
<div class="footer-categories">
<div class="footer-categories-wrapper">
<div class="grid-row">
<div class="column-one-third">
<h2>Support</h2>
<div class="column-one-quarter">
<ul>
<li><a href="https://status.notifications.service.gov.uk">System status</a></li>
<li><a href="{{ url_for('main.support') }}">Support</a></li>
<li><a href="https://status.notifications.service.gov.uk">System status</a></li>
<li><a href="https://www.gov.uk/performance/govuk-notify">Performance</a></li>
<li><a href="https://ukgovernmentdigital.slack.com/messages/govuk-notify">Chat with the Notify team</a></li>
<li><a href="https://ukgovernmentdigital.slack.com/messages/govuk-notify">Slack channel</a></li>
</ul>
</div>
<div class="column-one-third">
<h2>About</h2>
<div class="column-one-quarter">
<ul>
<li><a href="{{ url_for("main.using_notify") }}">Using Notify</a></li>
<li><a href="{{ url_for("main.features") }}">Features</a></li>
<li><a href="{{ url_for("main.roadmap") }}">Roadmap</a></li>
<li><a href="{{ url_for("main.security") }}">Security</a></li>
<li><a href="{{ url_for("main.terms") }}">Terms of use</a></li>
<li><a href="{{ url_for("main.using_notify") }}">Using Notify</a></li>
</ul>
</div>
<div class="column-one-quarter">
<ul>
<li><a href="{{ url_for("main.pricing") }}">Pricing</a></li>
</ul>
</div>
<div class="column-one-third">
<h2>API documentation</h2>
<div class="column-one-quarter">
<ul>
{% for language, url in [
('Java', 'https://github.com/alphagov/notifications-java-client'),
('.NET', 'https://github.com/alphagov/notifications-net-client'),
('Node JS', 'https://github.com/alphagov/notifications-node-client'),
('PHP', 'https://github.com/alphagov/notifications-php-client'),
('Python', 'https://github.com/alphagov/notifications-python-client'),
('Ruby', 'https://github.com/alphagov/notifications-ruby-client')
] %}
<li><a href="{{ url }}" target="_blank" rel="noopener noreferrer">{{ language }} client</a></li>
{% endfor %}
<li><a href="{{ url_for("main.integration_testing") }}">Integration testing</a></li>
<li><a href="{{ url_for("main.documentation") }}">Documentation</a></li>
</ul>
</div>
</div>

17
app/templates/components/sub-navigation.html
View File

@@ -3,22 +3,17 @@
) %}
<nav class="sub-navigation">
<ol itemscope itemtype="http://schema.org/ItemList">
{% for item in item_set %}
<li class="sub-navigation__item {% if item['link'] == request.endpoint %} sub-navigation__item--active {% endif %}"
itemprop="itemListElement"
itemscope
{% for item in item_set %}
<li class="sub-navigation__item {% if item['link'] == request.endpoint %} sub-navigation__item--active {% endif %}"
itemprop="itemListElement"
itemscope
itemtype="http://schema.org/ListItem"
>
<a href="{%- if item['external_link'] -%}
{{ item['link'] }}
{%- else -%}
{{ url_for(item['link']) }}
{%- endif -%}"
itemprop="item">
<a href="{{ url_for(item['link']) }}" itemprop="item">
<span itemprop="name">{{item['name']}}</span>
</a>
</li>
{% endfor %}
</ol>
</nav>
{% endmacro %}
{% endmacro %}