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

4632 - Adding DAP script tag into the CKAN footer template #186

Merged
merged 9 commits into from
Mar 12, 2024
Merged

4632 - Adding DAP script tag into the CKAN footer template #186

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
81a5874
Adding script tag into the CKAN footer template
dlennox24 Mar 1, 2024
2e62bb5
Moving identifier snippet into footer template snippet
dlennox24 Mar 1, 2024
a2380f5
Creating scripts template snippet and putting in page template
dlennox24 Mar 1, 2024
6e4d746
Cleaning up old identifier template snippet html file
dlennox24 Mar 1, 2024
a1d50cd
reverting removal of identifier snippet and using include statement i…
dlennox24 Mar 11, 2024
2d8a408
Update docker-compose.yml
jbrown-xentity Mar 11, 2024
5887994
Update docker-compose.yml
jbrown-xentity Mar 11, 2024
2e3bcd2
Merge branch 'main' into 4632_resolve-dap-script-regression
dlennox24 Mar 11, 2024
0d07814
Bumping version to 0.2.14
dlennox24 Mar 12, 2024
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
73 changes: 40 additions & 33 deletions ckanext/datagovtheme/templates/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,44 @@
<footer class="usa-footer site-footer" role="contentinfo">
<div class="footer-section-bottom bg-base-lighter">
<div class="grid-container">
<div class="grid-row padding-y-3">
<div class="tablet:grid-col-auto">
<div class="logo-links">
<a class="footer-logo media_link" href="https://data.gov">
<img
class="width-30 height-auto"
src="https://s3-us-gov-west-1.amazonaws.com/cg-0817d6e3-93c4-4de8-8b32-da6919464e61/logo.png"
alt="Data.gov logo"
/>
</a>
</div>
<ul class="grid-row grid-gap" id="menu-footer2">
{% snippet "snippets/footer2_menu.html" %} {% if c.userobj%}
<li><a href="{{ h.url_for('/user/_logout') }}" class="local-link"> {{ _('Logout') }}</a></li>
{% else %}
<li><a href="{{ h.get_login_url() }}" class="local-link"> {{ _('Login') }}</a></li>
{% endif %}
</ul>
</div>
<div class="tablet:grid-col"></div>
<div class="tablet:grid-col">
<ul class="add-list-reset">
<li>
<a href="https://twitter.com/usdatagov"><i class="fa fa-twitter"></i><span>Twitter</span></a>
</li>
<li>
<a href="https://github.com/GSA/data.gov"><i class="fa fa-github"></i><span>Github</span></a>
</li>
</ul>
</div>
</div>
<div class="footer-section-bottom bg-base-lighter">
<div class="grid-container">
<div class="grid-row padding-y-3">
<div class="tablet:grid-col-auto">
<div class="logo-links">
<a class="footer-logo media_link" href="https://data.gov">
<img
class="width-30 height-auto"
src="https://s3-us-gov-west-1.amazonaws.com/cg-0817d6e3-93c4-4de8-8b32-da6919464e61/logo.png"
alt="Data.gov logo"
/>
</a>
</div>
<ul class="grid-row grid-gap" id="menu-footer2">
{% snippet "snippets/footer2_menu.html" %} {% if c.userobj%}
<li>
<a href="{{ h.url_for('/user/_logout') }}" class="local-link"> {{ _('Logout') }}</a>
</li>
{% else %}
<li><a href="{{ h.get_login_url() }}" class="local-link"> {{ _('Login') }}</a></li>
{% endif %}
</ul>
</div>
<div class="tablet:grid-col"></div>
<div class="tablet:grid-col">
<ul class="add-list-reset">
<li>
<a href="https://twitter.com/usdatagov"
><i class="fa fa-twitter"></i><span>Twitter</span></a
>
</li>
<li>
<a href="https://github.com/GSA/data.gov"
><i class="fa fa-github"></i><span>Github</span></a
>
</li>
</ul>
</div>
</div>
</div>
</div>
{% include "snippets/identifier.html" %}
</footer>
dlennox24 marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion ckanext/datagovtheme/templates/page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<div class="alert alert-dismissible fade show {{ category }}">{{ h.literal(message) }}</div>
{% endfor %}
</div>
{% endif %} {% endblock %} {% block footer %} {% include "footer.html" %} {% include "snippets/identifier.html" %} {%
{% endif %} {% endblock %} {% block footer %} {% include "footer.html" %} {% include "snippets/scripts.html" %} {%
endblock %}
</div>
273 changes: 163 additions & 110 deletions ckanext/datagovtheme/templates/snippets/identifier.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,116 +1,169 @@
<div class="usa-identifier">
<section class="usa-identifier__section usa-identifier__section--masthead" aria-label="Agency identifier,,,">
<div class="grid-container-widescreen">
<div class="usa-identifier__container">
<div class="usa-identifier__logos">
<div class="usa-identifier__logo">
<img class="usa-identifier__logo-img" alt="GSA logo" role="img"
src="https://s3-us-gov-west-1.amazonaws.com/cg-0817d6e3-93c4-4de8-8b32-da6919464e61/gsa_starmark.png"/>
</div>
</div>
<div class="usa-identifier__identity" aria-label="Agency description">
<p class="usa-identifier__identity-domain">data.gov</p>
<p class="usa-identifier__identity-disclaimer">An official website of the GSA's <a
href="https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services"
class="usa-identifier__required-link usa-link"
>Technology Transformation Services</a>
<svg class="usa-icon" aria-hidden="true" role="img">
<use xlink:href="#svg-launch"></use>
<symbol viewBox="0 0 24 24" id="svg-launch" xmlns="http://www.w3.org/2000/svg"><path d="M19 19H5V5h7V3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"></path></symbol>
</svg>
</p>
</div>
</div>
<section
class="usa-identifier__section usa-identifier__section--masthead"
aria-label="Agency identifier,,,"
>
<div class="grid-container-widescreen">
<div class="usa-identifier__container">
<div class="usa-identifier__logos">
<div class="usa-identifier__logo">
<img
class="usa-identifier__logo-img"
alt="GSA logo"
role="img"
src="https://s3-us-gov-west-1.amazonaws.com/cg-0817d6e3-93c4-4de8-8b32-da6919464e61/gsa_starmark.png"
/>
</div>
</div>
</section>
<nav class="usa-identifier__section usa-identifier__section--required-links" aria-label="Important links,,,">
<div class="usa-identifier__container">
<ul class="usa-identifier__required-links-list">
<li class="usa-identifier__required-links-item">
<a href="https://www.gsa.gov/about-us" class="usa-identifier__required-link usa-link">About GSA</a>
<svg class="usa-icon" aria-hidden="true" role="img">
<use xlink:href="#svg-launch"></use>
<symbol viewBox="0 0 24 24" id="svg-launch" xmlns="http://www.w3.org/2000/svg"><path d="M19 19H5V5h7V3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"></path></symbol>
</svg>
</li>
<li class="usa-identifier__required-links-item">
<a
href="https://www.gsa.gov/website-information/website-policies#accessibility"
class="usa-identifier__required-link usa-link"
>Accessibility support</a
>
<svg class="usa-icon" aria-hidden="true" role="img">
<use xlink:href="#svg-launch"></use>
<symbol viewBox="0 0 24 24" id="svg-launch" xmlns="http://www.w3.org/2000/svg"><path d="M19 19H5V5h7V3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"></path></symbol>
</svg>
</li>
<li class="usa-identifier__required-links-item">
<a
href="https://www.gsa.gov/reference/freedom-of-information-act-foia"
class="usa-identifier__required-link usa-link"
>FOIA requests</a
>
<svg class="usa-icon" aria-hidden="true" role="img">
<use xlink:href="#svg-launch"></use>
<symbol viewBox="0 0 24 24" id="svg-launch" xmlns="http://www.w3.org/2000/svg"><path d="M19 19H5V5h7V3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"></path></symbol>
</svg>
</li>
<li class="usa-identifier__required-links-item">
<a
href="https://www.gsa.gov/reference/civil-rights-programs/notification-and-federal-employee-antidiscrimination-and-retaliation-act-of-2002"
class="usa-identifier__required-link usa-link"
>No FEAR Act data</a
>
<svg class="usa-icon" aria-hidden="true" role="img">
<use xlink:href="#svg-launch"></use>
<symbol viewBox="0 0 24 24" id="svg-launch" xmlns="http://www.w3.org/2000/svg"><path d="M19 19H5V5h7V3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"></path></symbol>
</svg>
</li>
<li class="usa-identifier__required-links-item">
<a href="https://www.gsaig.gov" class="usa-identifier__required-link usa-link"
>Office of the Inspector General</a
>
<svg class="usa-icon" aria-hidden="true" role="img">
<use xlink:href="#svg-launch"></use>
<symbol viewBox="0 0 24 24" id="svg-launch" xmlns="http://www.w3.org/2000/svg"><path d="M19 19H5V5h7V3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"></path></symbol>
</svg>
</li>
<li class="usa-identifier__required-links-item">
<a
href="https://www.gsa.gov/reference/reports/budget-performance"
class="usa-identifier__required-link usa-link"
>Performance reports</a
>
<svg class="usa-icon" aria-hidden="true" role="img">
<use xlink:href="#svg-launch"></use>
<symbol viewBox="0 0 24 24" id="svg-launch" xmlns="http://www.w3.org/2000/svg"><path d="M19 19H5V5h7V3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"></path></symbol>
</svg>
</li>
<li class="usa-identifier__required-links-item">
<a
href="https://www.gsa.gov/website-information/website-policies#privacy"
class="usa-identifier__required-link usa-link"
>Privacy policy</a
>
<svg class="usa-icon" aria-hidden="true" role="img">
<use xlink:href="#svg-launch"></use>
<symbol viewBox="0 0 24 24" id="svg-launch" xmlns="http://www.w3.org/2000/svg"><path d="M19 19H5V5h7V3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"></path></symbol>
</svg>
</li>
</ul>
</div>
</nav>
<section
class="usa-identifier__section usa-identifier__section--usagov"
aria-label="U.S. government information and services,,,"
>
<div class="usa-identifier__container">
<div class="usa-identifier__usagov-description">Looking for U.S. government information and services?</div>
<a href="https://www.usa.gov/" class="usa-link">Visit USA.gov</a>
<div class="usa-identifier__identity" aria-label="Agency description">
<p class="usa-identifier__identity-domain">data.gov</p>
<p class="usa-identifier__identity-disclaimer">
An official website of the GSA's
<a
href="https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services"
class="usa-identifier__required-link usa-link"
>Technology Transformation Services</a
>
<svg class="usa-icon" aria-hidden="true" role="img">
<use xlink:href="#svg-launch"></use>
<symbol viewBox="0 0 24 24" id="svg-launch" xmlns="http://www.w3.org/2000/svg"><path d="M19 19H5V5h7V3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"></path></symbol>
<use xlink:href="#svg-launch"></use>
<symbol viewBox="0 0 24 24" id="svg-launch" xmlns="http://www.w3.org/2000/svg">
<path
d="M19 19H5V5h7V3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"
></path>
</symbol>
</svg>
</p>
</div>
</section>
</div>
</div>
</section>
<nav
class="usa-identifier__section usa-identifier__section--required-links"
aria-label="Important links,,,"
>
<div class="usa-identifier__container">
<ul class="usa-identifier__required-links-list">
<li class="usa-identifier__required-links-item">
<a href="https://www.gsa.gov/about-us" class="usa-identifier__required-link usa-link"
>About GSA</a
>
<svg class="usa-icon" aria-hidden="true" role="img">
<use xlink:href="#svg-launch"></use>
<symbol viewBox="0 0 24 24" id="svg-launch" xmlns="http://www.w3.org/2000/svg">
<path
d="M19 19H5V5h7V3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"
></path>
</symbol>
</svg>
</li>
<li class="usa-identifier__required-links-item">
<a
href="https://www.gsa.gov/website-information/website-policies#accessibility"
class="usa-identifier__required-link usa-link"
>Accessibility support</a
>
<svg class="usa-icon" aria-hidden="true" role="img">
<use xlink:href="#svg-launch"></use>
<symbol viewBox="0 0 24 24" id="svg-launch" xmlns="http://www.w3.org/2000/svg">
<path
d="M19 19H5V5h7V3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"
></path>
</symbol>
</svg>
</li>
<li class="usa-identifier__required-links-item">
<a
href="https://www.gsa.gov/reference/freedom-of-information-act-foia"
class="usa-identifier__required-link usa-link"
>FOIA requests</a
>
<svg class="usa-icon" aria-hidden="true" role="img">
<use xlink:href="#svg-launch"></use>
<symbol viewBox="0 0 24 24" id="svg-launch" xmlns="http://www.w3.org/2000/svg">
<path
d="M19 19H5V5h7V3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"
></path>
</symbol>
</svg>
</li>
<li class="usa-identifier__required-links-item">
<a
href="https://www.gsa.gov/reference/civil-rights-programs/notification-and-federal-employee-antidiscrimination-and-retaliation-act-of-2002"
class="usa-identifier__required-link usa-link"
>No FEAR Act data</a
>
<svg class="usa-icon" aria-hidden="true" role="img">
<use xlink:href="#svg-launch"></use>
<symbol viewBox="0 0 24 24" id="svg-launch" xmlns="http://www.w3.org/2000/svg">
<path
d="M19 19H5V5h7V3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"
></path>
</symbol>
</svg>
</li>
<li class="usa-identifier__required-links-item">
<a href="https://www.gsaig.gov" class="usa-identifier__required-link usa-link"
>Office of the Inspector General</a
>
<svg class="usa-icon" aria-hidden="true" role="img">
<use xlink:href="#svg-launch"></use>
<symbol viewBox="0 0 24 24" id="svg-launch" xmlns="http://www.w3.org/2000/svg">
<path
d="M19 19H5V5h7V3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"
></path>
</symbol>
</svg>
</li>
<li class="usa-identifier__required-links-item">
<a
href="https://www.gsa.gov/reference/reports/budget-performance"
class="usa-identifier__required-link usa-link"
>Performance reports</a
>
<svg class="usa-icon" aria-hidden="true" role="img">
<use xlink:href="#svg-launch"></use>
<symbol viewBox="0 0 24 24" id="svg-launch" xmlns="http://www.w3.org/2000/svg">
<path
d="M19 19H5V5h7V3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"
></path>
</symbol>
</svg>
</li>
<li class="usa-identifier__required-links-item">
<a
href="https://www.gsa.gov/website-information/website-policies#privacy"
class="usa-identifier__required-link usa-link"
>Privacy policy</a
>
<svg class="usa-icon" aria-hidden="true" role="img">
<use xlink:href="#svg-launch"></use>
<symbol viewBox="0 0 24 24" id="svg-launch" xmlns="http://www.w3.org/2000/svg">
<path
d="M19 19H5V5h7V3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"
></path>
</symbol>
</svg>
</li>
</ul>
</div>
</nav>
<section
class="usa-identifier__section usa-identifier__section--usagov"
aria-label="U.S. government information and services,,,"
>
<div class="usa-identifier__container">
<div class="usa-identifier__usagov-description">
Looking for U.S. government information and services?
</div>
<a href="https://www.usa.gov/" class="usa-link">Visit USA.gov</a>
<svg class="usa-icon" aria-hidden="true" role="img">
<use xlink:href="#svg-launch"></use>
<symbol viewBox="0 0 24 24" id="svg-launch" xmlns="http://www.w3.org/2000/svg">
<path
d="M19 19H5V5h7V3H5a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14c1.1 0 2-.9 2-2v-7h-2v7zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3h-7z"
></path>
</symbol>
</svg>
</div>
</section>
</div>
6 changes: 6 additions & 0 deletions ckanext/datagovtheme/templates/snippets/scripts.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<!-- https://digital.gov/guides/dap/add-your-site-dap/ -->
<!-- https://github.com/digital-analytics-program/gov-wide-code/blob/master/documentation/GSA%20DAP%204.1%20-%20Quick%20Guide.pdf -->
<script
id="_fed_an_ua_tag"
src="https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js?agency=GSA&subagency=TTS"
></script>
Loading