mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-23 07:46:23 -04:00
- Removed links to the gov uk stylesheets
- Deleted /stylesheets folder - Removed sass build from gulpfile - Changed gov links to usa links - Changed other govuk styles, like breadcrumbs - Changed name of uk_components file to us_components - Fixed a few tests that broke on account of the changes
This commit is contained in:
Jonathan Bobel
@@ -4,7 +4,7 @@
|
||||
{% from "components/radios.html" import radio, conditional_radio_panel %}
|
||||
{% from "components/select-input.html" import select_wrapper %}
|
||||
{% from "components/form.html" import form_wrapper %}
|
||||
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
|
||||
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
|
||||
|
||||
|
||||
{% block backLink %}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
{% from "components/page-footer.html" import sticky_page_footer %}
|
||||
{% from "components/live-search.html" import live_search %}
|
||||
{% from "components/form.html" import form_wrapper %}
|
||||
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
|
||||
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
|
||||
|
||||
{% block per_page_title %}
|
||||
{{ page_title }}
|
||||
|
||||
@@ -9,9 +9,9 @@
|
||||
|
||||
{% block main %}
|
||||
<div class="govuk-width-container">
|
||||
<div class="navigation-service">
|
||||
<a href="{{ url_for('.organizations') }}" class="govuk-link govuk-link--no-visited-state navigation-service-back-to">All organizations</a>
|
||||
<a href="{{ url_for('main.choose_account') }}" class="govuk-link govuk-link--no-visited-state navigation-service-switch">Switch service</a>
|
||||
<div class="navigation-service usa-breadcrumb">
|
||||
<a href="{{ url_for('.organizations') }}" class="usa-link navigation-service usa-breadcrumb__link usa-breadcrumb-back-to">All organizations</a>
|
||||
<a href="{{ url_for('main.choose_account') }}" class="usa-link navigation-service usa-breadcrumb-switch">Switch service</a>
|
||||
</div>
|
||||
|
||||
<div class="govuk-grid-row">
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{% extends "views/platform-admin/_base_template.html" %}
|
||||
{% from "components/live-search.html" import live_search %}
|
||||
{% from "components/uk_components/button/macro.njk" import govukButton %}
|
||||
{% from "components/us_components/button/macro.njk" import govukButton %}
|
||||
|
||||
{% block per_page_title %}
|
||||
Organizations
|
||||
@@ -16,7 +16,7 @@
|
||||
<ul>
|
||||
{% for org in organizations|sort %}
|
||||
<li class="browse-list-item">
|
||||
<a href="{{ url_for('main.organization_dashboard', org_id=org.id) }}" class="govuk-link govuk-link--no-visited-state">{{ org.name }}</a>
|
||||
<a href="{{ url_for('main.organization_dashboard', org_id=org.id) }}" class="usa-link">{{ org.name }}</a>
|
||||
{% if not org.active %}
|
||||
<span class="table-field-status-default heading-medium">- archived</span>
|
||||
{% endif %}
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
{% for service in services %}
|
||||
<div class="keyline-block govuk-!-margin-top-2 organization-service">
|
||||
<h3 class="govuk-!-font-weight-bold govuk-!-font-size-24 govuk-!-margin-bottom-3 govuk-!-margin-top-1 live-search-relevant">
|
||||
<a href="{{ url_for('main.usage', service_id=service.service_id) }}" class="govuk-link govuk-link--no-visited-state browse-list-link">{{ service.service_name }}</a>
|
||||
<a href="{{ url_for('main.usage', service_id=service.service_id) }}" class="usa-link browse-list-link">{{ service.service_name }}</a>
|
||||
</h3>
|
||||
<div class="govuk-grid-row">
|
||||
<div class="govuk-grid-column-one-half">
|
||||
@@ -94,7 +94,7 @@
|
||||
{% else %}
|
||||
<div class="js-stick-at-bottom-when-scrolling">
|
||||
<p class="govuk-!-margin-bottom-1">
|
||||
<a href="{{ download_link }}" download="download" class="govuk-link govuk-link--no-visited-state govuk-!-font-weight-bold">Download this report (<abbr title="Comma separated values">CSV</abbr>)</a>
|
||||
<a href="{{ download_link }}" download="download" class="usa-link govuk-!-font-weight-bold">Download this report (<abbr title="Comma separated values">CSV</abbr>)</a>
|
||||
</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
{% from "components/page-header.html" import page_header %}
|
||||
{% from "components/list-entry.html" import list_entry %}
|
||||
{% from "components/form.html" import form_wrapper %}
|
||||
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
|
||||
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
|
||||
|
||||
{% block org_page_title %}
|
||||
Known email domains
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
{% from "components/page-header.html" import page_header %}
|
||||
{% from "components/textbox.html" import textbox %}
|
||||
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
|
||||
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
|
||||
|
||||
{% block org_page_title %}
|
||||
Edit request to go live notes
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{% from "components/page-header.html" import page_header %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
{% from "components/form.html" import form_wrapper %}
|
||||
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
|
||||
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
|
||||
|
||||
{% block org_page_title %}
|
||||
Change organization name
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
{% from "components/form.html" import form_wrapper %}
|
||||
{% from "components/textbox.html" import textbox %}
|
||||
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
|
||||
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
|
||||
|
||||
{% block org_page_title %}
|
||||
Edit organization billing details
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
{% from "components/form.html" import form_wrapper %}
|
||||
{% from "components/textbox.html" import textbox %}
|
||||
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
|
||||
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
|
||||
|
||||
{% block org_page_title %}
|
||||
Edit organization notes
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{% 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/uk_components/back-link/macro.njk" import govukBackLink %}
|
||||
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
|
||||
|
||||
{% block org_page_title %}
|
||||
Organization sector
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{% extends "org_template.html" %}
|
||||
{% from "components/form.html" import form_wrapper %}
|
||||
{% from "components/uk_components/button/macro.njk" import govukButton %}
|
||||
{% from "components/us_components/button/macro.njk" import govukButton %}
|
||||
{% from "components/branding-preview.html" import email_branding_preview %}
|
||||
|
||||
{% block org_page_title %}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
{% from "components/page-header.html" import page_header %}
|
||||
{% from "components/live-search.html" import live_search %}
|
||||
{% from "components/form.html" import form_wrapper %}
|
||||
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
|
||||
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
|
||||
|
||||
{% set page_title = "Default email branding" %}
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
<ul>
|
||||
{% for service in current_org.trial_services %}
|
||||
<li class="browse-list-item">
|
||||
<a href="{{ url_for('main.service_dashboard', service_id=service.id) }}" class="govuk-link govuk-link--no-visited-state browse-list-link">{{ service['name'] }}</a>
|
||||
<a href="{{ url_for('main.service_dashboard', service_id=service.id) }}" class="usa-link browse-list-link">{{ service['name'] }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{% from "components/table.html" import list_table, row, field, hidden_field_heading %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
{% from "components/live-search.html" import live_search %}
|
||||
{% from "components/uk_components/button/macro.njk" import govukButton %}
|
||||
{% from "components/us_components/button/macro.njk" import govukButton %}
|
||||
|
||||
{% block org_page_title %}
|
||||
Team members
|
||||
@@ -53,9 +53,9 @@
|
||||
</div>
|
||||
<div class="govuk-grid-column-one-quarter">
|
||||
{% if user.status == 'pending' %}
|
||||
<a class="govuk-link govuk-link--no-visited-state user-list-edit-link" href="{{ url_for('.cancel_invited_org_user', org_id=current_org.id, invited_user_id=user.id)}}">Cancel invitation<span class="usa-sr-only"> for {{ user.email_address }}</span></a>
|
||||
<a class="usa-link user-list-edit-link" href="{{ url_for('.cancel_invited_org_user', org_id=current_org.id, invited_user_id=user.id)}}">Cancel invitation<span class="usa-sr-only"> for {{ user.email_address }}</span></a>
|
||||
{% elif user.status != 'cancelled' %}
|
||||
<a class="govuk-link govuk-link--destructive user-list-edit-link" href="{{ url_for('.edit_organization_user', org_id=current_org.id, user_id=user.id)}}">Remove<span class="usa-sr-only"> {{ user.name }} {{ user.email_address }}</span></a>
|
||||
<a class="usa-link usa-link--destructive user-list-edit-link" href="{{ url_for('.edit_organization_user', org_id=current_org.id, user_id=user.id)}}">Remove<span class="usa-sr-only"> {{ user.name }} {{ user.email_address }}</span></a>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
{% 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/uk_components/back-link/macro.njk" import govukBackLink %}
|
||||
{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
|
||||
|
||||
{% block service_page_title %}
|
||||
Invite a team member
|
||||
|
||||
Reference in New Issue
Block a user