Skip to content

Commit a2640e5

Browse files
fanglinfangfanglinfang
authored
Merge pull request #3144 from uw-it-aca/qa
Feature/muwm 5351 a11y (#3142)
2 parents f21b3ba + 1645686 commit a2640e5

File tree

3 files changed

+35
-30
lines changed

3 files changed

+35
-30
lines changed

‎myuw_vue/components/_templates/card-status.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div class="mb-3">
33
<div class="d-flex align-items-center">
4-
<h3 class="h6 m-0 myuw-font-encode-sans status-label flex-fill">
4+
<h3 class="h6 m-0 myuw-font-encode-sans status-label flex-fill pe-3">
55
<slot name="status-label" />
66
</h3>
77
<div class="flex-fill text-end">

‎myuw_vue/components/accounts/tuition-fees.vue

+33-28
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010
</template>
1111
<template #card-body>
1212
<div>
13-
<div v-if="hasIacData" role="alert" class="alert alert-warning myuw-text-md">
14-
<strong>Digital material fees are not included in tuition</strong>, they must be paid
13+
<!--<div v-if="hasIacData" role="alert" class="alert alert-warning myuw-text-md">
14+
<font-awesome-icon :icon="faExclamationTriangle" />
15+
<strong>Digital material fees are not included in tuition</strong>. They must be paid
1516
separately below under "UW Day One Access Fees."
16-
</div>
17+
</div>-->
1718
<div
1819
v-if="hasTuitionDate && tuitionDateFromNow === 'Today' && tuiBalance > 0"
1920
class="alert alert-danger text-danger" style="text-align: center"
@@ -35,25 +36,27 @@
3536
<!-- If there is some or no tuition due -->
3637
<li v-if="tuiBalance >= 0">
3738
<uw-card-status>
38-
<template #status-label>Amount Due</template>
39+
<template #status-label>Student Fiscal Services (SFS)</template>
3940
<template v-if="tuiBalance > 0" #status-value>
4041
<span class="text-danger">${{ tuiBalance.toFixed(2) }}</span>
4142
</template>
4243
<template v-else #status-value>$ 0</template>
4344
<template #status-content>
44-
<div class="d-flex mb-2 myuw-text-md">
45-
<div class="flex-fill w-50">Student Fiscal Services</div>
46-
<div class="flex-fill w-50 text-end">
45+
<div class="d-flex mb-1 myuw-text-md row">
46+
<div class="col">Amount Due</div>
47+
<div class="col text-end">
4748
<a href="https://sdb.admin.uw.edu/sisStudents/uwnetid/tuition.aspx"
4849
>Tuition Statement</a
4950
>
5051
</div>
5152
</div>
5253
<div v-if="tuiBalance != 0" class="text-end">
5354
<uw-link-button
54-
v-out="'Make tuition payment'"
55+
v-out="'Pay SFS tuition'"
56+
class=""
57+
style="width: 10rem;"
5558
href="http://f2.washington.edu/fm/sfs/tuition/payment"
56-
>Make payment</uw-link-button
59+
>Pay SFS tuition</uw-link-button
5760
>
5861
</div>
5962
</template>
@@ -62,12 +65,12 @@
6265
<!-- If there is credit on account -->
6366
<li v-else-if="tuiBalance < 0">
6467
<uw-card-status>
65-
<template #status-label>Account Credit</template>
68+
<template #status-label>Student Fiscal Services (SFS)</template>
6669
<template #status-value> +${{ Math.abs(tuiBalance).toFixed(2) }} CR </template>
6770
<template #status-content>
68-
<div class="d-flex mb-2 myuw-text-md">
69-
<div class="flex-fill w-50">Student Fiscal Services</div>
70-
<div class="flex-fill w-50 text-end">
71+
<div class="d-flex mb-2 myuw-text-md row">
72+
<div class="col">Account Credit</div>
73+
<div class="col text-end">
7174
No payment needed<br />
7275
<a href="https://sdb.admin.uw.edu/sisStudents/uwnetid/tuition.aspx"
7376
>Tuition Statement</a
@@ -80,18 +83,19 @@
8083
<!-- If there is a PCE balance -->
8184
<li v-if="pceBalance > 0">
8285
<uw-card-status>
83-
<template #status-label>Amount Due</template>
86+
<template #status-label>PCE - Continuum College</template>
8487
<template #status-value>
8588
<span class="text-danger">${{ pceBalance.toFixed(2) }}</span>
8689
</template>
8790
<template #status-content>
88-
<div class="d-flex mb-2 myuw-text-md">
89-
<div class="flex-fill w-50">PCE-Continuum College</div>
90-
<div class="flex-fill w-50 text-end">
91+
<div class="d-flex mb-2 myuw-text-md row">
92+
<div class="col">Amount Due</div>
93+
<div class="text-end col">
9194
<uw-link-button
92-
v-out="'Make Continuum College tuition payment'"
95+
v-out="'Pay PCE tuition'"
96+
style="width: 10rem;"
9397
href="http://portal.continuum.uw.edu"
94-
>Make payment</uw-link-button
98+
>Pay PCE tuition</uw-link-button
9599
>
96100
</div>
97101
</div>
@@ -101,11 +105,11 @@
101105
<!-- If there is no PCE balance, either not pce or paid off -->
102106
<li v-else-if="isC2">
103107
<uw-card-status>
104-
<template #status-label>Amount Due</template>
108+
<template #status-label>PCE-Continuum College</template>
105109
<template #status-value>$ 0</template>
106110
<template #status-content>
107111
<div class="d-flex mb-2 myuw-text-md">
108-
<div class="flex-fill w-50">PCE-Continuum College</div>
112+
<div class="flex-fill w-50">Amount Due</div>
109113
<div class="flex-fill w-50 text-end">
110114
<a
111115
v-out="'Continuum College Account Statement'"
@@ -134,7 +138,7 @@
134138
</li>
135139

136140
<li v-if="hasIacData">
137-
<h3 class="h6 text-dark-beige myuw-font-encode-sans">UW Day One Access Fees</h3>
141+
<h3 class="h6 text-dark-beige myuw-font-encode-sans mt-4">UW Day One Access Fees</h3>
138142
<div class="alert alert-warning myuw-text-md" role="alert">
139143
<p>
140144
One or more of your enrolled courses provides you access to
@@ -156,20 +160,21 @@
156160
email <a href="mailto:[email protected]">[email protected]</a>.
157161
</div>
158162
<uw-card-status v-else>
159-
<template #status-label>Amount Due</template>
163+
<template #status-label>University Book Store</template>
160164
<template v-if="iacData.balance > 0" #status-value>
161165
<span class="text-danger">${{ iacData.balance.toFixed(2) }}</span>
162166
</template>
163167
<template v-else #status-value>$ 0</template>
164168

165169
<template v-if="iacData.balance > 0" #status-content>
166-
<div class="d-flex mb-2 myuw-text-md">
167-
<div class="flex-fill w-50">University Book Store</div>
168-
<div class="flex-fill w-50 text-end">
170+
<div class="d-flex mb-2 myuw-text-md row">
171+
<div class="col">Amount Due</div>
172+
<div class="text-end col">
169173
<uw-link-button
170-
v-out="'Make bookstore payment'"
174+
v-out="'Pay book store tuition'"
175+
style="width: 10rem;"
171176
:href="iacData.bookstore_checkout_url"
172-
>Make payment</uw-link-button
177+
>Pay book store fees</uw-link-button
173178
>
174179
</div>
175180
</div>

‎myuw_vue/components/textbooks/textbooks.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<li>
3535
<strong>Opting out:</strong>
3636
You can choose to opt-out of any item until the deadline.
37-
Opt out on your course Canvas <em>Digital Materials</em> page.
37+
Opt out on your course Canvas <em>Day One Access Materials</em> page.
3838
</li>
3939
<li>
4040
<strong>Payment status:</strong>

0 commit comments

Comments
 (0)