From 49263166fcd4688d3e4a7e350704e82d4bca5aaf Mon Sep 17 00:00:00 2001 From: vfedosevich Date: Mon, 1 Jun 2015 02:54:37 -0700 Subject: [PATCH] Password Tooltip added --- .../ExchangeServer/ExchangeCreateMailbox.ascx | 2 +- .../ExchangeServer/OrganizationCreateUser.ascx | 2 +- .../WebsitePanel/UserControls/PasswordControl.ascx | 14 ++++++++++++-- .../UserControls/PasswordControl.ascx.cs | 10 ++++++---- .../WebsitePanel/UserControls/SendToControl.ascx | 2 +- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeCreateMailbox.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeCreateMailbox.ascx index 2a117368..58336544 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeCreateMailbox.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeCreateMailbox.ascx @@ -111,7 +111,7 @@ - + diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateUser.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateUser.ascx index 0c857e01..864215ef 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateUser.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationCreateUser.ascx @@ -89,7 +89,7 @@ - + diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/PasswordControl.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/PasswordControl.ascx index 02f5e3c4..b27456da 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/PasswordControl.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/PasswordControl.ascx @@ -71,8 +71,8 @@ diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/PasswordControl.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/PasswordControl.ascx.cs index c6879b35..d9416e67 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/PasswordControl.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/PasswordControl.ascx.cs @@ -241,8 +241,7 @@ namespace WebsitePanel.Portal { if (!Page.ClientScript.IsClientScriptIncludeRegistered("wspValidationFunctions")) { - Page.ClientScript.RegisterClientScriptBlock(this.GetType(), "wspValidationFunctions", @" - + Page.ClientScript.RegisterClientScriptBlock(this.GetType(), "wspValidationFunctions", @" function wspValidatePasswordNumbers(source, args) { @@ -279,9 +278,12 @@ namespace WebsitePanel.Portal ", 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() diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/SendToControl.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/SendToControl.ascx index 544b2091..5ea7ea26 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/SendToControl.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/SendToControl.ascx @@ -5,7 +5,7 @@ - +