From da3008c9ccbf929c8170bda8ab3721bf464eeafe Mon Sep 17 00:00:00 2001 From: dev_amdtel Date: Tue, 12 Aug 2014 18:34:20 +0400 Subject: [PATCH] changes Account Home --- .../Default/Icons/activesync_policy_48.png | Bin 0 -> 703 bytes .../Default/Icons/crm_storage_settings_48.png | Bin 0 -> 703 bytes .../Default/Icons/disclaimers_48.png | Bin 0 -> 420 bytes .../Icons/enterprisestorage_drive_maps_48.png | Bin 0 -> 246 bytes .../Icons/lync_federationdomains_48.png | Bin 0 -> 582 bytes .../Default/Icons/lync_phonenumbers_48.png | Bin 0 -> 582 bytes .../Default/Icons/lync_userplans_48.png | Bin 0 -> 582 bytes .../Default/Icons/mailboxplans_48.png | Bin 0 -> 703 bytes .../Default/Icons/public_folders_48.png | Bin 0 -> 246 bytes .../Default/Icons/retentionpolicy_48.png | Bin 0 -> 703 bytes .../Default/Icons/retentionpolicytag_48.png | Bin 0 -> 703 bytes .../Icons/sharepoint_storage_settings_48.png | Bin 0 -> 1018 bytes .../Icons/sharepoint_storage_usage_48.png | Bin 0 -> 1018 bytes .../Default/Icons/storage_usages_48.png | Bin 0 -> 703 bytes .../UserOrganization.ascx.resx | 18 ++-- .../UserControls/OrganizationMenuControl.cs | 77 ++++++++++++------ .../WebsitePanel/UserOrganization.ascx | 60 ++++++++------ .../WebsitePanel/UserOrganization.ascx.cs | 14 ++-- .../UserOrganization.ascx.designer.cs | 4 +- .../WebsitePanel/UserSpaces.ascx | 1 - .../WebsitePanel.WebPortal.csproj | 14 ++++ 21 files changed, 119 insertions(+), 69 deletions(-) create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/activesync_policy_48.png create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/crm_storage_settings_48.png create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/disclaimers_48.png create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/enterprisestorage_drive_maps_48.png create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/lync_federationdomains_48.png create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/lync_phonenumbers_48.png create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/lync_userplans_48.png create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/mailboxplans_48.png create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/public_folders_48.png create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/retentionpolicy_48.png create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/retentionpolicytag_48.png create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/sharepoint_storage_settings_48.png create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/sharepoint_storage_usage_48.png create mode 100644 WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/storage_usages_48.png diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/activesync_policy_48.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/activesync_policy_48.png new file mode 100644 index 0000000000000000000000000000000000000000..96533b42690efac4ebfe48e8481b9281987020c1 GIT binary patch literal 703 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 U-C6NFga7~l07*qoM6N<$f`*y!CjbBd literal 0 HcmV?d00001 diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/lync_phonenumbers_48.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/lync_phonenumbers_48.png new file mode 100644 index 0000000000000000000000000000000000000000..3e9ffeaafc76018af2a06ccb85bc27bb81c00bb9 GIT binary patch literal 582 zcmV-M0=fN(P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0ozGLK~!i%?U=nT z1W_1n=O zoaE%>?9Q3pGrP$5Bu{2`es;ch_WaCj!!QiPFpNGjP%LvYBIo3yTqxGrwjs0AO@LUT ztWU|1XF1(m%}Z*46`4|KD{2dn%2$^@$yyjJmVXutP?3FkC+SC7=yiZexh8L9wh$@A zI%XAJCmxcQl5MZDXCcCZoa^!=*cOuj6UEZs{vwAZO^bc!lJ88W+a`1?ADgSCaQB%z zm=l~2@>8;JT<*$ic__2u-!)(0qOpCx++B(sm95~H;Je-==T!P7$_NW`LTZ3ib|mL8 zT9xt}=Yb3PE|-5km0%ND4QxyL106gYVVibBY9C;fIhLD}4jnQk_hipIF@!Kje|jN_Y_`MbAiz;{}I196OExG>a{HAi3L|=Lfi#XL40$$1kQ6 zTMeT;7r79pY^aN{psKc;2mBE9fm#R)s%pCcK(o1$Sv#&ztf(rM1?U)?$ofquf2*+M zIfd~*mA?Nk6oW@&f)Hp{5|THp*dz0=4A2VRya+~^B}qUgv3Y42hG7`SKcdn228as! U-C6NFga7~l07*qoM6N<$f`*y!CjbBd literal 0 HcmV?d00001 diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/lync_userplans_48.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/lync_userplans_48.png new file mode 100644 index 0000000000000000000000000000000000000000..3e9ffeaafc76018af2a06ccb85bc27bb81c00bb9 GIT binary patch literal 582 zcmV-M0=fN(P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0ozGLK~!i%?U=nT z1W_1n=O zoaE%>?9Q3pGrP$5Bu{2`es;ch_WaCj!!QiPFpNGjP%LvYBIo3yTqxGrwjs0AO@LUT ztWU|1XF1(m%}Z*46`4|KD{2dn%2$^@$yyjJmVXutP?3FkC+SC7=yiZexh8L9wh$@A zI%XAJCmxcQl5MZDXCcCZoa^!=*cOuj6UEZs{vwAZO^bc!lJ88W+a`1?ADgSCaQB%z zm=l~2@>8;JT<*$ic__2u-!)(0qOpCx++B(sm95~H;Je-==T!P7$_NW`LTZ3ib|mL8 zT9xt}=Yb3PE|-5km0%ND4QxyL106gYVVibBY9C;fIhLD}4jnQk_hipIF@!Kje|jN_Y_`MbAiz;{}I196OExG>a{HAi3L|=Lfi#XL40$$1kQ6 zTMeT;7r79pY^aN{psKc;2mBE9fm#R)s%pCcK(o1$Sv#&ztf(rM1?U)?$ofquf2*+M zIfd~*mA?Nk6oW@&f)Hp{5|THp*dz0=4A2VRya+~^B}qUgv3Y42hG7`SKcdn228as! U-C6NFga7~l07*qoM6N<$f`*y!CjbBd literal 0 HcmV?d00001 diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/mailboxplans_48.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Icons/mailboxplans_48.png new file mode 100644 index 0000000000000000000000000000000000000000..96533b42690efac4ebfe48e8481b9281987020c1 GIT binary patch literal 703 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 Policy - BlackBerry + Hosted Organization - BlackBerry BlackBerry Users @@ -151,10 +151,10 @@ Contacts - CRM 2013 + Hosted Organization - CRM 2013 - CRM + Hosted Organization - CRM CRM Organization @@ -178,19 +178,19 @@ Online Folders - Enterprise Storage + Hosted Organization - Enterprise Storage Accepted Domains - Exchange + Hosted Organization - Exchange Lync Federation Domains - Lync + Hosted Organization - Lync Phone Numbers @@ -208,13 +208,13 @@ Mailbox Plans - OCS + Hosted Organization - OCS OCS Users - Organization + Hosted Organization Organization Statistics @@ -235,7 +235,7 @@ Setup - SharePoint + Hosted Organization - SharePoint Sharepoint Sites diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs index 4f537a5f..6aac93ba 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrganizationMenuControl.cs @@ -72,6 +72,11 @@ namespace WebsitePanel.Portal.UserControls public bool ShortMenu = false; public bool ShowImg = false; + public MenuItem OrganizationMenuRoot = null; + public MenuItem ExchangeMenuRoot = null; + + public bool PutBlackBerryInExchange = false; + public void BindMenu(MenuItemCollection items) { if ((PackageId <= 0) || (ItemID <= 0)) @@ -132,16 +137,23 @@ namespace WebsitePanel.Portal.UserControls } else { - MenuItem item = new MenuItem(GetLocalizedString("Text.OrganizationGroup"), "", "", null); + MenuItem item; + + if (OrganizationMenuRoot != null) + item = OrganizationMenuRoot; + else + item = new MenuItem(GetLocalizedString("Text.OrganizationGroup"), "", "", null); item.Selectable = false; PrepareOrganizationMenu(item.ChildItems); - if (item.ChildItems.Count > 0) + if ((item.ChildItems.Count > 0) && (OrganizationMenuRoot == null)) { items.Add(item); } + + OrganizationMenuRoot = item; } } } @@ -188,6 +200,8 @@ namespace WebsitePanel.Portal.UserControls { items.Add(item); } + + ExchangeMenuRoot = item; } } @@ -202,38 +216,38 @@ namespace WebsitePanel.Portal.UserControls if (Utils.CheckQouta(Quotas.EXCHANGE2007_DISTRIBUTIONLISTS, Cntx)) exchangeItems.Add(CreateMenuItem("DistributionLists", "dlists", @"Icons/exchange_dlists_48.png")); - if (ShortMenu) return; + //if (ShortMenu) return; if (Utils.CheckQouta(Quotas.EXCHANGE2007_PUBLICFOLDERS, Cntx)) - exchangeItems.Add(CreateMenuItem("PublicFolders", "public_folders")); + exchangeItems.Add(CreateMenuItem("PublicFolders", "public_folders", @"Icons/public_folders_48.png")); if (!hideItems) if (Utils.CheckQouta(Quotas.EXCHANGE2007_ACTIVESYNCALLOWED, Cntx)) - exchangeItems.Add(CreateMenuItem("ActiveSyncPolicy", "activesync_policy")); + exchangeItems.Add(CreateMenuItem("ActiveSyncPolicy", "activesync_policy", @"Icons/activesync_policy_48.png")); if (!hideItems) if (Utils.CheckQouta(Quotas.EXCHANGE2007_MAILBOXES, Cntx)) - exchangeItems.Add(CreateMenuItem("MailboxPlans", "mailboxplans")); + exchangeItems.Add(CreateMenuItem("MailboxPlans", "mailboxplans", @"Icons/mailboxplans_48.png")); if (!hideItems) if (Utils.CheckQouta(Quotas.EXCHANGE2013_ALLOWRETENTIONPOLICY, Cntx)) - exchangeItems.Add(CreateMenuItem("RetentionPolicy", "retentionpolicy")); + exchangeItems.Add(CreateMenuItem("RetentionPolicy", "retentionpolicy", @"Icons/retentionpolicy_48.png")); if (!hideItems) if (Utils.CheckQouta(Quotas.EXCHANGE2013_ALLOWRETENTIONPOLICY, Cntx)) - exchangeItems.Add(CreateMenuItem("RetentionPolicyTag", "retentionpolicytag")); + exchangeItems.Add(CreateMenuItem("RetentionPolicyTag", "retentionpolicytag", @"Icons/retentionpolicytag_48.png")); if (!hideItems) if (Utils.CheckQouta(Quotas.EXCHANGE2007_MAILBOXES, Cntx)) - exchangeItems.Add(CreateMenuItem("ExchangeDomainNames", "domains")); + exchangeItems.Add(CreateMenuItem("ExchangeDomainNames", "domains", @"Icons/domains_48.png")); if (!hideItems) if (Utils.CheckQouta(Quotas.EXCHANGE2007_MAILBOXES, Cntx)) - exchangeItems.Add(CreateMenuItem("StorageUsage", "storage_usage")); + exchangeItems.Add(CreateMenuItem("StorageUsage", "storage_usage", @"Icons/storage_usages_48.png")); if (!hideItems) if (Utils.CheckQouta(Quotas.EXCHANGE2007_DISCLAIMERSALLOWED, Cntx)) - exchangeItems.Add(CreateMenuItem("Disclaimers", "disclaimers")); + exchangeItems.Add(CreateMenuItem("Disclaimers", "disclaimers", @"Icons/disclaimers_48.png")); } @@ -263,9 +277,9 @@ namespace WebsitePanel.Portal.UserControls crmItems.Add(CreateMenuItem("CRMOrganization", "CRMOrganizationDetails", @"Icons/crm_orgs_48.png")); crmItems.Add(CreateMenuItem("CRMUsers", "CRMUsers", @"Icons/crm_users_48.png")); - if (ShortMenu) return; + //if (ShortMenu) return; - crmItems.Add(CreateMenuItem("StorageLimits", "crm_storage_settings")); + crmItems.Add(CreateMenuItem("StorageLimits", "crm_storage_settings", @"Icons/crm_storage_settings_48.png")); } private void PrepareCRM2013MenuRoot(MenuItemCollection items) @@ -294,9 +308,9 @@ namespace WebsitePanel.Portal.UserControls crmItems.Add(CreateMenuItem("CRMOrganization", "CRMOrganizationDetails", @"Icons/crm_orgs_48.png")); crmItems.Add(CreateMenuItem("CRMUsers", "CRMUsers", @"Icons/crm_users_48.png")); - if (ShortMenu) return; + //if (ShortMenu) return; - crmItems.Add(CreateMenuItem("StorageLimits", "crm_storage_settings")); + crmItems.Add(CreateMenuItem("StorageLimits", "crm_storage_settings", @"Icons/crm_storage_settings_48.png")); } private void PrepareBlackBerryMenuRoot(MenuItemCollection items) @@ -307,13 +321,24 @@ namespace WebsitePanel.Portal.UserControls } else { - MenuItem item = new MenuItem(GetLocalizedString("Text.BlackBerryGroup"), "", "", null); + MenuItem item; + bool additem = true; + + if (PutBlackBerryInExchange && (ExchangeMenuRoot != null)) + { + item = ExchangeMenuRoot; + additem = false; + } + else + item = new MenuItem(GetLocalizedString("Text.BlackBerryGroup"), "", "", null); item.Selectable = false; PrepareBlackBerryMenu(item.ChildItems); - if (item.ChildItems.Count > 0) + additem = additem && (item.ChildItems.Count > 0); + + if (additem) { items.Add(item); } @@ -351,10 +376,10 @@ namespace WebsitePanel.Portal.UserControls { spItems.Add(CreateMenuItem("SiteCollections", "sharepoint_sitecollections", @"Icons/sharepoint_sitecollections_48.png")); - if (ShortMenu) return; + //if (ShortMenu) return; - spItems.Add(CreateMenuItem("StorageUsage", "sharepoint_storage_usage")); - spItems.Add(CreateMenuItem("StorageLimits", "sharepoint_storage_settings")); + spItems.Add(CreateMenuItem("StorageUsage", "sharepoint_storage_usage", @"Icons/sharepoint_storage_usage_48.png")); + spItems.Add(CreateMenuItem("StorageLimits", "sharepoint_storage_settings", @"Icons/sharepoint_storage_settings_48.png")); } private void PrepareOCSMenuRoot(MenuItemCollection items) @@ -408,16 +433,16 @@ namespace WebsitePanel.Portal.UserControls { lyncItems.Add(CreateMenuItem("LyncUsers", "lync_users", @"Icons/lync_users_48.png")); - if (ShortMenu) return; + //if (ShortMenu) return; - lyncItems.Add(CreateMenuItem("LyncUserPlans", "lync_userplans")); + lyncItems.Add(CreateMenuItem("LyncUserPlans", "lync_userplans", @"Icons/lync_userplans_48.png")); if (Utils.CheckQouta(Quotas.LYNC_FEDERATION, Cntx)) - lyncItems.Add(CreateMenuItem("LyncFederationDomains", "lync_federationdomains")); + lyncItems.Add(CreateMenuItem("LyncFederationDomains", "lync_federationdomains", @"Icons/lync_federationdomains_48.png")); if (Utils.CheckQouta(Quotas.LYNC_PHONE, Cntx)) - lyncItems.Add(CreateMenuItem("LyncPhoneNumbers", "lync_phonenumbers")); + lyncItems.Add(CreateMenuItem("LyncPhoneNumbers", "lync_phonenumbers", @"Icons/lync_phonenumbers_48.png")); } private void PrepareEnterpriseStorageMenuRoot(MenuItemCollection items) @@ -445,10 +470,10 @@ namespace WebsitePanel.Portal.UserControls { enterpriseStorageItems.Add(CreateMenuItem("EnterpriseStorageFolders", "enterprisestorage_folders", @"Icons/enterprisestorage_folders_48.png")); - if (ShortMenu) return; + //if (ShortMenu) return; if (Utils.CheckQouta(Quotas.ENTERPRICESTORAGE_DRIVEMAPS, Cntx)) - enterpriseStorageItems.Add(CreateMenuItem("EnterpriseStorageDriveMaps", "enterprisestorage_drive_maps")); + enterpriseStorageItems.Add(CreateMenuItem("EnterpriseStorageDriveMaps", "enterprisestorage_drive_maps", @"Icons/enterprisestorage_drive_maps_48.png")); } diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx index 8ade5af5..9d56cc81 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx @@ -1,33 +1,41 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="UserOrganization.ascx.cs" Inherits="WebsitePanel.Portal.UserOrganization" %> <%@ Import Namespace="WebsitePanel.Portal" %> -<%@ Register Src="UserControls/ServerDetails.ascx" TagName="ServerDetails" TagPrefix="uc3" %> -<%@ Register Src="UserControls/Comments.ascx" TagName="Comments" TagPrefix="uc4" %> -<%@ Import Namespace="WebsitePanel.Portal" %> -
- - - - -
- <%# Eval("Text") %> - - -
    - - -
  • <%# Eval("Text") %>
    • -     -     -
- - - - -
+ + + + +
+ +
+ + + + +
+ <%# Eval("Text") %> + + +
    + + +
  • <%# Eval("Text") %>
    • +     +     +
+ + + + +
+ +
+ + + diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.cs index a487dda2..84239131 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.cs @@ -102,29 +102,33 @@ namespace WebsitePanel.Portal protected void Page_Load(object sender, EventArgs e) { - ShortMenu = true; + ShortMenu = false; ShowImg = true; + PutBlackBerryInExchange = true; if ((PackageId > 0) && (Cntx.Groups.ContainsKey(ResourceGroups.HostedOrganizations))) { MenuItemCollection items = new MenuItemCollection(); + OrganizationMenuRoot = new MenuItem(GetLocalizedString("Text.OrganizationGroup"), "", "", null); + items.Add(OrganizationMenuRoot); + if (ItemID > 0) { - items.Add(CreateMenuItem("OrganizationHome", "organization_home", @"Icons/organization_home_48.png")); + OrganizationMenuRoot.ChildItems.Add(CreateMenuItem("OrganizationHome", "organization_home", @"Icons/organization_home_48.png")); BindMenu(items); } else { - items.Add(CreateMenuItem("CreateOrganization", "create_organization", @"Icons/create_organization_48.png")); + OrganizationMenuRoot.ChildItems.Add(CreateMenuItem("CreateOrganization", "create_organization", @"Icons/create_organization_48.png")); } UserOrgPanel.Visible = true; - OrgIcons.DataSource = items; - OrgIcons.DataBind(); + OrgList.DataSource = items; + OrgList.DataBind(); } else UserOrgPanel.Visible = false; diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.designer.cs index 26efff9f..0c00eff8 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.designer.cs @@ -22,12 +22,12 @@ namespace WebsitePanel.Portal { protected global::System.Web.UI.WebControls.Panel UserOrgPanel; /// - /// OrgIcons control. + /// OrgList control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.DataList OrgIcons; + protected global::System.Web.UI.WebControls.Repeater OrgList; } } diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserSpaces.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserSpaces.ascx index da26021d..97281335 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserSpaces.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserSpaces.ascx @@ -56,7 +56,6 @@ - diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj b/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj index a28a12e2..3c33cdbb 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj @@ -104,6 +104,7 @@ + @@ -111,15 +112,22 @@ + + + + + + + @@ -128,10 +136,16 @@ + + + + + +