user_signup.html: removing triple underscoring

3 files changed, 21 insertions, 29 deletions

diff --git a/res/client/css/partials/user-signup.scss b/res/client/css/partials/user-signup.scss
index d7f738ed..1fb4677c 100644
--- a/res/client/css/partials/user-signup.scss
+++ b/res/client/css/partials/user-signup.scss
@@ -10,7 +10,7 @@
 	box-shadow: 0px 3px 6px 3px rgba(0, 0, 0, 0.3);
 } */
 
-/* #signup_form___submit_button {
+/* #signup_form__submit_button {
 	background-color: #ee3654;
 	border-radius: 3px;
 	color: #fff;
@@ -59,7 +59,7 @@
 	background-position: 140px 2px;
 }
 
-#signup_form___submit_button_row {
+#signup_form__submit_button_row {
 	overflow: auto;
 }  */
 
@@ -72,7 +72,7 @@
 	width: 92%;
 }
 
-#signup_form___submit_button:hover {
+#signup_form__submit_button:hover {
 	alpha: 1.0;
 }
 
diff --git a/res/templates/user_signup.html b/res/templates/user_signup.html
index 639fdc06..3b0fc4ef 100644
--- a/res/templates/user_signup.html
+++ b/res/templates/user_signup.html
@@ -40,13 +40,13 @@ body {
         <div class="signup_form__row">
             <div class="signup_form__field signup_form__row_sharing_field">
                 <input
-                    id="signup_form___first_name"
+                    id="signup_form__first_name"
                     placeholder="First name"
                     class="login-input input-username">
             </div>
             <div class="signup_form__field signup_form__row_sharing_field">
                 <input
-                    id="signup_form___last_name"
+                    id="signup_form__last_name"
                     placeholder="Last name"
                     class="login-input input-username">
             </div>
@@ -54,7 +54,7 @@ body {
         <div class="signup_form__row">
             <div class="signup_form__field">
                 <input
-                    id="signup_form___rz_username"
+                    id="signup_form__rz_username"
                     placeholder="Rhizi username"
                     class="login-input input-username">
             </div>
@@ -62,7 +62,7 @@ body {
         <div class="signup_form__row">
             <div class="signup_form__field">
                 <input
-                    id="signup_form___email_address"
+                    id="signup_form__email_address"
                     type="email"
                     placeholder="Email"
                     class="login-input">
@@ -71,7 +71,7 @@ body {
         <div class="signup_form__row">
             <div class="signup_form__field">
                 <input
-                    id="signup_form___password_first"
+                    id="signup_form__password_first"
                     type="password"
                     placeholder="password"
                     class="login-input">
@@ -80,7 +80,7 @@ body {
         <div class="signup_form__row">
             <div class="signup_form__field">
                 <input
-                    id="signup_form___password_second"
+                    id="signup_form__password_second"
                     type="password"
                     placeholder="Re-type password"
                     class="login-input">
@@ -91,10 +91,10 @@ body {
             id="err_msg_row"
             class="alert alert-error">
         </div>
-        <div id="signup_form___submit_button_row">
+        <div id="signup_form__submit_button_row">
             <div
-                id="signup_form___submit_button" class="login-form_button signup-button"
-                onclick="signup_form___submit();">Sign Up</div>
+                id="signup_form__submit_button" class="login-form_button signup-button"
+                onclick="signup_form__submit();">Sign Up</div>
         </div>
         <div id="signup_form__ajax_response"></div>
         {% endif %}
diff --git a/src/client/user_signup.js b/src/client/user_signup.js
index 1f1cc748..cb7e4b4f 100644
--- a/src/client/user_signup.js
+++ b/src/client/user_signup.js
@@ -1,20 +1,12 @@
 "use strict"
 
-function signup_form___submit() {
+function signup_form__submit() {
 
     function validate_data(data) {
         var err_msg_row = $('#err_msg_row'); // reset
         err_msg_row.children().remove();
-        if (data.password_first != data.password_second) {
-            err_msg_row.append($('<p>passwords do not match</p>'));
-            err_msg_row.css('display', 'block');
-            return false;
-        }
-        if (data.password_first.length < 8) {
-            err_msg_row.append($('<p>password too short - must be at least 8 charachters long</p>'));
-            err_msg_row.css('display', 'block');
-            return false;
-        }
+
+        // FIXME call util.validate...
 
         // TODO validate email
 
@@ -23,12 +15,12 @@ function signup_form___submit() {
     }
 
     var form_data = {
-        first_name : $('#signup_form___first_name').val(),
-        last_name : $('#signup_form___last_name').val(),
-        rz_username : $('#signup_form___rz_username').val(),
-        email_address : $('#signup_form___email_address').val(),
-        password_first : $('#signup_form___password_first').val(),
-        password_second : $('#signup_form___password_second').val(),
+        first_name : $('#signup_form__first_name').val(),
+        last_name : $('#signup_form__last_name').val(),
+        rz_username : $('#signup_form__rz_username').val(),
+        email_address : $('#signup_form__email_address').val(),
+        password_first : $('#signup_form__password_first').val(),
+        password_second : $('#signup_form__password_second').val(),
     };
 
     if (false == validate_data(form_data)) {