Skip to content

Commit

Permalink
Updates to ancillary pages (#2119)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jkachel
jkachel authored Mar 20, 2024
1 parent 1b575ab commit 8ffe888
Show file tree
Hide file tree
Showing 55 changed files with 1,826 additions and 1,162 deletions.
202 changes: 113 additions & 89 deletions cms/templates/flexiblepricing/flexible_pricing_request_form.html
View file
Original file line number Diff line number Diff line change
@@ -1,120 +1,144 @@
{% extends "base.html" %}

{% load wagtailcore_tags %}
{% load static wagtail_img_src feature_img_src %}

{% block title %}{{ site_name }} | {{ page.title }}{% endblock %}

{% block content %}
<div id="main" class="main-page-content container">
<div class="std-page-body">
<div id="main" class="main-page-content">
<div role="banner" class="std-page-header">
<h1>{{ page.title|richtext }}</h1>
</div>

{% if user.is_authenticated %}{# is logged in #}
{% if prior_request is None or prior_request.is_reset %}{# has submission #}
<div class="flexible-pricing-head">
<h1>{{ page.title|richtext }}</h1>
{{ page.intro|richtext }}
</div>
<div class="container auth-page">
<div class="auth-card card-shadow auth-form flexible-pricing-form">
<div class="auth-header">
<h4 class="tell-us-about-your-income">Tell us about your income</h4>
<form action="{% pageurl page %}" method="POST">
{% csrf_token %}
<div class="form-group">
<label for="your_income" id="your_income_label">Yearly Income</label>
{%if form.fields.your_income.required %}<span class="required">*</span>{% endif %}
<input type="number" name="your_income" step="any" class="form-control {%if form.your_income.errors %}errored{% endif %}" id="your_income" aria-describedby="your_incomeError" required>
{% for error in form.your_income.errors %}
<div class="form-error" id="your_incomeError" role="alert">{{error}}</div>
{% endfor %}
</div>
<div class="form-group">
<label for="income_currency">Income Currency</label>
{%if form.fields.income_currency.required %}<span class="required">*</span>{% endif %}
<span class="income_currency_label" id="income-currency-subtitle">The currency you’re paid in.</span>
<select name="income_currency" id="income_currency" class="form-control {%if form.income_currency.errors %}errored{% endif %}" aria-describedby="income-currency-subtitle" required>
<option value="">Choose</option>
{% for choice in form.fields.income_currency.choices %}
<option value="{{ choice.0 }}">{{ choice.1 }}</option>
{% endfor %}
</select>
{% for error in form.income_currency.errors %}
<div class="form-error" id="income_currencyError" role="alert">{{error}}</div>
{% endfor %}
</div>
<div class="form-group">
<input id="" type="checkbox" required aria-label="financial assistance attestation" aria-describedby="financial-assist-testify"/>
<span id="financial-assist-testify" class="financial-assist-testify">I testify that the income I reported is true and accurate. I am aware that I may be asked to verify the reported income with documentation.</span>
</div>
<div class="row submit-row no-gutters justify-content-center">
<button type="submit" class="btn btn-primary btn-gradient-red large">Submit request</button>
</div>
</form>
<div class="std-page-body">
<div class="std-card std-card-finasst">
<div class="std-card-body">
{{ page.intro|richtext }}
</div>
</div>
<div class="container auth-page">
<div class="std-card std-card-auth">
<div class="std-card-body financial-assistance-page">
<h1 class="tell-us-about-your-income">Tell us about your income</h1>
<form action="{% pageurl page %}" method="POST">
{% csrf_token %}
<div class="form-group">
<label for="your_income" id="your_income_label" class="fw-bold">Yearly Income</label>
{%if form.fields.your_income.required %}<span aria-hidden="true" class="required">*</span>{% endif %}
<input type="number" name="your_income" step="any" class="form-control {%if form.your_income.errors %}errored{% endif %}" id="your_income" aria-describedby="your_incomeError" required>
{% for error in form.your_income.errors %}
<div class="form-error" id="your_incomeError" role="alert">{{error}}</div>
{% endfor %}
</div>
<div class="form-group">
<label for="income_currency" class="label-helptext">
<div class="fw-bold">
Income Currency
{%if form.fields.income_currency.required %}<span aria-hidden="true" class="required">*</span>{% endif %}
</div>
<div class="subtitle">
The currency you’re paid in.
</div>
</label>

<select name="income_currency" id="income_currency" class="form-control {%if form.income_currency.errors %}errored{% endif %}" aria-describedby="income-currency-subtitle" required>
<option value="">Choose</option>
{% for choice in form.fields.income_currency.choices %}
<option value="{{ choice.0 }}">{{ choice.1 }}</option>
{% endfor %}
</select>
{% for error in form.income_currency.errors %}
<div class="form-error" id="income_currencyError" role="alert">{{error}}</div>
{% endfor %}
</div>
<div class="form-group checkbox-long-label">
<input id="" type="checkbox" required aria-label="financial assistance attestation" aria-describedby="financial-assist-testify"/>
<span id="financial-assist-testify" class="financial-assist-testify">I testify that the income I reported is true and accurate. I am aware that I may be asked to verify the reported income with documentation.</span>
</div>
<div class="row submit-row no-gutters justify-content-center">
<button type="submit" class="btn btn-primary btn-gradient-red-to-blue large">Submit request</button>
</div>
</form>
</div>
</div>
</div>

</div>
{% else %}
{% if prior_request.is_approved %}{# request status #}
{% if prior_request.tier.discount.amount == 0 %}{# discount amount text #}
<div class="flexible-pricing-head">
{{ page.application_approved_no_discount_text|richtext }}
</div>
{% else %}
<div class="flexible-pricing-head">
{{ page.application_approved_text|richtext }}
</div>
{% endif %}{# end discount amount text #}

{% if page.selected_course %}
{% if product %}{# product and unexpired course run exist #}
<form action="/cart/add" method="get" className="text-center">
<input type="hidden" name="product_id" value={{ product.id }} />
<button
type="submit"
class="btn btn-primary btn-gradient-red flexible-price-certificate-btn">
Get Certificate
</button>
</form>
<div class="std-page-body">
<div class="std-card std-card-finasst">
<div class="std-card-body financial-assistance-page">
{% if prior_request.tier.discount.amount == 0 %}{# discount amount text #}
{{ page.application_approved_no_discount_text|richtext }}
{% else %}
<a href="{{ product_page }}" class="btn btn-primary btn-gradient-red flexible-price-certificate-btn">
Course details
{{ page.application_approved_text|richtext }}
{% endif %}{# end discount amount text #}

{% if page.selected_course %}
{% if product %}{# product and unexpired course run exist #}
<form action="/cart/add" method="get" class="text-center">
<input type="hidden" name="product_id" value={{ product.id }} />
<button
type="submit"
class="btn btn-primary btn-gradient-red-to-blue flexible-price-certificate-btn">
Get Certificate
</button>
</form>
{% else %}
<a href="{{ product_page }}" class="btn btn-primary btn-gradient-red-to-blue flexible-price-certificate-btn">
Course details
</a>
{% endif %}
{% elif page.selected_program %}
<a href="/dashboard" class="btn btn-primary btn-gradient-red-to-blue flexible-price-certificate-btn">
Go to Dashboard
</a>
{% endif %}
{% elif page.selected_program %}
<a href="/dashboard" class="btn btn-primary btn-gradient-red flexible-price-certificate-btn">
Go to Dashboard
</a>
{% endif %}
</div>
</div>
</div>



{% elif prior_request.is_denied %}
<div class="flexible-pricing-head">
{{ page.application_denied_text|richtext }}
<div class="std-page-body">
<div class="std-card std-card-finasst">
<div class="std-card-body financial-assistance-page">
{{ page.application_denied_text|richtext }}
</div>
</div>
</div>
{% else %}
<div class="flexible-pricing-head">
{{ page.application_processing_text|richtext }}
<div class="std-page-body">
<div class="std-card std-card-finasst">
<div class="std-card-body financial-assistance-page">
{{ page.application_processing_text|richtext }}
</div>
</div>
</div>
{% endif %}{# request status #}
{% endif %}{# has submission #}
{% else %}
{{ page.guest_text|richtext }}
{% endif %} {# is logged in #}
</div>

</div>
{% endblock %}

{% block scripts %}
<script type="text/javascript">
$(document).ready(function() {
$("#your_income").on("focus", function() {
$(this).on("keydown", function(e) {
//disable up/down keyboard for increment
if (e.keyCode === 38 || e.keyCode === 40) {
e.preventDefault();
}
});
});

<script type="text/javascript">
$(document).ready(function() {
$("#your_income").on("focus", function() {
$(this).on("keydown", function(e) {
//disable up/down keyboard for increment
if (e.keyCode === 38 || e.keyCode === 40) {
e.preventDefault();
}
});
</script>
{% endblock %}
});

});
</script>
{% endblock %}
62 changes: 0 additions & 62 deletions frontend/public/scss/auth.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,68 +154,6 @@

}

.auth-form {
.form-control {
font-size: inherit;
font-weight: inherit;
}

.form-error {
font-size: 1rem;
font-weight: 400;
}

.errored {
border: 2px solid $red;
}

.submit-row {
margin-top: 25px;
}

.error-label {
color: red;
}

.col {
align-self: flex-start;
}

.form-control:focus {
border-color: $success;
box-shadow: 0 0 0 1px $success;
}

label {
font-weight: normal !important;
justify-content: space-between;

div {
font-weight: inherit !important;
}

.subtitle {
color: $label-subtitle;
font-size: 14px;
}
}

.required {
color: $brand-button-bg;
}

.label-secondary {
padding-top: 10px;
font-size: 14px;
}
}

.registration-page .auth-form {
.row-inner {
margin-top: 20px;
}
}

.additional-street {
cursor: pointer;
color: $light-blue;
Expand Down
Loading

0 comments on commit 8ffe888

Please sign in to comment.