Merge pull request #3519 from ONRR/dev

Dev-->Master
DOI-ONRR · Dec 21, 2018 · 1ba9cf0 · 1ba9cf0
2 parents a779061 + 8e6cf64
commit 1ba9cf0
Show file tree

Hide file tree

Showing 52 changed files with 4,157 additions and 2,113 deletions.
diff --git a/_config.yml b/_config.yml
@@ -8,7 +8,7 @@ url: https://revenuedata.doi.gov
 
 # app version number
 
-version: v4.3.0
+version: v4.3.1
 
 exclude:
   # top-level log
@@ -103,9 +103,6 @@ collections:
   offshore_regions:
     output: true
     permalink: /explore/:path/
-  states:
-    output: true
-    permalink: /explore/:path/
   reconciliation:
     output: true
     permalink: /how-it-works/reconciliation/:path/
@@ -123,12 +120,6 @@ defaults:
     values:
       layout: reconciliation
 
-  - scope:
-      path: ''
-      type: states
-    values:
-      layout: state-page
-
   - scope:
       path: ''
       type: offshore_regions

diff --git a/_how-it-works/federal-revenue-by-company/index.html b/_how-it-works/federal-revenue-by-company/index.html
@@ -1,5 +1,5 @@
 ---
 layout: redirect
 permalink: /how-it-works/federal-revenue-by-company/
-redirect_url: /how-it-works/federal-revenue-by-company/2017/
+redirect_to: /how-it-works/federal-revenue-by-company/2017/
 ---
diff --git a/_how-it-works/tribal-economic-impact.md b/_how-it-works/tribal-economic-impact.md
@@ -2,6 +2,7 @@
 title: Native American Lands | Economic Impact
 layout: content
 permalink: /how-it-works/native-american-economic-impact/
+redirect_from: /how-it-works/tribal-economic-impact/
 nav_description: Jump to a section
 nav_items:
   - name: introduction

diff --git a/_how-it-works/tribal-ownership-and-governance.md b/_how-it-works/tribal-ownership-and-governance.md
@@ -2,6 +2,7 @@
 title: Native American Lands | Ownership and Governance
 layout: content
 permalink: /how-it-works/native-american-ownership-governance/
+redirect_from: /how-it-works/tribal-ownership-governance/
 nav_description: Jump to a section
 nav_items:
   - name: introduction

diff --git a/_how-it-works/tribal-production.md b/_how-it-works/tribal-production.md
@@ -2,6 +2,7 @@
 title: Native American Lands | Natural Resource Production
 layout: content
 permalink: /how-it-works/native-american-production/
+redirect_from: /how-it-works/tribal-production/
 nav_description: Jump to a section
 nav_items:
   - name: introduction

diff --git a/_how-it-works/tribal-revenue.md b/_how-it-works/tribal-revenue.md
@@ -2,6 +2,7 @@
 title: Native American Lands | Revenue
 layout: content
 permalink: /how-it-works/native-american-revenue/
+redirect_from: /how-it-works/tribal-revenue/
 nav_description: Jump to a section
 nav_items:
   - name: introduction

diff --git a/_layouts/redirect.html b/_layouts/redirect.html
@@ -2,10 +2,11 @@
 <html lang="en">
   <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-    <meta http-equiv="refresh" content="0;url={{ page.redirect_url | prepend:site.baseurl }}" />
+    <meta http-equiv="refresh" content="0; url={{ page.redirect.to }}" />
+    <link rel="canonical" href="{{ page.redirect.to }}" />
   </head>
   <h1>Redirecting...</h1>
-  <p>If your browser doesn&rsquo;t redirect automatically, you can
-    <a href="{{ page.redirect | default: '/' | prepend: site.baseurl }}">do it manually</a>.</p>
+  <p>If your browser doesn't redirect automatically, you can
+    <a href="{{ page.redirect.to | default: '/' }}">do it manually</a>.</p>
 </html>
 
diff --git a/_plugins/federalist-preview.rb b/_plugins/federalist-preview.rb
@@ -5,7 +5,7 @@ def generate(site)
       # Federalist preview URL for this branch.
       branch = ENV['BRANCH']
       if branch && branch != 'master'
-        site.config['url'] = "https://federalist.fr.cloud.gov/preview/onrr/doi-extractives-data/#{branch}"
+        site.config['url'] = "https://federalist-proxy.app.cloud.gov"
         puts "*** Federalist URL: <#{site.config['url']}> ***"
       end
     end

diff --git a/blog-site/gatsby-config.js b/blog-site/gatsby-config.js
@@ -2,12 +2,17 @@
 // https://github.com/18F/federalist-garden-build#variables-exposed-during-builds
 const BASEURL = process.env.BASEURL || '';
 
+// Federalist provides the google_analytics env variable
+const GOOGLE_ANALYTICS_ID = (process.env.google_analytics) ?
+                (process.env.google_analytics[process.env.BRANCH] || process.env.google_analytics.default)
+                :
+                "UA-48605964-8";
 
 module.exports = {
   siteMetadata: {
     title: 'Open data design at the Department of the Interior',
     author: 'Ryan Johnson',
-    description: 'Our blog about data, design, and innovation at the Department of the Interior.',
+    description: 'Our blog about data, design, and innovation at the Department of the Interior',
     siteUrl: 'https://revenuedata.doi.gov/',
   },
   pathPrefix: `${BASEURL}/blog`,
@@ -34,10 +39,11 @@ module.exports = {
       resolve: `gatsby-transformer-remark`,
       options: {
         plugins: [
+          `gatsby-remark-autolink-headers`,
           {
             resolve: `gatsby-remark-images`,
             options: {
-              maxWidth: 590,
+              maxWidth: 650,
               quality: 80,
             },
           },
@@ -58,7 +64,7 @@ module.exports = {
     {
       resolve: `gatsby-plugin-google-analytics`,
       options: {
-        //trackingId: `ADD YOUR TRACKING ID HERE`,
+        trackingId: GOOGLE_ANALYTICS_ID,
       },
     },
     `gatsby-plugin-offline`,