Merge pull request #4170 from ONRR/dev

dev-->master
DOI-ONRR · Jun 13, 2019 · 5d08b55 · 5d08b55
2 parents 4dfe2e6 + 1a379b0
commit 5d08b55
Show file tree

Hide file tree

Showing 115 changed files with 155,226 additions and 51 deletions.
diff --git a/downloads/CY 03-18 Federal Revenues.csv b/downloads/CY 03-18 Federal Revenues.csv
diff --git a/downloads/FY 03-18 Federal Revenues.csv b/downloads/FY 03-18 Federal Revenues.csv
diff --git a/downloads/Native American Revs FY03-18.csv b/downloads/Native American Revs FY03-18.csv
diff --git a/downloads/Native-American-Revenues-CY03-18.csv b/downloads/Native-American-Revenues-CY03-18.csv
diff --git a/...ads/Native American Revenues CY03-18.xlsx → ...ads/Native-American-Revenues-CY03-18.xlsx b/...ads/Native American Revenues CY03-18.xlsx → ...ads/Native-American-Revenues-CY03-18.xlsx
diff --git a/downloads/disbursements_2012-2013_2015-11-20.xlsx b/downloads/disbursements_2012-2013_2015-11-20.xlsx
diff --git a/downloads/disbursements_FY2003-2017_by_type.xlsx b/downloads/disbursements_FY2003-2017_by_type.xlsx
diff --git a/downloads/disbursements_FY2003-2018_by_type.csv b/downloads/disbursements_FY2003-2018_by_type.csv
diff --git a/downloads/disbursements_FY2012-2015_2016-03-04.xlsx b/downloads/disbursements_FY2012-2015_2016-03-04.xlsx
diff --git a/downloads/disbursements_FY2012-2016_2017-02-08.xlsx b/downloads/disbursements_FY2012-2016_2017-02-08.xlsx
diff --git a/downloads/disbursements_FY2014-2017.xlsx b/downloads/disbursements_FY2014-2017.xlsx
diff --git a/downloads/disbursements_documentation_2015-11-20.docx b/downloads/disbursements_documentation_2015-11-20.docx
diff --git a/downloads/federal_civil_pentalties_other_revenues_acct-year_CY06-15_2016-05-01.xlsx b/downloads/federal_civil_pentalties_other_revenues_acct-year_CY06-15_2016-05-01.xlsx
diff --git a/downloads/federal_civil_pentalties_other_revenues_acct-year_FY06-15_2016-05-01.xlsx b/downloads/federal_civil_pentalties_other_revenues_acct-year_FY06-15_2016-05-01.xlsx
diff --git a/downloads/federal_production_CY03-18.csv b/downloads/federal_production_CY03-18.csv
diff --git a/downloads/federal_production_CY03-18.xlsx b/downloads/federal_production_CY03-18.xlsx
diff --git a/downloads/federal_production_CY06-15_2016-09-02.xlsx b/downloads/federal_production_CY06-15_2016-09-02.xlsx
diff --git a/downloads/federal_production_CY07-16.xlsx b/downloads/federal_production_CY07-16.xlsx
diff --git a/downloads/federal_production_CY08-17.xlsx b/downloads/federal_production_CY08-17.xlsx
diff --git a/downloads/federal_production_FY05-14_2016-02-25.xlsx b/downloads/federal_production_FY05-14_2016-02-25.xlsx
diff --git a/downloads/federal_production_FY06-15_2016-09-02.xlsx b/downloads/federal_production_FY06-15_2016-09-02.xlsx
diff --git a/downloads/federal_production_FY07-16.xlsx b/downloads/federal_production_FY07-16.xlsx
diff --git a/downloads/federal_production_FY2008-2017_2018-06-15.xlsx b/downloads/federal_production_FY2008-2017_2018-06-15.xlsx
diff --git a/downloads/federal_production_FY2009-2018_2019-03-26.csv b/downloads/federal_production_FY2009-2018_2019-03-26.csv
diff --git a/downloads/federal_production_documentation-2015-11-25.docx b/downloads/federal_production_documentation-2015-11-25.docx
diff --git a/downloads/federal_revenue_acct-year_FY06-18_2018-12-13.xlsx b/downloads/federal_revenue_acct-year_FY06-18_2018-12-13.xlsx
diff --git a/downloads/federal_revenue_by_company_CY2013-CY2018.csv b/downloads/federal_revenue_by_company_CY2013-CY2018.csv
diff --git a/downloads/federal_revenue_by_company_documentation_2015-11-20.docx b/downloads/federal_revenue_by_company_documentation_2015-11-20.docx
diff --git a/...ral_revenue_civil-penalties_other-rev_not-tied-to-lease_acct-year_CY06-15_2016-09-15.xlsx b/...ral_revenue_civil-penalties_other-rev_not-tied-to-lease_acct-year_CY06-15_2016-09-15.xlsx
diff --git a/...ral_revenue_civil-penalties_other-rev_not-tied-to-lease_acct-year_CY06-16_2017-04-07.xlsx b/...ral_revenue_civil-penalties_other-rev_not-tied-to-lease_acct-year_CY06-16_2017-04-07.xlsx
diff --git a/...ral_revenue_civil-penalties_other-rev_not-tied-to-lease_acct-year_CY06-16_2017-05-04.xlsx b/...ral_revenue_civil-penalties_other-rev_not-tied-to-lease_acct-year_CY06-16_2017-05-04.xlsx
diff --git a/...ral_revenue_civil-penalties_other-rev_not-tied-to-lease_acct-year_CY06-17_2018_03_02.xlsx b/...ral_revenue_civil-penalties_other-rev_not-tied-to-lease_acct-year_CY06-17_2018_03_02.xlsx
diff --git a/...ral_revenue_civil-penalties_other-rev_not-tied-to-lease_acct-year_FY06-15_2016-09-15.xlsx b/...ral_revenue_civil-penalties_other-rev_not-tied-to-lease_acct-year_FY06-15_2016-09-15.xlsx
diff --git a/...ral_revenue_civil-penalties_other-rev_not-tied-to-lease_acct-year_FY06-16_2017-04-07.xlsx b/...ral_revenue_civil-penalties_other-rev_not-tied-to-lease_acct-year_FY06-16_2017-04-07.xlsx
diff --git a/...ral_revenue_civil-penalties_other-rev_not-tied-to-lease_acct-year_FY06-17_2017-11-30.xlsx b/...ral_revenue_civil-penalties_other-rev_not-tied-to-lease_acct-year_FY06-17_2017-11-30.xlsx
diff --git a/downloads/federal_revenue_offshore_acct-year_CY04-13_2015-11-20.xlsx b/downloads/federal_revenue_offshore_acct-year_CY04-13_2015-11-20.xlsx
diff --git a/downloads/federal_revenue_offshore_acct-year_CY06-15_2016-05-01.xlsx b/downloads/federal_revenue_offshore_acct-year_CY06-15_2016-05-01.xlsx
diff --git a/downloads/federal_revenue_offshore_acct-year_CY06-15_2016-09-15.xlsx b/downloads/federal_revenue_offshore_acct-year_CY06-15_2016-09-15.xlsx
diff --git a/downloads/federal_revenue_offshore_acct-year_CY06-16_2017-05-04.xlsx b/downloads/federal_revenue_offshore_acct-year_CY06-16_2017-05-04.xlsx
diff --git a/downloads/federal_revenue_offshore_acct-year_CY06-17_2018_03_02.xlsx b/downloads/federal_revenue_offshore_acct-year_CY06-17_2018_03_02.xlsx
diff --git a/downloads/federal_revenue_offshore_acct-year_FY04-14_2015-11-20.xlsx b/downloads/federal_revenue_offshore_acct-year_FY04-14_2015-11-20.xlsx
diff --git a/downloads/federal_revenue_offshore_acct-year_FY06-15_2016-05-01.xlsx b/downloads/federal_revenue_offshore_acct-year_FY06-15_2016-05-01.xlsx
diff --git a/downloads/federal_revenue_offshore_acct-year_FY06-15_2016-09-15.xlsx b/downloads/federal_revenue_offshore_acct-year_FY06-15_2016-09-15.xlsx
diff --git a/downloads/federal_revenue_offshore_acct-year_FY06-16_2017-04-07.xlsx b/downloads/federal_revenue_offshore_acct-year_FY06-16_2017-04-07.xlsx
diff --git a/downloads/federal_revenue_offshore_acct-year_FY06-17_2017-11-30.xlsx b/downloads/federal_revenue_offshore_acct-year_FY06-17_2017-11-30.xlsx
diff --git a/downloads/federal_revenue_onshore_acct-year_CY04-13_2015-11-20.xlsx b/downloads/federal_revenue_onshore_acct-year_CY04-13_2015-11-20.xlsx
diff --git a/downloads/federal_revenue_onshore_acct-year_CY06-15_2016-05-01.xlsx b/downloads/federal_revenue_onshore_acct-year_CY06-15_2016-05-01.xlsx
diff --git a/downloads/federal_revenue_onshore_acct-year_CY06-15_2016-09-15.xlsx b/downloads/federal_revenue_onshore_acct-year_CY06-15_2016-09-15.xlsx
diff --git a/downloads/federal_revenue_onshore_acct-year_CY06-16_2017-04-21.xlsx b/downloads/federal_revenue_onshore_acct-year_CY06-16_2017-04-21.xlsx
diff --git a/downloads/federal_revenue_onshore_acct-year_CY06-16_2017-05-04.xlsx b/downloads/federal_revenue_onshore_acct-year_CY06-16_2017-05-04.xlsx
diff --git a/downloads/federal_revenue_onshore_acct-year_CY06-17_2018_03_02.xlsx b/downloads/federal_revenue_onshore_acct-year_CY06-17_2018_03_02.xlsx
diff --git a/downloads/federal_revenue_onshore_acct-year_FY04-14_2015-11-20.xlsx b/downloads/federal_revenue_onshore_acct-year_FY04-14_2015-11-20.xlsx
diff --git a/downloads/federal_revenue_onshore_acct-year_FY06-15_2016-05-01.xlsx b/downloads/federal_revenue_onshore_acct-year_FY06-15_2016-05-01.xlsx
diff --git a/downloads/federal_revenue_onshore_acct-year_FY06-15_2016-09-15.xlsx b/downloads/federal_revenue_onshore_acct-year_FY06-15_2016-09-15.xlsx
diff --git a/downloads/federal_revenue_onshore_acct-year_FY06-16_2017-04-21.xlsx b/downloads/federal_revenue_onshore_acct-year_FY06-16_2017-04-21.xlsx
diff --git a/downloads/federal_revenue_onshore_acct-year_FY06-17_2017-11-30.xlsx b/downloads/federal_revenue_onshore_acct-year_FY06-17_2017-11-30.xlsx
diff --git a/downloads/monthly-disbursements_02-2019.xlsx b/downloads/monthly-disbursements_02-2019.xlsx
diff --git a/downloads/monthly-disbursements_03-2019.xlsx b/downloads/monthly-disbursements_03-2019.xlsx
diff --git a/downloads/monthly-disbursements_04-2019.csv b/downloads/monthly-disbursements_04-2019.csv
diff --git a/downloads/monthly-disbursements_04-2019.xlsx b/downloads/monthly-disbursements_04-2019.xlsx
diff --git a/downloads/monthly_production_02-2019.xlsx b/downloads/monthly_production_02-2019.xlsx
diff --git a/downloads/monthly_production_03-2019.xlsx b/downloads/monthly_production_03-2019.xlsx
diff --git a/downloads/monthly_production_04-2019.xlsx b/downloads/monthly_production_04-2019.xlsx
diff --git a/downloads/monthly_production_05-2019.csv b/downloads/monthly_production_05-2019.csv
diff --git a/downloads/monthly_production_06-2019.csv b/downloads/monthly_production_06-2019.csv
diff --git a/downloads/monthly_production_06-2019.xlsx b/downloads/monthly_production_06-2019.xlsx
diff --git a/downloads/monthly_production_11-2018.xlsx b/downloads/monthly_production_11-2018.xlsx
diff --git a/downloads/monthly_production_12-2018.xlsx b/downloads/monthly_production_12-2018.xlsx
diff --git a/downloads/monthly_revenue_01-2019.xlsx b/downloads/monthly_revenue_01-2019.xlsx
diff --git a/downloads/monthly_revenue_02-2019.xlsx b/downloads/monthly_revenue_02-2019.xlsx
diff --git a/downloads/monthly_revenue_03-2019.xlsx b/downloads/monthly_revenue_03-2019.xlsx
diff --git a/downloads/monthly_revenue_04-2019.csv b/downloads/monthly_revenue_04-2019.csv
diff --git a/downloads/monthly_revenue_04-2019.xlsx b/downloads/monthly_revenue_04-2019.xlsx
diff --git a/downloads/monthly_revenue_05-2019.csv b/downloads/monthly_revenue_05-2019.csv
diff --git a/downloads/monthly_revenue_05-2019.xlsx b/downloads/monthly_revenue_05-2019.xlsx
diff --git a/downloads/monthly_revenue_10-2018.xlsx b/downloads/monthly_revenue_10-2018.xlsx
diff --git a/downloads/monthly_revenue_11-2018.xlsx b/downloads/monthly_revenue_11-2018.xlsx
diff --git a/downloads/native_american_revenue_CY06-18.xlsx b/downloads/native_american_revenue_CY06-18.xlsx
diff --git a/downloads/native_american_revenue_FY06-18.xlsx b/downloads/native_american_revenue_FY06-18.xlsx
diff --git a/downloads/production_federal_lands_waters_CY2013_oil_gas_solids-2015-11-25.xlsx b/downloads/production_federal_lands_waters_CY2013_oil_gas_solids-2015-11-25.xlsx
diff --git a/downloads/revenues/monthly_revenue.xlsx b/downloads/revenues/monthly_revenue.xlsx
diff --git a/gatsby-config.js b/gatsby-config.js
@@ -16,7 +16,7 @@ let config = {
   siteMetadata: {
     title: 'Natural Resources Revenue Data',
     description: 'This site provides open data about natural resource management on federal lands and waters in the United States, including oil, gas, coal, and other extractive industries.',
-    version: 'v5.2.2',
+    version: 'v5.2.3',
     googleAnalyticsId: GOOGLE_ANALYTICS_ID,
   },
   plugins: [

diff --git a/humans.txt b/humans.txt
@@ -48,6 +48,7 @@
     [Book](https://thenounproject.com/term/book/8372/) by Danilo Gusmão Silveira from The Noun Project
     [Buildings](https://thenounproject.com/search/?q=Buildings&creator=31590&i=47227) by Stefan Parnarov from The Noun Project
     [Coal Trolley](https://thenounproject.com/term/coal-trolley/13384/) by David Chapman from The Noun Project
+    [CSV File](https://thenounproject.com/term/csv-file/305198/) by Milinda Courey from the Noun Project
     [Dam](https://thenounproject.com/term/dam/69333/) by iconsmind from The Noun Project
     [Gas](https://thenounproject.com/term/flame/57314/) by the2ne from The Noun Project
     Geothermal by Michelle Hertzfeld
@@ -61,6 +62,7 @@
     [Swings](https://thenounproject.com/search/?q=swings&creator=16899&i=37924) by Rafael Farias Leão from The Noun Project
     [Wheat](https://thenounproject.com/search/?q=wheat&creator=40467&i=17766) by Andrea Caldarelli from The Noun Project
     [Wind Turbine](https://thenounproject.com/search/?q=turbine&creator=438738&i=68926) by iconsmind from The Noun Project
+    [XLS File](https://thenounproject.com/term/xls-file/305171/) by Milinda Courey from the Noun Project
     [Gold Bullion](https://thenounproject.com/search/?q=gold+bars&i=229933) by niedzwiedz from The Noun Project
     [Excavator](https://thenounproject.com/search/?q=excavation&i=60617) by Bruno Gatjens Gonzalez from The Noun Project
     [Fish](https://thenounproject.com/search/?q=fish&i=153358) by Mario Bieh from The Noun Project

diff --git a/src/components/layouts/DefaultLayout/DefaultLayout.js b/src/components/layouts/DefaultLayout/DefaultLayout.js
@@ -35,6 +35,7 @@ const DefaultLayout = ({ children }) => {
   return (
     <div>
       <Helmet
+        htmlAttributes={{ lang: 'en' }}
         meta={[
           { name: 'google-site-verification', content: 'OxyG3U-Vtui-uK6wHUeOw83OgdfcfxvsWWZcb5x7aZ0' },
           // Mobile Specific Metas

diff --git a/src/components/layouts/Footer/Footer.js b/src/components/layouts/Footer/Footer.js
@@ -23,8 +23,7 @@ const Footer = ({ version }) => (
           <p className="footer-para_callout footer-para_callout-bigger">Built in the open</p>
           <p className="footer-para">This site (<a href={'https://github.com/onrr/doi-extractives-data/releases/' + version } className="link-active-beta">{ version }</a>)
         is powered by <a className="link-active-beta" href="/downloads">open data</a> and <a className="link-active-beta" href="https://github.com/ONRR/doi-extractives-data/">source code</a>.
-        We welcome contributions and comments on <a className="link-active-beta" href="https://github.com/ONRR/doi-extractives-data/issues/new">GitHub</a>. We write about how we work on this site on <Link to="/blog" className="link-active-beta">our team's blog</Link>.<br/>
-          <a className={styles.helpWanted} href="https://docs.google.com/forms/d/e/1FAIpQLSe5fTZq_SCrid9N48Bh2DJ-WzHfYvo75-En6g7f9iaIK6EGiQ/viewform">Help make this site better.<span style={{ paddingLeft: '15px', verticalAlign: 'middle' }}><BullhornIcon viewBox="0 -15 100 100" width="25px" height="25px"/></span></a></p>
+        We welcome contributions and comments on <a className="link-active-beta" href="https://github.com/ONRR/doi-extractives-data/issues/new">GitHub</a>. We write about how we work on this site on <Link to="/blog" className="link-active-beta">our team's blog</Link>.</p>
 
           <p className="footer-para-small footer-para_last"><a href="https://www.doi.gov/" className="link-beta">Department of the Interior</a> | <a href="https://www.doi.gov/privacy" className="link-beta">Privacy Policy</a> | <a href="https://www.doi.gov/foia" className="link-beta">FOIA</a> | <a href="https://www.usa.gov/" className="link-beta">USA.gov</a></p>
 

diff --git a/src/components/layouts/Header/Header.js b/src/components/layouts/Header/Header.js
@@ -69,7 +69,6 @@ const Header = props => {
             <li className="header-nav_item_top">
               <a href="#" onClick={() => props.glossaryTermSelected('', true)} className="header-nav_item_link_top js-glossary-toggle" alt="this is the glossary drawer">Glossary</a>
             </li>
-            <span className="header-nav_item_link_spacer"> | </span>
             <li className="header-nav_item_top">
               <Link {...downloadClassNames} to="/downloads/">Download data </Link>
             </li> <li className="header-nav_item_top">

diff --git a/src/components/layouts/icon-links/DownloadCsvLink/DownloadCsvLink.README.md b/src/components/layouts/icon-links/DownloadCsvLink/DownloadCsvLink.README.md
@@ -0,0 +1,15 @@
+---
+title: Download CSV Link
+componentName: DownloadCsvLink
+patternCategory: Layouts
+---
+
+```
+<DownloadCsvLink to="/explore/#production" >Download production data</DownloadCsvLink>
+```
+
+## How to use
+The Download CSV Link component includes a custom icon and produces a link style for downloading `csv` versions of our data files.
+
+In markdown files, use the `<csv-link>` variant.
+
diff --git a/src/components/layouts/icon-links/DownloadCsvLink/DownloadCsvLink.js b/src/components/layouts/icon-links/DownloadCsvLink/DownloadCsvLink.js
@@ -0,0 +1,25 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Link from '../../../utils/temp-link';
+
+import styles from "./DownloadCsvLink.module.scss"
+
+import DownloadCsvIcon from '-!svg-react-loader!../../../../img/svg/icon-download-csv.svg';
+
+const DownloadCsvLink = (props) => ( 
+    <Link to={props.to} className={styles.root}>
+        <DownloadCsvIcon />
+        <span>
+        	{props.children === undefined ?
+            'Download' :
+            props.children}
+        </span>
+    </Link>
+);
+
+DownloadCsvLink.propTypes = {
+	/** The url for the link */
+	to: PropTypes.string,
+}
+
+export default DownloadCsvLink;
diff --git a/src/components/layouts/icon-links/DownloadCsvLink/DownloadCsvLink.module.scss b/src/components/layouts/icon-links/DownloadCsvLink/DownloadCsvLink.module.scss
@@ -0,0 +1,12 @@
+@value colors: "../../../../css-global/colors.scss";
+@value blue as _blue from colors;
+
+.root svg{
+	fill: currentColor;
+	vertical-align: middle;
+	margin-right: 8px;
+}
+
+.root span{
+	vertical-align: baseline;
+}
diff --git a/src/components/layouts/icon-links/DownloadCsvLink/index.js b/src/components/layouts/icon-links/DownloadCsvLink/index.js
@@ -0,0 +1 @@
+export default from './DownloadCsvLink';
diff --git a/src/components/layouts/icon-links/DownloadExcelLink/DownloadExcelLink.README.md b/src/components/layouts/icon-links/DownloadExcelLink/DownloadExcelLink.README.md
@@ -0,0 +1,15 @@
+---
+title: Download Excel Link
+componentName: DownloadExcelLink
+patternCategory: Layouts
+---
+
+```
+<DownloadExcelLink to="/explore/#production" >Download production data</DownloadExcelLink>
+```
+
+## How to use
+The Download Excel Link component includes a custom icon and produces a link style for downloading `xlsx` versions of our data files.
+
+In markdown files, use the `<excel-link>` variant.
+
diff --git a/src/components/layouts/icon-links/DownloadExcelLink/DownloadExcelLink.js b/src/components/layouts/icon-links/DownloadExcelLink/DownloadExcelLink.js
@@ -0,0 +1,25 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Link from '../../../utils/temp-link';
+
+import styles from "./DownloadExcelLink.module.scss"
+
+import DownloadExcelIcon from '-!svg-react-loader!../../../../img/svg/icon-download-xls.svg';
+
+const DownloadExcelLink = (props) => ( 
+    <Link to={props.to} className={styles.root}>
+        <DownloadExcelIcon />
+        <span>
+        	{props.children === undefined ?
+            'Download' :
+            props.children}
+        </span>
+    </Link>
+);
+
+DownloadExcelLink.propTypes = {
+	/** The url for the link */
+	to: PropTypes.string,
+}
+
+export default DownloadExcelLink;
diff --git a/src/components/layouts/icon-links/DownloadExcelLink/DownloadExcelLink.module.scss b/src/components/layouts/icon-links/DownloadExcelLink/DownloadExcelLink.module.scss
@@ -0,0 +1,12 @@
+@value colors: "../../../../css-global/colors.scss";
+@value blue as _blue from colors;
+
+.root svg{
+	fill: currentColor;
+	vertical-align: middle;
+	margin-right: 8px;
+}
+
+.root span{
+	vertical-align: baseline;
+}
diff --git a/src/components/layouts/icon-links/DownloadExcelLink/index.js b/src/components/layouts/icon-links/DownloadExcelLink/index.js
@@ -0,0 +1 @@
+export default from './DownloadExcelLink';
diff --git a/src/components/locations/RevenueProcessTable.js b/src/components/locations/RevenueProcessTable.js
@@ -41,7 +41,7 @@ const RevenueTypeTableRow = props => {
     <tr>
 		    <th scope="row" data-value={props.commodityData.All[props.year]} name={'#revenue-' + utils.formatToSlug(props.commodityName)} className="table-arrow_box-subheader">
 		      <strong>{ props.commodityName }</strong><br/>
-		      <strong className="table-arrow_box-subheader-value">{ utils.formatToDollarInt(props.commodityData.All[props.year]) }</strong>
+		      <strong className="table-arrow_box-subheader-value"> { utils.formatToDollarInt(props.commodityData.All[props.year]) }</strong>
 		    </th>
 		  	{
 		  		revenueTypeNames.map((revenueTypeName, index) => {
@@ -183,25 +183,25 @@ const RevenueProcessTable = props => {
 			  	}
 			  	{ valuesRoyalties.Oil > 0 &&
 				  	<span className="text table-arrow_box-subheader-value">
-				  		<strong className="text-header text-header-first">Oil</strong>
+				  		<strong className="text-header text-header-first">Oil </strong>
 				  		{ utils.formatToDollarInt(valuesRoyalties.Oil)}
 				  	</span>
 			  	}
 			  	{ valuesRoyalties.Gas > 0 &&
 				  	<span className="text table-arrow_box-subheader-value">
-				  		<strong className="text-header text-header-first">Gas</strong>
+				  		<strong className="text-header text-header-first">Gas </strong>
 				  		{ utils.formatToDollarInt(valuesRoyalties.Gas)}
 				  	</span>
 			  	}
 			  	{ valuesRoyalties.NGL > 0 &&
 				  	<span className="text table-arrow_box-subheader-value">
-				  		<strong className="text-header text-header-first">NGL</strong>
+				  		<strong className="text-header text-header-first">NGL </strong>
 				  		{ utils.formatToDollarInt(valuesRoyalties.NGL)}
 				  	</span>
 			  	}
 			  	{ valuesRoyalties.OilShale > 0 &&
 				  	<span className="text table-arrow_box-subheader-value">
-				  		<strong className="text-header text-header-first">OilShale</strong>
+				  		<strong className="text-header text-header-first">OilShale </strong>
 				  		{ Ututilsils.formatToDollarInt(valuesRoyalties.OilShale)}
 				  	</span>
 			  	}

diff --git a/src/components/locations/RevenueTypeTable.js b/src/components/locations/RevenueTypeTable.js
@@ -40,7 +40,7 @@ const RevenueTypeTableRow = props => {
     <tr>
 		    <th scope="row" data-value={props.commodityData.All[props.year]} name={'#revenue-' + utils.formatToSlug(props.commodityName)} className="table-arrow_box-subheader">
 		      <strong>{ props.commodityName }</strong><br/>
-		      <strong className="table-arrow_box-subheader-value">{ utils.formatToDollarInt(props.commodityData.All[props.year]) }</strong>
+		      <strong className="table-arrow_box-subheader-value"> { utils.formatToDollarInt(props.commodityData.All[props.year]) }</strong>
 		    </th>
 		  	{
 		  		revenueTypeNames.map((revenueTypeName, index) => {
@@ -56,8 +56,8 @@ const RevenueTypeTableRow = props => {
 		  								<br/>
 			  							<span className="table-arrow_box-asterisk">
 			  								* Includes revenues not tied to specific commo&shy;dities
-			  								({ utils.formatToDollarInt(NATIONAL_REVENUES_INSPECTION_FEES[props.year]) } in inspection fees,
-			  								{ utils.formatToDollarInt(NATIONAL_REVENUES_CIVIL_PENALTIES[props.year]) } in civil penalties,
+			  								({ utils.formatToDollarInt(NATIONAL_REVENUES_INSPECTION_FEES[props.year]) } in inspection fees, 
+			  								{' ' +  utils.formatToDollarInt(NATIONAL_REVENUES_CIVIL_PENALTIES[props.year]) } in civil penalties,
 			  								and { utils.formatToDollarInt(NATIONAL_REVENUES_OTHER_REVENUES[props.year]) } in other revenue).
 			  							</span>
 		  							</div>
@@ -182,25 +182,25 @@ const RevenueTypeTable = props => {
 			  	}
 			  	{ valuesRoyalties.Oil > 0 &&
 				  	<span className="text table-arrow_box-subheader-value">
-				  		<strong className="text-header text-header-first">Oil</strong>
+				  		<strong className="text-header text-header-first">Oil </strong>
 				  		{ utils.formatToDollarInt(valuesRoyalties.Oil)}
 				  	</span>
 			  	}
 			  	{ valuesRoyalties.Gas > 0 &&
 				  	<span className="text table-arrow_box-subheader-value">
-				  		<strong className="text-header text-header-first">Gas</strong>
+				  		<strong className="text-header text-header-first">Gas </strong>
 				  		{ utils.formatToDollarInt(valuesRoyalties.Gas)}
 				  	</span>
 			  	}
 			  	{ valuesRoyalties.NGL > 0 &&
 				  	<span className="text table-arrow_box-subheader-value">
-				  		<strong className="text-header text-header-first">NGL</strong>
+				  		<strong className="text-header text-header-first">NGL </strong>
 				  		{ utils.formatToDollarInt(valuesRoyalties.NGL)}
 				  	</span>
 			  	}
 			  	{ valuesRoyalties.OilShale > 0 &&
 				  	<span className="text table-arrow_box-subheader-value">
-				  		<strong className="text-header text-header-first">OilShale</strong>
+				  		<strong className="text-header text-header-first">OilShale </strong>
 				  		{ utils.formatToDollarInt(valuesRoyalties.OilShale)}
 				  	</span>
 			  	}

diff --git a/src/components/sections/RevenueTrends/RevenueTrends.js b/src/components/sections/RevenueTrends/RevenueTrends.js
@@ -209,7 +209,9 @@ const PercentDifference = ({currentAmount, previousAmount}) => {
         :
           <TriangleDownIcon viewBox="-20 -10 50 40"/>
       }
-      {utils.round(percentIncrease, 0)+'%'}
+      <span>
+        {utils.round(percentIncrease, 0)+'%'}
+      </span>  
     </span>
   );
 }
diff --git a/src/components/sections/WhatsNew/WhatsNew.js b/src/components/sections/WhatsNew/WhatsNew.js
@@ -7,10 +7,12 @@ const WhatsNew = props => (
   <section className={styles.root + ' slab-delta'}>
   	<div className="container-page-wrapper">
       <h2>What's new</h2>
-      <p>In our latest release on May 28, 2019, we made the following changes:</p>
+      <p>In our latest release on June 13, 2019, we made the following changes:</p>
       <ul className="list-bullet ribbon-card-top-list">
-        <li>Updated <Link to="downloads/federal-revenue-by-location/">revenue data downloads to include 2003-2018 data</Link></li>
-        <li>Updated revenue trends section styling and changed to a 10-year rolling trend line </li>
+        <li>Added csv option for all <Link to="downloads/">downloads</Link></li>
+        <li>Updated <Link to="downloads/federal-production/">calendar year production file to include 2003-2018 data</Link></li>
+        <li>Updated homepage graphs with monthly revenue through May 2019 and production through February 2019 </li>
+        <li>Updated <Link to="downloads/federal-disbursements-by-month/"> monthly disbursements file through April 2019</Link></li>
       </ul>
 
       <p>Review our <a href="https://github.com/ONRR/doi-extractives-data/releases">full release details</a>.</p>

diff --git a/src/data-graphql/production_volumes.xlsx b/src/data-graphql/production_volumes.xlsx
diff --git a/src/img/svg/arrow-up.svg b/src/img/svg/arrow-up.svg
diff --git a/src/img/svg/icon-download-csv.svg b/src/img/svg/icon-download-csv.svg
diff --git a/src/img/svg/icon-download-xls.svg b/src/img/svg/icon-download-xls.svg
diff --git a/src/js/hast-react-renderer.js b/src/js/hast-react-renderer.js
@@ -36,6 +36,8 @@ import RenewablesIcon from '-!svg-react-loader!../img/svg/icon-renewables.svg';
 import GeothermalIcon from '-!svg-react-loader!../img/svg/icon-geothermal.svg';
 import ChevronIcon from '-!svg-react-loader!../img/svg/chevron-lt.svg';
 import DownloadLink from '../components/layouts/icon-links/DownloadLink';
+import DownloadCsvLink from '../components/layouts/icon-links/DownloadCsvLink';
+import DownloadExcelLink from '../components/layouts/icon-links/DownloadExcelLink';
 
 const SelectWrapper = (props) => {
   let { onchange, ...mutableProps } = props;
@@ -123,10 +125,11 @@ const hastReactRenderer = new rehypeReact({
                 'geothermal-icon': GeothermalIcon,
                 'chevron-icon': ChevronIcon,
                 'select': SelectWrapper,
-                'download-link': DownloadLink,
                 'use': UseWrapper,
                 'svg': SvgWrapper,
                 'download-link': DownloadLink,
+                'excel-link': DownloadExcelLink,
+                'csv-link': DownloadCsvLink,
               },
 
 }).Compiler; 

diff --git a/src/markdown/downloads/default.md b/src/markdown/downloads/default.md
@@ -23,7 +23,7 @@ tag:
     <download-data-link to="/downloads/federal-production-by-month/">Downloads and documentation</download-data-link>
   </li>
   <li class="downloads-download_links">
-    <h3 id="federal-lands-and-waters">Production from federal land and waters by year</h3>
+    <h3 id="federal-lands-and-waters">Production by year</h3>
     <p>These datasets include commodity volumes of natural resources extracted from federal lands and waters. Production volumes are available by state, county, and offshore area. We offer production data for calendar and fiscal years.</p>
     <download-data-link to="/downloads/federal-production/">Downloads and documentation</download-data-link>
   </li>
@@ -40,7 +40,7 @@ tag:
   </li>
   <!--Federal revenue by location-->
   <li class="downloads-download_links">
-    <h3 id="all-revenue">Federal revenue by year and location</h3>
+    <h3 id="all-revenue">Revenue by year</h3>
     <p>These datasets include natural resource revenues for U.S. federal lands and offshore areas by calendar and fiscal years. It does not include Native American lands, privately owned lands, or U.S. state lands.</p>
     <download-data-link to="/downloads/federal-revenue-by-location/">Downloads and documentation</download-data-link>
   </li>