diff --git a/app/static/scripts/function.js b/app/static/scripts/function.js
index 73c3017b9900d8ebadd58ec7a4b43194615b116c..5329376cee4a11b1da34285518aa35084bd61f3d 100644
--- a/app/static/scripts/function.js
+++ b/app/static/scripts/function.js
@@ -11,9 +11,8 @@ function preCertification() {
function check() {
var submitButton = document.getElementById("submit");
- let ckbox1 = document.getElementById('agree1');
- let ckbox2 = document.getElementById('agree2');
- submitButton.disabled = !(ckbox1.checked && ckbox2.checked);
+ let ckbox = document.getElementById('agree');
+ submitButton.disabled = !(ckbox.checked);
};
function displayloading1() {
diff --git a/app/templates/account/certify.html b/app/templates/account/certify.html
index 30ce3b41e0e40317403d82a90ab1145510d6d93d..bfb91a334fa36f18d7ddfce1f8d1043277da77a0 100644
--- a/app/templates/account/certify.html
+++ b/app/templates/account/certify.html
@@ -1,5 +1,5 @@
<html class="gr__rc_uab_edu">
-<title>Annual Certification</title>
+<title>Annual Account Certification</title>
<head>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.7.3/socket.io.min.js"></script>
@@ -82,7 +82,7 @@
<div class="col-md-10 col-sm-10 my-col">
<div id="form-wrapper">
- <h2> Annual Certification</h2>
+ <h2> Annual Account Certification</h2>
<div id="pre-certify">
<p style="font-size:110%;"> {{ pre_certification_msg |safe }}</p>
<div class="col-md-7 col-sm-7 my-col">
@@ -103,8 +103,7 @@
<label for="email" class="control-label">Email:</label>	<input id="email" class="form-control" placeholder="Enter Email" required><br>
</div>
<div class="col-md-10 col-sm-10 my-col">
- <br><input class="checks" id ="agree1" type="checkbox" name="agree" value="agree" onchange= check() /> I have read & accept UAB IT's <a href="https://secure2.compliancebridge.com/uab/public/index.php?fuseaction=print.preview&docID=786" target="_blank">Acceptable Use Policy</a> and <a href="https://www.uab.edu/it/home/policies/data-classification/classification-overview" target="_blank">Data Classification Policy</a><br/>
- <br><input class="checks" id ="agree2" type="checkbox" name="agree" value="agree" onchange= check() /> I also understand that it is my responsibility to follow all relevant <a href="https://www.uab.edu/it/home/policies" target="_blank">UAB IT policies</a> when using this resource.<br/>
+ <br><input class="checks" id ="agree" type="checkbox" name="agree" value="agree" onchange= check() /> I have read & accept UAB <a href="https://secure2.compliancebridge.com/uab/public/index.php?fuseaction=print.preview&docID=786" target="_blank">Acceptable Use</a>, <a href="https://www.uab.edu/it/home/policies/data-classification/classification-overview" target="_blank">Data Classification</a> and all other Information Technology <a href="https://www.uab.edu/it/home/policies" target="_blank">Policies.</a><br/>
<br><button class="btn btn-danger btn-md" id="cancel" name="cancel" type="button" onClick="renderDom('Account Certification Cancelled','{{ cancel_msg |safe }}', null)">Cancel</button>
<button class="btn btn-primary btn-md" disabled id="submit" name="submit" type="button" value="Submit" onclick="displayloading1();certify_account()"> Certify Account</button>
</div>
diff --git a/app/templates/account/hold.html b/app/templates/account/hold.html
index 5a8bbf920768eb73ada32d45fc95d18f5b857259..862f10ba7b2eefeabd494d231e97045554ddeda2 100644
--- a/app/templates/account/hold.html
+++ b/app/templates/account/hold.html
@@ -1,5 +1,5 @@
<html class="gr__rc_uab_edu">
-<title>Account on Hold</title>
+<title>Account On Hold</title>
<head>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.7.3/socket.io.min.js"></script>
@@ -52,7 +52,7 @@
<div class="col-md-10 col-sm-10 my-col">
<div id="form-wrapper">
- <h2> Account on Hold </h2>
+ <h2> Account On Hold </h2>
<p style="font-size:110%;"> {{ account_hold_msg |safe }}</p>
</div>
</div>
diff --git a/app/templates/auth/SignUp.html b/app/templates/auth/SignUp.html
index b715441dd9ba619015ca76e8f2ebcaa100e1e1f5..4231ca4a9751faf1c29871d3026687a9ca8a5a93 100644
--- a/app/templates/auth/SignUp.html
+++ b/app/templates/auth/SignUp.html
@@ -96,8 +96,7 @@
<textarea class="form-control" id="reason" name="reason" placeholder="Enter Reason for Account Request" required></textarea><br>
</div>
<div class="col-md-10 col-sm-10 my-col">
- <br><input class="checks" id ="agree1" type="checkbox" name="agree" value="agree" onchange= check() /> I have read & accept UAB IT's <a href="https://secure2.compliancebridge.com/uab/public/index.php?fuseaction=print.preview&docID=786" target="_blank">Acceptable Use Policy</a> and <a href="https://www.uab.edu/it/home/policies/data-classification/classification-overview" target="_blank">Data Classification Policy</a><br/>
- <br><input class="checks" id ="agree2" type="checkbox" name="agree" value="agree" onchange= check() /> I also understand that it is my responsibility to follow all relevant <a href="https://www.uab.edu/it/home/policies" target="_blank">UAB IT policies</a> when using this resource.<br/>
+ <br><input class="checks" id ="agree" type="checkbox" name="agree" value="agree" onchange= check() /> I have read & accept UAB <a href="https://secure2.compliancebridge.com/uab/public/index.php?fuseaction=print.preview&docID=786" target="_blank">Acceptable Use</a>, <a href="https://www.uab.edu/it/home/policies/data-classification/classification-overview" target="_blank">Data Classification</a> and all other Information Technology <a href="https://www.uab.edu/it/home/policies" target="_blank">Policies.</a><br/>
<br><button class="btn btn-danger btn-md" id="cancel" name="cancel" type="button" onClick="renderDom('Account Creation Cancelled','{{ cancel_msg |safe }}', null)">Cancel</button>
<button class="btn btn-primary btn-md" disabled id="submit" name="submit" type="button" value="Submit" onclick="displayloading1();request_account()"> Create Account</button>
</div>
diff --git a/messages.py b/messages.py
index 60c0745159a627cbe99cd7245eacebea79b37b93..ca89d6078a8d3b0f5487ee697552622af4ed4cb6 100644
--- a/messages.py
+++ b/messages.py
@@ -1,8 +1,8 @@
-welcome_message = "The information below will be used to create your account. Please fill in the reason for requesting your account as this helps us understand our user base.<br>Contact <a href='mailto:support@listserv.uab.edu'>Research Computing</a> if you have any questions."
-cancel_message = "Close current tab to end session.<br>Contact <a href="'mailto:support@listserv.uab.edu'">Research Computing</a> if you have any questions."
-error_message = "An error occurred while creating your account. Research Computing team has been notified and is working on fixing it.<br>Contact <a href='mailto:support@listserv.uab.edu'>Research Computing</a> if you have any questions."
-unauthorized_message = "Your UAB Research Computing account is currently on hold.<br>Accounts are put on hold if there are changes with your UAB affiliation or if there is an issue on one of the platforms.<br>Please contact <a href="'mailto:support@listserv.uab.edu'">Research Computing</a> or attend the weekly office hours to resolve any issues."
-account_hold_message = "Your UAB Research Computing account is currently on hold.<br>Please contact <a href="'mailto:support@listserv.uab.edu'">Research Computing</a> or attend the weekly office hours to resolve any issues."
-pre_certification_message = "Welcome back to the UAB Research Computing services page.<br>Annual account certification is required for continued access to Research Computing services. <br> To continue with the self certification process click on continue below"
-certification_message = "Welcome back to the UAB Research Computing services page.<br>The usage of this resource is governed by UAB IT's <a href=' https://secure2.compliancebridge.com/uab/public/index.php?fuseaction=print.preview&docID=786' target='_blank'>Acceptable Use Policy </a> and <a href='https://www.uab.edu/it/home/policies/data-classification/classification-overview' target='_blank'>Data Classification Policy</a><br>To read and understand all UAB IT policies click <a href=' https://www.uab.edu/it/home/policies' target='_blank'>here</a><br>Verify your information in the form below and hit the Certify Account button when you are done."
-good_standing_message= "Your account is in good standing. Click <a href=https://rc.uab.edu>here</a> to proceed to dashboard"
+welcome_message = "The information below will be used to create your account. Please fill in the reason for requesting your account as this helps us understand our user base. Please be aware that the use of this resource is governed by <a href='https://www.uab.edu/it/home/policies' target='_blank'>UAB Information Technology Security Policies.</a><br><br>Contact <a href='mailto:support@listserv.uab.edu'>Research Computing</a> if you have any questions.<br>"
+cancel_message = "Close current tab to end session.<br>Contact <a href="'mailto:support@listserv.uab.edu'">Research Computing</a> if you have any questions.<br>"
+error_message = "An error occurred while creating your account. Research Computing team has been notified and is working on fixing it.<br>Contact <a href='mailto:support@listserv.uab.edu'>Research Computing</a> if you have any questions.<br>"
+unauthorized_message = "Your UAB login is not authorized to use UAB Research Computing services. Contact <a href='mailto:support@listserv.uab.edu'>Research Computing</a> to resolve this issue.<br>"
+account_hold_message = "Your UAB Research Computing account is currently on hold.<br>Please contact <a href="'mailto:support@listserv.uab.edu'">Research Computing</a> or attend the weekly <a href='https://uabrc.github.io/#contact-us' target='_blank'>office hours</a> to resolve this issue.<br>"
+pre_certification_message = "Annual account certification is required for continued access to Research Computing Systems.<br>To continue with the self certification process click on continue below.<br><br>"
+certification_message= "This resource is governed by <a href='https://www.uab.edu/it/home/policies' target='_blank'>UAB Information Technology Security Policies.</a><br><br>Please verify your information in the form below and press the Certify Account to complete the certification process.<br>"
+good_standing_message= "Your account is in good standing. Click <a href=https://rc.uab.edu>here</a> to proceed to dashboard.<br>"