3 files changed, 61 insertions, 60 deletions
diff --git a/app/php/pages/Signup.php b/app/php/components/RegistrationForm.php
index e989eb6..71d4df1 100644
--- a/app/php/pages/Signup.php
+++ b/app/php/components/RegistrationForm.php
@@ -2,7 +2,7 @@
 
 Prado::using('Application.model.User');
 
-class Signup extends TPage {
+class RegistrationForm extends TTemplateControl {
 
     public function checkUsername($sender, $param) {
         $param->IsValid = !User::finder()->countByLogin($this->Login->SafeText);
diff --git a/app/php/components/RegistrationForm.tpl b/app/php/components/RegistrationForm.tpl
new file mode 100644
index 0000000..295aff1
--- /dev/null
+++ b/app/php/components/RegistrationForm.tpl
@@ -0,0 +1,59 @@
+Username:
+<com:TTextBox ID="Login"
+              ValidationGroup="SignupGroup" />
+<com:TRequiredFieldValidator
+   ControlToValidate="Login"
+   Display="Dynamic"
+   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"
+   ValidationGroup="SignupGroup" />
+<com:TCustomValidator
+   ControlToValidate="Login"
+   OnServerValidate="checkUsername"
+   Display="Dynamic"
+   ErrorMessage="Username already exists"
+   ValidationGroup="SignupGroup" />
+<br />
+Password:
+<com:TTextBox ID="Password"
+              TextMode="Password"
+              ValidationGroup="SignupGroup" />
+<com:TRequiredFieldValidator
+   ControlToValidate="Password"
+   Display="Dynamic"
+   ErrorMessage="Password cannot be empty"
+   ValidationGroup="SignupGroup" />
+<br />
+Repeat password:
+<com:TTextBox ID="RePassword"
+              TextMode="Password"
+              ValidationGroup="SignupGroup" />
+<com:TRequiredFieldValidator
+   ControlToValidate="RePassword"
+   Display="Dynamic"
+   ErrorMessage="Password cannot be empty"
+   ValidationGroup="SignupGroup" />
+<com:TCompareValidator
+   ControlToValidate="RePassword"
+   ControlToCompare="Password"
+   DataType="String"
+   Operator="Equal"
+   Display="Dynamic"
+   ErrorMessage="Passwords don't match"
+   ValidationGroup="SignupGroup" />
+<br />
+Admin:
+<com:TCheckBox ID="Admin"
+               ValidationGroup="SignupGroup" />
+<br />
+<com:TButton
+   Text="Create"
+   OnCommand="registerUser"
+   ValidationGroup="SignupGroup" />
+<com:TValidationSummary
+   ValidationGroup="SignupGroup" />
diff --git a/app/php/pages/Signup.page b/app/php/pages/Signup.page
index b8ce6bd..da863d4 100644
--- a/app/php/pages/Signup.page
+++ b/app/php/pages/Signup.page
@@ -1,61 +1,3 @@
 <com:TContent ID="Content">
-  Username:
-  <com:TTextBox ID="Login"
-                ValidationGroup="SignupGroup" />
-  <com:TRequiredFieldValidator
-     ControlToValidate="Login"
-     Display="Dynamic"
-     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"
-     ValidationGroup="SignupGroup" />
-  <com:TCustomValidator
-     ControlToValidate="Login"
-     OnServerValidate="checkUsername"
-     Display="Dynamic"
-     ErrorMessage="Username already exists"
-     ValidationGroup="SignupGroup" />
-  <br />
-  Password:
-  <com:TTextBox ID="Password"
-                TextMode="Password"
-                ValidationGroup="SignupGroup" />
-  <com:TRequiredFieldValidator
-     ControlToValidate="Password"
-     Display="Dynamic"
-     ErrorMessage="Password cannot be empty"
-     ValidationGroup="SignupGroup" />
-  <br />
-  Repeat password:
-  <com:TTextBox ID="RePassword"
-                TextMode="Password"
-                ValidationGroup="SignupGroup" />
-  <com:TRequiredFieldValidator
-     ControlToValidate="RePassword"
-     Display="Dynamic"
-     ErrorMessage="Password cannot be empty"
-     ValidationGroup="SignupGroup" />
-  <com:TCompareValidator
-     ControlToValidate="RePassword"
-     ControlToCompare="Password"
-     DataType="String"
-     Operator="Equal"
-     Display="Dynamic"
-     ErrorMessage="Passwords don't match"
-     ValidationGroup="SignupGroup" />
-  <br />
-  Admin:
-  <com:TCheckBox ID="Admin"
-                 ValidationGroup="SignupGroup" />
-  <br />
-  <com:TButton
-     Text="Create"
-     OnCommand="registerUser"
-     ValidationGroup="SignupGroup" />
-  <com:TValidationSummary
-     ValidationGroup="SignupGroup" />
+  <com:RegistrationForm />
 </com:TContent>