Merge branch 'master' into update-uswds-2.0

.gitignore

@@ -11,6 +11,7 @@ node_modules/
 .rvmrc
 
 # Jekyll stuff
+.jekyll-cache
 .jekyll-metadata
 .jekyll-cache
 _site

README.md

@@ -271,7 +271,7 @@ The default colors can be configured in the `_data/theme.yml` file. Other settin
 Before configuring your search you will need to create a search.gov account and set up your website
 with search.gov.
 
-After setting up your site on search.gov you can then add your `site handle` to the `config.yml`.
+After setting up your site on search.gov you can then add your `search_site_handle` to the `config.yml`.
 
 ### Analytics
 

_includes/analytics.html

@@ -1,16 +1,13 @@
 {% if site.google_analytics_ua %}
 <!-- Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics_ua }}"></script>
 <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-  ga('create', '{{ site.google_analytics_ua }}', 'auto');
+  window.dataLayer = window.dataLayer || [];
+  function gtag() { dataLayer.push(arguments); }
+  gtag('js', new Date());
 
-  // anonymize user IPs (chops off the last IP triplet)
-  ga('set', 'anonymizeIp', true);
-  ga('set', 'forceSSL', true);
-  ga('send', 'pageview');
+  // `forceSSL` was used for analytics.js (the older Google Analytics script). It isn't documented for gtag.js, but the term occurs in the gtag.js code; figure it doesn't hurt to leave it in. -@afeld, 5/29/19
+  gtag('config', '{{ site.google_analytics_ua }}', { 'anonymize_ip': true, 'forceSSL': true });
 </script>
 {% endif %}
 

_includes/components/header.html

@@ -95,38 +95,7 @@
         {% if header.type == 'basic' or header.type == 'basic-mega' %}
           {% assign _secondary = header.secondary %}
           {% if site.search_site_handle  %}
-            <form
-              accept-charset="UTF-8"
-              action="https://search.usa.gov/search"
-              id="search_form"
-              method="get"
-              class="usa-search usa-search--small js-search-form">
-              <input
-                name="utf8"
-                type="hidden"
-                value="&#x2713;" />
-              <input
-                id="affiliate"
-                name="affiliate"
-                type="hidden"
-                value="{{ site.search_site_handle }}" />
-              <div role="search">
-                <label for="query" class="usa-sr-only">Enter Search Term(s):</label>
-                <input
-                  autocomplete="off"
-                  class="usa-input usagov-search-autocomplete"
-                  id="query"
-                  name="query"
-                  type="search" />
-                <button
-                  class="usa-button"
-                  type="submit"
-                  name="commit">
-                  <span class="usa-sr-only">Search</span>
-                </button>
-              </div>
-            </form>
-            {% endif %}
+            {% include components/search.html %}
           {% endif %}
 
           {% if header.type == 'extended' or header.type == 'extended-mega' %}

_includes/components/search.html

@@ -0,0 +1,11 @@
+<form accept-charset="UTF-8" action="https://search.usa.gov/search" class="usa-search usa-search-small js-search-form" method="get">
+  <input name="utf8" type="hidden" value="&#x2713;"/>
+  <input id="affiliate" name="affiliate" type="hidden" value="{{ site.search_site_handle }}"/>
+  <div role="search">
+    <label class="usa-sr-only" for="query">Enter Search Term(s):</label>
+    <input autocomplete="off" class="usagov-search-autocomplete" id="query" name="query" type="search"/>
+    <button type="submit">
+      <span class="usa-sr-only">Search</span>
+    </button>
+  </div>
+</form>

_includes/meta.html

@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
-<title>{% if page.title %}{{ page.title }} | {% endif %}{{ site.title }}</title>
+<title>{% if page.title %}{{ page.title | strip_html }} | {% endif %}{{ site.title }}</title>
 
 {% assign description = page.description | default: site.description %}
 {% if description %}

_includes/scripts.html

@@ -26,10 +26,10 @@
 {% endfor %}
 
 
-{% if site.search %}
+{% if site.search_site_handle %}
 <script type="text/javascript">
 //<![CDATA[
-      var usasearch_config = { siteHandle:"{{ site.search.site_handle }}" };
+      var usasearch_config = { siteHandle:"{{ site.search_site_handle }}" };
 
       var script = document.createElement("script");
       script.type = "text/javascript";

uswds-jekyll.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files -z`.split("\x0").select { |f| f.match(%r{^(assets|_layouts|_includes|_sass|LICENSE|README)}i) }
 
-  s.add_runtime_dependency "jekyll", ">= 4.0"
+  s.add_runtime_dependency "jekyll", ">= 4.0", "< 5"
 
   s.add_development_dependency "bundler"
   s.add_development_dependency "rake"