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

Clean up admin folders/templates and fix missing files #1887

Merged
merged 3 commits into from
Aug 22, 2024
Merged

Clean up admin folders/templates and fix missing files #1887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91f79f6
update webmanifest url to fix broken link
Aug 20, 2024
10b65ef
removed new folder and moved components to components folder
Aug 20, 2024
13cdb10
Merge branch 'main' into 1886-cleaning-up-admin-and-fix-missing-files
Aug 22, 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
2 changes: 1 addition & 1 deletion app/assets/error_pages/5xx.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
href="/static/images/apple-touch-icon.png?a0f7e1b728a42016b247dc54ee40d055">
<link rel="icon" type="image/png" sizes="32x32" href="/static/images/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/static/images/favicon-16x16.png">
<link rel="manifest" href="/static/images/site.webmanifest">
<link rel="manifest" href="{{ asset_url('images/site.webmanifest') }}">

<link rel="stylesheet" media="screen" href="/static/stylesheets/main.css?d077f86473501ab244de0b30600536ee" />
<link rel="stylesheet" media="print" href="/static/stylesheets/print.css?28010888ca5719dc83d7c2c80f6ed2b2" />
Expand Down
10 changes: 5 additions & 5 deletions app/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{% block per_page_title %}{% endblock %} – Notify.gov
{% endblock %}
</title>
{% include "new/components/head.html" %}
{% include "components/head.html" %}
</head>
<body class="usa-template__body {{ bodyClasses }}">
<script nonce="{{ csp_nonce() }}">document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');</script>
Expand All @@ -32,8 +32,8 @@


{% block header %}
{% include 'new/components/usa_banner.html' %}
{% include 'new/components/header.html' %}
{% include 'components/usa_banner.html' %}
{% include 'components/header.html' %}
{% endblock %}

{% block main %}
Expand All @@ -47,7 +47,7 @@
{% endblock %}
{% block content %}
{% block flash_messages %}
{% include 'new/components/flash_messages.html' %}
{% include 'components/flash_messages.html' %}
{% endblock %}
{% block maincolumn_content %}
<div class="grid-row">
Expand Down Expand Up @@ -78,7 +78,7 @@
{% set meta_suffix = "Built by the " + long_link + commit_hash %}
{% endif %}

{% include "new/components/footer.html" %}
{% include "components/footer.html" %}

{% if current_user.is_authenticated %}
{% block sessionUserWarning %}
Expand Down
0 ...plates/new/components/flash_messages.html → app/templates/components/flash_messages.html
View file
Open in desktop
File renamed without changes.
0 app/templates/new/components/footer.html → app/templates/components/footer.html
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions app/templates/new/components/head.html → app/templates/components/head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<link rel="icon" type="image/png" sizes="16x16" href="{{ assetPath | default('/static') }}/images/favicon-16x16.png" />
<link rel="mask-icon" href="{{ assetPath | default('/static') }}/images/safari-pinned-tab.svg" color="#5bbad5">
<link rel="apple-touch-icon" sizes="180x180" href="{{ assetPath | default('/static') }}/images/apple-touch-icon.png">
<link rel="manifest" href="/site.webmanifest">
<link rel="manifest" href="{{ asset_url('images/site.webmanifest') }}">
<meta name="msapplication-TileColor" content="#da532c">
<link href="{{ assetPath | default('/static') }}/images/notify-dark-favicon.png" rel="icon" media="(prefers-color-scheme: dark)">
<meta name="theme-color" content="#ffffff">
Expand All @@ -30,7 +30,7 @@
<meta property="og:image" content="/static/images/notify-og-image.png">
{# google #}
<script type="text/javascript" src="{{ asset_url('js/gtm_head.js') }}"></script>
<meta name="google-site-verification" content="niWnSqImOWz6mVQTYqNb5tFK8HaKSB4b3ED4Z9gtUQ0" />
<meta name="google-site-verification" content="niWnSqImOWz6mVQTYqNb5tFK8HaKSB4b3ED4Z9gtUQ0" /> {# pragma: allowlist secret #}
{% if g.hide_from_search_engines %}
<meta name="robots" content="noindex" />
{% endif %}
0 app/templates/new/components/header.html → app/templates/components/header.html
View file
Open in desktop
File renamed without changes.
0 app/templates/new/components/main_nav.html → app/templates/components/main_nav.html
View file
Open in desktop
File renamed without changes.
0 app/templates/new/components/org_nav.html → app/templates/components/org_nav.html
View file
Open in desktop
File renamed without changes.
0 ...es/new/components/org_nav_breadcrumb.html → ...plates/components/org_nav_breadcrumb.html
View file
Open in desktop
File renamed without changes.
0 ...templates/new/components/service_nav.html → app/templates/components/service_nav.html
View file
Open in desktop
File renamed without changes.
0 ...emplates/new/components/settings_nav.html → app/templates/components/settings_nav.html
View file
Open in desktop
File renamed without changes.
0 app/templates/new/components/usa_banner.html → app/templates/components/usa_banner.html
View file
Open in desktop
File renamed without changes.
302 changes: 0 additions & 302 deletions app/templates/old/admin_template.html
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions app/templates/old/content_template.html
View file
Open in desktop

This file was deleted.

Loading
Loading