* validation groups for login/signup forms

2 files changed, 57 insertions, 24 deletions

diff --git a/app/php/pages/Login.page b/app/php/pages/Login.page
index a2e5cd5..5f02a5f 100644
--- a/app/php/pages/Login.page
+++ b/app/php/pages/Login.page
@@ -1,17 +1,31 @@
 <com:TContent ID="Content">
-  Username: <com:TTextBox ID="Login" />
-  <com:TRequiredFieldValidator ControlToValidate="Login"
-                               Display="Dynamic"
-                               ErrorMessage="Username cannot be empty" />
+  Username:
+  <com:TTextBox ID="Login"
+                ValidationGroup="LoginGroup" />
+  <com:TRequiredFieldValidator
+     ControlToValidate="Login"
+     Display="Dynamic"
+     ErrorMessage="Username cannot be empty"
+     ValidationGroup="LoginGroup" />
   <br />
-  Password: <com:TTextBox ID="Password" TextMode="Password" />
-  <com:TRequiredFieldValidator ControlToValidate="Password"
-                               Display="Dynamic"
-                               ErrorMessage="Password cannot be empty" />
-  <com:TCustomValidator ControlToValidate="Password"
-                        OnServerValidate="validatePassword"
-                        Display="Dynamic"
-                        ErrorMessage="Username and password don't match" />
+  Password:
+  <com:TTextBox ID="Password"
+                TextMode="Password"
+                ValidationGroup="LoginGroup" />
+  <com:TRequiredFieldValidator
+     ControlToValidate="Password"
+     Display="Dynamic"
+     ErrorMessage="Password cannot be empty"
+     ValidationGroup="LoginGroup" />
+  <com:TCustomValidator
+     ControlToValidate="Password"
+     OnServerValidate="validatePassword"
+     Display="Dynamic"
+     ErrorMessage="Username and password don't match"
+     ValidationGroup="LoginGroup" />
   <br />
-  <com:TButton Text="Login" OnCommand="loginUser" />
+  <com:TButton
+     Text="Login"
+     OnCommand="loginUser"
+     ValidationGroup="LoginGroup" />
 </com:TContent>
diff --git a/app/php/pages/Signup.page b/app/php/pages/Signup.page
index a833da7..30c382d 100644
--- a/app/php/pages/Signup.page
+++ b/app/php/pages/Signup.page
@@ -1,37 +1,56 @@
 <com:TContent ID="Content">
-  Username: <com:TTextBox ID="Login" />
+  Username:
+  <com:TTextBox ID="Login"
+                ValidationGroup="SignupGroup" />
   <com:TRequiredFieldValidator
      ControlToValidate="Login"
      Display="Dynamic"
-     ErrorMessage="Username cannot be empty" />
+     ErrorMessage="Username cannot be empty"
+     ValidationGroup="SignupGroup" />
   <com:TRegularExpressionValidator
      ControlToValidate="Login"
      RegularExpression="[a-zA-Z0-9_]{6,255}"
      Display="Dynamic"
-     ErrorMessage="Username must contain 6-255 characters, all Latin alphanumeric or underscore" />
+     ErrorMessage="Username must contain 6-255 characters, all Latin alphanumeric or underscore"
+     ValidationGroup="SignupGroup" />
   <com:TCustomValidator
      ControlToValidate="Login"
      OnServerValidate="checkUsername"
      Display="Dynamic"
-     ErrorMessage="Username already exists" />
+     ErrorMessage="Username already exists"
+     ValidationGroup="SignupGroup" />
   <br />
-  Password: <com:TTextBox ID="Password" TextMode="Password" />
+  Password:
+  <com:TTextBox ID="Password"
+                TextMode="Password"
+                ValidationGroup="SignupGroup" />
   <com:TRequiredFieldValidator
      ControlToValidate="Password"
      Display="Dynamic"
-     ErrorMessage="Password cannot be empty" />
+     ErrorMessage="Password cannot be empty"
+     ValidationGroup="SignupGroup" />
   <br />
-  Repeat password: <com:TTextBox ID="RePassword" TextMode="Password" />
+  Repeat password:
+  <com:TTextBox ID="RePassword"
+                TextMode="Password"
+                ValidationGroup="SignupGroup" />
   <com:TCompareValidator
      ControlToValidate="RePassword"
      ControlToCompare="Password"
      DataType="String"
      Operator="Equal"
      Display="Dynamic"
-     ErrorMessage="Passwords don't match" />
+     ErrorMessage="Passwords don't match"
+     ValidationGroup="SignupGroup" />
   <br />
-  Admin: <com:TCheckBox ID="Admin" />
+  Admin:
+  <com:TCheckBox ID="Admin"
+                 ValidationGroup="SignupGroup" />
   <br />
-  <com:TButton Text="Create" OnCommand="registerUser" />
-  <com:TValidationSummary />
+  <com:TButton
+     Text="Create"
+     OnCommand="registerUser"
+     ValidationGroup="SignupGroup" />
+  <com:TValidationSummary
+     ValidationGroup="SignupGroup" />
 </com:TContent>