Merge branch 'dev' into content-3-18

_assets/css/_search.scss

@@ -0,0 +1,34 @@
+#search-results ol {
+  padding-left: 0;
+  li {
+    @include u-border-bottom('solid', '1px', 'base-lighter');
+    padding-bottom: units(3);
+    margin-bottom: units(3);
+    list-style: none;
+    &:before {
+
+    }
+    a {
+      @include u-text('no-underline');
+      display: block;
+      &:visited,
+      &:hover,
+      &:focus {
+        h2 {
+          @include u-color('primary-dark');
+
+        }
+      }
+      h2 {
+        @include u-margin-top(0);
+      }
+      p {
+        @include u-color('base-darkest');
+      }
+    }
+    .read-more {
+      @include u-text('underline');
+      @include u-color('primary-dark');
+    }
+  }
+}

_assets/css/index.scss

@@ -7,3 +7,4 @@
 @import "home";
 @import "hero";
 @import "footer";
+@import "search";

_assets/js/app.js

@@ -1,58 +1,16 @@
 //= require uswds/dist/js/uswds.min
-//= require ./simple-jekyll-search
-
-(function () {
-  const form = document.getElementById('search_form');
-  if (form) {
-    const urlParams = new URLSearchParams(window.location.search);
-    const autocomplete = document.getElementById('autocomplete-container');
-    const fullPageResults = document.getElementById('search-results');
-    const searchBox = document.getElementById('search-box');
-
-    const sjs = SimpleJekyllSearch({
-      searchInput: searchBox,
-      resultsContainer: fullPageResults || autocomplete,
-      json: form.action + '.json',
-      noResultsText: 'No results found.',
-      searchResultTemplate: '<li class="padding-1 font-sans-md"><a href="{url}" title="{desc}">{title}</a></li>',
-      templateMiddleware: function (prop, value, template) {
-        if (prop === 'url') return value;
-
-        const inputValue = searchBox.value;
-        const regex = new RegExp(inputValue, 'i');
-
-        const output = value.replace(regex, function (v) {
-          return '<b>'+ v +'</b>'
-        });
-        return output
-      },
-      limit: 10,
-      fuzzy: true
-    });
-
-    const query = urlParams.get('query');
-
-    if (query) {
-      window.addEventListener('load', function () {
-        const searchInput = document.querySelector('#search-box');
-        searchInput.setAttribute("value", query);
-        sjs.search(query);
-      });
-    }
-  }
-})();
 
 const EXPANDED = "aria-expanded";
 
 var url = window.location.href;
 var idx = url.indexOf("#");
-var questionAnchor = idx != -1 ? url.substring(idx+1) : "";
+var questionAnchor = idx != -1 ? url.substring(idx + 1) : "";
 
-if(questionAnchor.length > 1){
+if (questionAnchor.length > 1) {
   var accordionButtons = document.querySelectorAll('.usa-accordion__button');
 
-  accordionButtons.forEach(accordion =>{
-    if(accordion.getAttribute('id') != questionAnchor) {
+  accordionButtons.forEach(accordion => {
+    if (accordion.getAttribute('id') != questionAnchor) {
       accordion.setAttribute(EXPANDED, "false");
     }
   })

_config.yml

@@ -96,8 +96,8 @@ secondary_navigation:
 # 3. Add your site/affiliate name here.
 searchgov:
   endpoint: https://search.usa.gov # You should not change this.
-  affiliate: faq.coronavirus.gov # replace this with your search.gov account
-  access_key: ACSIQG9J_Xe7h9TTxjMrNqfUCp9O3ryactfBybCMIGc= # This is placeholder. Not private.
+  affiliate: 18fcvddev # replace this with your search.gov account
+  access_key: yBQhiqQjR80tDwx5HuPvbluq4NgkO_RTwludGJAPgwg= # This is placeholder. Not private.
   inline: true #this renders the results on the same domain. Otherwise, it will render the results in the search.gov domain
 
 ##########################################################################################

_content/animals/can-i-travel-to-the-us-with-dogs.md

@@ -1,5 +1,5 @@
 ---
-title: Can I travel to the United States with dogs or import dogs to the United States during the COVID-19 outbreak?
+title: Can I travel with or import dogs to the United States during the outbreak?
 category: animals
 layout: post
 date: March 16, 2020

_content/animals/what-about-imported-animals-or-animal-products.md

@@ -1,5 +1,5 @@
 ---
-title: What about imported animals or animal products?
+title: Should I be concerned about imported animals or animal products?
 category: animals
 layout: post
 date: March 16, 2020

_content/basics/how-can-people-help-stop-stigma-related-to-COVID-19.md

@@ -5,7 +5,7 @@ layout: post
 date: March 16, 2020
 source: CDC
 source_url: https://www.cdc.gov/coronavirus/2019-ncov/faq.html#basics
-excerpt: Coronavirus Disease 2019 Basics
+excerpt: About COVID-19
 ---
 
 People can fight stigma and help, not hurt, others by providing social support. Counter stigma by learning and sharing facts. 

_content/basics/what-is-a-novel-coronavirus.md

@@ -6,7 +6,7 @@ promoted: true
 date: March 16, 2020
 source: CDC
 source_url: https://www.cdc.gov/coronavirus/2019-ncov/faq.html#basics
-excerpt: Coronavirus Disease 2019 Basics
+excerpt: About COVID-19
 ---
 
 A novel coronavirus is a new coronavirus that has not been previously identified. The virus causing coronavirus disease 2019 

_content/basics/what-is-social-distancing.md

@@ -0,0 +1,12 @@
+---
+title: What is social distancing?
+category: basics
+layout: post
+date: March 18, 2020
+source: CDC
+source_url: https://webcache.googleusercontent.com/search?q=cache:_WT1yjb8w94J:https://www.cdc.gov/coronavirus/2019-ncov/about/coping.html+&cd=6&hl=en&ct=clnk&gl=us and https://www.cdc.gov/coronavirus/2019-ncov/travelers/faqs.html
+---
+
+Social distancing means remaining out of places where people meet or gather, avoiding local public transportation (e.g., bus, subway, taxi, rideshare), and maintaining distance (approximately 6 feet or 2 meters) from others.
+
+You practice social distancing when you stay out of crowded places and avoid group gatherings. 

_content/basics/why-is-the-disease-called-covid-19.md

@@ -5,7 +5,7 @@ layout: post
 date: March 16, 2020
 source: CDC
 source_url: https://www.cdc.gov/coronavirus/2019-ncov/faq.html#basics
-excerpt: Coronavirus Disease 2019 Basics
+excerpt: About COVID-19
 ---
 
 On February 11, 2020 the World Health Organization <a href="https://twitter.com/DrTedros/status/1227297754499764230"> announced

_content/basics/why-might-someone-be-blame-or-avoid-individuals-and-groups-or-create-stigma-because-of-COVID-19.md → _content/basics/why-might-someone-blame-or-avoid-individuals-and-groups-or-create-stigma-because-of-COVID-19.md

@@ -5,7 +5,7 @@ layout: post
 date: March 16, 2020
 source: CDC
 source_url: https://www.cdc.gov/coronavirus/2019-ncov/faq.html#basics
-excerpt: Coronavirus Disease 2019 Basics
+excerpt: About COVID-19
 ---
 
 People in the U.S. may be worried or anxious about friends and relatives who are living in or visiting areas where COVID-19 
@@ -16,5 +16,4 @@ Stigma is discrimination against an identifiable group of people, a place, or a
 knowledge about how COVID-19 spreads, a need to blame someone, fears about disease and death, and gossip that spreads rumors 
 and myths.
 
-Stigma hurts everyone by creating more fear or anger towards ordinary people instead of the disease that is causing the 
-problem.
+Stigma hurts everyone by creating more fear or anger towards ordinary people instead of the disease that is causing the problem.

_content/biosafety/are-certified-class-ii-bscs-required.md

@@ -1,5 +1,5 @@
 ---
-title: Are certified Class II biological safety cabinets (BSCs) required to process COVID-19 specimens? Should laboratory staff put procedures in place to minimize personnel exposure if there is no certified Class II BSC?
+title: Are certified Class II biological safety cabinets (BSCs) required to process COVID-19 specimens? Should staff put procedures in place to minimize exposure if there is no certified Class II BSC?
 category: biosafety
 layout: post
 date: March 17, 2020

_content/biosafety/do-people-packing-specimens-need-to-be-trained.md

@@ -1,5 +1,5 @@
 ---
-title: Do people packing specimens for transport need to be trained and competent?
+title: Do people packing specimens for transport need to be trained?
 category: biosafety
 layout: post
 date: March 17, 2020

_content/biosafety/how-should-the-laboratory-perform-a-risk-assessment.md → _content/biosafety/how-should-laboratories-perform-risk-assessments.md

@@ -1,5 +1,5 @@
 ---
-title: How should the laboratory perform a risk assessment to identify and mitigate risks? 
+title: How should laboratories perform risk assessments?
 category: biosafety
 layout: post
 date: March 17, 2020

_content/biosafety/how-should-staff-members-transport-clinical-specimens.md

@@ -1,5 +1,5 @@
 ---
-title: How should staff members transport clinical specimens from suspected COVID-19 PUIs within a facility?
+title: How should staff members transport clinical specimens within facilities?
 category: biosafety
 layout: post
 date: March 17, 2020

_content/biosafety/how-should-personnel-remove-biohazardous-waste.md → _content/biosafety/how-should-staff-remove-biohazardous-waste.md

@@ -1,5 +1,5 @@
 ---
-title: How should personnel remove biohazardous waste from the laboratory or testing area for decontamination and disposal? Does an autoclave need to be available in the facility?
+title: How should staff remove biohazardous waste? Does an autoclave need to be used?
 category: biosafety
 layout: post
 date: March 17, 2020

_content/biosafety/once-packaging-is-complete-should-staff-decontaminate.md

@@ -1,5 +1,5 @@
 ---
-title: Once packaging of the samples is complete should staff members decontaminate the work area?
+title: Once packaging of samples is complete, should staff members decontaminate work areas?
 category: biosafety
 layout: post
 date: March 17, 2020

_content/biosafety/what-biosafety-level-is-recommended.md

@@ -1,5 +1,5 @@
 ---
-title: What biosafety level is recommended for handling clinical specimens from suspected COVID-19 PUIs?
+title: What biosafety level is recommended for handling clinical specimens?
 category: biosafety
 layout: post
 date: March 17, 2020

_content/biosafety/what-disinfectant-should-personnel-use.md → _content/biosafety/what-disinfectants-should-staff-use.md

@@ -1,5 +1,5 @@
 ---
-title: What disinfectant should personnel use to decontaminate work surfaces?
+title: What disinfectants should staff use to decontaminate work surfaces?
 category: biosafety
 layout: post
 date: March 17, 2020

_content/biosafety/what-information-is-required-on-the-outer-package-dry-ice.md → _content/biosafety/what-information-is-required-on-outer-packages-dry-ice.md

@@ -1,5 +1,5 @@
 ---
-title: What information is required on the outer package for shipment of specimens with dry ice?
+title: What information is required on outer packages when shipping specimens with dry ice?
 category: biosafety
 layout: post
 date: March 17, 2020

_content/biosafety/what-information-is-required-on-the-outer-package-ice-packs.md → _content/biosafety/what-information-is-required-on-outer-packages-ice-packs.md

@@ -1,5 +1,5 @@
 ---
-title: What information is required on the outer package for shipment of specimens with ice packs?
+title: What information is required on outer packages when shipping specimens with dry ice?
 category: biosafety
 layout: post
 date: March 17, 2020

_content/biosafety/what-information-is-required-on-an-overpack.md → _content/biosafety/what-information-is-required-on-outer-packages.md

@@ -1,5 +1,5 @@
 ---
-title: What information is required on an overpack if used for specimen shipment? 
+title: What information is required on outer packages used for specimen shipment? 
 category: biosafety
 layout: post
 date: March 17, 2020

_content/biosafety/what-specific-packaging-should-personnel-use.md → _content/biosafety/what-packaging-should-staff-use.md

@@ -1,5 +1,5 @@
 ---
-title: What specific packaging should personnel use when shipping clinical specimens from suspected COVID-19 PUIs?
+title: What packaging should staff use when shipping clinical specimens?
 category: biosafety
 layout: post
 date: March 17, 2020

_content/diagnostic-panels/i-believe-i-have-found-a-treatment-or-vaccine.md → _content/diagnostic-panels/i-have-found-a-treatment-or-vaccine.md

@@ -1,5 +1,5 @@
 ---
-title: I believe that I have found a treatment or vaccine for COVID-19. Is CDC the best place to submit my idea?
+title: I have found a treatment or vaccine for COVID-19. Where do I submit my idea?
 category: diagnostic-panels
 layout: post
 date: March 17, 2020

_content/diagnostic-panels/what-other-equipment-will-labs-need.md → _content/diagnostic-panels/what-equipment-will-labs-need.md

@@ -1,5 +1,5 @@
 ---
-title: What other equipment will labs need to perform tests using the diagnostic panel?
+title: What equipment will labs need to perform tests using the diagnostic panel?
 category: diagnostic-panels
 layout: post
 date: March 17, 2020

_content/healthcare-professionals/what-are-the-clinical-features-of-COVID19.md

@@ -1,6 +1,6 @@
 ---
 title: What are the clinical features of COVID-19?
-Category: healthcare
+category: healthcare-professionals
 layout: post
 date: March 16, 2020
 source: CDC

_content/protect-yourself/am-i-at-risk-for-covid-19-from-a-package-or products-shipping-from-china.md

@@ -1,6 +1,6 @@
 ---
 title: Am I at risk for COVID-19 from a package or products shipping from China?
-tag: protect-yourself
+category: protect-yourself
 layout: post
 date: March 16, 2020
 source: CDC

_content/travel/what-can-I-bring-when-arriving-to-the-united-states.md

@@ -1,5 +1,5 @@
 ---
-title: What can I bring when arriving to the United States?
+title: What can I expect when arriving to the United States?
 category: travel
 layout: post
 date: March 16, 2020

_content/travel/what-can-I-expect-when-arriving-to-the-united-states.md

@@ -0,0 +1,19 @@
+---
+title: What can I expect when arriving to the United States?
+category: travel
+layout: post
+date: March 16, 2020
+source: CDC
+source_url: https://www.cdc.gov/coronavirus/2019-ncov/travelers/faqs.html
+excerpt: Returning from travel
+---
+
+At this time, travel restrictions and entry screening only apply to travelers arriving from countries with a level 3 travel health notice. [Note: US policies are subject to change as the COVID-19 pandemic evolves.]
+
+This means that if you traveled from countries other than those listed above, you:
+* Won’t be subject to additional health screening upon arrival in the United States, and
+* Won’t be under mandatory quarantine orders upon entry to the United States.
+
+If you are arriving to the United States from a country with <a href="https://wwwnc.cdc.gov/travel/notices/"> level 2 travel health notice</a>, you will be asked to monitor your health and practice social distancing. Social distancing means staying out of crowded places, avoiding group gatherings, and maintaining distance (approximately 6 feet or 2 meters) from others when possible.
+
+If you are coming from an international destination with a <a href="https://wwwnc.cdc.gov/travel/notices/"> level 3 Travel Health Notice</a>, you will be asked to stay home for 14 days from the time you return from travel, monitor your health and practice social distancing. Social distancing means staying out of crowded places, avoiding group gatherings, and maintaining distance (approximately 6 feet or 2 meters) from others when possible.

_includes/content-questions.html

@@ -13,7 +13,7 @@ <h3>{{ site_category.title }}</h3>
           {% for question in category_questions limit:4 %}
             {% if page.lang == question.lang %}
             <li class="padding-y-1">
-              <a href="{{ site.baseurl }}/{{ site_category.name}}.html#{{ question.title|slugify }}">{{ question.title }}</a>
+              <a href="{{ site.baseurl }}/{{ site_category.name}}/#{{ question.title|slugify }}">{{ question.title }}</a>
             </li>
             {% endif %}
           {% endfor %}

_includes/hero.html

@@ -14,12 +14,11 @@
       {% endcomment %}
       <h1 class="grid-col-12">{{ include.hero.title }}</h1>
     </div>
-
-    <form id="search_form" class="usa-search" action="{{ site.baseurl }}/search">
+    <div  class="usa-search">
       {% include search.html %}
-    </form>
+    </div>
     <div class="grid-row">
       <p class="hero--tagline grid-col-12">or you can browse the categories below to find what you are looking for.</p>
     </div>
   </div>
-</section>
+</section>

_includes/questions-box.html

@@ -9,12 +9,12 @@
         <h2>{{ include.questions_box.box_1_header }}</h2>
         <ul class="usa-list usa-list--unstyled">
           <li class="padding-y-1">
-            <a href="https://www.cdc.gov/coronavirus/2019-ncov/prepare/prevention.html">
+            <a href="https://www.cdc.gov/coronavirus/2019-ncov/prepare/prevention/">
               What are the steps to prevent the illness?
             </a>
           </li>
           <li class="padding-y-1">
-            <a href="{{ site.baseurl }}/protect-yourself.html">
+            <a href="{{ site.baseurl }}/protect-yourself/">
               Am I at risk?
             </a>
           </li>
@@ -42,12 +42,12 @@ <h2>{{ include.questions_box.box_1_header }}</h2>
         <h2>{{ include.questions_box.box_2_header }}</h2>
         <ul class="usa-list usa-list--unstyled">
           <li class="padding-y-1">
-            <a href="{{ site.baseurl }}/basics.html#what-are-the-symptoms-and-complications-that-covid-19-can-cause">
+            <a href="{{ site.baseurl }}/basics/#what-are-the-symptoms-and-complications-that-covid-19-can-cause">
               What are the symptoms of COVID-19?
             </a>
           </li>
           <li class="padding-y-1">
-            <a href="{{ site.baseurl }}/basics.html#should-i-be-tested-for-covid-19">
+            <a href="{{ site.baseurl }}/basics/#should-i-be-tested-for-covid-19">
               Should I get tested?
             </a>
           </li>