Merge pull request #2836 from 18F/dev

Dev-->Staging

_config-dev.yml

@@ -61,3 +61,4 @@ exclude:
   - maps/land/*.json
   - serve*
   - re-serve*
+  - public

_config.yml

@@ -8,7 +8,7 @@ url: https://revenuedata.doi.gov
 
 # app version number
 
-version: v3.1.4
+version: v3.1.5
 
 exclude:
   # top-level log

_data/fund_names.yml

@@ -12,10 +12,10 @@ Land & Water Conservation:
   description: Provides matching grants to states and local governments to buy and develop public outdoor recreation areas across the 50 states. See below for more information about this fund.
 Historic Preservation:
   name: Historic Preservation Fund
-  description: Helps preserve US historical and archaeological sites and cultural heritage through grants to state and tribal historic preservation offices. See below for more information about this fund.
+  description: Helps preserve U.S. historical and archaeological sites and cultural heritage through grants to state and tribal historic preservation offices. See below for more information about this fund.
 American Indian Tribes:
   name: American Indian tribes
   description: ONRR disburses 100% of revenue collected from resource extraction on American Indian lands back to the Indian tribes and individual Indian landowners.
 Other:
   name: Other funds
-  description: Some funds are directed back to federal agencies that administer these lands to help cover operational costs. The Ultra-Deepwater Research Program and the Mescal Settlement Agreement also receive $50 million each.
+  description: Some funds are directed back to federal agencies that administer these lands to help cover operational costs. The Ultra-Deepwater Research Program and the Mescal Settlement Agreement also receive $50 million each.

_downloads/disbursements.md

@@ -17,6 +17,8 @@ nav_items:
         title: Onshore
       - name: offshore
         title: Offshore
+  - name: archive
+    title: Archive
   - name: contact-us
     title: Contact us
 selector: list
@@ -80,12 +82,35 @@ _Historic Preservation Fund_ This fund helps preserve U.S. historical and archae
 
 _States_ States receive federal Outer Continental Shelf revenue in two ways:
 
-
 1. 27% of revenue from leases in the 8(g) Zone (the first three nautical miles of the Outer Continental Shelf) are shared with states.
 2. 37.5% of revenue from certain leases in the Gulf of Mexico are shared with Alabama, Louisiana, Mississippi, and Texas.
 
 _Other_ Certain offshore funds are directed back to the federal agencies that administer these lands (e.g., BOEM and BSEE) to help cover the agencies’ operational costs.
 
+## Archive
+
+In the past, this site has offered detailed data for disbursements distributed from other funds. For example, the data below details disbursements to sub-funds of the Land and Water Conservation Fund and the Historic Preservation Fund.
+
+### Land and Water Conservation Fund
+
+{{ "ONRR" | term }} disburses revenue to the [Land and Water Conservation Fund (LWCF)](https://www.nps.gov/subjects/lwcf/index.htm) according to federal law. However, these funds are subject to congressional appropriations. Some of the money disbursed from ONRR to the fund is spent on LWCF projects, but some of it ultimately goes to other expenditures. The fund is authorized to receive and disburse $900 million each year, but congressional appropriations to LWCF projects have been limited to between $149 million and $573 million each year since 1999.
+
+To see how much was disbursed to states, sub-funds, and other projects each year, see the following datasets.
+
+* [American Battlefield Protection Program, 2011-2015 data]({{ site.baseurl }}/data/disbursements/lwcf/abpp.tsv) (TSV): Details about the location, acreage, and grant amounts of each battlefield funded through the [American Battlefield Protection Program](https://www.nps.gov/abpp/index.htm), a National Parks Service program that preserves the land where historic American battles were fought.
+
+* [Cooperative Endangered Species Conservation Fund, 2011-2015 data]({{ site.baseurl }}/data/disbursements/lwcf/cescf.tsv) (TSV): List of individual projects and locations funded through the [Cooperative Endangered Species Conservation Fund](https://www.fws.gov/endangered/grants/), a [Fish and Wildlife Service](https://www.fws.gov/) program for conservation planning and acquisition of vital habitat for threatened and endangered species.
+
+* [State and local grants, 2011-2016 data]({{ site.baseurl }}/data/disbursements/lwcf/grants.tsv) (TSV): Details about the location, amount, and purpose of all Land and Water Conservation Fund grants to state and local governments.
+
+* [Land acquisitions, 2011-2016 data]({{ site.baseurl }}/data/disbursements/lwcf/land-acquisition.tsv) (TSV): Details about the location, budget, acreage, and purpose of each federal land acquisition funded by the Land and Water Conservation Fund.
+
+### Historic Preservation Fund
+
+Like the LWCF, money in the Historic Preservation Fund is subject to congressional appropriations. Some of it is spent on historic preservation projects, but some of it ultimately goes to other expenditures. The fund is authorized to receive and disburse $150 million each year, but annual appropriations have declined from $94 million to less than $60 million since 2001.
+
+To see how much was disbursed to each state for preservation projects, see [Historic Preservation grants, 2011-2016]({{ site.baseurl }}/data/disbursements/historic-preservation.tsv) (TSV).
+
 ## Contact us
 
 {% include contact.html %}

_how-it-works/coal-excise-tax.md

@@ -11,10 +11,7 @@ nav_items:
   - name: introduction
     title: Top
   - name: coal-excise-tax-rates
-    title: Coal excise
-    subnav_items:
-      - name: coal-excise-tax-rates
-        title: Coal excise tax rates
+    title: Coal excise tax rates
 permalink: /how-it-works/coal-excise-tax/
 breadcrumb:
   - title: How it works
@@ -61,7 +58,7 @@ The current tax rate is $1.10 per ton for coal from underground mines and $0.55
   </tbody>
 </table>
 
-The coal excise tax rates are scheduled to decline to $0.50 per ton for underground mines and $0.25 per ton for surface mines (both limited to two percent of the coal’s selling price). This change will occur either on January 1, 2019 or the first January 1st when there are no more repayable advances from the General Fund to the Trust Fund and no unpaid interest on previous such advances.
+The coal excise tax rates are scheduled to decline to $0.50 per ton for underground mines and $0.25 per ton for surface mines (both limited to two percent of the coal’s selling price). This change will occur either on January 1, 2019, or the first January 1 when there are no more repayable advances from the General Fund to the Trust Fund and no unpaid interest on previous such advances.
 
 ## Notes
 

_how-it-works/default.md

@@ -39,7 +39,7 @@ selector: list
         {% include svg/how-it-works-ribbon-graphic.svg %}
       </div>
       <div class="ribbon-card-bottom">
-        <a href="{{site.baseurl}}/how-it-works/production/" class="link-alpha">What natural resources does the U.S. produce?</a>
+        <a href="{{site.baseurl}}/how-it-works/#production" class="link-alpha">What natural resources does the U.S. produce?</a>
       </div>
     </div>
   </div>

_how-it-works/tribal-economic-impact.md

@@ -36,7 +36,7 @@ Little data exists to measure the economic impact of extraction on tribal econom
 
 ## Gross domestic product and jobs
 
-The Bureau of Economic Analysis, Bureau of Labor Statistics, and the U.S. Census Bureau do not collect tribal-specific information related to the extractive industries. The closest indicator for the extractive industries’ effect on tribal economies comes from the Department of the Interior’s [Economic Report for Fiscal Year 2015 (PDF)](https://www.doi.gov/sites/doi.gov/files/uploads/fy2015_doi_econ_report_2016-06-17.pdf). See page 22 of this annual report for estimates of the direct economic contribution, total economic contribution, and total value added by DOI’s activities, as well as the total number of domestic jobs supported by those activities.
+The Bureau of Economic Analysis, Bureau of Labor Statistics, and the U.S. Census Bureau do not collect tribal-specific information related to the extractive industries. The closest indicator for the extractive industries’ effect on tribal economies comes from the [Department of the Interior’s Economic Report (PDF)](https://www.doi.gov/sites/doi.gov/files/uploads/fy_2016_doi_economic_report_2017-09-25.pdf). See page 10 of this annual report for estimates of the direct economic contribution, total economic contribution, and total value added by DOI’s activities, as well as the total number of domestic jobs supported by those activities.
 
 ## Costs
 

_includes/location/national-disbursements.html

@@ -33,27 +33,22 @@ <h4 id="lwcf">Land and Water Conservation Fund</h4>
 
   <p>{{ "ONRR" | term }} disburses revenue to the <a href="https://www.nps.gov/subjects/lwcf/index.htm">Land and Water Conservation Fund</a> (LWCF) according to federal law. However, these funds are subject to congressional appropriations. Some of the money disbursed from ONRR to the fund is spent on LWCF projects, but some of it ultimately goes to other expenditures. The fund is authorized to receive and disburse $900 million each year, but congressional appropriations to LWCF projects have been limited to between $149 million and $573 million each year since 1999.</p>
 
-  <p>To see how much was disbursed to states, sub-funds, and other projects each year, see the following datasets:</p>
-
-  <ul>
-    <li>
-      <a href="{{ site.baseurl }}/data/disbursements/lwcf/abpp.tsv">American Battlefield Protection Program, 2011-2015 data (TSV)</a>: Details about the location, acreage, and grant amounts of each battlefield funded through the <a href="https://www.nps.gov/abpp/index.htm">American Battlefield Protection Program</a>, a National Parks Service program that preserves the land where historic American battles were fought.
-    </li>
-    <li>
-      <a href="{{ site.baseurl }}/data/disbursements/lwcf/cescf.tsv">Cooperative Endangered Species Conservation Fund, 2011-2015 data (TSV)</a>: List of individual projects and locations funded through the <a href="https://www.fws.gov/endangered/grants/">Cooperative Endangered Species Conservation Fund</a>, a <a href="https://www.fws.gov/">Fish and Wildlife Service</a> program for conservation planning and acquisition of vital habitat for threatened and endangered species.
-    </li>
-    <li>
-      <a href="{{ site.baseurl }}/data/disbursements/lwcf/grants.tsv">State and local grants, 2011-2016 data (TSV)</a>: Details about the location, amount, and purpose of all Land and Water Conservation Fund grants to state and local governments.
-    </li>
-    <li>
-      <a href="{{ site.baseurl }}/data/disbursements/lwcf/land-acquisition.tsv">Land acquisitions, 2011-2016 data (TSV)</a>: Details about the location, budget, acreage, and purpose of each federal land acquisition funded by the Land and Water Conservation Fund.
-    </li>
-  </ul>
+  <p>
+    <a href="{{site.baseurl}}/downloads/disbursements/#land-and-water-conservation-fund">
+      <object type="image/svg+xml" data="{{site.baseurl}}/public/img/icons/file-text-o.svg" class="u-padding-right icon-small">
+      </object>Data archive
+    </a>
+  </p>
 
   <h4 id="hpf">Historic Preservation Fund</h4>
 
   <p>Like the LWCF, money in the Historic Preservation Fund is subject to congressional appropriations. Some of it is spent on historic preservation projects, but some of it ultimately goes to other expenditures. The fund is authorized to receive and disburse $150 million each year, but annual appropriations have declined from $94 million to less than $60 million since 2001.</p>
 
-  <p>To see how much was disbursed to each state for preservation projects (including Hurricane Sandy recovery funds), see <a href="{{ site.baseurl }}/data/disbursements/historic-preservation.tsv">Historic Preservation grants, 2011-2016 (TSV)</a>.</p>
+  <p>
+    <a href="{{site.baseurl}}/downloads/disbursements/#historic-preservation-fund">
+      <object type="image/svg+xml" data="{{site.baseurl}}/public/img/icons/file-text-o.svg" class="u-padding-right icon-small">
+      </object>Data archive
+    </a>
+  </p>
 
 </section>

js/components/bar-chart-table.js

@@ -177,7 +177,7 @@
         .attr('data-year', year)
         .text(year)
 
-      sentences.select('[data-year]')
+      sentences.selectAll('[data-year]')
         .attr('data-year', year)
         .text(year)
 
@@ -372,25 +372,36 @@
           bar.style.setProperty(sizeProperty, Math.abs(size) + '%');
 
           if(Math.abs(size) === 0) {
-             bar.style.setProperty('display', 'none');
+            bar.style.setProperty('display', 'none');
+          }
+          else {
+            bar.style.removeProperty('display')
           }
 
           [].forEach.call(childCells, function(childSpan) {
+
             var childBar = document.createElement('div');
             childBar.className = 'bar';
             var newBar = barExtent.appendChild(childBar);
             var childValue = +childSpan.dataset.value;
             size = width(childValue);
             newBar.style.setProperty(sizeProperty, Math.abs(size) + '%');
             if(Math.abs(size) === 0) {
-               newBar.style.setProperty('display', 'none');
+              newBar.style.setProperty('display', 'none');
+            }
+            else {
+              newBar.style.removeProperty('display')
             }
           });
         } else {
+
           bar.style.setProperty(sizeProperty, Math.abs(size) + '%');
 
           if(Math.abs(size) === 0) {
-             bar.style.setProperty('display', 'none');
+            bar.style.setProperty('display', 'none');
+          }
+          else {
+            bar.style.removeProperty('display')
           }
         }
       });