diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Buttons.skin b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Buttons.skin index 99a84757..ffaaaff6 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Buttons.skin +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Buttons.skin @@ -32,11 +32,13 @@ Default skin template. The following skins are provided as examples only. + + \ No newline at end of file diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/apply_16.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/apply_16.png new file mode 100644 index 00000000..45241776 Binary files /dev/null and b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/apply_16.png differ diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/apply_24.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/apply_24.png new file mode 100644 index 00000000..420e923e Binary files /dev/null and b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/apply_24.png differ diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Skin.css b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Skin.css index 829d8662..b280d4be 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Skin.css +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Skin.css @@ -183,7 +183,7 @@ h2.ProductTitle.Huge {margin:0;} .FormButtonsBarCleanRight {text-align: right;} .FormButtonsBarCleanMiddle {float: right;} .FormButtonsBarCleanSeparator {padding-right: 30px;} -.FormButtonsBarCleanSeparatorSmall {padding-right: 15px;} +.FormButtonsBarCleanSeparatorSmall {padding-right: 3px;} .GridFooter .Left {float: left;} .GridFooter .Right {text-align: right;} .FormRow {padding-top: 4px; padding-bottom: 4px;} diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx.cs index 3ac06800..3bbef5a1 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxes.ascx.cs @@ -306,8 +306,6 @@ namespace WebsitePanel.Portal.ExchangeServer messageBox.ShowWarningMessage("ORGANIZATION_USERS_ACTIONS"); } } - - userActions.ResetSelection(); } } } diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUsers.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUsers.ascx.cs index 1c711e93..962f208c 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUsers.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationUsers.ascx.cs @@ -424,8 +424,6 @@ namespace WebsitePanel.Portal.HostedSolution messageBox.ShowWarningMessage("ORGANIZATION_USERS_ACTIONS"); } } - - userActions.ResetSelection(); } } } diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/App_LocalResources/UserActions.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/App_LocalResources/UserActions.ascx.resx index 659f25a5..e581ec9d 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/App_LocalResources/UserActions.ascx.resx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/App_LocalResources/UserActions.ascx.resx @@ -141,6 +141,9 @@ Ok + + Apply + - Actions - diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/UserActions.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/UserActions.ascx index 93583c75..9c16f527 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/UserActions.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/UserActions.ascx @@ -8,15 +8,16 @@ - - Actions + + <%--Actions--%> Disable Enable SetServiceLevel SetVIP + + @@ -39,7 +40,7 @@ + CausesValidation="false" /> @@ -63,7 +64,7 @@ + CausesValidation="false" /> @@ -89,7 +90,7 @@ + CausesValidation="false" /> @@ -118,7 +119,7 @@ + CausesValidation="false" /> diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/UserActions.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/UserActions.ascx.cs index ab5b3c8f..a19336c9 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/UserActions.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/UserActions.ascx.cs @@ -77,7 +77,7 @@ namespace WebsitePanel.Portal } } - protected void ddlUserActions_OnSelectedIndexChanged(object sender, EventArgs e) + protected void cmdApply_OnClick(object sender, ImageClickEventArgs e) { switch (SelectedAction) { @@ -94,6 +94,8 @@ namespace WebsitePanel.Portal case UserActionTypes.SetVIP: Modal.PopupControlID = VIPPanel.ID; break; + default: + return; } Modal.Show(); @@ -121,15 +123,6 @@ namespace WebsitePanel.Portal if (ExecutingUserAction != null) ExecutingUserAction(this, new EventArgs()); } - protected void btnModalCancel_OnClick(object sender, EventArgs e) - { - ResetSelection(); - } - - public void ResetSelection() - { - ddlUserActions.ClearSelection(); - } protected int ChangeUsersSettings(List userIds, bool? disable, int? serviceLevelId, bool? isVIP) { diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/UserActions.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/UserActions.ascx.designer.cs index c5b3a377..6a6aaf52 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/UserActions.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/UserActions.ascx.designer.cs @@ -58,6 +58,15 @@ namespace WebsitePanel.Portal { /// protected global::System.Web.UI.WebControls.DropDownList ddlUserActions; + /// + /// cmdApply control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ImageButton cmdApply; + /// /// Modal control. ///