Merge pull request #1887 from GSA/1886-cleaning-up-admin-and-fix-miss…

…ing-files Clean up admin folders/templates and fix missing files
GSA · Aug 22, 2024 · 6ae00ca · 6ae00ca
2 parents 4f9f546 + 13cdb10
commit 6ae00ca
Show file tree

Hide file tree

Showing 29 changed files with 17 additions and 636 deletions.
diff --git a/app/assets/error_pages/5xx.html b/app/assets/error_pages/5xx.html
@@ -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" />

diff --git a/app/templates/base.html b/app/templates/base.html
@@ -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>
@@ -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 %}
@@ -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">
@@ -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 %}

diff --git a/...plates/new/components/flash_messages.html → app/templates/components/flash_messages.html b/...plates/new/components/flash_messages.html → app/templates/components/flash_messages.html
diff --git a/app/templates/new/components/footer.html → app/templates/components/footer.html b/app/templates/new/components/footer.html → app/templates/components/footer.html
diff --git a/app/templates/new/components/head.html → app/templates/components/head.html b/app/templates/new/components/head.html → app/templates/components/head.html
@@ -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">
@@ -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 %}
diff --git a/app/templates/new/components/header.html → app/templates/components/header.html b/app/templates/new/components/header.html → app/templates/components/header.html
diff --git a/app/templates/new/components/main_nav.html → app/templates/components/main_nav.html b/app/templates/new/components/main_nav.html → app/templates/components/main_nav.html
diff --git a/app/templates/new/components/org_nav.html → app/templates/components/org_nav.html b/app/templates/new/components/org_nav.html → app/templates/components/org_nav.html
diff --git a/...es/new/components/org_nav_breadcrumb.html → ...plates/components/org_nav_breadcrumb.html b/...es/new/components/org_nav_breadcrumb.html → ...plates/components/org_nav_breadcrumb.html
diff --git a/...templates/new/components/service_nav.html → app/templates/components/service_nav.html b/...templates/new/components/service_nav.html → app/templates/components/service_nav.html
diff --git a/...emplates/new/components/settings_nav.html → app/templates/components/settings_nav.html b/...emplates/new/components/settings_nav.html → app/templates/components/settings_nav.html
diff --git a/app/templates/new/components/usa_banner.html → app/templates/components/usa_banner.html b/app/templates/new/components/usa_banner.html → app/templates/components/usa_banner.html
diff --git a/app/templates/old/admin_template.html b/app/templates/old/admin_template.html
diff --git a/app/templates/old/content_template.html b/app/templates/old/content_template.html