Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Link to Search #2733

Merged
merged 2 commits into from
Nov 6, 2023
Merged

Link to Search #2733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ff73d1
Re-introduce search to the homescreen
jperson1 Nov 6, 2023
2672a18
Primary nav to match static site
jperson1 Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion backend/static/scss/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,11 @@

.usa-accordion__button {
color: #171717
}
};

a.usa-nav-link {
color: #171717
};
}

.fac-beta-banner {
Expand Down
43 changes: 16 additions & 27 deletions backend/templates/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,8 @@ <h1 class="text-base-darkest font-sans-2xl">
When an organization spends $750,000 or more in federal grant funds in a given year, they are required to
submit an audit.
</p>
{% comment %}
Uncomment when search is implemented.
<p>
The FAC is moving to a new home at the General Services Administration (GSA). Only audits from 2022 will be
searchable on fac.gov for now.
<a href="https://facides.census.gov/Account/Login.aspx"
aria-controls="legacy-fac-modal"
data-open-modal>Please use the U.S. Census Bureau FAC site to search for older records.</a>
</p>
{% endcomment %}
<ul class="usa-card-group margin-top-10">
<li class="usa-card desktop:grid-col-6 desktop:grid-offset-3">
<li class="usa-card desktop:grid-col-6">
<div class="usa-card__container">
<div>
<a class="usa-button sign-in-button"
Expand All @@ -32,23 +22,22 @@ <h1 class="text-base-darkest font-sans-2xl">
<p class="usa-card__body">Sign in to submit and review your audits.</p>
</div>
</li>
{% comment %}
Uncomment when search is implemented, and return the <li> above to grid-col-6 with no offset.
<li class="usa-card desktop:grid-col-6">
<div class="usa-card__container">
<div>
<a class="usa-button usa-button--outline"
href="https://facides.census.gov/Account/Login.aspx"
aria-controls="legacy-fac-modal"
data-open-modal>Search older audit reports</a>
</div>
<p class="usa-card__body">
Search audit report records from before 2022.
You don’t need a FAC account to search.
</p>
<li class="usa-card desktop:grid-col-6">
<div class="usa-card__container">
<div>
<a class="usa-button usa-button--outline"
href="{% url 'dissemination:Search' %}">Search audit reports</a>
</div>
</li>
{% endcomment %}
<p class="usa-card__body">
Search audits accepted since October 1, 2023.
Older reports are available
<a class="usa-link usa-link--external"
href="https://facides.census.gov/Account/Login.aspx"
target="_blank">from the Census Bureau</a>
.
</p>
</div>
</li>
</ul>
</div>
</section>
Expand Down
52 changes: 18 additions & 34 deletions backend/templates/includes/nav_primary.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,61 +16,45 @@
<img src="{% static 'img/usa-icons/close.svg' %}" role="img" alt="Close" />
</button>
<ul class="usa-nav__primary usa-accordion pa11y-ignore">
{% comment %}
Uncomment after search is implemented.
<li class="usa-nav__primary-item">
<a href="https://example.gov" class="usa-nav__link">
<span>Search audit reports</span>
</a>
</li>
{% endcomment %}
<li class="usa-nav__primary-item">
<button class="usa-accordion__button usa-nav__link"
aria-expanded="false"
aria-controls="basic-nav-section-1">
<span>News</span>
aria-controls="nav-section-data">
<span>Data</span>
</button>
<ul id="basic-nav-section-1" class="usa-nav__submenu" hidden="">
<ul id="nav-section-data" class="usa-nav__submenu" hidden="">
<li class="usa-nav__submenu-item">
<a href="{{ STATIC_SITE_URL }}info/announcements/"
target="_blank">OMB Announcements</a>
<a href="{% url 'dissemination:Search' %}"
target="_blank">Search audits</a>
</li>
<li class="usa-nav__submenu-item">
<a href="{{ STATIC_SITE_URL }}info/updates/"
target="_blank">FAC Updates</a>
<a href="{{ STATIC_SITE_URL }}developers/"
target="_blank">API</a>
</li>
</ul>
</li>
<li class="usa-nav__primary-item">
<a class="usa-nav-link" href="{{ STATIC_SITE_URL }}audits/"
target="_blank">Audit submission</a>
</li>
<li class="usa-nav__primary-item">
<button class="usa-accordion__button usa-nav__link"
aria-expanded="false"
aria-controls="basic-nav-section-2">
<span>Resources &#38; Policy</span>
<span>Policy &#38; News</span>
</button>
<ul id="basic-nav-section-2" class="usa-nav__submenu" hidden="">
<li class="usa-nav__submenu-item">
<a href="{{ STATIC_SITE_URL }}resources/instructions/"
target="_blank">How-to</a>
</li>
<li class="usa-nav__submenu-item">
<a href="{{ STATIC_SITE_URL }}resources/workbooks/"
target="_blank">Workbooks</a>
<a href="{{ STATIC_SITE_URL }}policy/"
target="_blank">Policy</a>
</li>
<li class="usa-nav__submenu-item">
<a href="{{ STATIC_SITE_URL }}developers/"
target="_blank">Developer tools</a>
</li>
<li class="usa-nav__submenu-item">
<a href="{{ STATIC_SITE_URL }}resources/guidance/"
target="_blank">Uniform Guidance</a>
</li>
<li class="usa-nav__submenu-item">
<a href="{{ STATIC_SITE_URL }}resources/compliance/"
target="_blank">Compliance</a>
<a href="{{ STATIC_SITE_URL }}info/announcements/"
target="_blank">OMB Announcements</a>
</li>
<li class="usa-nav__submenu-item">
<a href="{{ STATIC_SITE_URL }}resources/burden-statement/"
target="_blank">Burden Statement</a>
<a href="{{ STATIC_SITE_URL }}info/updates/"
target="_blank">FAC Updates</a>
</li>
</ul>
</li>
Expand Down