From 884183a2ce79a6d6423e35e911cce44e271e479d Mon Sep 17 00:00:00 2001
From: vfedosevich <devnull@localhost>
Date: Thu, 27 Feb 2014 20:41:52 +0300
Subject: [PATCH] replace menu

---
 .../App_Skins/Default/Browse2.ascx            | 11 +++------
 .../App_Skins/Default/Browse3.ascx            |  7 ++----
 .../App_Skins/Default/Storefront2.ascx        |  5 +---
 .../App_Themes/Default/Styles/Menus.css       | 11 +++++++++
 .../App_Themes/Default/Styles/SkinLayout.css  |  4 ++--
 .../WebsitePanel/SpaceMenu.ascx               | 18 +++++++-------
 .../WebsitePanel/SpaceMenu.ascx.cs            |  7 +++++-
 .../WebsitePanel/SpaceMenu.ascx.designer.cs   | 24 +++++++++++++++----
 .../WebsitePanel/UserAccountMenu.ascx         | 18 +++++++-------
 .../WebsitePanel/UserAccountMenu.ascx.cs      |  7 +++++-
 10 files changed, 67 insertions(+), 45 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Browse2.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Browse2.ascx
index 5d7a7432..ae2563c2 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Browse2.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Browse2.ascx
@@ -34,20 +34,15 @@
         
         <div id="TopMenu">
             <wsp:TopMenu ID="menu" runat="server" />
+            <asp:PlaceHolder ID="LeftPane" runat="server"></asp:PlaceHolder>
         </div>
         
         <div id="Top">
             <wsp:UserSpaceBreadcrumb ID="breadcrumb" runat="server"/>
         </div>
         
-        <div id="Left">
-            <asp:PlaceHolder ID="LeftPane" runat="server"></asp:PlaceHolder>
-        </div>
-        
-        <div id="Content">
-            <div id="CenterOneColumn">
-                <asp:PlaceHolder ID="ContentPane" runat="server"></asp:PlaceHolder>
-            </div>
+        <div id="ContentOneColumn">
+            <asp:PlaceHolder ID="ContentPane" runat="server"></asp:PlaceHolder>
         </div>
     </div>
     <div id="Footer">
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Browse3.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Browse3.ascx
index 76eb4385..8dcd0803 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Browse3.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Browse3.ascx
@@ -34,17 +34,14 @@
         
         <div id="TopMenu">
             <wsp:TopMenu ID="menu" runat="server" />
+            <asp:PlaceHolder ID="LeftPane" runat="server"></asp:PlaceHolder>
         </div>
         
         <div id="Top">
             <wsp:UserSpaceBreadcrumb ID="breadcrumb" runat="server"/>
         </div>
         
-        <div id="Left">
-            <asp:PlaceHolder ID="LeftPane" runat="server"></asp:PlaceHolder>
-        </div>
-        
-        <div id="Content">
+        <div id="ContentOneColumn">
             <div id="Center">
                 <asp:PlaceHolder ID="ContentPane" runat="server"></asp:PlaceHolder>
             </div>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Storefront2.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Storefront2.ascx
index 7ae9c2f0..e0c4f531 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Storefront2.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Skins/Default/Storefront2.ascx
@@ -29,16 +29,13 @@
         
         <div id="TopMenu">
             <wsp:TopMenu ID="menu" runat="server" />
+            <asp:PlaceHolder ID="LeftPane" runat="server"></asp:PlaceHolder>
         </div>
         
         <div id="Top">
 			<wsp:CatalogBreadCrumb runat="server" />
         </div>
         
-        <div id="Left">
-            <asp:PlaceHolder ID="LeftPane" runat="server"></asp:PlaceHolder>
-        </div>
-        
         <div id="StorefrontCenter">
 			<div>
 				<asp:PlaceHolder ID="ContentPane" runat="server"></asp:PlaceHolder>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Menus.css b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Menus.css
index 51ed7485..04555d46 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Menus.css
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/Menus.css
@@ -19,6 +19,17 @@
 	z-index: 502;
 }
 
+.TopMenu ul.AspNet-Menu li ul li.AspNet-Menu-WithChildren span
+{
+    color: #000000 !important;
+    background: transparent url(../Images/menu_popup2.gif) right center no-repeat !important;
+    text-align: left !important;
+    border-right: none !important;
+    display: table !important;
+}
+
+.TopMenu ul.AspNet-Menu li span
+
 .TopMenu li.AspNet-Menu-Leaf a, /* leaves */
 .TopMenu li.AspNet-Menu-Leaf span
 {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/SkinLayout.css b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/SkinLayout.css
index 0705da62..e4fcc83a 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/SkinLayout.css
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Styles/SkinLayout.css
@@ -278,14 +278,14 @@ BODY
 #Center
 {
 	float: left;
-	width: 540px;
+	width: 730px;
 	padding: 10px 0px 10px 10px;
 }
 
 #StorefrontCenter
 {
 	float: left;
-	width: 755px;
+	width: 955px;
 	padding: 10px 0px 10px 10px;
 }
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceMenu.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceMenu.ascx
index fae4127d..60311a77 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceMenu.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceMenu.ascx
@@ -1,11 +1,9 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="SpaceMenu.ascx.cs" Inherits="WebsitePanel.Portal.SpaceMenu" %>
-<div class="MenuHeader">
-    <asp:Localize ID="locMenuTitle" runat="server" meta:resourcekey="locMenuTitle"></asp:Localize>
-</div>
-<div class="Menu">
-    <asp:Menu ID="menu" runat="server"
-        Orientation="Vertical"
-        EnableViewState="false"
-        CssSelectorClass="LeftMenu" >
-    </asp:Menu>
-</div>
\ No newline at end of file
+
+<asp:Localize ID="locMenuTitle" runat="server" meta:resourcekey="locMenuTitle" Visible="false"></asp:Localize>
+
+<asp:Menu ID="menu" runat="server"
+    Orientation="Horizontal"
+    EnableViewState="false"
+    CssSelectorClass="TopMenu" >
+</asp:Menu>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceMenu.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceMenu.ascx.cs
index ac690b70..dcd41537 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceMenu.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceMenu.ascx.cs
@@ -53,7 +53,12 @@ namespace WebsitePanel.Portal
             cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
 
             // bind root node
-            BindMenu(menu.Items, PortalUtils.GetModuleMenuItems(this));
+            MenuItem rootItem = new MenuItem(locMenuTitle.Text);
+            rootItem.Selectable = false;
+
+            menu.Items.Add(rootItem);
+
+            BindMenu(rootItem.ChildItems, PortalUtils.GetModuleMenuItems(this));
         }
 
         private void BindMenu(MenuItemCollection items, XmlNodeList nodes)
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceMenu.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceMenu.ascx.designer.cs
index fbf07849..b325bfe7 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceMenu.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SpaceMenu.ascx.designer.cs
@@ -1,17 +1,33 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.42
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     the code is regenerated. 
 // </auto-generated>
 //------------------------------------------------------------------------------
 
 namespace WebsitePanel.Portal {
     
+    
     public partial class SpaceMenu {
-        protected System.Web.UI.WebControls.Localize locMenuTitle;
-        protected System.Web.UI.WebControls.Menu menu;
+        
+        /// <summary>
+        /// locMenuTitle control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Localize locMenuTitle;
+        
+        /// <summary>
+        /// menu control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Menu menu;
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountMenu.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountMenu.ascx
index 611b51a7..d1c072d4 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountMenu.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountMenu.ascx
@@ -1,11 +1,9 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="UserAccountMenu.ascx.cs" Inherits="WebsitePanel.Portal.UserAccountMenu" %>
-<div class="MenuHeader">
-    <asp:Localize ID="locMenuTitle" runat="server" meta:resourcekey="locMenuTitle"></asp:Localize>
-</div>
-<div class="Menu">
-    <asp:Menu ID="menu" runat="server"
-        Orientation="Vertical"
-        EnableViewState="false"
-        CssSelectorClass="LeftMenu" >
-    </asp:Menu>
-</div>
\ No newline at end of file
+
+<asp:Localize ID="locMenuTitle" runat="server" meta:resourcekey="locMenuTitle" Visible="false"></asp:Localize>
+
+<asp:Menu ID="menu" runat="server"
+    Orientation="Horizontal"
+    EnableViewState="false"
+    CssSelectorClass="TopMenu" >
+</asp:Menu>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountMenu.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountMenu.ascx.cs
index 7652383e..41bba3ba 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountMenu.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserAccountMenu.ascx.cs
@@ -47,7 +47,12 @@ namespace WebsitePanel.Portal
     {
         protected void Page_Load(object sender, EventArgs e)
         {
-            BindMenu(menu.Items, PortalUtils.GetModuleMenuItems(this));
+            MenuItem rootItem = new MenuItem(locMenuTitle.Text);
+            rootItem.Selectable = false;
+
+            menu.Items.Add(rootItem);
+
+            BindMenu(rootItem.ChildItems, PortalUtils.GetModuleMenuItems(this));
         }
 
         private void BindMenu(MenuItemCollection items, XmlNodeList nodes)