diff options
| author | Fabio Bas <ctrlaltca@gmail.com> | 2013-11-23 14:52:53 +0100 |
|---|---|---|
| committer | Fabio Bas <ctrlaltca@gmail.com> | 2013-11-23 14:52:53 +0100 |
| commit | c90614303d9993023a8fa218bd210e7e32802fa7 (patch) | |
| tree | f2d4b80a400e456d5a1e4b6db89238108bd1e823 /framework/Wsat/pages/TWsatLogin.page | |
| parent | 5909ef5a99fd98dbc1b25fcb4640c03fdef4cb53 (diff) | |
| parent | efde949d00b808f55710abbd3d82ceb490545116 (diff) | |
Merge branch 'jquery' of https://github.com/pradosoft/prado into jquery
Conflicts:
framework/Wsat/pages/TWsatLogin.php
framework/Wsat/themes/PradoSoft/main.css
Diffstat (limited to 'framework/Wsat/pages/TWsatLogin.page')
| -rw-r--r-- | framework/Wsat/pages/TWsatLogin.page | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/framework/Wsat/pages/TWsatLogin.page b/framework/Wsat/pages/TWsatLogin.page index b256d719..d0a94f2a 100644 --- a/framework/Wsat/pages/TWsatLogin.page +++ b/framework/Wsat/pages/TWsatLogin.page @@ -29,9 +29,10 @@ <div class="login_form"> <com:TLabel Text="Please enter your password:" ForControl="password"/><br/> <com:TTextBox ID="password" TextMode="Password" style="margin: 5px" /><br/> - <com:TRequiredFieldValidator ControlToValidate="password" Text="Password cannot be blank." /><br/> - - <com:TButton Text="Enter" OnClick="login" /> + <com:TRequiredFieldValidator ControlToValidate="password" ValidationGroup="loginGroup" Text="Password cannot be blank." /><br/> + <com:TCustomValidator ControlToValidate="password" ValidationGroup="loginGroup" OnServerValidate="validatePassword" Text="Incorrect password." /> + + <com:TButton Text="Enter" ValidationGroup="loginGroup" OnClick="login" /> </div> <div id="footer"> |