From bd4a098b6e068e37ce2b8c760bdb1564e9a32a95 Mon Sep 17 00:00:00 2001 From: emkael Date: Wed, 6 Apr 2016 11:19:45 +0200 Subject: * markup indentation --- app/php/components/LoginBox.tpl | 32 ++++++++-------- app/php/components/PasswordChange.tpl | 54 +++++++++++++-------------- app/php/components/RegistrationForm.tpl | 66 ++++++++++++++++----------------- app/php/components/TimezoneSelect.tpl | 4 +- app/php/components/UserSelection.tpl | 8 ++-- 5 files changed, 82 insertions(+), 82 deletions(-) (limited to 'app/php') diff --git a/app/php/components/LoginBox.tpl b/app/php/components/LoginBox.tpl index c602b88..d3e1a1e 100644 --- a/app/php/components/LoginBox.tpl +++ b/app/php/components/LoginBox.tpl @@ -2,28 +2,28 @@ Username: + ControlToValidate="Login" + Display="Dynamic" + ErrorMessage="Username cannot be empty" + ValidationGroup="LoginGroup" />
Password: + ControlToValidate="Password" + Display="Dynamic" + ErrorMessage="Password cannot be empty" + ValidationGroup="LoginGroup" /> + ControlToValidate="Password" + OnServerValidate="validatePassword" + Display="Dynamic" + ErrorMessage="Username and password don't match" + ValidationGroup="LoginGroup" />
+ Text="Login" + OnCommand="loginUser" + ValidationGroup="LoginGroup" /> diff --git a/app/php/components/PasswordChange.tpl b/app/php/components/PasswordChange.tpl index c1eb793..915e8b3 100644 --- a/app/php/components/PasswordChange.tpl +++ b/app/php/components/PasswordChange.tpl @@ -4,49 +4,49 @@ Current password: TextMode="Password" ValidationGroup="ChangePasswordGroup" /> + ControlToValidate="Password" + Display="Dynamic" + ErrorMessage="Current password cannot be empty" + ValidationGroup="ChangePasswordGroup" /> + ControlToValidate="Password" + OnServerValidate="checkPassword" + Display="Dynamic" + ErrorMessage="Password is incorrect" + ValidationGroup="ChangePasswordGroup" />
New password: + ControlToValidate="NewPassword" + Display="Dynamic" + ErrorMessage="New password cannot be empty" + ValidationGroup="ChangePasswordGroup" />
Repeat password: + ControlToValidate="ReNewPassword" + Display="Dynamic" + ErrorMessage="New password cannot be empty" + ValidationGroup="ChangePasswordGroup" /> + ControlToValidate="ReNewPassword" + ControlToCompare="NewPassword" + DataType="String" + Operator="Equal" + Display="Dynamic" + ErrorMessage="Passwords don't match" + ValidationGroup="ChangePasswordGroup" />
+ Text="Change password" + OnCommand="changePassword" + ValidationGroup="ChangePasswordGroup" /> diff --git a/app/php/components/RegistrationForm.tpl b/app/php/components/RegistrationForm.tpl index 295aff1..ffa4778 100644 --- a/app/php/components/RegistrationForm.tpl +++ b/app/php/components/RegistrationForm.tpl @@ -2,58 +2,58 @@ Username: + ControlToValidate="Login" + Display="Dynamic" + ErrorMessage="Username cannot be empty" + ValidationGroup="SignupGroup" /> + 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" /> + ControlToValidate="Login" + OnServerValidate="checkUsername" + Display="Dynamic" + ErrorMessage="Username already exists" + ValidationGroup="SignupGroup" />
Password: + ControlToValidate="Password" + Display="Dynamic" + ErrorMessage="Password cannot be empty" + ValidationGroup="SignupGroup" />
Repeat password: + ControlToValidate="RePassword" + Display="Dynamic" + ErrorMessage="Password cannot be empty" + ValidationGroup="SignupGroup" /> + ControlToValidate="RePassword" + ControlToCompare="Password" + DataType="String" + Operator="Equal" + Display="Dynamic" + ErrorMessage="Passwords don't match" + ValidationGroup="SignupGroup" />
Admin:
+ Text="Create" + OnCommand="registerUser" + ValidationGroup="SignupGroup" /> + ValidationGroup="SignupGroup" /> diff --git a/app/php/components/TimezoneSelect.tpl b/app/php/components/TimezoneSelect.tpl index 38d6bad..2d40014 100644 --- a/app/php/components/TimezoneSelect.tpl +++ b/app/php/components/TimezoneSelect.tpl @@ -1,4 +1,4 @@ + Text="Save timezone" + OnCommand="saveTimezone" /> diff --git a/app/php/components/UserSelection.tpl b/app/php/components/UserSelection.tpl index 6c19013..14035ca 100644 --- a/app/php/components/UserSelection.tpl +++ b/app/php/components/UserSelection.tpl @@ -6,15 +6,15 @@ Selected calendars: + Text="[X]" + OnCommand="SourceTemplateControl.removeFromSelection"> <%# $this->Data->ID %> <%# !$this->SourceTemplateControl->UserToDisplay->IsGuest %> <%# $this->Data->Name %> + Text="(www)" + Target="_blank"> <%# $this->Data->Website %>
-- cgit v1.2.3