zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Password Tooltip added

Browse source
This commit is contained in:
vfedosevich 2015-06-01 02:54:37 -07:00
parent c60c38e966
commit 49263166fc
5 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeCreateMailbox.ascx
View file

@ -111,7 +111,7 @@
<wsp:SendToControl id="sendToControl" runat="server" ValidationGroup="CreateMailbox" ControlToHide="PasswordBlock"></wsp:SendToControl> <wsp:SendToControl id="sendToControl" runat="server" ValidationGroup="CreateMailbox" ControlToHide="PasswordBlock"></wsp:SendToControl>
</td> </td>
</tr> </tr>
<tr id="PasswordBlock" runat="server" Visible="false"> <tr id="PasswordBlock" runat="server">
<td class="FormLabel150" valign="top"><asp:Localize ID="locPassword" runat="server" meta:resourcekey="locPassword" Text="Password: *"></asp:Localize></td> <td class="FormLabel150" valign="top"><asp:Localize ID="locPassword" runat="server" meta:resourcekey="locPassword" Text="Password: *"></asp:Localize></td>
<td> <td>
<wsp:PasswordControl id="password" runat="server" ValidationGroup="CreateMailbox" AllowGeneratePassword="false"> <wsp:PasswordControl id="password" runat="server" ValidationGroup="CreateMailbox" AllowGeneratePassword="false">

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateUser.ascx
View file

@ -89,7 +89,7 @@
<wsp:SendToControl id="sendToControl" runat="server" ValidationGroup="CreateMailbox" ControlToHide="PasswordBlock"></wsp:SendToControl> <wsp:SendToControl id="sendToControl" runat="server" ValidationGroup="CreateMailbox" ControlToHide="PasswordBlock"></wsp:SendToControl>
</td> </td>
</tr> </tr>
<tr id="PasswordBlock" runat="server" Visible="false"> <tr id="PasswordBlock" runat="server">
<td class="FormLabel150" valign="top"> <td class="FormLabel150" valign="top">
<asp:Localize ID="locPassword" runat="server" meta:resourcekey="locPassword" Text="Password: *"></asp:Localize></td> <asp:Localize ID="locPassword" runat="server" meta:resourcekey="locPassword" Text="Password: *"></asp:Localize></td>
<td> <td>

14
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/PasswordControl.ascx
View file

@ -71,8 +71,8 @@
<script> <script>
$(document).ready(function () { function BindPopup() {
$('#<%=txtPassword.ClientID%>').poshytip({ $('#<%=txtPassword.ClientID%>').poshytip({
className: 'tip-bluesimple', className: 'tip-bluesimple',
showOn: 'focus', showOn: 'focus',
@ -84,5 +84,15 @@
return $('#password-hint-popup').html(); return $('#password-hint-popup').html();
} }
}); });
};
$(document).ready(function () {
BindPopup();
});
var prm = Sys.WebForms.PageRequestManager.getInstance();
prm.add_endRequest(function () {
BindPopup();
}); });
</script> </script>

10
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/PasswordControl.ascx.cs
View file

@ -241,8 +241,7 @@ namespace WebsitePanel.Portal
{ {
if (!Page.ClientScript.IsClientScriptIncludeRegistered("wspValidationFunctions")) if (!Page.ClientScript.IsClientScriptIncludeRegistered("wspValidationFunctions"))
{ {
Page.ClientScript.RegisterClientScriptBlock(this.GetType(), "wspValidationFunctions", @" Page.ClientScript.RegisterClientScriptBlock(this.GetType(), "wspValidationFunctions", @"
function wspValidatePasswordNumbers(source, args) function wspValidatePasswordNumbers(source, args)
{ {
@ -279,9 +278,12 @@ namespace WebsitePanel.Portal
", true); ", true);
Page.ClientScript.RegisterClientScriptInclude("jqueryui-tooltip", ResolveUrl("~/JavaScript/jquery.poshytip.min.js"));
} }
if (!Page.ClientScript.IsClientScriptIncludeRegistered("jqueryui-tooltip"))
{
Page.ClientScript.RegisterClientScriptInclude(this.GetType(),"jqueryui-tooltip", ResolveUrl("~/JavaScript/jquery.poshytip.min.js"));
}
} }
private void ToggleControls() private void ToggleControls()

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/SendToControl.ascx
View file

@ -5,7 +5,7 @@
<tr> <tr>
<td class="FormLabel150"></td> <td class="FormLabel150"></td>
<td> <td>
<asp:CheckBox ID="chkSendPasswordResetEmail" runat="server" meta:resourcekey="chkSendPasswordResetEmail" Text="Send Password Request" AutoPostBack="true" Checked="True" OnCheckedChanged="chkSendPasswordResetEmail_StateChanged" /> <asp:CheckBox ID="chkSendPasswordResetEmail" runat="server" meta:resourcekey="chkSendPasswordResetEmail" Text="Send Password Request" AutoPostBack="true" OnCheckedChanged="chkSendPasswordResetEmail_StateChanged" />
</td> </td>
</tr> </tr>
<tbody id="SendToBody" runat="server" visible="False"> <tbody id="SendToBody" runat="server" visible="False">