Merge pull request #1285 from GSA/staging

Staging

_config.yml

@@ -89,8 +89,8 @@ primary_navigation:
         url: "/federal-financial-reporting/"
       - name: Financial Management Workforce
         url: "/workforce-modernization/"
-      - name: Major Legislation
-        url:  "/major-legislation/"
+      # - name: Major Legislation
+      #   url:  "/major-legislation/"
       - name: Payment Integrity
         url: "/payment-integrity/"
       - name: Payment Integrity & Fraud Symposium
@@ -153,8 +153,9 @@ primary_navigation_coffa:
     children:
       - name: Uniform Guidance
         url: "/coffa/uniform-guidance-coffa/"
- #     - name: Training
- #      url: "/coffa/training-coffa/"
+      - name: Training
+        url: "#"
+
   - name: Resources
     url: "/coffa/resources/#focus_area=.federal-financial-assistance&sub_focus_area=*&type=*&source=*&fiscal_year=*"
 
@@ -305,4 +306,4 @@ sass:
   sourcemap: development
   quiet_deps: true
   style: compressed
-  verbose: true
+  verbose: true

_data/coffa_training_tabs_module_1.yml

@@ -0,0 +1,42 @@
+- name: overview
+  title: Overview
+  path: /coffa/training-coffa
+  content: |
+    <h2>Coming Soon</h2>
+
+    <div><p> description </p></div>
+
+- name: "module-1"
+  title: "module 1"
+  path: /coffa/training-coffa/module-1/
+  content: |+
+    <h3>Module 1 - Coming Soon</h3>
+    <div><p>more information will be added here...</p></div>
+
+        
+- name: "module-2"
+  title: "module 2"
+  path: /coffa/training-coffa/module-2/
+  content: |
+    <h3>Module 2 - Coming Soon</h3>
+    <div><p>more information will be added here...</p></div>
+
+- name: "module-3"
+  title: "module 3"
+  path: /coffa/training-coffa/module-3/
+  content: |
+    <h3>Module 3 - Coming Soon</h3>
+    <div><p>more information will be added here...</p></div>
+
+- name: "module-4"
+  title: "module 4"
+  path: /coffa/training-coffa/module-4/
+  content: >
+    <h3>Module 4 - Coming Soon</h3> <div><p>more information will be added here...</p></div>
+
+- name: "module-5"
+  title: "module 5"
+  path: /coffa/training-coffa/module-5/
+  content: |
+    
+    <h3>Module 5 - Coming Soon</h3> <div><p>more information will be added here...</p></div>

_includes/coffa-tabs.html

@@ -0,0 +1,28 @@
+{% comment %}
+This template used by CFO Tabs feature. Include your data to render.
+{% endcomment %}
+
+{% assign data = include.data %}
+
+<div id="cfo-tabs" class="grid-row clearfix">
+  <ul class="tablet:grid-col-3 shadow-5">
+    {% for tab in data %}
+    <li>
+      <a href="#{{ tab.name }}"
+         role="tab"
+         aria-controls="{{ tab.name }}"
+         data-path="{{site.baseurl}}{{ tab.path }}"
+         id="tab-btn-{{ tab.name }}"
+         class="text-no-underline text-base-darker font-sans-md"
+      >{{ tab.title }}</a></li>
+    {% endfor %}
+  </ul>
+
+  {% for tab in data %}
+  <div id="{{ tab.name }}" tabindex="0" role="tabpanel" aria-labelledby="tab-btn-{{ tab.name }}"
+       class="tablet:grid-col-9 ui-tabs-panel ui-corner-bottom ui-widget-content padding-4">
+    {{ tab.content | replace: '[site_baseurl]', site.baseurl }}
+  </div>
+  {% endfor %}
+
+</div>

_includes/meta.html

@@ -29,6 +29,9 @@
     <meta property="og:title" content="CFO.gov | {{page.title}}">
     {% endif %}
 
+
+    <script src="{{ site.baseurl }}/assets/js/purify.min.js"></script>
+
     <!-- <meta name="description" content="{{page.description}}"> -->
     <meta name="keyword" content="{{page.keyword}}">
 

_includes/welcome.html

@@ -34,17 +34,15 @@ <h2 class="text-primary-darker">Our Work</h2>
                     <p class="font-heading-md f-weight-600">Financial Management Workforce</p>
                 </a>
             </div>
-            <div class="tablet:grid-col-4 text-center margin-y-1">
+            <!-- <div class="tablet:grid-col-4 text-center margin-y-1">
                 <a href="{{site.baseurl}}/major-legislation/" class="text-no-underline text-gray-70"
                     style="display: inline-block;">
                     <div class="circle-image picons bg-white"> 
                         <img class="picon-svg" src="{{site.baseurl}}/assets/images/logos/major-legislation.svg" alt="Major Legislation logo" />
                     </div>
                     <p class="font-heading-md f-weight-600">Major Legislation</p>
                 </a>
-            </div>
-        </div>
-        <div class="grid-row margin-x-10 flex-row">
+            </div> -->
             <div class="tablet:grid-col-4 text-center margin-y-1">
                 <a href="{{site.baseurl}}/payment-integrity/" class="text-no-underline text-gray-70"
                     style="display: inline-block;">
@@ -54,6 +52,8 @@ <h2 class="text-primary-darker">Our Work</h2>
                     <p class="font-heading-md f-weight-600">Payment Integrity</p>
                 </a>
             </div>
+        </div>
+        <div class="grid-row margin-x-10 flex-row">
             <div class="tablet:grid-col-4 text-center margin-y-1">
                 <a href="{{site.baseurl}}/payment-integrity-fraud-symposium/" class="text-no-underline text-gray-70"
                     style="display: inline-block;">

_layouts/priority-copy-coffa.html

@@ -8,7 +8,7 @@
 <section class="usa-hero grid-container about-the-council {% unless page.priority_icons %} margin-bottom-4{% endunless %}">
     <div class="grid-row grid-gap flex-align-center div-height">
         <div class="tablet:grid-col-auto tablet:grid-offset-1 text-center">
-            <img class="circle-card tablet:float-left" src="{{site.baseurl}}/assets/images/logos/{{ page.type }}.svg"
+            <img class="circle-card tablet:float-left" src="{{site.baseurl}}/assets/images/logos/training.svg"
                  alt="{{ page.type }}" />
         </div>
         <div class="tablet:grid-col-8 margin-left-2 margin-right-2">
@@ -91,5 +91,8 @@ <h1 class="margin-0 font-ui-2xl text-normal">{{ page.title }}</h1>
     {% if page.type == "uniform-guidance-coffa" %}
     {% include cfo-tabs.html data = site.data.coffa_ug_tabs %}
     {% endif %}
+    {% if page.type == "training-coffa" %}
+    {% include coffa-tabs.html data = site.data.coffa_training_tabs_module_1 %}
+    {% endif %}
 
 </section>

_layouts/training-coffa.html

@@ -0,0 +1,97 @@
+---
+
+layout: coffa-default
+title: Priority
+
+---
+
+<section class="usa-hero grid-container about-the-council {% unless page.priority_icons %} margin-bottom-4{% endunless %}">
+    <div class="grid-row grid-gap flex-align-center div-height">
+        <div class="tablet:grid-col-auto tablet:grid-offset-1 text-center">
+            <img class="circle-card tablet:float-left" src="{{site.baseurl}}/assets/images/logos/{{ page.type }}.svg"
+                 alt="{{ page.type }}" />
+        </div>
+        <div class="tablet:grid-col-8 margin-left-2 margin-right-2">
+            <div class="priority-tag-line">
+                <h1 class="margin-0 font-ui-2xl text-normal">{{ page.title }}</h1>
+            </div>
+            <div class="priority-tag-line">
+                <p class="margin-0 font-sans-md">{{ page.description1 }}</p>
+            </div>
+            {% if page.type == "career-planning-training-tool" %}
+                <a class="margin-top-1 text-no-underline margin-bottom-1 text-green usa-button usa-button--secondary bg-yellow border-0 padding-2" href="{{site.baseurl}}/career-planning-tool/" aria-label="Career Planning & Training Tool button">Career Planning & Training Tool</a>
+            {% endif %}
+        </div>
+    </div>
+</section>
+
+
+<!--All icons and text for each priority area are referenced in the respective md file under prioritypages folder-->
+{% if page.priority_icons %}
+<section class="usa-graphic-list usa-section usa-prose clearfix">
+
+    <div class="grid-row clearfix grid-container priority-icons">
+
+        {% for icon in page.priority_icons %}
+        {% if page.number_of_icons >= 4 %}
+        <div class="tablet:grid-col-4 text-center margin-bottom-2 margin-top-3">
+            {% endif %}
+            {% if page.number_of_icons <= 3 %}
+            <div class="tablet:grid-col-4 text-center margin-y-10">
+                {% endif %}
+                {% if icon.url %}
+                <a href="{{ site.baseurl }}{{ icon.url }}" class="text-no-underline text-gray-70" style="display: inline-block;">
+                    {% else %}
+                    <a href="{{ icon.link }}" class="text-no-underline" style="display: inline-block;" {% if icon.id %} id="{{ icon.id }}" {% endif %}>
+                        {% endif %}
+                        <div class="circle-image picons bg-white">
+                            <img class="picon" src="{{site.baseurl}}{{ icon.logo }}" alt="{{ icon.name }} image" />
+                        </div>
+                        <p class="font-heading-md text-gray-70 text-no-underline">{{ icon.name }}</p>
+                    </a>
+            </div>
+            {% endfor %}
+        </div>
+    </div>
+</section>
+{% endif %}
+
+{% if page.type == "symposium" %}
+{% include priority_payment-integirty-fraud-symposium.html %}
+{% endif %}
+
+<div class="grid-container grid-gap">{{ content }}</div>
+
+<section class="grid-container grid-gap usa-graphic-list clearfix tabSection">
+
+    {% if page.type == "payment-integrity" %}
+    {% include cfo-tabs.html data = site.data.pi_tabs %}
+    {% endif %}
+
+    {% if page.type == "workforce-modernization" %}
+    {% include cfo-tabs.html data = site.data.workforce_modernization_tabs %}
+    {% endif %}
+
+    {% if page.type == "major-legislation" %}
+    {% include cfo-tabs.html data = site.data.ml_tabs %}
+    {% endif %}
+
+    {% if page.type == "ffr" %}
+    {% include cfo-tabs.html data = site.data.ffr_tabs %}
+    {% endif %}
+
+    {% if page.type == "ffa" %}
+    {% include cfo-tabs.html data = site.data.ffa_tabs %}
+    {% endif %}
+
+    {% if page.type == "symposium" %}
+    {% include cfo-tabs.html data = site.data.pifss_tabs %}
+    {% endif %}
+
+    {% if page.type == "uniform-guidance-coffa" %}
+    {% include cfo-tabs.html data = site.data.coffa_ug_tabs %}
+    {% if page.type == "training-coffa" %}
+    {% include coffa-tabs.html data = site.data.coffa_training_tabs_module_1 %}
+    {% endif %}
+
+</section>

_pages/coffa/assets/js/app.js

@@ -21,7 +21,8 @@ window.addEventListener('pageshow', function(event) {
         '/workforce-modernization',
         '/major-legislation',
         '/payment-integrity',
-        '/coffa/uniform-guidance-coffa'
+        '/coffa/uniform-guidance-coffa',
+        '/coffa/training-coffa/'
     ];
 
     var shouldReload = urlsToCheck.some(function(url) {

_pages/coffa/training-module.md

@@ -0,0 +1,22 @@
+---
+layout: coffa-default
+title: Training Module
+permalink: /coffa/training-coffa
+description:
+---
+
+
+<section class="usa-hero grid-container about-the-council">
+    <div class="grid-row grid-gap flex-align-center">
+        <div class="tablet:grid-col-auto tablet:grid-offset-1 text-center">
+            <img class="circle-card tablet:float-left"  src="{{site.baseurl}}/assets/images/logos/training.svg"
+                 alt="COFFA Training Logo" />
+        </div>
+        <div class="tablet:grid-col-8 margin-left-2 margin-right-2">
+            <div class="priority-tag-line">
+                <h1 class="margin-0 font-ui-2xl text-normal">{{ page.title }}</h1>
+            </div>
+        </div>
+    </div>
+</section>
+

_pages/coffa/training.md

@@ -3,7 +3,7 @@ layout: resources-landing-coffa
 title: "Federal Financial Assistance Training"
 subtitle: "Federal Financial Assistance Training"
 filters: federal-financial-assistance training omb
-permalink: coffa/training-coffa/
+permalink: coffa/training-coffa/1
 fiscal_year:
 ---
 

_pages/coffa/welcome.html

@@ -23,12 +23,13 @@ <h2 class="text-primary-darker">MAJOR INITIATIVES</h2>
             </div>
             <div class="tablet:grid-col-4 text-center margin-y-1">
                 <a class="text-no-underline text-gray-70"
-                    style="display: inline-block;">
+                    style="display: inline-block;" href="#"> 
                     <div class="circle-image picons bg-white"> 
                         <img class="picon-svg-homepage" src="../coffa/assets/images/training.svg" alt="Training logo" />
                     </div>
                     <p class="font-heading-md f-weight-600">Training</p>
                     <p class="font-heading-md f-weight-600">(Coming Soon)</p>
+
                 </a>
             </div>
             <div class="tablet:grid-col-4 text-center margin-y-1">

_pages/payment-accuracy/assets/app.js

@@ -22,7 +22,8 @@ window.addEventListener('pageshow', function(event) {
         '/financial-management-workforce',
         '/major-legislation',
         '/payment-integrity',
-        '/coffa/uniform-guidance-coffa'
+        '/coffa/uniform-guidance-coffa',
+        '/coffa/training-coffa'
     ];
 
     var shouldReload = urlsToCheck.some(function(url) {

_pages/payment-accuracy/assets/js/search.js

@@ -1,4 +1,3 @@
-import DOMPurify from 'dompurify';
 
 document.addEventListener("DOMContentLoaded", function () {
     var searchResults = document.getElementById("search-results");

_resources-coffa/training.md

@@ -0,0 +1,19 @@
+---
+layout: resources-landing
+title: "Uniform Guidance: Title 2 of the Code of Federal Regulations"
+subtitle: "Uniform Guidance: Title 2 of the Code of Federal Regulations"
+permalink: /resources-coffa/training/
+filters: federal-financial-assistance guidance 2013
+fiscal_year: 2013
+---
+
+Title 2 of the Code of Federal Regulations, also known as the “Uniform Guidance”, consists of Administrative Requirements, Cost Principles, and Audit Requirements for Federal Awards. It was issued by The Office of Management and Budget’s (OMB) on December 26, 2013 and was compiled from previously separate OMB circulars that addressed separately administrative requirements, audits, and cost principles for specific entities such as States and local governments, non-profit organizations, institutions of higher education, and Indian Tribes. The overarching goal of the Uniform Guidance is to improve program performance, reduce the administrative burden on award recipients and mitigate the risk of the inappropriate use of Federal funds. 2 CFR is considered guidance and not regulation.
+
+OMB Guidance contained in Title 2 Subtitle A and applicable to Federal financial assistance includes 2 CFR 25 Universal Identifier and System for Award Management; 2 CFR 170 Reporting Subaward and Executive Compensation Information; and 2 CFR 180 OMB Guidelines to Agencies on Governmentwide Debarment and Suspension, and Part 184 Buy America Preferences for Infrastructure Projects. The guidance also includes several appendices, including Appendix I: Full Text of Notice of Funding Opportunity.  Similarly, agencies publish their own regulations adopting the Uniform Guidance, with some published exceptions, in Title 2 Subtitle B.
+
+In 2024, OMB <a href="{{site.baseurl}}/assets/files/Final 2 CFR Guidance - 4.3.2024 - Pre-Publication Version.pdf" aria-label="Pre-publication Version">released</a> an updated version of the <a href="https://www.federalregister.gov/documents/2024/04/22/2024-07496/guidance-for-federal-financial-assistance" target="_blank">Uniform Guidance</a>, a redline document showing the 2024 revisions (<a href="{{site.baseurl}}/assets/files/2 CFR Revisions 2024 Redline.pdf" aria-label="2 CFR Revisions 2024 Redline PDF version">PDF</a> and <a href="{{site.baseurl}}/assets/files/2 CFR Revisions 2024 Redline.docx" aria-label="2 CFR Revisions 2024 Redline Word version">Word</a>), and issued an accompanying <a href="https://www.whitehouse.gov/wp-content/uploads/2024/04/M-24-11-Revisions-to-2-CFR.pdf" target="_blank">implementation memorandum</a> as well as <a href="{{site.baseurl}}/assets/files/Uniform Guidance _Reference Guides FINAL 4-2024.pdf">reference guides</a>.
+
+<h2>April 4, 2024: Uniform Guidance Revisions Launch</h2>
+<div style="padding:56.25% 0 0 0;position:relative;"><iframe src="https://player.vimeo.com/video/935454224?h=5962b7e124&amp;badge=0&amp;autopause=0&amp;player_id=0&amp;app_id=58479" frameborder="0" allow="autoplay; fullscreen; picture-in-picture; clipboard-write" style="position:absolute;top:0;left:0;width:100%;height:100%;" title="OMB Announces Release of the 2024 Uniform Grants Guidance"></iframe></div><script src="https://player.vimeo.com/api/player.js"></script>
+
+<a class="padding-y-105 padding-x-4 margin-top-1 text-no-underline text-white margin-bottom-1 usa-button bg-yellow border-0 padding-1" href="{{site.baseurl}}/resources/#focus_area=*&sub_focus_area=*&type=.guidance&source=*&fiscal_year=*" aria-label="Guidance related resources">Resources</a>

assets/js/app.js

@@ -21,7 +21,8 @@ window.addEventListener('pageshow', function(event) {
         '/workforce-modernization',
         '/major-legislation',
         '/payment-integrity',
-        '/coffa/uniform-guidance-coffa'
+        '/coffa/uniform-guidance-coffa',
+        '/coffa/training-coffa'
     ];
 
     var shouldReload = urlsToCheck.some(function(url) {

assets/js/search.js

@@ -1,4 +1,3 @@
-import DOMPurify from 'dompurify';
 
 document.addEventListener("DOMContentLoaded", function () {
     var searchResults = document.getElementById("search-results");

assets/js/slick.js

@@ -15,7 +15,6 @@
 
  */
 /* global window, document, define, jQuery, setInterval, clearInterval */
-import DOMPurify from 'dompurify';
 (function (factory) {
     'use strict';
     if (typeof define === 'function' && define.amd) {
@@ -29,7 +28,6 @@ import DOMPurify from 'dompurify';
 }(function ($) {
     'use strict';
     var Slick = window.Slick || {};
-    var DOMPurify = require('dompurify');
 
     Slick = (function () {