diff --git a/cfgov/paying_for_college/jinja2/paying-for-college/college-cost-blocks/02-school-costs.html b/cfgov/paying_for_college/jinja2/paying-for-college/college-cost-blocks/02-school-costs.html index a294ff111a1..16dceda558c 100644 --- a/cfgov/paying_for_college/jinja2/paying-for-college/college-cost-blocks/02-school-costs.html +++ b/cfgov/paying_for_college/jinja2/paying-for-college/college-cost-blocks/02-school-costs.html @@ -4,7 +4,7 @@

Your estimated costs for X
  • Estimated time frame: X years
  • Estimated yearly costs: $X
  • -
  • This estimate is based on the net price paid by in-state students with family incomes between $X.
  • +
  • This estimate is based on the net price paid by in-state students with family incomes $X.
  • Your actual expenses will depend on your situation—any financial aid you receive, your personal budgeting, rising costs, and other factors.{{tooltip.render('Net price is the school’s cost of attendance minus any grants and scholarships received. For public schools, this is only the average costs for in-state students. See College Score Card for more information.')}}
diff --git a/cfgov/paying_for_college/jinja2/paying-for-college/college-cost-blocks/08-affording-payments.html b/cfgov/paying_for_college/jinja2/paying-for-college/college-cost-blocks/08-affording-payments.html index 1619b23da92..8e63035c6bf 100644 --- a/cfgov/paying_for_college/jinja2/paying-for-college/college-cost-blocks/08-affording-payments.html +++ b/cfgov/paying_for_college/jinja2/paying-for-college/college-cost-blocks/08-affording-payments.html @@ -51,7 +51,8 @@

See if the monthly payment fits in an average monthly budget

'value': '$0', 'decor': '—', 'is_editable': 'True', - 'data_attribute': 'data-expenses-item="total_expenses"' + 'data_attribute': 'data-expenses-item="total_expenses"', + 'note': 'From the Bureau of Labor Statistics' Consumer Expenditure Survey' } %} {% call() flyout(flyout_settings) %} {{ diff --git a/cfgov/paying_for_college/jinja2/paying-for-college/college-cost-blocks/macros/financial-item-flyout.html b/cfgov/paying_for_college/jinja2/paying-for-college/college-cost-blocks/macros/financial-item-flyout.html index 8df1835eb8b..d605c6995bf 100644 --- a/cfgov/paying_for_college/jinja2/paying-for-college/college-cost-blocks/macros/financial-item-flyout.html +++ b/cfgov/paying_for_college/jinja2/paying-for-college/college-cost-blocks/macros/financial-item-flyout.html @@ -40,7 +40,7 @@ type="button"> - {{ value.label }} + {{ value.label | safe }} {% if value.decor %}{{ value.decor | safe }}{% endif %} diff --git a/cfgov/unprocessed/apps/paying-for-college/js/college-costs/models/state-model.js b/cfgov/unprocessed/apps/paying-for-college/js/college-costs/models/state-model.js index 58de0e687c3..93750ef0ea4 100644 --- a/cfgov/unprocessed/apps/paying-for-college/js/college-costs/models/state-model.js +++ b/cfgov/unprocessed/apps/paying-for-college/js/college-costs/models/state-model.js @@ -88,11 +88,11 @@ const stateModel = { inDistrict: 'In district', }, programIncome: { - '0-30k': '$0 to $30,000', - '30k-48k': '$30,000 to $48,000', - '48k-75k': '$48,000 to $75,000', - '75k-110k': '$75,000 to $110,000', - '110k-plus': '$110,000 or more', + '0-30k': 'from $0 to $30,000', + '30k-48k': 'from $30,000 to $48,000', + '48k-75k': 'from $48,000 to $75,000', + '75k-110k': 'from $75,000 to $110,000', + '110k-plus': 'of $110,000 or more', }, }, diff --git a/cfgov/unprocessed/apps/paying-for-college/js/college-costs/views/chart-view.js b/cfgov/unprocessed/apps/paying-for-college/js/college-costs/views/chart-view.js index 4f312a10c39..e3fb5aae35b 100644 --- a/cfgov/unprocessed/apps/paying-for-college/js/college-costs/views/chart-view.js +++ b/cfgov/unprocessed/apps/paying-for-college/js/college-costs/views/chart-view.js @@ -326,12 +326,14 @@ const costOfBorrowingOpts = { pointWidth: 60, data: [10000], color: '#ff9e1b', + legendIndex: 2 }, { name: 'Estimated total borrowed: $55,000', pointWidth: 60, data: [40000], color: '#ffe1b9', + legendIndex: 1 }, ], }; @@ -461,6 +463,7 @@ const affordingOpts = { data: [524], color: '#ffe1b9', stack: 'costs', + legendIndex: 2 }, { name: 'Average monthly expenses: $2,246', @@ -469,6 +472,7 @@ const affordingOpts = { data: [2246], color: '#ff9e1b', stack: 'costs', + legendIndex: 1 }, { name: 'Monthly median salary: $4,357', @@ -488,6 +492,7 @@ const affordingOpts = { }, }, stack: 'salary', + legendIndex: 3 }, ], };