From 5e39dbb3f74d0352bbc8e157d9ae35398caebaf2 Mon Sep 17 00:00:00 2001 From: Chuck Werner Date: Mon, 9 Sep 2024 15:37:23 -0400 Subject: [PATCH 1/2] - Move Grad PLUS loan on customize page - Modify Edit/Close cues on customize page --- .../05-customize-estimate.html | 74 +++++++++---------- .../macros/financial-item-flyout.html | 8 +- .../css/college-costs/financial-item.scss | 17 ++++- 3 files changed, 50 insertions(+), 49 deletions(-) diff --git a/cfgov/paying_for_college/jinja2/paying-for-college/college-cost-blocks/05-customize-estimate.html b/cfgov/paying_for_college/jinja2/paying-for-college/college-cost-blocks/05-customize-estimate.html index c39aa6428e9..e922a7e2747 100644 --- a/cfgov/paying_for_college/jinja2/paying-for-college/college-cost-blocks/05-customize-estimate.html +++ b/cfgov/paying_for_college/jinja2/paying-for-college/college-cost-blocks/05-customize-estimate.html @@ -20,7 +20,7 @@

Enter information from your financial aid offer

'value': '$0', 'is_editable': 'True', 'status': 'warning', - 'note': 'Previously, we showed you average costs for your family's income level. Now we'll get into specifics. Type in the costs listed in your financial aid offer, adding additional costs as needed. Remember, these are estimates based on students’ reported spending.', + 'note': 'Previously, we showed you average costs for your family's income level. Now we'll get into specifics. Type in the costs listed in your financial aid offer, adding additional costs as needed. Remember, these are estimates based on students’ reported spending.', 'data_attribute': 'data-financial-item="total_costs"' } %} {% call() flyout(flyout_settings) %} @@ -226,6 +226,36 @@

Enter information from your financial aid offer

}) }} + +
+
+ {% set tt = tooltip.render('Grad PLUS loan: For graduate or professional degree students. These loans are generally eligible for the same benefits as Direct subsidized and unsubsidized loans. More details about Grad PLUS loans can be found at Federal Student Aid website..') %} + {{ + input.render({ + 'label': 'Grad PLUS Loan amount' ~ tt, + 'id': 'plan__gradPlus', + 'value': '0', + 'data_attribute': 'data-financial-item="plusLoan_gradPlus"', + 'note': '' + }) + }} + {% set tt = tooltip.render('Interest starts accumulating as soon as the money is sent to your school. The U.S. Department of Education sets the interest rate on federal student loans each July. If you are using this tool prior to July 1 for loans you will receive after July 1, then the interest rate may be different from what you see here.') %} + {{ + text_item.render({ + 'label': 'Interest rate (%)', + 'value': '0', + 'data_attribute': 'data-financial-item="rate_gradPlus"', + }) + }} + {{ + text_item.render({ + 'label': 'Loan fee (%)' ~ tooltip.render('This fee is deducted immediately from your loan amount, lowering the total you receive. For example, if the loan fee is 1%, then $10 will be subtracted from a $1,000 loan, so you or your school will only receive $990 but you would have to repay $1,000.'), + 'value': '0', + 'data_attribute': 'data-financial-item="fee_gradPlus"', + }) + }} +
+
{% endcall %} @@ -283,52 +313,14 @@

Other Loans

If you still have uncovered costs after working with the financial aid office to exhaust all the options listed above, you and your family have two more loan options to consider:

- {% set flyout_settings = { - 'label': 'Grad PLUS loan' | safe, - 'value': '$0', - 'class': 'graduate-content o-costs-group--first', - 'is_editable': 'True', - 'data_attribute': 'data-financial-item="total_plusLoans"' - } %} - {% call() flyout(flyout_settings) %} -
- {{ - input.render({ - 'label': 'Loan amount', - 'id': 'plan__gradPlus', - 'value': '0', - 'data_attribute': 'data-financial-item="plusLoan_gradPlus"', - 'note': '' - }) - }} - {{ - text_item.render({ - 'label': 'Interest rate (%)', - 'value': '0', - 'data_attribute': 'data-financial-item="rate_gradPlus"', - 'helper_text': 'Interest starts accumulating as soon as the money is sent to your school. The U.S. Department of Education sets the interest rate on federal student loans each July. If you are using this tool prior to July 1 for loans you will receive after July 1, then the interest rate may be different from what you see here.' - }) - }} - {{ - text_item.render({ - 'label': 'Loan fee (%)' ~ tooltip.render('This fee is deducted immediately from your loan amount, lowering the total you receive. For example, if the loan fee is 1%, then $10 will be subtracted from a $1,000 loan, so you or your school will only receive $990 but you would have to repay $1,000.'), - 'value': '0', - 'data_attribute': 'data-financial-item="fee_gradPlus"', - 'helper_text': 'This fee is deducted immediately from your loan amount, lowering the total you receive.' - }) - }} -
- {% endcall %} - {% set flyout_settings = { 'label': 'Parent PLUS loan' | safe, 'value': '$0', - 'class': 'dependent-content o-costs-group--first', + 'class': 'undergrad-content dependent-content o-costs-group--first', 'note': '', 'is_editable': 'True', 'data_attribute': 'data-financial-item="total_plusLoans"' 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 d605c6995bf..8c249bc1caa 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 @@ -47,11 +47,11 @@ {{ value.value }} - - {{ svg_icon('edit') if value.is_editable else svg_icon('plus-round') }} + + {{ 'Edit' if value.is_editable else svg_icon('plus-round') }} - - {{ svg_icon('edit') if value.is_editable else svg_icon('minus-round') }} + + {{ 'Close' if value.is_editable else svg_icon('minus-round') }} diff --git a/cfgov/unprocessed/apps/paying-for-college/css/college-costs/financial-item.scss b/cfgov/unprocessed/apps/paying-for-college/css/college-costs/financial-item.scss index 20b0941b9ae..0af5768896c 100644 --- a/cfgov/unprocessed/apps/paying-for-college/css/college-costs/financial-item.scss +++ b/cfgov/unprocessed/apps/paying-for-college/css/college-costs/financial-item.scss @@ -70,6 +70,7 @@ .financial-item__value { color: var(--black); + font-weight: 500; } } @@ -84,8 +85,12 @@ display: none; } .o-costs-group__cue-open { - display: inline; - margin-left: math.div(5px, $base-font-size-px) + em; + display: inline-block; + font-weight: 500; + margin-left: math.div(10px, $base-font-size-px) + em; + padding-left: math.div(10px, $base-font-size-px) + em; + border-left: 1px solid var(--gray-20); + width: 3em; } } @@ -94,8 +99,12 @@ display: none; } .o-costs-group__cue-close { - display: inline; - margin-left: math.div(5px, $base-font-size-px) + em; + display: inline-block; + font-weight: 500; + margin-left: math.div(10px, $base-font-size-px) + em; + padding-left: math.div(10px, $base-font-size-px) + em; + border-left: 1px solid var(--gray-20); + width: 3em; } } From 20ee186dd6480e137919e57b25fc2d0f6ce8f65f Mon Sep 17 00:00:00 2001 From: Chuck Werner Date: Thu, 3 Oct 2024 12:08:59 -0400 Subject: [PATCH 2/2] Update cfgov/paying_for_college/jinja2/paying-for-college/college-cost-blocks/05-customize-estimate.html Co-authored-by: Wyatt Pearsall --- .../college-cost-blocks/05-customize-estimate.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfgov/paying_for_college/jinja2/paying-for-college/college-cost-blocks/05-customize-estimate.html b/cfgov/paying_for_college/jinja2/paying-for-college/college-cost-blocks/05-customize-estimate.html index e922a7e2747..45dc6789b41 100644 --- a/cfgov/paying_for_college/jinja2/paying-for-college/college-cost-blocks/05-customize-estimate.html +++ b/cfgov/paying_for_college/jinja2/paying-for-college/college-cost-blocks/05-customize-estimate.html @@ -242,7 +242,7 @@

Enter information from your financial aid offer

{% set tt = tooltip.render('Interest starts accumulating as soon as the money is sent to your school. The U.S. Department of Education sets the interest rate on federal student loans each July. If you are using this tool prior to July 1 for loans you will receive after July 1, then the interest rate may be different from what you see here.') %} {{ text_item.render({ - 'label': 'Interest rate (%)', + 'label': 'Interest rate (%)' ~ tt, 'value': '0', 'data_attribute': 'data-financial-item="rate_gradPlus"', })