From e6a7d222d5ec954fb6ff40bc96f71e8d29906c88 Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Wed, 12 Mar 2014 05:29:04 +0300
Subject: [PATCH] showing of Account Menu updated

---
 .../App_Data/WebsitePanel_Pages.config          | 11 +++++++++++
 .../App_Skins/Default/Edit.ascx                 |  4 +++-
 .../App_Skins/Default/Exchange.ascx             |  5 +++--
 .../WebsitePanel.WebPortal/Default.aspx.cs      | 17 ++++++++++++++++-
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Pages.config b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Pages.config
index d5a7060d..437fbfb4 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Pages.config
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Pages.config
@@ -127,6 +127,9 @@
   <!-- Space Home Page -->
   <Page name="SpaceHome" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True" skin="Browse3.ascx">
     <Content id="LeftPane">
+      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
+        <ModuleData ref="UserMenu"/>
+      </Module>
       <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
         <ModuleData ref="SpaceMenu"/>
       </Module>
@@ -192,6 +195,9 @@
 
   <Page name="SpaceWebSites" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True">
     <Content id="LeftPane">
+      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
+        <ModuleData ref="UserMenu"/>
+      </Module>
       <Module moduleDefinitionID="SpaceMenu" title="SpaceMenu" container="Clear.ascx">
         <ModuleData ref="SpaceMenu"/>
       </Module>
@@ -510,6 +516,11 @@
   </Page>
 
   <Page name="SpaceExchangeServer" roles="Administrator,Reseller,PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User" hidden="True" skin="Exchange.ascx" adminskin="Exchange.ascx">
+    <Content id="LeftPane">
+      <Module moduleDefinitionID="UserAccountMenu" title="UserMenu" container="Clear.ascx">
+        <ModuleData ref="UserMenu"/>
+      </Module>
+    </Content>
     <Content id="ContentPane">
       <Module moduleDefinitionID="ExchangeServer" title="ExchangeServer" icon="" container="Exchange.ascx" admincontainer="Exchange.ascx" readOnlyRoles="PlatformCSR,ResellerCSR"/>
     </Content>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Edit.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Edit.ascx
index 7d87ddcd..0e9074ff 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Edit.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Edit.ascx
@@ -33,7 +33,9 @@
         </div>
         
         <div id="TopMenu">
-            <wsp:TopMenu ID="menu" runat="server" />
+            <wsp:TopMenu ID="leftMenu" runat="server" Align="left" />
+            <asp:PlaceHolder ID="LeftPane" runat="server"></asp:PlaceHolder>
+            <wsp:TopMenu ID="rightMenu" runat="server" Align="right" />
         </div>
         
         <div id="Top">
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Exchange.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Exchange.ascx
index 55014f68..d675d9f9 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Exchange.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Exchange.ascx
@@ -33,9 +33,10 @@
         </div>
         
         <div id="TopMenu">
-            <wsp:TopMenu ID="menu" runat="server" />
+            <wsp:TopMenu ID="leftMenu" runat="server" Align="left" />
+            <asp:PlaceHolder ID="LeftPane" runat="server"></asp:PlaceHolder>
+            <wsp:TopMenu ID="rightMenu" runat="server" Align="right" />
         </div>
-        
         <div id="Top">
             <wsp:UserSpaceBreadcrumb ID="breadcrumb" runat="server"/>
         </div>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/Default.aspx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/Default.aspx.cs
index 50c487d0..383e2a53 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/Default.aspx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/Default.aspx.cs
@@ -58,6 +58,7 @@ namespace WebsitePanel.WebPortal
         public const string SKINS_FOLDER = "App_Skins";
         public const string CONTAINERS_FOLDER = "App_Containers";
         public const string CONTENT_PANE_NAME = "ContentPane";
+        public const string LEFT_PANE_NAME = "LeftPane";
         public const string MODULE_TITLE_CONTROL_ID = "lblModuleTitle";
         public const string MODULE_ICON_CONTROL_ID = "imgModuleIcon";
         public const string DESKTOP_MODULES_FOLDER = "DesktopModules";
@@ -234,10 +235,24 @@ namespace WebsitePanel.WebPortal
                 if (ctrlPane != null)
                 {
                     // add "edit" module
-                    if(PortalConfiguration.Site.Modules.ContainsKey(ModuleID))
+                    if (PortalConfiguration.Site.Modules.ContainsKey(ModuleID))
                         AddModuleToContentPane(ctrlPane, PortalConfiguration.Site.Modules[ModuleID],
                             ModuleControlID, editMode);
                 }
+                // find LeftPane
+                ctrlPane = ctrlSkin.FindControl(LEFT_PANE_NAME);
+                if (ctrlPane != null)
+                {
+                    ContentPane pane = page.ContentPanes[LEFT_PANE_NAME];
+                     foreach (PageModule module in pane.Modules)
+                        {
+                            if (IsAccessibleToUser(Context, module.ViewRoles))
+                            {
+                                // add module
+                                AddModuleToContentPane(ctrlPane, module, "", false);
+                            }
+                        }
+                }
             }
         }