Merge f534e5a into 8e13e9d

paying_for_college/templates/landing.html

@@ -67,7 +67,7 @@ <h2 class="h4 border-overlay">Student financial guides</h2>
                     <h3>Student loans</h3>
                     <p>If you’re considering student loans to help you pay for school, you’re not alone – many students need loans to cover their full cost of attendance. If you have to take out student loans, comparing your options can help you find the student loan best suited for your needs. <a href="/{{url_root}}/choose-a-student-loan/">More about student loans</a>.</p>
 
-                    <p>Still need to apply for financial aid? <br><a href="https://fafsa.gov/" target="_blank" rel="noopener noreferrer">Visit fafsa.gov&nbsp;<i class="icon-external-link"></i></a> 
+                    <p>Still need to apply for financial aid? <br><a href="https://fafsa.gov/" target="_blank" rel="noopener noreferrer">Visit fafsa.gov&nbsp;<i class="icon-external-link"></i></a>
                 </p>
                 </div>
                 <div class="col last col6">
@@ -84,7 +84,7 @@ <h2 class="h4 border-overlay">Compare financial aid offers</h2>
             <div class="col last col8">
                 <p>As part of our <a href="http://www.consumerfinance.gov/students/knowbeforeyouowe/">Know Before You Owe project</a>, we worked with the Department of Education to create a <a class="pdf exit-link" href="http://collegecost.ed.gov/shopping_sheet.pdf">Financial Aid Shopping Sheet</a>. Now that thousands of colleges are adopting this clear and comparable form, we’ve built a tool that complements the shopping sheet to help students make comparisons tailored to their individual circumstances.</p>
                 <p><a class="button" href="/{{url_root}}/compare-financial-aid-and-college-cost/">Compare costs</a></p>
-                <p>Still researching schools? <br><a class="exit-link" href="http://collegecost.ed.gov/scorecard/index.aspx" target="_blank" rel="noopener noreferrer">Check out College Scorecard&nbsp;<i class="icon-external-link"></i></a> 
+                <p>Still researching schools? <br><a class="exit-link" href="http://collegecost.ed.gov/scorecard/index.aspx" target="_blank" rel="noopener noreferrer">Check out College Scorecard&nbsp;<i class="icon-external-link"></i></a>
                 </p>
             </div>
         </section>

paying_for_college/templates/repay_student_debt.html

@@ -231,7 +231,7 @@ <h3>Additional information</h3>
     <div class="ds-content">
       <p><span class="cf-icon cf-icon-building-credit-round"></span> <strong>Do you need to get credit (for example, get a credit card, take out a mortgage, or qualify for a car loan)?</strong></p>
 
-      <div class='ds-buttons'>
+      <div class="ds-buttons">
         <button class="btn" data-ds-name="yes">Yes</button>
         <button class="btn" data-ds-name="no">No</button>
       </div>
@@ -246,7 +246,7 @@ <h3>Additional information</h3>
     <div class="ds-content">
       <p><span class="cf-icon cf-icon-money-round"></span> <strong>Can you pay off your defaulted federal student loans?</strong></p>
 
-      <div class='ds-buttons'>
+      <div class="ds-buttons">
         <button class="btn" data-ds-name="yes">Yes</button>
         <button class="btn" data-ds-name="no">No</button>
       </div>
@@ -326,7 +326,7 @@ <h4>Helpful advice</h4>
       <li>Be aware, your interest rate will be recalculated as the weighted average of your current federal loans and rounded up to the nearest .125%.  This means that your interest rate will not decrease and actually may rise slightly.</li>
     </ul>
 
-    <p class='tip'><b>WARNING FOR SERVICEMEMBERS:</b> Taking out a new Federal Direct Consolidation Loan will impact your eligibility for an interest rate reduction under the <a href='http://www.consumerfinance.gov/askcfpb/675/i-am-member-military-active-duty-or-about-go-active-duty-what-options-exist-help-me-deal-my-student-loans.html'>Servicemembers Civil Relief Act</a>.</p>
+    <p class="tip"><b>WARNING FOR SERVICEMEMBERS:</b> Taking out a new Federal Direct Consolidation Loan will impact your eligibility for an interest rate reduction under the <a href='http://www.consumerfinance.gov/askcfpb/675/i-am-member-military-active-duty-or-about-go-active-duty-what-options-exist-help-me-deal-my-student-loans.html'>Servicemembers Civil Relief Act</a>.</p>
 
     <p>To get started on consolidation, contact the Department of Education (1-800-557-7392) to find out if consolidation is right for you. To begin the application process, check out the consolidation <a href="http://loanconsolidation.ed.gov/">website</a>. You can also use the Department's <a href='http://studentaid.ed.gov/repay-loans/understand/plans/standard/comparison-calculator'>calculator</a> to determine your payments if you choose to extend your loan term and lower monthly payments.</p>
   </section>
@@ -337,7 +337,7 @@ <h3>Lower your interest rate</h3>
 
     <p>If you are currently serving on active-duty you are eligible to have the interest rate lowered to 6% on all student loans taken out prior to your military service. This benefit applies to both your federal and private (non-federal) student loans and is available for all active-duty servicemembers, regardless of where you serve.  Most borrowers on active-duty will qualify for this benefit, so it makes sense to start here.</p>
 
-    <p class='act'>To obtain an interest rate reduction under the <a href='http://www.consumerfinance.gov/askcfpb/675/i-am-member-military-active-duty-or-about-go-active-duty-what-options-exist-help-me-deal-my-student-loans.html'>Servicemembers Civil Relief Act (SCRA)</a>, contact your servicer and ask about this option directly. You will be required to provide your servicer with proof of your active-duty status in the form of orders from your commanding officer.</p>
+    <p class="act">To obtain an interest rate reduction under the <a href="http://www.consumerfinance.gov/askcfpb/675/i-am-member-military-active-duty-or-about-go-active-duty-what-options-exist-help-me-deal-my-student-loans.html">Servicemembers Civil Relief Act (SCRA)</a>, contact your servicer and ask about this option directly. You will be required to provide your servicer with proof of your active-duty status in the form of orders from your commanding officer.</p>
 
     <p><a href="http://www.studentaid.ed.gov/types/grants-scholarships/military#limited-interest-rates-suspended-accrual-of-interest-and-deferment-of-student-loans">Learn more about the Servicemembers Civil Relief Act</a> and other benefits for servicemembers with student loans from the U.S. Department of Education.</p>
 
@@ -347,12 +347,12 @@ <h3>Income-driven repayment plans and public service loan forgiveness (PSLF)</h3
 
     <p>This is one of the best options to stay on the road to repayment for federal student loan borrowers. <a href='http://blog.ed.gov/2015/12/your-federal-student-loans-just-got-easier-to-repaye/'>Income-driven repayment plans</a> ties your payment to your income and family size. (The chart below gives you an idea of your approximate payment.)</p>
 
-    <p class='illus paperwork'>For borrowers who will make a career out of military service, Income-driven repayment plans provide another major benefit— you may be eligible for <a href="http://studentaid.ed.gov/repay-loans/forgiveness-cancellation/charts/public-service">loan forgiveness</a>
+    <p class="illus paperwork">For borrowers who will make a career out of military service, Income-driven repayment plans provide another major benefit— you may be eligible for <a href="http://studentaid.ed.gov/repay-loans/forgiveness-cancellation/charts/public-service">loan forgiveness</a>
       after 10 years of reduced monthly payments. If you think you will spend a decade or more in the military, it is important to enter into an income-driven repayment plan as soon as possible; each qualifying monthly payment gets you closer to <a href="http://studentaid.ed.gov/repay-loans/forgiveness-cancellation/charts/public-service">Public Service Loan Forgiveness (PSLF)</a>.</p>
 
       <p>If you leave the military but plan to pursue another qualifying public service profession, like teaching or serving in government, you may still be eligible for PSLF.</p>
 
-      <div class='act'>
+      <div class="act">
         <p>Get started by <a href="https://studentloans.gov/myDirectLoan/index.action" class="external-link" target="_blank" rel="noopener noreferrer">enrolling online at StudentLoans.gov</a>. Once you sign in, select “Income-Driven Repayment Plan Request.” These plans are always available for free to federal student loan borrowers with eligible loans.</p>
 
         <p>You can also contact your servicer (the company that sends you a bill each month) about enrolling. They will likely ask for proof of your income, such as a tax return or pay stub, to determine your payment.</p>

paying_for_college/templates/technote.html

@@ -1060,13 +1060,12 @@ <h2 class="header-slug">
                         </p>
                     </div>
                     <p>
-                        <a
-                         href="https://www.consumer.ftc.gov/articles/0395-choosing-college-questions-ask"
-                         target="_blank" rel="noopener noreferrer">Questions to ask your college</a>
+                        <a href="https://www.consumer.ftc.gov/articles/0395-choosing-college-questions-ask"
+                           target="_blank" rel="noopener noreferrer">Questions to ask your college</a>
                     </p>
                     <div>
                         <a href="https://fafsa.ed.gov/"
-                        target="_blank" rel="noopener noreferrer">FAFSA&reg;</a>
+                           target="_blank" rel="noopener noreferrer">FAFSA&reg;</a>
                         <p>
                             Apply for federal, state, and school financial
                             aid.

paying_for_college/templates/worksheet.html

@@ -435,10 +435,8 @@ <h3 class="offer-part_heading">
                                             </label>
                                             <p class="aid-form_definition">
                                                 Based on financial need,
-                                                <a
-                                                href="https://studentaid.ed.gov/sa/types/grants-scholarships/pell"
-                                                target="_blank" rel="noopener noreferrer">see how you
-                                                qualify</a>
+                                                <a href="https://studentaid.ed.gov/sa/types/grants-scholarships/pell"
+                                                   target="_blank" rel="noopener noreferrer">see how you qualify</a>
                                             </p>
                                         </div>
                                         <div class="aid-form_input-wrapper">
@@ -964,8 +962,8 @@ <h3 class="offer-part_heading">
                                                 accumulating 9 months after you
                                                 leave school; <a
                                                 href="https://studentaid.ed.gov/sa/types/loans/perkins"
-                                                target="_blank" rel="noopener noreferrer">see
-                                                how you qualify</a>
+                                                target="_blank" rel="noopener noreferrer">
+                                                see how you qualify</a>
                                             </p>
                                         </div>
                                     </div>

test/js-unit/query-handler-spec.js

@@ -24,7 +24,7 @@ describe( 'queryHandler...', function() {
     expect( typeof valuePairs.otherExpenses ).to.equal( "number" );
   });
 
-  it( '...ignores any key which does not appear in keyMaps' , function() {
+  it( '...ignores any key which does not appear in keyMaps', function() {
     var queryString = '?tuit=100&hous=101&book=102&tran=103&othr=104&lol=999&hack=true',
         valuePairs = queryHandler( queryString );
     expect( valuePairs.tuitionFees ).to.equal( 100 );