diff --git a/app/__init__.py b/app/__init__.py
index cc2b989d94580ab41df2593ec22a4a9bb05e5a8d..aba5b71a4b39fcbad3bd863895d230dca2ece2df 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -50,8 +50,8 @@ def create_app(config_name):
if (not any(item in session['user'].get('eppa') for item in valid_eppa)):
return render_template('account/unauthorized.html', unauthorized_msg=messages.unauthorized_message)
- if rc_util.check_state(session['user'].get('username')) == "blocked":
- return render_template('account/blocked.html', unauthorized_msg=messages.unauthorized_message)
+ if rc_util.check_state(session['user'].get('username')) == "hold":
+ return render_template('account/hold.html', account_hold_msg=messages.account_hold_message)
elif rc_util.check_state(session['user'].get('username')) == "certification":
return render_template('account/certify.html', room_id=session['uid'],
diff --git a/app/templates/account/certify.html b/app/templates/account/certify.html
index c894eeaaa52d50d23bca66e1778f37263d46c5df..4ba8afa89bff05a4f78841393fc5688138dc3751 100644
--- a/app/templates/account/certify.html
+++ b/app/templates/account/certify.html
@@ -1,5 +1,5 @@
<html class="gr__rc_uab_edu">
-<title>User Certification </title>
+<title>Annual 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>
@@ -60,7 +60,7 @@
<div class="navbar-right">
<ul class="nav navbar-nav">
<li>
- <a target="_blank" href="https://docs.uabgrid.uab.edu/wiki/Cheaha_GettingStarted">
+ <a target="_blank" href="https://uabrc.github.io/">
<i class="fas fa-info-circle fa-fw"></i> Online Documentation
</a>
</li>
@@ -79,7 +79,7 @@
<div class="col-md-10 col-sm-10 my-col">
<div id="form-wrapper">
- <h2> Annual Recertification</h2>
+ <h2> Annual 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">
@@ -97,12 +97,12 @@
<label for="fullname" class="control-label">Full Name:</label>	<input id="fullname" class="form-control" placeholder="Enter Full Name" required><br>
</div>
<div class="col-md-7 col-sm-7 my-col">
- <label for="email" class="control-label">Email:</label>	<input id="email" class="form-control" placeholder="Enter Email" required>
+ <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/>
- <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">IT policies</a> when using this resource.<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>
+ <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><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>
</form>
diff --git a/app/templates/account/blocked.html b/app/templates/account/hold.html
similarity index 93%
rename from app/templates/account/blocked.html
rename to app/templates/account/hold.html
index f716dfd7ce621c1525a170b08205785afdd10bf4..12f45337cf9b50e7ff919b023779a19a1b57cd68 100644
--- a/app/templates/account/blocked.html
+++ b/app/templates/account/hold.html
@@ -33,7 +33,7 @@
<div class="navbar-right">
<ul class="nav navbar-nav">
<li>
- <a target="_blank" href="https://docs.uabgrid.uab.edu/wiki/Cheaha_GettingStarted">
+ <a target="_blank" href="https://uabrc.github.io/">
<i class="fas fa-info-circle fa-fw"></i> Online Documentation
</a>
</li>
@@ -52,8 +52,8 @@
<div class="col-md-10 col-sm-10 my-col">
<div id="form-wrapper">
- <h2> Account blocked </h2>
- <p style="font-size:110%;"> {{ unauthorized_msg |safe }}</p>
+ <h2> Account on Hold </h2>
+ <p style="font-size:110%;"> {{ account_hold_msg |safe }}</p>
</div>
</div>
</div>
diff --git a/app/templates/account/unauthorized.html b/app/templates/account/unauthorized.html
index 339a4200bddebf23ec9e4427278304a583e09b9c..66bfd78a10d2d1fc56da72c044d03017410ac037 100644
--- a/app/templates/account/unauthorized.html
+++ b/app/templates/account/unauthorized.html
@@ -33,7 +33,7 @@
<div class="navbar-right">
<ul class="nav navbar-nav">
<li>
- <a target="_blank" href="https://docs.uabgrid.uab.edu/wiki/Cheaha_GettingStarted">
+ <a target="_blank" href="https://uabrc.github.io/">
<i class="fas fa-info-circle fa-fw"></i> Online Documentation
</a>
</li>
diff --git a/app/templates/auth/SignUp.html b/app/templates/auth/SignUp.html
index 5394a91ceecc4629315db372064520eac33596fe..b715441dd9ba619015ca76e8f2ebcaa100e1e1f5 100644
--- a/app/templates/auth/SignUp.html
+++ b/app/templates/auth/SignUp.html
@@ -59,7 +59,7 @@
<div class="navbar-right">
<ul class="nav navbar-nav">
<li>
- <a target="_blank" href="https://docs.uabgrid.uab.edu/wiki/Cheaha_GettingStarted">
+ <a target="_blank" href="https://uabrc.github.io/">
<i class="fas fa-info-circle fa-fw"></i> Online Documentation
</a>
</li>
@@ -93,12 +93,12 @@
</div>
<div class="col-md-7 col-sm-7 my-col">
<label for="reason" class="control-label">Reason for Requesting Account:</label><br>
- <textarea class="form-control" id="reason" name="reason" placeholder="Enter Reason for Account Request" required></textarea>
+ <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/>
- <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">IT policies</a> when using this resource.<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>
+ <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><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>
</form>
diff --git a/messages.py b/messages.py
index 72af34c3cf8746fe2860919659544a373ddb4aaf..60c0745159a627cbe99cd7245eacebea79b37b93 100644
--- a/messages.py
+++ b/messages.py
@@ -1,7 +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 UAB affiliation or if there is an issue on one of the platforms.<br>Please reach out to <a href="'mailto:support@listserv.uab.edu'">Research Computing</a> or attend the weekly office hours and we'll work with you to clear your account."
-pre_certification_message = "Welcome back to the UAB Research Computing services page.<br>We are asking for researchers to recertify their accounts annually so that we'll know who is still actively using the systems. <br> To continue with the self certification process click on continue below"
+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"