diff --git a/app/__init__.py b/app/__init__.py index 871f0809b6a9b2c7333ccfff0d60772d8947b5de..e37cb6eed8fa2515149e811635ba0c08586271cd 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -58,7 +58,7 @@ def create_app(config_name): username=session['user'].get('username'), fullname=session['user'].get('fullname'), email=session['user'].get('email'), referrer=session['return_url'], cancel_url=vars.default_referrer, - cancel_msg=messages.cancel_message, certification_message=messages.certification_message) + cancel_msg=messages.cancel_message, pre_certification_msg=messages.pre_certification_message, certification_msg=messages.certification_message) else: return render_template('auth/SignUp.html', room_id=session['uid'], username=session['user'].get('username'), diff --git a/app/static/scripts/function.js b/app/static/scripts/function.js index 3527e3c7a9465471d0a83003dc692b0eda894074..73c3017b9900d8ebadd58ec7a4b43194615b116c 100644 --- a/app/static/scripts/function.js +++ b/app/static/scripts/function.js @@ -1,7 +1,19 @@ +function preCertification() { + const element = document.getElementById("pre-certify"); + element.remove(); + var x = document.getElementById("user-recertify"); + if (x.style.display === "block") { + x.style.display = "none"; + } else { + x.style.display = "block"; + } +} + function check() { var submitButton = document.getElementById("submit"); - let ckbox = document.getElementById('agree'); - submitButton.disabled = !ckbox.checked; + let ckbox1 = document.getElementById('agree1'); + let ckbox2 = document.getElementById('agree2'); + submitButton.disabled = !(ckbox1.checked && ckbox2.checked); }; function displayloading1() { diff --git a/app/templates/account/certify.html b/app/templates/account/certify.html index 1ed9819cceb2b039185ea755465cea5f743b0a6d..f23e43bfa37bad3f0e4139e9484919c7161b0ba1 100644 --- a/app/templates/account/certify.html +++ b/app/templates/account/certify.html @@ -79,9 +79,16 @@ <div class="col-md-10 col-sm-10 my-col"> <div id="form-wrapper"> - <h2> Annual Recertification Form </h2> - <p style="font-size:110%;"> {{ certification_message |safe }}</p> - <div id="user-input"> + <h2> Annual Recertification</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"> + <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" id="submit" name="submit" type="button" value="Submit" onclick="preCertification()"> Continue to Certification</button> + </div> + </div> + <div id="user-recertify" style="display: none"> + <p style="font-size:110%;"> {{ certification_msg |safe }}</p> <form id="signup" data-toggle="validator" role="form" action="." method="post" onsubmit=""> <div class="col-md-7 col-sm-7 my-col"> <label for="username" class="control-label">Blazer Id:</label>	<input id="username" class="form-control" placeholder="Enter Username" required><br> @@ -93,12 +100,15 @@ <label for="email" class="control-label">Email:</label>	<input id="email" class="form-control" placeholder="Enter Email" required><br> </div> <br> - <div class="col-md-7 col-sm-7 my-col"> + <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">Acceptable Use Policy</a> and <a href="https://www.uab.edu/it/home/policies/data-classification/classification-overview">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">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> - <button class="btn btn-primary btn-md" id="submit" name="submit" type="button" value="Submit" onclick="displayloading1();certify_account()"> Certify Account</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> </div> + </div> </div> </div> </div> diff --git a/messages.py b/messages.py index 8463099d6d10b7627d5a332e8d3dce32fdc180e7..52788e5e0ad36fe7f686c690b76c650478cee445 100644 --- a/messages.py +++ b/messages.py @@ -1,5 +1,6 @@ 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." -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>Fill out the form below and hit the Certify Account button when you are done." 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" +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>Fill out the form below and hit the Certify Account button when you are done."