Merge pull request #935 from fedspendingtransparency/staging

Colleges and Universities Patch Release 6.0.1
fedspendingtransparency · Aug 5, 2019 · fd273ff · fd273ff
2 parents 71e209e + 44c5ad0
commit fd273ff
Show file tree

Hide file tree

Showing 31 changed files with 1,163 additions and 960 deletions.
diff --git a/.gitignore b/.gitignore
@@ -65,5 +65,3 @@ Gemfile.lock
 package-lock.json
 node_modules
 .Rproj.user
-
-docker-compose.yml
diff --git a/404.html b/404.html
@@ -6,15 +6,14 @@
 ---
 
 <div id="four-oh-four">
-
   <div class="four-container">
-    <h3>
-      Oops!
-    </h3>
-    <p>
-      Looks like you got lost in the data. <br>
-      <span>It happens.</span> Find your way back.
-    </p>
+    <h3>Oops!</h3>
+    <p>Looks like you got lost in the data. <br> <span>It happens.</span> Find your way back.</p>
+
+    <div id="btn-container">
+      <div id="back-btn"><a href='dts.html'><i class="fas fa-arrow-left"></i>Back</a></div>
+      <div id="home-btn"><a href='/'><i class="fas fa-home"></i>Home</a></div>
+    </div>
 
   </div>
 </div>

diff --git a/_includes/colleges/colleges-share.html b/_includes/colleges/colleges-share.html
@@ -1,59 +1,59 @@
 <script>
-    function clickShareItemLink(item, url) {
-        window.open(url, 'pop-up', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0');
+ function clickShareItemLink(item, url) {
+     window.open(url, 'pop-up', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0');
 
-        window.Analytics.event({
-            category: 'Share Menu - Click Item',
-            action: item
-        });
+     window.Analytics.event({
+         category: 'Share Menu - Click Item',
+         action: item
+     });
 
-        return false;
-    }
+     return false;
+ }
 </script>
 
 <div class="popup new-share-button">
-    <span class="viz-share-icon" aria-hidden="true">
-        {% include svgs/share.svg %} Share
-    </span>
-    <span class="popuptext right newpopup" id="sharePopup">
-        <div class="share-buttons">
-            <ul>
-                <li>
-                    <a href="javascript:clickShareItemLink('Facebook', 'https://www.facebook.com/sharer/sharer.php?u={{ site.url }}{{ site.baseurl }}{{ page.url }}#{{include.anchor}}')" title="Share on Facebook">
-                        {% include svgs/facebook_square_x.svg class="share-icon icon-facebook" %}
-                        <span class="share-button-text">Facebook</span>
-                    </a>
-                </li>
-                <li>
-                    {% if page.socialMediaText %}
-                    {% assign twitterVariable = page.socialMediaText %}
-                    {% else %} 
-                    {% assign twitterVariable = page.title %}
-                    {% endif %}
-                    <a href="javascript:clickShareItemLink('Twitter', 'https://twitter.com/intent/tweet?text='+encodeURIComponent('{{ twitterVariable }}')+'&url={{ site.url }}{{ site.baseurl }}{{ page.url }}#{{include.anchor}}')" title="Share on Twitter">
-                        {% include svgs/twitter_square_x.svg class="share-icon icon-twitter" %}
-                        <span class="share-button-text">Twitter</span>
-                    </a>
-                </li>
-                <li>
-                    <a href="javascript:clickShareItemLink('Reddit', 'http://www.reddit.com/submit?url={{ site.url }}{{ site.baseurl }}{{ page.url }}')#{{include.anchor}}" title="Share on Reddit">
-                        {% include svgs/reddit.svg class="share-icon icon-reddit" %}
-                        <span class="share-button-text">Reddit</span>
-                    </a>
-                </li>
-                <li>
-                    <a href='javascript:clickShareItemLink("Linkedin", "https://www.linkedin.com/shareArticle?mini=true&url={{ site.url }}{{ site.baseurl }}{{ page.url }}#{{include.anchor}}")' title="Share on LinkedIn">
-                        {% include svgs/linkedin_square_x.svg class="share-icon icon-linkedin" %}
-                        <span class="share-button-text">Linkedin</span>
-                    </a>
-                </li>
-                <li>
-                    <a href="mailto:?subject=Check out this analysis on Data Lab&body=Did you know the federal government invested over $149 billion in higher education? Check out this analysis and discover how much your Alma Mater received in federal funds!%0D%0A%0D%0ACheck out this site {{ site.url }}{{ site.baseurl }}{{ page.url }}#{{include.anchor}}" title="Share via Email">
-                        {% include svgs/envelope.svg class="share-icon icon-envelope" %}
-                        <span class="share-button-text">Email</span>
-                    </a>
-                </li>
-            </ul>
-        </div>
-    </span>
+  <span class="viz-share-icon" aria-hidden="true">
+    {% include svgs/share.svg %} Share
+  </span>
+  <span class="popuptext right newpopup" id="sharePopup">
+    <div class="share-buttons">
+      <ul>
+        <li>
+          <a href="javascript:clickShareItemLink('Facebook', 'https://www.facebook.com/sharer/sharer.php?u={{ site.url }}{{ site.baseurl }}{{ page.url }}#{{include.anchor}}')" title="Share on Facebook">
+            {% include svgs/facebook_square_x.svg class="share-icon icon-facebook" %}
+            <span class="share-button-text">Facebook</span>
+          </a>
+        </li>
+        <li>
+          {% if page.socialTwitterText %}
+          {% assign twitterVariable = page.socialTwitterText %}
+          {% else %} 
+          {% assign twitterVariable = page.title %}
+          {% endif %}
+          <a href="javascript:clickShareItemLink('Twitter', 'https://twitter.com/intent/tweet?text='+encodeURIComponent('{{ twitterVariable }}')+'&url={{ site.url }}{{ site.baseurl }}{{ page.url }}#{{include.anchor}}')" title="Share on Twitter">
+            {% include svgs/twitter_square_x.svg class="share-icon icon-twitter" %}
+            <span class="share-button-text">Twitter</span>
+          </a>
+        </li>
+        <li>
+          <a href="javascript:clickShareItemLink('Reddit', 'http://www.reddit.com/submit?url={{ site.url }}{{ site.baseurl }}{{ page.url }}')" title="Share on Reddit">
+            {% include svgs/reddit.svg class="share-icon icon-reddit" %}
+            <span class="share-button-text">Reddit</span>
+          </a>
+        </li>
+        <li>
+          <a href='javascript:clickShareItemLink("Linkedin", "https://www.linkedin.com/shareArticle?mini=true&url={{ site.url }}{{ site.baseurl }}{{ page.url }}#{{include.anchor}}")' title="Share on LinkedIn">
+            {% include svgs/linkedin_square_x.svg class="share-icon icon-linkedin" %}
+            <span class="share-button-text">Linkedin</span>
+          </a>
+        </li>
+        <li>
+          <a href="mailto:?subject=Check out this analysis on Data Lab&body=Did you know the federal government invested over $149 billion in higher education? Check out this analysis and discover how much your Alma Mater received in federal funds!%0D%0A%0D%0ACheck out this site {{ site.url }}{{ site.baseurl }}{{ page.url }}#{{include.anchor}}" title="Share via Email">
+            {% include svgs/envelope.svg class="share-icon icon-envelope" %}
+            <span class="share-button-text">Email</span>
+          </a>
+        </li>
+      </ul>
+    </div>
+  </span>
 </div>
diff --git a/_includes/colleges/investment-categories.html b/_includes/colleges/investment-categories.html
@@ -11,7 +11,8 @@ <h1 class="cu-header__teaser">
       </h1>
       <p class="cu-header__blurb">
 	Now that we know how much money was invested in higher education, are you curious to know how the money was used? This visualization allows you to discover the various categories the government uses to classify funding.
-	Note: Product and Service Codes (PSCs) are used to categorize contract purchases of products and services and Federal Assistance Listings are used to categorize grant funding.
+	Note:
+        Product and Service Codes (PSCs) are used to categorize contract purchases of products and services and Federal Assistance Listings are used to categorize grant funding.
       </p>
 
       <section class="accordion">
@@ -29,14 +30,14 @@ <h1 class="accordion__heading">Instructions</h1>
       <div id='sunburst-header' class="cu-header__controls">
         <form id='categories'>
           <input type='radio' name='category' value='contracts' id='contracts_data' onchange='changeCategory(this)' />
-          <label for='contracts_data' class='desktop'>Contracts (PSC)</label>
-          <label for='contracts_data' class='mobile'>PSC</label>
+          <label for='contracts_data' class='desktop'>Contracts</label>
+          <label for='contracts_data' class='mobile'>Contracts</label>
           <input type='radio' name='category' value='grants' id='grants_data' checked onchange='changeCategory(this)' />
-          <label for='grants_data' class='desktop'>Grants (CFDA)</label>
-          <label for='grants_data' class='mobile'>CFDA</label>
+          <label for='grants_data' class='desktop'>Grants</label>
+          <label for='grants_data' class='mobile'>Grants</label>
           <input type='radio' name='category' value='research' id='research_data' onchange='changeCategory(this)'/>
           <label for='research_data'>
-              <span class='desktop'>Research Grants (CFDA)</span>
+              <span class='desktop'>Research Grants</span>
               <span class='mobile'>Grants (Research)</span>
               <div class="cfda">
               <button type="button" class="cfda__trigger"><img src="/assets/icons/CU/info-circle-solid.svg" alt="close"></button>
@@ -68,7 +69,12 @@ <h1 class="accordion__heading">Instructions</h1>
 
         <div id='investment-function-buttons' class='function-buttons' onclick='panelClick(this.id)'>
           <div id='investment-search' class='button-set'>
-            <button type='button' title='Search' onclick='searchClick("investment-function-buttons")'><img src='/assets/icons/magnifier.svg' /></button>
+            <button type='button' title='Search'
+              onclick='searchClick("investment-function-buttons")'
+              ga-on="click" ga-event-category="AB Test" ga-event-action="Clicked C&U Search"
+            >
+              <img src='/assets/icons/magnifier.svg' />
+            </button>
           </div>
           <div class='button-set'>
             <button id='sunburst-chart-trigger' type='button' title='View chart' style='opacity: 1;' onclick='switchView("investment", "chart")'><img src='/assets/icons/sunburst_icon.svg' /></button>

diff --git a/_includes/colleges/sectionone.html b/_includes/colleges/sectionone.html
@@ -40,34 +40,34 @@ <h1 class="cu-header__teaser">
       </div>
 
       <div id="investment-subtext">
-	<div id="aid-subsection">
+	<div class="aid-subsection">
 	  <p id="aid-heading-aid">
 	    Student Aid
 	  </p>
-	  <div id="aid-image">
+	  <div class="aid-image">
 	    <img src="/assets/icons/aidv2.svg"/>
 	  </div>
 	  <p id="aid-description">
 	    Federal student aid is financial assistance provided through grants, scholarships, work-study, and loans to students for their educational expenses. This can include costs such as tuition, housing, transportation, books, and supplies. Loans comprise approximately 73% of the total aid to students, making them the largest source of assistance from the federal government.
 		  Although student aid includes the $11.6 billion investment made through the <a class="cu-header--red" href="https://www.va.gov/education/about-gi-bill-benefits/" target="_blank">G.I. Bill of Rights</a>, it is not included in this analysis because we were not able to make a direct connection between that investment and the benefits given to an institution.
 	  </p>
 	</div>
-	<div id="aid-subsection">
+	<div class="aid-subsection">
 	  <p id="aid-heading-grants">
 	    Grants
 	  </p>
-	  <div id="aid-image">
+	  <div class="aid-image">
 	    <img src="/assets/icons/grantsv2.svg"/>
 	  </div>
 	  <p id="aid-description">
 	    A federal grant is an agreement through which a federal agency provides financial assistance to an individual or organization used for projects and expenses that contribute to public good. For example, in 2018, the Department of Commerce funded the University of Maryland, Baltimore County’s (UMBC) research for measuring and improving the robustness of deep learning algorithms.
 	  </p>
 	</div>
-	<div id="aid-subsection">
+	<div class="aid-subsection">
 	  <p id="aid-heading-contracts">
 	    Contracts
 	  </p>
-	  <div id="aid-image">
+	  <div class="aid-image">
 	    <img src="/assets/icons/contractsv2.svg"/>
 	  </div>
 	  <p id="aid-description">

diff --git a/_includes/colleges/sectionpre.html b/_includes/colleges/sectionpre.html
@@ -16,7 +16,6 @@ <h3 class="section-pre--tablet-subblurb">
     </p>
   </div>
 
-
   <section id="TOC">
     <div id="section-pre__TOC">
       <div class="section-pre__tile">

diff --git a/_includes/colleges/sectionthree.html b/_includes/colleges/sectionthree.html
@@ -48,7 +48,12 @@ <h1 class="accordion__heading">Instructions</h1>
 
         <div id='bubble-function-buttons' class="function-buttons" onclick='panelClick(this.id)'>
           <div id="bubble-search" class='button-set'>
-            <button type='button' title='Search' onclick='searchClick("bubble-function-buttons")'><img src='/assets/icons/magnifier.svg' /></button>
+            <button type='button' title='Search'
+              onclick='searchClick("bubble-function-buttons")'
+              ga-on="click" ga-event-category="AB Test" ga-event-action="Clicked C&U Search"
+            >
+              <img src='/assets/icons/magnifier.svg' />
+            </button>
           </div>
           <div class='button-set' id="bubble-table" >
             <button id="bubble-chart-trigger" type='button' title='View chart' style='opacity: 1;' onclick='switchView("bubble", "chart")'><img src='/assets/icons/bubble_icon.svg' /></button>

diff --git a/_includes/colleges/sectiontwo.html b/_includes/colleges/sectiontwo.html
@@ -53,7 +53,12 @@ <h1 class="accordion__heading">Instructions</h1>
     <div id="mapContainer">
       <div id='map-function-buttons' class="function-buttons" onclick='panelClick(this.id)'>
           <div id="map-search" class='button-set'>
-            <button type='button' title='Search' onclick='searchClick("map-function-buttons")'><img src='/assets/icons/magnifier.svg' /></button>
+            <button type='button' title='Search'
+              onclick='searchClick("map-function-buttons")'
+              ga-on="click" ga-event-category="AB Test" ga-event-action="Clicked C&U Search"
+            >
+              <img src='/assets/icons/magnifier.svg' />
+            </button>
             <div class="map-search">
               <div class="map-search__input-wrapper">
                 <input id='map-search__input' class="map-search__input" onkeydown="filterSearch()" placeholder="Search Institutions"/>

diff --git a/_includes/head.html b/_includes/head.html
@@ -35,6 +35,9 @@
   {% if page.colleges %}
   <link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.54.0/mapbox-gl.css' rel='stylesheet'/>
   <script src='https://api.tiles.mapbox.com/mapbox-gl-js/v0.54.0/mapbox-gl.js'></script>
+  {% if page.socialMediaImage %}
+  <meta property="og:image" content="{{ page.socialMediaImage | prepend: '/assets/cu-share.jpg' | prepend: site.baseurl | prepend: site.url }}"/>
+  {% endif %}
   {% endif %}
 
   <link rel="stylesheet" href="/assets/ffg/components/glossary/glossary.css" />
@@ -50,17 +53,17 @@
 
   <!-- Google Tag Manager -->
   <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-  new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-  j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-  'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-  })(window,document,'script','dataLayer','GTM-5GVVS7L');</script>
+							new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+												  j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+												      'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+   })(window,document,'script','dataLayer','GTM-5GVVS7L');</script>
   <!-- End Google Tag Manager -->
 
   <script>
-      window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
-      ga('create', 'UA-19138737-13', 'auto');
+   window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
+   ga('create', 'UA-19138737-13', 'auto');
 
-      ga('require', 'eventTracker');
+   ga('require', 'eventTracker');
   </script>
   <script async src="https://www.google-analytics.com/analytics.js"></script>
   <script async src="/js/autotrack.js"></script>
@@ -71,6 +74,8 @@
   {% if page.permalink %}<meta property="og:url" content="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}" />{% endif %}
   {% if page.socialMediaImage %}
   <meta property="og:image" content="{{ page.socialMediaImage | prepend: '/assets/ffg/social-media-share/' | prepend: site.baseurl | prepend: site.url }}"/>
+  {% elsif page.socialShare %}
+  <meta property="og:image" content="{{ page.socialShare | prepend: '/assets/' | prepend: site.baseurl | prepend: site.url }}"/>
   {% else %}
   <meta property="og:image" content="{{ '/assets/data-lab-og.png' | prepend: site.baseurl | prepend: site.url }}"/>
   {% endif %}

diff --git a/_includes/svgs/arrow.svg b/_includes/svgs/arrow.svg
diff --git a/_includes/svgs/download-solid.svg b/_includes/svgs/download-solid.svg
diff --git a/_includes/svgs/search-solid.svg b/_includes/svgs/search-solid.svg
diff --git a/_sass/C-a-U-mobile.scss b/_sass/C-a-U-mobile.scss
@@ -9,7 +9,7 @@ $cuRed: #881E3D;
 
 /* Mobile View only */
 @media (max-width: 949px) {
-  #aid-subsection {
+  .aid-subsection {
     padding-left: 1.5rem;
     padding-right: 1.5rem;
   }
@@ -144,7 +144,7 @@ $cuRed: #881E3D;
 	    justify-content: space-evenly;
 
 
-	    #aid-subsection {
+	    .aid-subsection {
 	      padding-left: 1rem;
 	      padding-right: 1rem;
 	    }

diff --git a/_sass/C-a-U-share.scss b/_sass/C-a-U-share.scss
@@ -6,20 +6,20 @@
 }
 
 .newpopup {
-    top: 40px !important;
+  top: 40px !important;
 }
 
 .new-share-button .viz-share-icon:hover {
-    fill: #881E3D;
+  fill: #881E3D;
 }
 
 .viz-share-icon {
-    width: auto;
-    font-size: 1rem;
-    color: #4a4a4a;
+  width: auto;
+  font-size: 1rem;
+  color: #4a4a4a;
 
-    svg {
-        margin-right: 4px;
-        transform: translateY(4px);
-    }
+  img {
+    margin-right: 4px;
+    transform: translateY(4px);
+  }
 }