Merge branch 'main' into nl-add-touchpoints-to-job-board

config/gulp/file-prep.js

@@ -1,6 +1,5 @@
 const { src, series } = require("gulp");
 const sharp = require("sharp");
-const del = require("del");
 const tap = require("gulp-tap");
 const sizeOf = require("image-size");
 const fs = require("fs");
@@ -205,12 +204,17 @@ function cleanFileName(origfilename) {
  * removes files in content/images/_inbox directories
  * keeps _inbox/__add image or static files to this folder__
  */
-function cleanInbox() {
-  return del([
-    "content/uploads/_inbox/**",
-    "!content/uploads/_inbox",
-    "!content/uploads/_inbox/__add image or static files to this folder__",
-  ]);
+function cleanInbox(done) {
+  const inboxDir = `${filePaths.uploads}`;
+  const filesToDelete = fs
+    .readdirSync(inboxDir)
+    .filter((file) => file !== "__add image or static files to this folder__");
+
+  filesToDelete.forEach((file) => {
+    const filePath = path.join(inboxDir, file);
+    fs.unlinkSync(filePath);
+  });
+  done();
 }
 
 /**

config/gulp/file-process.js

@@ -2,7 +2,6 @@ const { series } = require("gulp");
 const sharp = require("sharp");
 const fs = require("fs");
 const path = require("path");
-const del = require("del");
 
 /**
  * Set input and output directories for image processing
@@ -136,7 +135,7 @@ async function processImages() {
         const imageToProcess = getImageDetails(image);
         return Promise.all([
           processImageOriginal(imageToProcess),
-          processImageVariants(imageToProcess)
+          processImageVariants(imageToProcess),
         ]);
       });
 
@@ -156,12 +155,17 @@ async function processImages() {
  */
 function removeProcessedImage() {
   return new Promise((resolve, reject) => {
-    const imageDir = "content/uploads/_working-images/processed";
-
-    if (fs.existsSync(imageDir) && fs.readdirSync(imageDir).length > 0) {
-      return del([
-        "content/uploads/_working-images/to-process",
-      ]).then(() => resolve()).catch((err) => reject(err));
+    if (
+      fs.existsSync(processedImagesDirectory) &&
+      fs.readdirSync(processedImagesDirectory).length > 0
+    ) {
+      fs.rmdir(processImagesDirectory, { recursive: true }, (err) => {
+        if (err) {
+          reject(err);
+        } else {
+          resolve();
+        }
+      });
     } else {
       resolve();
     }

config/gulp/styles.js

@@ -19,7 +19,6 @@ const replace = require("gulp-replace");
 const sass = require("gulp-sass")(require("sass-embedded"));
 const sourcemaps = require("gulp-sourcemaps");
 const svgSprite = require("gulp-svg-sprite");
-const del = require("del");
 const rename = require("gulp-rename");
 const pkg = require("../../node_modules/@uswds/uswds/package.json");
 
@@ -144,7 +143,8 @@ function renameSprite() {
 }
 
 function cleanSprite() {
-  return del.sync(`${IMG_DEST}/symbol`);
+  const spriteDir = `${IMG_DEST}/symbol`;
+  fs.rmdirSync(spriteDir, { recursive: true });
 }
 
 exports.init = series(

content/about/style-guide.md

@@ -15,17 +15,6 @@ Below you’ll find guidance for voice and tone, author bios and photos, brandin
 
 Articles for Digital.gov—written by employees from across the federal government—use an informal, conversational tone.
 
-### Conscious inclusivity
-
-Not everyone who uses government services or engages with federal agencies are U.S. citizens. When appropriate, use phrases or words such as: the public, users, people, or folks.
-
-Additionally, where possible:
-
-* Avoid using gendered pronouns; instead, use they or their.
-* Avoid age-related descriptions of people unless absolutely necessary for the content; in those cases, try using `older people` or `older person` — instead of _elderly_ or _senior_.
-
-See the **18F Content Guide** for more on inclusive language: https://content-guide.18f.gov/inclusive-language/.
-
 ## Grammar and spelling
 
 In general, we follow [AP Style](https://www.apstylebook.com/). Use [plain language](https://www.plainlanguage.gov/) in your writing for clarity. Avoid using acronyms or [jargon](https://www.digitalgov.gov/2014/08/15/get-out-of-the-jargon-trap-plain-language-training-can-help/) that may be unfamiliar to the general public or those outside your agency.
@@ -312,31 +301,36 @@ Please do not use images of text; we can highlight text in call-out box, an acco
 * Getty Images Content License Agreement: https://www.gettyimages.com/eula — Section 6 has intellectual property rights and how to properly format attribution for an image.
 
 Example:
-* [10 Hiring Tips for Attracting Underrepresented Digital Services Talent to Serve](https://digital.gov/2022/03/16/ten-hiring-tips-attracting-underrepresented-digital-services-talent-to-serve/)
-* [10 Tips to Create, Maintain, and Present Non-English Digital Content: A Q&A with Michael Mulé](https://digital.gov/2022/05/23/10-tips-to-create-maintain-and-present-non-english-digital-content-a-qa-with-michael-mule/)
+
+{{< img src="website-audit-control-panel-olivier-le-moal-istock-getty-images-693699396-comp" >}}
 
 2. **iStock.com photos (formerly Thinkstock)**
 
 * iStock Content License Agreement: https://www.istockphoto.com/legal/license-agreement &mdash; Section 3 covers restricted uses, and Section 7 has intellectual property rights and how to properly format attribution for an image.
 * Using iStock files: https://www.istockphoto.com/faq/using-files
 * Frequently Asked Questions: https://www.istockphoto.com/faq
 
+Example:
+
+{{< img src="agile-flow-600" >}}
+
 3. **Creative Commons** (CC)
 
 _Best Practices for Attribution_ (with examples):
 [http://wiki.creativecommons.org/Best_practices_for_attribution](http://wiki.creativecommons.org/Best_practices_for_attribution)
 
 Examples on Digital.gov:
 
-* [Social Media: Accessibility Issues and Solutions](https://digital.gov/2014/06/30/social-media-accessibility-issues-and-solutions/)
-* [Celebrating Black History at TTS: Reflections on the Challenges of the Past and Present](https://digital.gov/2022/03/14/celebrating-black-history-at-tts-reflections-on-the-challenges-of-the-past-and-present/)
+{{< img src="accessibility-disability-see" >}}
 
 4. **flickr** photos
 
 Many Flickr users have chosen to offer their work under a Creative Commons license.
 https://www.flickr.com/creativecommons/
 
-[Digital.gov example](https://digital.gov/2014/06/30/social-media-accessibility-issues-and-solutions/)
+Example
+
+{{< legacy-img src="2014/02/InnovationChalkboard1.jpg" alt="The word innovation written in all-caps, inside a thought bubble, on a chalkboard." caption="Missy Schmidt, Flickr, CC BY 2.0" >}}
 
 Give attribution to photographers with CC license
 https://help.yahoo.com/kb/flickr/SLN7674.html

content/communities/it-acquisition.md

@@ -71,7 +71,6 @@ The IT Acq CoP unites federal employees to improve the IT acquisition experien
 
 * [Federal Acquisition Regulation (FAR)](https://www.gsa.gov/policy-regulations/regulations/federal-acquisition-regulation-far) — The primary regulation for use by all executive agencies in their acquisition of supplies and services with appropriated funds. The FAR also contains standard solicitation provisions and contract clauses and the various agency FAR supplements.
 * [FAR Updated to Add Revised Section 508 Standards for Information and Communication Technology](https://www.section508.gov/blog/far-update-adds-revised-508-standards/) November 2021
-* [Five Procurement Strategies for Diverse Digital Services](https://digital.gov/2022/06/30/five-procurement-strategies-for-diverse-digital-services/) June 2022
 * [Find Your Section 508 Program Manager](https://www.section508.gov/tools/coordinator-listing/) — Agency Section 508 Program Managers (PMs) are your first point of contact for questions about IT accessibility.
 * [Accessibility Requirements Tool (ART)](https://www.section508.gov/art/) — ART is a multifaceted tool that offers interactive, step-by-step guidance on how to determine applicable accessibility requirements.
 * [18F De-risking Guides](https://derisking-guide.18f.gov/) — The Federal Field Guide to De-risk Government Technology offers guidance to federal agencies on how to structure software development teams, write contracts, and oversee agile software activities to reduce risks and improve outcomes for end-users.

content/events/2020/03/2020-03-03-mitigating-bias-while-building-research-practices.md

@@ -6,6 +6,9 @@ title: "Mitigating Bias While Building Research Practices"
 deck: ""
 summary: "Learn the methods used by 18F and the State of Vermont as they conducted discovery research to understand and improve the experiences of Vermonters who utilize healthcare and economic assistance programs. "
 host: "User Experience"
+
+expirydate: "2025-01-22"
+
 event_organizer: "Digital.gov"
 registration_url: https://www.eventbrite.com/e/95462014455
 captions: https://www.captionedtext.com/client/event.aspx?EventID=4344427&CustomerID=321

content/events/2021/05/2021-05-21-challenge-and-prize-community-spotlight-chat-with-the-small-business-administration.md

@@ -4,6 +4,9 @@ title: Challenge and Prize Community Spotlight Chat with the Small Business
 deck: 
 kicker: Spotlight Chat
 summary: A discussion of lessons learned from implementing the Lab-to-Market (L2M) Inclusive Innovation Ecosystem prize competition with members of the prize planning committee, including the White House Office of Science and Technology Policy (OSTP), the U.S. Small Business Administration (SBA), and the Science and Technology Policy Institute (STPI)-- one of three federally funded research and development centers of the Institute for Defense Analyses (IDA), a non-profit corporation that assists the federal government in addressing national security issues.
+
+expirydate: "2025-01-22"
+
 host: Challenge & Prize Community of Practice
 event_organizer: Digital.gov
 registration_url: https://www.eventbrite.com/e/challenge-prize-community-spotlight-chat-registration-156270187337