Merge branch 'fix-web-text' into 'master'

Fix web text

See merge request rc/self-reg-form!12

app/templates/auth/SignUp.html

@@ -27,7 +27,7 @@
         socket.on( 'account error', function( msg ) {
           console.log(msg);
           $('#myModal2').modal('hide'); 
-          renderDom("Account Create Error", "{{ error_msg }}", msg);
+          renderDom("Account Create Error", "{{ error_msg |safe}}", msg);
         });
 
     });
@@ -78,7 +78,7 @@
 
   <div class="col-md-10 col-sm-10 my-col">
     <div id="form-wrapper">
-    <h2> Self Registration Form </h2>
+    <h2>Welcome to UAB Research Computing</h2>
     <p style="font-size:110%;"> {{ welcome_msg |safe }}</p>
       <div id="user-input">    
         <form id="signup" data-toggle="validator" role="form" action="." method="post" onsubmit="">
@@ -127,7 +127,7 @@
         <h4 class="modal-title" id="myModalLabel">Account Request Received!</h4>
       </div>
       <div class="modal-body">
-        <span>Please wait while we create your account. This may take up to 5-10 minutes.</span>
+        <span>Sit tight while we create your account.</span>
         <img src="{{ url_for('static', filename='img/loading.gif') }}" width="40px">
       </div>
     </div>

messages.py

-welcome_message = "Welcome to UAB's Reseach Computing cluster. The information below will be used to create your account. Please fill in all the details as this helps us understand our user base. Contact <a href='mailto:support@listserv.uab.edu'>Research Computing</a>  for any assistance in creating your account."
-cancel_message = "Close browser to end session. Contact <a href="'mailto:support@listserv.uab.edu'">Research Computing</a> for any assistance in creating your account."
-error_message = "Error while creating your account. We've been notified about this. Contact <a href="'mailto:support@listserv.uab.edu'">Research Computing</a>  for any assistance in creating your account."
+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."