Skip to content

Commit df40056

Browse files
FCDO-DesignFCDO-Design
committed
Update partners tab to new styling.
1 parent de1a64e commit df40056

7 files changed

Lines changed: 104 additions & 15 deletions

File tree

‎data/cache/high_level_sector_list.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"updatedDate":"2023-09-13","data":{"sectorsData":[{"code":19,"name":"Administration","budget":3703352.0},{"code":11,"name":"Agricultural","budget":70014344.23},{"code":9,"name":"Banking and Financial Services","budget":264669783.43999997},{"code":16,"name":"Budget","budget":54396824.05},{"code":10,"name":"Business","budget":7836024.12},{"code":7,"name":"Communications","budget":38189122.11},{"code":18,"name":"Disaster relief","budget":374613458.6999999},{"code":1,"name":"Education","budget":225228827.46999976},{"code":14,"name":"Environment","budget":161996804.1900001},{"code":4,"name":"Government and Civil Society","budget":239941027.66000023},{"code":2,"name":"Health","budget":379208967.41220015},{"code":12,"name":"Industry","budget":309043934.03999996},{"code":15,"name":"Multisector","budget":116177737.69000004},{"code":5,"name":"Other Social Infrastructure and Services","budget":73653607.85000001},{"code":13,"name":"Trade","budget":23811007.350000005},{"code":6,"name":"Transport and Storage","budget":29648274.249999993},{"code":22,"name":"Unallocated","budget":3327281520.3199997},{"code":3,"name":"Water","budget":28089977.66999999}],"totalBudget":5727504594.5522}}

‎data/cache/top5Countries.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"updatedDate":"2023-09-13","data":[{"name":"Syrian Arab Republic (the)","code":"SY","budget":85103365.09},{"name":"Brazil","code":"BR","budget":13025547.99},{"name":"Pitcairn","code":"PN","budget":0.0},{"name":"Montserrat","code":"MS","budget":18517710.67},{"name":"Saint Helena, Ascension and Tristan da Cunha","code":"SH","budget":4752673.67},{"name":"Bolivia (Plurinational State of)","code":"BO","budget":2676.67},{"name":"Myanmar","code":"MM","budget":56168530.01},{"name":"Cambodia","code":"KH","budget":1793574.54},{"name":"Cameroon","code":"CM","budget":579168.43},{"name":"Comoros (the)","code":"KM","budget":28892.47},{"name":"Timor-Leste","code":"TL","budget":294154.09},{"name":"Guinea","code":"GN","budget":2676.67},{"name":"Guyana","code":"GY","budget":898251.97},{"name":"Indonesia","code":"ID","budget":8364759.34},{"name":"Côte d'Ivoire","code":"CI","budget":4117672.67},{"name":"Kenya","code":"KE","budget":75197455.89},{"name":"Lao People's Democratic Republic (the)","code":"LA","budget":2676.67},{"name":"Madagascar","code":"MG","budget":2222708.56},{"name":"Mali","code":"ML","budget":2602668.67},{"name":"Morocco","code":"MA","budget":31950.98},{"name":"Namibia","code":"NA","budget":2676.67},{"name":"Nepal","code":"NP","budget":56497101.09},{"name":"Nicaragua","code":"NI","budget":25397.03},{"name":"Nigeria","code":"NG","budget":86393263.26},{"name":"Pakistan","code":"PK","budget":47446459.09},{"name":"Philippines (the)","code":"PH","budget":882692.73},{"name":"Samoa","code":"WS","budget":2676.67},{"name":"South Africa","code":"ZA","budget":9053491.88},{"name":"Tajikistan","code":"TJ","budget":3993.46},{"name":"Tanzania, the United Republic of","code":"TZ","budget":19282599.47},{"name":"Zambia","code":"ZM","budget":15158032.02},{"name":"Zimbabwe","code":"ZW","budget":19120106.12},{"name":"Ethiopia","code":"ET","budget":80117751.43},{"name":"Colombia","code":"CO","budget":14332135.15},{"name":"Mexico","code":"MX","budget":2676.67},{"name":"Ecuador","code":"EC","budget":2676.67},{"name":"Costa Rica","code":"CR","budget":2676.67},{"name":"El Salvador","code":"SV","budget":2676.67},{"name":"Panama","code":"PA","budget":2676.67},{"name":"Honduras","code":"HN","budget":2676.67},{"name":"Peru","code":"PE","budget":2676.67},{"name":"Guatemala","code":"GT","budget":2676.67},{"name":"China","code":"CN","budget":102176.67},{"name":"Viet Nam","code":"VN","budget":2123041.19},{"name":"Malawi","code":"MW","budget":21714983.65},{"name":"Malaysia","code":"MY","budget":859972.37},{"name":"Mozambique","code":"MZ","budget":43071472.02},{"name":"Uganda","code":"UG","budget":20140343.78},{"name":"Benin","code":"BJ","budget":2676.67},{"name":"Niger (the)","code":"NE","budget":2676.67},{"name":"Congo (the Democratic Republic of the)","code":"CD","budget":71810064.09},{"name":"Congo (the)","code":"CG","budget":792890.17},{"name":"Mongolia","code":"MN","budget":2676.67},{"name":"Georgia","code":"GE","budget":2756075.23},{"name":"Singapore","code":"SG","budget":2676.67},{"name":"Thailand","code":"TH","budget":294154.09},{"name":"Sierra Leone","code":"SL","budget":22808683.67},{"name":"Liberia","code":"LR","budget":929274.0},{"name":"Angola","code":"AO","budget":2676.67},{"name":"Botswana","code":"BW","budget":2676.67},{"name":"Somalia","code":"SO","budget":102482843.09},{"name":"Yemen","code":"YE","budget":103210861.46},{"name":"Ghana","code":"GH","budget":11359997.74},{"name":"Bhutan","code":"BT","budget":2676.67},{"name":"Bangladesh","code":"BD","budget":55548424.29},{"name":"Cabo Verde","code":"CV","budget":3550.53},{"name":"Senegal","code":"SN","budget":3550.53},{"name":"Sri Lanka","code":"LK","budget":28892.47},{"name":"Armenia","code":"AM","budget":2756075.23},{"name":"Micronesia (Federated States of)","code":"FM","budget":2676.67},{"name":"Palestine, State of","code":"PS","budget":13827706.67},{"name":"South Sudan","code":"SS","budget":50410665.2},{"name":"Eswatini","code":"SZ","budget":2676.67},{"name":"Kyrgyzstan","code":"KG","budget":502684.67},{"name":"Burkina Faso","code":"BF","budget":2676.67},{"name":"Papua New Guinea","code":"PG","budget":1402668.67},{"name":"India","code":"IN","budget":33833092.13},{"name":"Egypt","code":"EG","budget":1510252.09},{"name":"Jordan","code":"JO","budget":32267420.09},{"name":"Türkiye","code":"TR","budget":19927927.17},{"name":"Cuba","code":"CU","budget":2676.67},{"name":"Iraq","code":"IQ","budget":11179191.89},{"name":"Lebanon","code":"LB","budget":2676.67},{"name":"Togo","code":"TG","budget":2676.67},{"name":"Central African Republic (the)","code":"CF","budget":562212.79},{"name":"Rwanda","code":"RW","budget":20082190.82},{"name":"Afghanistan","code":"AF","budget":170579530.4},{"name":"Belize","code":"BZ","budget":2676.67},{"name":"Chad","code":"TD","budget":16424248.79},{"name":"Mauritania","code":"MR","budget":2676.67},{"name":"Argentina","code":"AR","budget":2676.67},{"name":"Algeria","code":"DZ","budget":2676.67},{"name":"Fiji","code":"FJ","budget":2676.67},{"name":"Guinea-Bissau","code":"GW","budget":2676.67},{"name":"Kazakhstan","code":"KZ","budget":2676.67},{"name":"Moldova (the Republic of)","code":"MD","budget":2839511.55},{"name":"Serbia","code":"RS","budget":2676.67},{"name":"Tunisia","code":"TN","budget":294154.09},{"name":"Ukraine","code":"UA","budget":17662656.67},{"name":"Libya","code":"LY","budget":2676.67},{"name":"Burundi","code":"BI","budget":2676.67},{"name":"Mauritius","code":"MU","budget":373632.87},{"name":"Mayotte","code":"YT","budget":2676.67},{"name":"Eritrea","code":"ER","budget":2676.67},{"name":"Djibouti","code":"DJ","budget":2676.67},{"name":"Sudan (the)","code":"SD","budget":9391261.98},{"name":"Gabon","code":"GA","budget":2676.67},{"name":"Equatorial Guinea","code":"GQ","budget":2676.67},{"name":"Sao Tome and Principe","code":"ST","budget":2676.67},{"name":"Lesotho","code":"LS","budget":2676.67},{"name":"Gambia (the)","code":"GM","budget":2676.67},{"name":"Bahamas (the)","code":"BS","budget":2676.67},{"name":"Barbados","code":"BB","budget":2676.67},{"name":"Dominican Republic (the)","code":"DO","budget":2676.67},{"name":"Haiti","code":"HT","budget":13402628.67},{"name":"Jamaica","code":"JM","budget":2002696.67},{"name":"Netherlands Antilles","code":"AN","budget":2676.67},{"name":"Aruba","code":"AW","budget":2676.67},{"name":"Trinidad and Tobago","code":"TT","budget":2676.67},{"name":"Anguilla","code":"AI","budget":2676.67},{"name":"Antigua and Barbuda","code":"AG","budget":2676.67},{"name":"Dominica","code":"DM","budget":2676.67},{"name":"Grenada","code":"GD","budget":2676.67},{"name":"Saint Kitts and Nevis","code":"KN","budget":2676.67},{"name":"Saint Lucia","code":"LC","budget":2676.67},{"name":"Saint Vincent and the Grenadines","code":"VC","budget":2676.67},{"name":"Cayman Islands (the)","code":"KY","budget":2676.67},{"name":"Turks and Caicos Islands (the)","code":"TC","budget":2676.67},{"name":"Virgin Islands (British)","code":"VG","budget":2676.67},{"name":"Falkland Islands (the) [Malvinas]","code":"FK","budget":2676.67},{"name":"Paraguay","code":"PY","budget":2676.67},{"name":"Suriname","code":"SR","budget":2676.67},{"name":"Venezuela (Bolivarian Republic of)","code":"VE","budget":2676.67},{"name":"Brunei Darussalam","code":"BN","budget":2676.67},{"name":"Taiwan (Province of China)","code":"TW","budget":2676.67},{"name":"Hong Kong","code":"HK","budget":2676.67},{"name":"Korea (the Democratic People's Republic of)","code":"KP","budget":2676.67},{"name":"Korea (the Republic of)","code":"KR","budget":2676.67},{"name":"Macao","code":"MO","budget":2676.67},{"name":"Bahrain","code":"BH","budget":2676.67},{"name":"Iran (Islamic Republic of)","code":"IR","budget":2676.67},{"name":"Israel","code":"IL","budget":2676.67},{"name":"Kuwait","code":"KW","budget":2676.67},{"name":"Oman","code":"OM","budget":2676.67},{"name":"Qatar","code":"QA","budget":2676.67},{"name":"Saudi Arabia","code":"SA","budget":2676.67},{"name":"United Arab Emirates (the)","code":"AE","budget":2676.67},{"name":"Azerbaijan","code":"AZ","budget":2676.67},{"name":"Turkmenistan","code":"TM","budget":2676.67},{"name":"Uzbekistan","code":"UZ","budget":2676.67},{"name":"Maldives","code":"MV","budget":2676.67},{"name":"Cyprus","code":"CY","budget":2676.67},{"name":"Gibraltar","code":"GI","budget":2676.67},{"name":"Malta","code":"MT","budget":2676.67},{"name":"Kosovo","code":"XK","budget":2676.67},{"name":"Slovenia","code":"SI","budget":2676.67},{"name":"Croatia","code":"HR","budget":2676.67},{"name":"Bosnia and Herzegovina","code":"BA","budget":2700275.47},{"name":"Montenegro","code":"ME","budget":2676.67},{"name":"North Macedonia","code":"MK","budget":2676.67},{"name":"Albania","code":"AL","budget":2676.67},{"name":"Belarus","code":"BY","budget":2676.67},{"name":"New Caledonia","code":"NC","budget":2676.67},{"name":"Vanuatu","code":"VU","budget":2676.67},{"name":"Solomon Islands","code":"SB","budget":2676.67},{"name":"Kiribati","code":"KI","budget":2676.67},{"name":"Nauru","code":"NR","budget":2676.67},{"name":"Northern Mariana Islands (the)","code":"MP","budget":2676.67},{"name":"Marshall Islands (the)","code":"MH","budget":2676.67},{"name":"Palau","code":"PW","budget":2676.67},{"name":"French Polynesia","code":"PF","budget":2676.67},{"name":"Niue","code":"NU","budget":2676.67},{"name":"Tokelau","code":"TK","budget":2676.67},{"name":"Tonga","code":"TO","budget":2676.67},{"name":"Tuvalu","code":"TV","budget":2676.67},{"name":"Wallis and Futuna","code":"WF","budget":2676.67},{"name":"Chile","code":"CL","budget":0.0},{"name":"Uruguay","code":"UY","budget":0.0},{"name":"United Kingdom of Great Britain and Northern Ireland (the)","code":"GB","budget":1629997.0}]}

‎data/cache/what_we_do.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"updatedDate":"2023-09-13","data":[{"code":2,"name":"Health","budget":448375953.7222},{"code":18,"name":"Disaster relief","budget":406633157.14},{"code":12,"name":"Industry","budget":314743730.7},{"code":9,"name":"Banking and Financial Services","budget":279755806.0},{"code":4,"name":"Government and Civil Society","budget":228826941.89000008},{"code":1,"name":"Education","budget":206172827.8399999},{"code":14,"name":"Environment","budget":189600459.59000003},{"code":15,"name":"Multisector","budget":139622486.32000005},{"code":5,"name":"Other Social Infrastructure and Services","budget":76745501.54000002},{"code":11,"name":"Agricultural","budget":72004789.14000003}]}

‎public/assets/scss/application.css‎

Lines changed: 54 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8575,7 +8575,9 @@ l .app-collapsible-title__link:focus {
85758575
display: none;
85768576
}
85778577

8578-
.rm-link {
8578+
.rm-link,
8579+
#fundingProjects a,
8580+
#fundedProjects a {
85798581
font-family: "GDS Transport", arial, sans-serif;
85808582
-webkit-font-smoothing: antialiased;
85818583
-moz-osx-font-smoothing: grayscale;
@@ -8584,28 +8586,75 @@ l .app-collapsible-title__link:focus {
85848586
display: inline-block;
85858587
margin-bottom: 20px;
85868588
}
8587-
.rm-link:focus {
8589+
.rm-link:focus,
8590+
#fundingProjects a:focus,
8591+
#fundedProjects a:focus {
85888592
color: #0b0c0c;
85898593
background-color: #ffdd00;
85908594
box-shadow: 0 -2px #ffdd00, 0 4px #0b0c0c;
85918595
text-decoration: none;
85928596
}
8593-
.rm-link:link, .rm-link:visited {
8597+
.rm-link:link, .rm-link:visited,
8598+
#fundingProjects a:link,
8599+
#fundingProjects a:visited,
8600+
#fundedProjects a:link,
8601+
#fundedProjects a:visited {
85948602
color: #1d70b8;
85958603
}
8596-
.rm-link:hover {
8604+
.rm-link:hover,
8605+
#fundingProjects a:hover,
8606+
#fundedProjects a:hover {
85978607
color: #003078;
85988608
}
8599-
.rm-link:active, .rm-link:focus {
8609+
.rm-link:active, .rm-link:focus,
8610+
#fundingProjects a:active,
8611+
#fundingProjects a:focus,
8612+
#fundedProjects a:active,
8613+
#fundedProjects a:focus {
86008614
color: #0b0c0c;
86018615
}
86028616

8617+
#fundingProjects a,
8618+
#fundedProjects a {
8619+
display: block;
8620+
margin-bottom: 10px;
8621+
margin-right: 10px;
8622+
}
8623+
86038624
@media (min-width: 40.0625em) {
86048625
.app-summary-list__key {
86058626
width: 60%;
86068627
}
86078628
}
86088629

8630+
#fundingProjects h4,
8631+
#fundedProjects h4 {
8632+
margin-top: 30px !important;
8633+
font-size: 19px;
8634+
font-size: 1.1875rem;
8635+
line-height: 1.3157894737;
8636+
color: #0b0c0c;
8637+
font-family: "GDS Transport", arial, sans-serif;
8638+
-webkit-font-smoothing: antialiased;
8639+
-moz-osx-font-smoothing: grayscale;
8640+
font-weight: 700;
8641+
display: block;
8642+
margin-bottom: 15px;
8643+
}
8644+
8645+
#fundingProjects ul,
8646+
#fundedProjects ul {
8647+
padding-left: 0;
8648+
list-style-type: none;
8649+
}
8650+
#fundingProjects ul li,
8651+
#fundedProjects ul li {
8652+
font-size: 19px;
8653+
font-size: 1.1875rem;
8654+
line-height: 1.3157894737;
8655+
margin-bottom: 5px;
8656+
}
8657+
86098658
.map {
86108659
margin: 0 0 5px 0;
86118660
}

‎public/assets/scss/application.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/assets/scss/patterns/_gds-overrides.scss‎

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
display: none;
1111
}
1212

13-
.rm-link {
13+
.rm-link,
14+
#fundingProjects a,
15+
#fundedProjects a {
1416
font-family: "GDS Transport", arial, sans-serif;
1517
-webkit-font-smoothing: antialiased;
1618
-moz-osx-font-smoothing: grayscale;
@@ -41,8 +43,43 @@
4143
}
4244
}
4345

46+
#fundingProjects a,
47+
#fundedProjects a {
48+
display: block;
49+
margin-bottom: 10px;
50+
margin-right: 10px;
51+
}
52+
4453
.app-summary-list__key {
4554
@include govuk-media-query($from: tablet) {
4655
width: 60%;
4756
}
57+
}
58+
59+
#fundingProjects h4,
60+
#fundedProjects h4 {
61+
margin-top: 30px !important;
62+
font-size: 19px;
63+
font-size: 1.1875rem;
64+
line-height: 1.3157894737;
65+
color: #0b0c0c;
66+
font-family: "GDS Transport", arial, sans-serif;
67+
-webkit-font-smoothing: antialiased;
68+
-moz-osx-font-smoothing: grayscale;
69+
font-weight: 700;
70+
display: block;
71+
margin-bottom: 15px;
72+
}
73+
74+
#fundingProjects ul,
75+
#fundedProjects ul {
76+
padding-left: 0;
77+
list-style-type: none;
78+
79+
li {
80+
font-size: 19px;
81+
font-size: 1.1875rem;
82+
line-height: 1.3157894737;
83+
margin-bottom: 5px;
84+
}
4885
}

‎views/projects/partners.html.erb‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@
4646
var htmlString = '';
4747
if (Object.keys(res).length > 0) {
4848
if (isFCDOProj(projectID)){
49-
htmlString = htmlString + '<div id="fundedProjList" class="twelve columns results-info"><h3 class="section-group-title">Partner Programmes</h3>';
49+
htmlString = htmlString + '<div id="fundedProjList" class="twelve columns results-info"><h3 class="govuk-heading-m">Partner Programmes</h3>';
5050
}
5151
else {
52-
htmlString = htmlString + '<div id="fundedProjList" class="twelve columns results-info"><h3 class="section-group-title">Funded Programmes</h3>';
52+
htmlString = htmlString + '<div id="fundedProjList" class="twelve columns results-info"><h3 class="govuk-heading-m">Funded Programmes</h3>';
5353
}
5454
jq3.each(res, function(i, data){
5555
if(data.iati_identifier.toString() != projectID.toString()){
@@ -75,7 +75,7 @@
7575
fp_description = 'N/A';
7676
}
7777
if (isFCDOProj(projectID)) {
78-
htmlString = htmlString + '<div class="row"><div class="four columns summary"><h4>'
78+
htmlString = htmlString + '<div class="row"><div class="four columns summary"><h4 class="govuk-heading-s">'
7979
+fp_reporting_org+'</h4></div><div class="eight columns"><ul>'
8080
+ '<li><a href="/projects/'
8181
+encodeURI(data.iati_identifier)+'/summary">'
@@ -85,7 +85,7 @@
8585
+data.total_project_budget + '</span>'+'<span>Total Funding: ' + data.total_funding + '</span></li></ul></div></div>';
8686
}
8787
else {
88-
htmlString = htmlString + '<div class="row"><div class="four columns summary"><h4>'
88+
htmlString = htmlString + '<div class="row"><div class="four columns summary"><h4 class="govuk-heading-s">'
8989
+fp_reporting_org+'</h4></div><div class="eight columns"><ul>'
9090
+ '<li><a href="/projects/'
9191
+encodeURI(data.iati_identifier)+'/summary">'
@@ -99,7 +99,7 @@
9999
htmlString = htmlString + '</div></div>'
100100
+'<div class="twelve columns"><button '
101101
+'id="fundedProjects_more" class="govuk-button" data-module="govuk-button"'
102-
+'style="margin-top: 10px; float: right;">Load more</button>'
102+
+'style="margin-top: 10px;">Load more</button>'
103103
+'<input id="fundedProjects_more_data" type="hidden" value="1" /></div>';
104104
// if(response.output['hasNext'] != null){
105105
// htmlString = htmlString + '</div></div>'
@@ -168,7 +168,7 @@
168168
+data.total_project_budget + '</span>'+'<span>Total Funding: ' + data.total_funding + '</span></li></ul></div></div>';
169169
}
170170
else {
171-
htmlString = htmlString + '<div class="row"><div class="four columns summary"><h4>'
171+
htmlString = htmlString + '<div class="row"><div class="four columns summary"><h4 class="govuk-heading-s">'
172172
+fp_reporting_org+'</h4></div><div class="eight columns"><ul>'
173173
+ '<li><a href="/projects/'
174174
+encodeURI(data.iati_identifier)+'/summary">'
@@ -217,10 +217,10 @@
217217
if (Object.keys(res).length > 0) {
218218
var htmlString = '';
219219
// 2 divs open
220-
htmlString = htmlString + '<div class="row"><div class="twelve columns results-info"><h3 class="section-group-title">Funding Programme</h3>';
220+
htmlString = htmlString + '<div class="row"><div class="twelve columns results-info"><h3 class="govuk-heading-m">Funding Programme</h3>';
221221
jq3.each(res, function(i, data){
222222
htmlString = htmlString + '<div class="row"><div class="four columns summary">'
223-
+ '<h4>'+data.reporting_org_title+'</h4>'
223+
+ '<h4 class="govuk-heading-s">'+data.reporting_org_title+'</h4>'
224224
+ '</div><div class="eight columns"><ul><li>'
225225
+ '<a href="/projects/'+encodeURI(data.iati_identifier)+'/summary">'+data.title+'</a>' + data.description
226226
+ '<span>'+data.total_funding+'</span></li></ul></div></div>';

0 commit comments

Comments
 (0)