Skip to content

Commit fd273ff

Browse files
brett-varneybrett-varney
authored
Merge pull request #935 from fedspendingtransparency/staging
Colleges and Universities Patch Release 6.0.1
2 parents 71e209e + 44c5ad0 commit fd273ff

31 files changed

+1163
-960
lines changed

‎.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,3 @@ Gemfile.lock
6565
package-lock.json
6666
node_modules
6767
.Rproj.user
68-
69-
docker-compose.yml

‎404.html

+7-8
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@
66
---
77

88
<div id="four-oh-four">
9-
109
<div class="four-container">
11-
<h3>
12-
Oops!
13-
</h3>
14-
<p>
15-
Looks like you got lost in the data. <br>
16-
<span>It happens.</span> Find your way back.
17-
</p>
10+
<h3>Oops!</h3>
11+
<p>Looks like you got lost in the data. <br> <span>It happens.</span> Find your way back.</p>
12+
13+
<div id="btn-container">
14+
<div id="back-btn"><a href='dts.html'><i class="fas fa-arrow-left"></i>Back</a></div>
15+
<div id="home-btn"><a href='/'><i class="fas fa-home"></i>Home</a></div>
16+
</div>
1817

1918
</div>
2019
</div>

‎_includes/colleges/colleges-share.html

+52-52
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,59 @@
11
<script>
2-
function clickShareItemLink(item, url) {
3-
window.open(url, 'pop-up', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0');
2+
function clickShareItemLink(item, url) {
3+
window.open(url, 'pop-up', 'left=20,top=20,width=500,height=500,toolbar=1,resizable=0');
44

5-
window.Analytics.event({
6-
category: 'Share Menu - Click Item',
7-
action: item
8-
});
5+
window.Analytics.event({
6+
category: 'Share Menu - Click Item',
7+
action: item
8+
});
99

10-
return false;
11-
}
10+
return false;
11+
}
1212
</script>
1313

1414
<div class="popup new-share-button">
15-
<span class="viz-share-icon" aria-hidden="true">
16-
{% include svgs/share.svg %} Share
17-
</span>
18-
<span class="popuptext right newpopup" id="sharePopup">
19-
<div class="share-buttons">
20-
<ul>
21-
<li>
22-
<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">
23-
{% include svgs/facebook_square_x.svg class="share-icon icon-facebook" %}
24-
<span class="share-button-text">Facebook</span>
25-
</a>
26-
</li>
27-
<li>
28-
{% if page.socialMediaText %}
29-
{% assign twitterVariable = page.socialMediaText %}
30-
{% else %}
31-
{% assign twitterVariable = page.title %}
32-
{% endif %}
33-
<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">
34-
{% include svgs/twitter_square_x.svg class="share-icon icon-twitter" %}
35-
<span class="share-button-text">Twitter</span>
36-
</a>
37-
</li>
38-
<li>
39-
<a href="javascript:clickShareItemLink('Reddit', 'http://www.reddit.com/submit?url={{ site.url }}{{ site.baseurl }}{{ page.url }}')#{{include.anchor}}" title="Share on Reddit">
40-
{% include svgs/reddit.svg class="share-icon icon-reddit" %}
41-
<span class="share-button-text">Reddit</span>
42-
</a>
43-
</li>
44-
<li>
45-
<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">
46-
{% include svgs/linkedin_square_x.svg class="share-icon icon-linkedin" %}
47-
<span class="share-button-text">Linkedin</span>
48-
</a>
49-
</li>
50-
<li>
51-
<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">
52-
{% include svgs/envelope.svg class="share-icon icon-envelope" %}
53-
<span class="share-button-text">Email</span>
54-
</a>
55-
</li>
56-
</ul>
57-
</div>
58-
</span>
15+
<span class="viz-share-icon" aria-hidden="true">
16+
{% include svgs/share.svg %} Share
17+
</span>
18+
<span class="popuptext right newpopup" id="sharePopup">
19+
<div class="share-buttons">
20+
<ul>
21+
<li>
22+
<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">
23+
{% include svgs/facebook_square_x.svg class="share-icon icon-facebook" %}
24+
<span class="share-button-text">Facebook</span>
25+
</a>
26+
</li>
27+
<li>
28+
{% if page.socialTwitterText %}
29+
{% assign twitterVariable = page.socialTwitterText %}
30+
{% else %}
31+
{% assign twitterVariable = page.title %}
32+
{% endif %}
33+
<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">
34+
{% include svgs/twitter_square_x.svg class="share-icon icon-twitter" %}
35+
<span class="share-button-text">Twitter</span>
36+
</a>
37+
</li>
38+
<li>
39+
<a href="javascript:clickShareItemLink('Reddit', 'http://www.reddit.com/submit?url={{ site.url }}{{ site.baseurl }}{{ page.url }}')" title="Share on Reddit">
40+
{% include svgs/reddit.svg class="share-icon icon-reddit" %}
41+
<span class="share-button-text">Reddit</span>
42+
</a>
43+
</li>
44+
<li>
45+
<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">
46+
{% include svgs/linkedin_square_x.svg class="share-icon icon-linkedin" %}
47+
<span class="share-button-text">Linkedin</span>
48+
</a>
49+
</li>
50+
<li>
51+
<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">
52+
{% include svgs/envelope.svg class="share-icon icon-envelope" %}
53+
<span class="share-button-text">Email</span>
54+
</a>
55+
</li>
56+
</ul>
57+
</div>
58+
</span>
5959
</div>

‎_includes/colleges/investment-categories.html

+13-7
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ <h1 class="cu-header__teaser">
1111
</h1>
1212
<p class="cu-header__blurb">
1313
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.
14-
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.
14+
Note:
15+
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.
1516
</p>
1617

1718
<section class="accordion">
@@ -29,14 +30,14 @@ <h1 class="accordion__heading">Instructions</h1>
2930
<div id='sunburst-header' class="cu-header__controls">
3031
<form id='categories'>
3132
<input type='radio' name='category' value='contracts' id='contracts_data' onchange='changeCategory(this)' />
32-
<label for='contracts_data' class='desktop'>Contracts (PSC)</label>
33-
<label for='contracts_data' class='mobile'>PSC</label>
33+
<label for='contracts_data' class='desktop'>Contracts</label>
34+
<label for='contracts_data' class='mobile'>Contracts</label>
3435
<input type='radio' name='category' value='grants' id='grants_data' checked onchange='changeCategory(this)' />
35-
<label for='grants_data' class='desktop'>Grants (CFDA)</label>
36-
<label for='grants_data' class='mobile'>CFDA</label>
36+
<label for='grants_data' class='desktop'>Grants</label>
37+
<label for='grants_data' class='mobile'>Grants</label>
3738
<input type='radio' name='category' value='research' id='research_data' onchange='changeCategory(this)'/>
3839
<label for='research_data'>
39-
<span class='desktop'>Research Grants (CFDA)</span>
40+
<span class='desktop'>Research Grants</span>
4041
<span class='mobile'>Grants (Research)</span>
4142
<div class="cfda">
4243
<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>
6869

6970
<div id='investment-function-buttons' class='function-buttons' onclick='panelClick(this.id)'>
7071
<div id='investment-search' class='button-set'>
71-
<button type='button' title='Search' onclick='searchClick("investment-function-buttons")'><img src='/assets/icons/magnifier.svg' /></button>
72+
<button type='button' title='Search'
73+
onclick='searchClick("investment-function-buttons")'
74+
ga-on="click" ga-event-category="AB Test" ga-event-action="Clicked C&U Search"
75+
>
76+
<img src='/assets/icons/magnifier.svg' />
77+
</button>
7278
</div>
7379
<div class='button-set'>
7480
<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>

‎_includes/colleges/sectionone.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -40,34 +40,34 @@ <h1 class="cu-header__teaser">
4040
</div>
4141

4242
<div id="investment-subtext">
43-
<div id="aid-subsection">
43+
<div class="aid-subsection">
4444
<p id="aid-heading-aid">
4545
Student Aid
4646
</p>
47-
<div id="aid-image">
47+
<div class="aid-image">
4848
<img src="/assets/icons/aidv2.svg"/>
4949
</div>
5050
<p id="aid-description">
5151
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.
5252
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.
5353
</p>
5454
</div>
55-
<div id="aid-subsection">
55+
<div class="aid-subsection">
5656
<p id="aid-heading-grants">
5757
Grants
5858
</p>
59-
<div id="aid-image">
59+
<div class="aid-image">
6060
<img src="/assets/icons/grantsv2.svg"/>
6161
</div>
6262
<p id="aid-description">
6363
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.
6464
</p>
6565
</div>
66-
<div id="aid-subsection">
66+
<div class="aid-subsection">
6767
<p id="aid-heading-contracts">
6868
Contracts
6969
</p>
70-
<div id="aid-image">
70+
<div class="aid-image">
7171
<img src="/assets/icons/contractsv2.svg"/>
7272
</div>
7373
<p id="aid-description">

‎_includes/colleges/sectionpre.html

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ <h3 class="section-pre--tablet-subblurb">
1616
</p>
1717
</div>
1818

19-
2019
<section id="TOC">
2120
<div id="section-pre__TOC">
2221
<div class="section-pre__tile">

‎_includes/colleges/sectionthree.html

+6-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,12 @@ <h1 class="accordion__heading">Instructions</h1>
4848

4949
<div id='bubble-function-buttons' class="function-buttons" onclick='panelClick(this.id)'>
5050
<div id="bubble-search" class='button-set'>
51-
<button type='button' title='Search' onclick='searchClick("bubble-function-buttons")'><img src='/assets/icons/magnifier.svg' /></button>
51+
<button type='button' title='Search'
52+
onclick='searchClick("bubble-function-buttons")'
53+
ga-on="click" ga-event-category="AB Test" ga-event-action="Clicked C&U Search"
54+
>
55+
<img src='/assets/icons/magnifier.svg' />
56+
</button>
5257
</div>
5358
<div class='button-set' id="bubble-table" >
5459
<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>

‎_includes/colleges/sectiontwo.html

+6-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,12 @@ <h1 class="accordion__heading">Instructions</h1>
5353
<div id="mapContainer">
5454
<div id='map-function-buttons' class="function-buttons" onclick='panelClick(this.id)'>
5555
<div id="map-search" class='button-set'>
56-
<button type='button' title='Search' onclick='searchClick("map-function-buttons")'><img src='/assets/icons/magnifier.svg' /></button>
56+
<button type='button' title='Search'
57+
onclick='searchClick("map-function-buttons")'
58+
ga-on="click" ga-event-category="AB Test" ga-event-action="Clicked C&U Search"
59+
>
60+
<img src='/assets/icons/magnifier.svg' />
61+
</button>
5762
<div class="map-search">
5863
<div class="map-search__input-wrapper">
5964
<input id='map-search__input' class="map-search__input" onkeydown="filterSearch()" placeholder="Search Institutions"/>

‎_includes/head.html

+12-7
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
{% if page.colleges %}
3636
<link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.54.0/mapbox-gl.css' rel='stylesheet'/>
3737
<script src='https://api.tiles.mapbox.com/mapbox-gl-js/v0.54.0/mapbox-gl.js'></script>
38+
{% if page.socialMediaImage %}
39+
<meta property="og:image" content="{{ page.socialMediaImage | prepend: '/assets/cu-share.jpg' | prepend: site.baseurl | prepend: site.url }}"/>
40+
{% endif %}
3841
{% endif %}
3942

4043
<link rel="stylesheet" href="/assets/ffg/components/glossary/glossary.css" />
@@ -50,17 +53,17 @@
5053

5154
<!-- Google Tag Manager -->
5255
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
53-
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
54-
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
55-
'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
56-
})(window,document,'script','dataLayer','GTM-5GVVS7L');</script>
56+
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
57+
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
58+
'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
59+
})(window,document,'script','dataLayer','GTM-5GVVS7L');</script>
5760
<!-- End Google Tag Manager -->
5861

5962
<script>
60-
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
61-
ga('create', 'UA-19138737-13', 'auto');
63+
window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
64+
ga('create', 'UA-19138737-13', 'auto');
6265

63-
ga('require', 'eventTracker');
66+
ga('require', 'eventTracker');
6467
</script>
6568
<script async src="https://www.google-analytics.com/analytics.js"></script>
6669
<script async src="/js/autotrack.js"></script>
@@ -71,6 +74,8 @@
7174
{% if page.permalink %}<meta property="og:url" content="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}" />{% endif %}
7275
{% if page.socialMediaImage %}
7376
<meta property="og:image" content="{{ page.socialMediaImage | prepend: '/assets/ffg/social-media-share/' | prepend: site.baseurl | prepend: site.url }}"/>
77+
{% elsif page.socialShare %}
78+
<meta property="og:image" content="{{ page.socialShare | prepend: '/assets/' | prepend: site.baseurl | prepend: site.url }}"/>
7479
{% else %}
7580
<meta property="og:image" content="{{ '/assets/data-lab-og.png' | prepend: site.baseurl | prepend: site.url }}"/>
7681
{% endif %}

‎_includes/svgs/arrow.svg

+4-7
Loading

‎_includes/svgs/download-solid.svg

100644100755
File mode changed.

‎_includes/svgs/search-solid.svg

+1
Loading

‎_sass/C-a-U-mobile.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ $cuRed: #881E3D;
99

1010
/* Mobile View only */
1111
@media (max-width: 949px) {
12-
#aid-subsection {
12+
.aid-subsection {
1313
padding-left: 1.5rem;
1414
padding-right: 1.5rem;
1515
}
@@ -144,7 +144,7 @@ $cuRed: #881E3D;
144144
justify-content: space-evenly;
145145

146146

147-
#aid-subsection {
147+
.aid-subsection {
148148
padding-left: 1rem;
149149
padding-right: 1rem;
150150
}

‎_sass/C-a-U-share.scss

+9-9
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66
}
77

88
.newpopup {
9-
top: 40px !important;
9+
top: 40px !important;
1010
}
1111

1212
.new-share-button .viz-share-icon:hover {
13-
fill: #881E3D;
13+
fill: #881E3D;
1414
}
1515

1616
.viz-share-icon {
17-
width: auto;
18-
font-size: 1rem;
19-
color: #4a4a4a;
17+
width: auto;
18+
font-size: 1rem;
19+
color: #4a4a4a;
2020

21-
svg {
22-
margin-right: 4px;
23-
transform: translateY(4px);
24-
}
21+
img {
22+
margin-right: 4px;
23+
transform: translateY(4px);
24+
}
2525
}

0 commit comments

Comments
 (0)