From aed8ea323e663c2358f8eb324d2aa9c52cef799a Mon Sep 17 00:00:00 2001 From: me Date: Mon, 9 Feb 2015 13:09:40 +0400 Subject: [PATCH] wsp-10311 Add Apply button --- .../App_Themes/Default/Buttons.skin | 2 ++ .../App_Themes/Default/Images/apply_16.png | Bin 0 -> 682 bytes .../App_Themes/Default/Images/apply_24.png | Bin 0 -> 1160 bytes .../App_Themes/Default/Styles/Skin.css | 2 +- .../ExchangeServer/ExchangeMailboxes.ascx.cs | 2 -- .../ExchangeServer/OrganizationUsers.ascx.cs | 2 -- .../App_LocalResources/UserActions.ascx.resx | 3 +++ .../WebsitePanel/UserControls/UserActions.ascx | 15 ++++++++------- .../UserControls/UserActions.ascx.cs | 13 +++---------- .../UserControls/UserActions.ascx.designer.cs | 9 +++++++++ 10 files changed, 26 insertions(+), 22 deletions(-) create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/apply_16.png create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/apply_24.png 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 0000000000000000000000000000000000000000..4524177685d013019b7d6ff8c0b6a8a4b7d6f486 GIT binary patch literal 682 zcmV;b0#*HqP)djvRmvxnun58#g3e;_h37eVuR)H~l@~P}Eu>A$|#Rn;pz(^w~ zP0$FY4@PCCmqf@6U1oDbb5}PvHg&g$FhoY_dHitB`JB)BFgOajArppl@RXMY%KLcA z-D8g+mIy;eugOl?EEZsS%a4z1Q!+WMo-(xklDS5vgY-uRS7~;Mz0#!M zXJQHE*_8-HgP8d>>!XCa|D4bT1q2EhsAz+_C(h_GN`xUESJ_R3lNxdjc@Q}xp3S`g zOW4-QCRHQog2y5iO*>B3_2i@-n?^T0`-<~4S)5X?n1d~ZQJirK?^h-e-HCQiHmPF( zz=A>h?XngaI02XCTJ+BKx6eNOB8i;gaejK9>#C&zft_VoGD_f&tY9jr`Y1!)drJry zz{rbOORQpZH-tOq+h8xOa#2D@ThFy%ha@2KA~?ch=-V(Tq0R3aC$+yR(FiG&&@S4| zR>buf;(83WLK})D85O3p*uXkY7>eNajbTCax!+!y=-Xd1#SmWmYXkD;_NHPpTMI=&$sFP`xHcwj)Y)K@|vPu$l}alh1;I zi0J+N6x+#!!}sJzAf*8S#9t-`Vvd+RADUOJ<{D%PnaC4N@Gg#FL0fct9pilm#VK*- z`RN|#n>u}PyeTB-tkeJEGpU9b1}pCiRJbcpUZaFIkJNkBR6GFq4J)tFe*XqI Q5dZ)H07*qoM6N<$g1HzuTmS$7 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..420e923e43ecdf8d41e00babec8e76650a436e92 GIT binary patch literal 1160 zcmV;31b6$1P)=F5ps6Y^ohwS!u0RbX}NnwnS)?is zJuqN=;BBgL*R*epv@u(mWuiEVu1S^}A#^GEZT><|s$%a0140p9uddvMjm>C&442d} z-2p;Ikc)+3EN7wPbZjX3K){l2e|vMNrD?VKIFqFb%1#N7?q-?4j@&|)TsfQQj}3ML z-1i}yA1;X+(%2Vke1)Pt$L0AXZe6Fw9YmLsv8lnFP(}R4`s={Em?*>m6NLnOICCdJ zDC+(#4ckm91cS4KlquqoZoDox=Q0C0j@@x`>*?f8;2oO0(%ZYHrp5F~55u{$OuUym zghHG*$lV$q{HUt6F|Z=`Wbi32&nKCvq;N|Ybw({SrD?LobmFJ2{hhb&ktlrr<`eB^ z*r;c2ah@0I*7JS(yV#LbPgEQb>#W^Y4j}Y#&{R;m+8VatC^qBeB!=!G?5)M4x#&xs z%L(OXH8)1ZQKR)ngt6HR98P}Cv56BbbvMu!+1jKD*&FEcM*&ntZC@8zAFcP-lPp~Z zVN>lj2^%3sGDA3y-En+NU-G|zuygZvk;1|pHa26qU-&V75>558F|xVIr}+lLpM+ko zc31CvuI_mXR-Wu)2EWT-nJ>a@F-zuJCh^1Olb!z#zYZw8eQ5kMYP~@$$D*)Ups-lr zV&M`lX|R3OPSengu5Bw`#-n-owR8zxlSGUN}SLK&aSM|1dDR+%fAEKe|FWvTW&My)r*&*OdM%lWqwFP=DZX8@pwFXr0{ zQHzD92LB2S-9yb)IT27T>*eX{8~I$neHCR z^|M6x6Y3GF1?meFyB%t|d^hMEy zhAuT~T_G}sG*kJh#5bD~x4kuY1ptyeuXI+dQhaRYESf5bcp`*cA;96x#F=}l=6?Zz zk?rTZD^@u^nmr4SgHIX^|2~9m+Z|tR_%?a3z+FH6wTD|`n$Y%Zsx+k{yL&bq-FvU$ a0Dl5N8=HY+0OybZ0000 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. ///