From 8ade43624a143df501457d06ed65e40d2f751c5a Mon Sep 17 00:00:00 2001
From: dev_amdtel <devnull@localhost>
Date: Thu, 7 Aug 2014 18:45:46 +0400
Subject: [PATCH] Account Home Organization module fix

---
 .../Sources/WebsitePanel.WebPortal.sln        |  3 ---
 .../App_Data/ModulesData.config               | 10 ++++----
 .../App_LocalResources/UserSpaces.ascx.resx   | 19 ++++++++++++--
 .../WebsitePanel/UserOrganization.ascx        | 22 ++++++++--------
 .../WebsitePanel/UserOrganization.ascx.cs     |  4 +--
 .../WebsitePanel/UserSpaces.ascx              | 10 ++++----
 .../WebsitePanel/UserSpaces.ascx.cs           |  4 +++
 .../WebsitePanel.WebPortal.csproj             | 25 +++++++++++++++++++
 8 files changed, 70 insertions(+), 27 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal.sln b/WebsitePanel/Sources/WebsitePanel.WebPortal.sln
index 4fc0c4ef..24bfb087 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal.sln
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal.sln
@@ -38,7 +38,4 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(Performance) = preSolution
-		HasPerformanceSessions = true
-	EndGlobalSection
 EndGlobal
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ModulesData.config b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ModulesData.config
index 77a50c2a..83a6b0f3 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ModulesData.config
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/ModulesData.config
@@ -88,28 +88,28 @@
   </ModuleData>
 
 	<ModuleData id="SpaceIcons">
-    <Group pageID="SpaceHome" title="System">
+    <Group pageID="SpaceHome" titleresourcekey="System">
 		  <Icon pageID="SpaceDomains" resourceGroup="OS" imageUrl="icons/domains_48.png" />
       <Icon pageID="SpaceFtpAccounts" resourceGroup="FTP" imageUrl="icons/ftp_48.png"/>
       <Icon pageID="SpaceFileManager" resourceGroup="OS" quota="OS.FileManager" imageUrl="icons/filemanager_48.png"/>
       <Icon pageID="SpaceApplicationsInstaller" resourceGroup="OS" quota="OS.AppInstaller" imageUrl="icons/applicationsinstaller_48.png"/>
       <Icon pageID="SpaceScheduledTasks" resourceGroup="OS" quota="OS.ScheduledTasks" imageUrl="icons/scheduledtasks_48.png"/>
     </Group>
-    <Group pageID="SpaceWeb" title="Web &amp; Applications">
+    <Group pageID="SpaceWeb" titleresourcekey="Web">
       <Icon pageID="SpaceWebSites" resourceGroup="Web" imageUrl="icons/websites_48.png" />
       <Icon pageID="SpaceWebIPAddresses" resourceGroup="Web" imageUrl="icons/webipaddresses_48.png" />
       <Icon pageID="SpaceSharedSSL" resourceGroup="OS" quota="Web.SharedSSL" imageUrl="icons/sharedssl_48.png" />
       <Icon pageID="SpaceAdvancedStatistics" resourceGroup="Statistics" imageUrl="icons/advancedstatistics_48.png" />
       <Icon pageID="SpaceWebApplicationsGallery" resourceGroup="Web" quota="Web.WebAppGallery" imageUrl="icons/webapplicationsgallery_48.png"/>
     </Group>
-    <Group pageID="SpaceMail" title="Email" resourceGroup="Mail" >
+    <Group pageID="SpaceMail" titleresourcekey="Email" resourceGroup="Mail" >
       <Icon pageID="SpaceMailAccounts" quota="Mail.Accounts" imageUrl="icons/mail_accounts_48.png"/>
       <Icon pageID="SpaceMailForwardings" quota="Mail.Forwardings" imageUrl="icons/mail_forwardings_48.png"/>
       <Icon pageID="SpaceMailGroups" quota="Mail.Groups" imageUrl="icons/mail_groups_48.png"/>
       <Icon pageID="SpaceMailLists" quota="Mail.Lists" imageUrl="icons/mail_lists_48.png"/>
       <Icon pageID="SpaceMailDomains"  resourceGroup="Mail" imageUrl="icons/mail_domains_48.png"/>
     </Group>
-    <Group pageID="SpaceDatabases" title="Databases" disabled="True">
+    <Group pageID="SpaceDatabases" titleresourcekey="Databases" disabled="True">
       <Icon pageID="SpaceMsSql2000" resourceGroup="MsSQL2000" imageUrl="icons/mssql_48.png"/>
       <Icon pageID="SpaceMsSql2005" resourceGroup="MsSQL2005" imageUrl="icons/mssql_48.png"/>
       <Icon pageID="SpaceMsSql2008" resourceGroup="MsSQL2008" imageUrl="icons/mssql_48.png"/>
@@ -118,7 +118,7 @@
       <Icon pageID="SpaceMySql5" resourceGroup="MySQL5" imageUrl="icons/mysql_48.png"/>
       <Icon pageID="SpaceOdbc" resourceGroup="OS" quota="OS.ODBC" imageUrl="icons/odbc_48.png"/>
     </Group>
-    <Group pageID="SpaceHome" title="VPS" disabled="True">
+    <Group pageID="SpaceHome" titleresourcekey="VPS" disabled="True">
       <Icon pageID="SpaceVPS" resourceGroup="VPS" imageUrl="icons/vps_48.png" />
       <Icon pageID="SpaceVPSForPC" resourceGroup="VPSForPC" imageUrl="icons/vpsforpc_48.png" />
     </Group>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserSpaces.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserSpaces.ascx.resx
index 88c22595..02874ca9 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserSpaces.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserSpaces.ascx.resx
@@ -112,14 +112,20 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="btnAddItem.Text" xml:space="preserve">
     <value>Create Hosting Space</value>
   </data>
+  <data name="Databases.Text" xml:space="preserve">
+    <value>Databases</value>
+  </data>
+  <data name="Email.Text" xml:space="preserve">
+    <value>Email</value>
+  </data>
   <data name="gvPackages.Empty" xml:space="preserve">
     <value>This account has just been created and doesn't have Hosting Spaces. To create web sites, FTP, mail accounts, databases, etc. a new Hosting Space should be created for this customer.&lt;br&gt;&lt;br&gt;To create a new Hosting Space click "Create Hosting Space" button.</value>
   </data>
@@ -144,4 +150,13 @@
   <data name="selPackage.AlternateText" xml:space="preserve">
     <value>Switch to this Space</value>
   </data>
+  <data name="System.Text" xml:space="preserve">
+    <value>System</value>
+  </data>
+  <data name="VPS.Text" xml:space="preserve">
+    <value>VPS</value>
+  </data>
+  <data name="Web.Text" xml:space="preserve">
+    <value>Web &amp; Applications</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx
index 84547d05..77a76bef 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx
@@ -6,15 +6,17 @@
 
 
 <asp:Panel ID="UserOrgPanel" runat="server" Visible="false">
-    <asp:DataList ID="OrgIcons" runat="server" 
-        CellSpacing="1" RepeatColumns="5" RepeatDirection="Horizontal">
-        <ItemTemplate>
-            <asp:Panel ID="IconPanel" runat="server" CssClass="Icon">
-                <asp:HyperLink ID="imgLink" runat="server" NavigateUrl='<%# Eval("NavigateURL") %>'><asp:Image ID="imgIcon" runat="server" ImageUrl='<%# Eval("ImageUrl") %>' /></asp:HyperLink>
-                <br />
-                <asp:HyperLink ID="lnkIcon" runat="server" NavigateUrl='<%# Eval("NavigateURL") %>'><%# Eval("Text") %></asp:HyperLink>
-            </asp:Panel>
-        </ItemTemplate>
-    </asp:DataList>
+    <div class="IconsBlock">
+        <asp:DataList ID="OrgIcons" runat="server" 
+            CellSpacing="1" RepeatColumns="5" RepeatDirection="Horizontal">
+            <ItemTemplate>
+                <asp:Panel ID="IconPanel" runat="server" CssClass="Icon">
+                    <asp:HyperLink ID="imgLink" runat="server" NavigateUrl='<%# Eval("NavigateURL") %>'><asp:Image ID="imgIcon" runat="server" ImageUrl='<%# Eval("ImageUrl") %>' /></asp:HyperLink>
+                    <br />
+                    <asp:HyperLink ID="lnkIcon" runat="server" NavigateUrl='<%# Eval("NavigateURL") %>'><%# Eval("Text") %></asp:HyperLink>
+                </asp:Panel>
+            </ItemTemplate>
+        </asp:DataList>
+    </div>
 </asp:Panel>
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.cs
index 37e43bed..aa753946 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.cs
@@ -129,8 +129,8 @@ namespace WebsitePanel.Portal
 
             item.Text = GetLocalizedString("Text." + text);
             item.NavigateUrl = PortalUtils.NavigatePageURL( PID_SPACE_EXCHANGE_SERVER, "ItemID", ItemID.ToString(),
-                PortalUtils.SPACE_ID_PARAM + "=" + PackageId, DefaultPage.CONTROL_ID_PARAM + "=" + key
-                /*, DefaultPage.MODULE_ID_PARAM + "=" + */ );
+                PortalUtils.SPACE_ID_PARAM + "=" + PackageId, DefaultPage.CONTROL_ID_PARAM + "=" + key,
+                "moduleDefId=exchangeserver");
 
             if (img == null)
                 item.ImageUrl = PortalUtils.GetThemedIcon("Icons/tool_48.png");
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserSpaces.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserSpaces.ascx
index ff83ca0e..e003e191 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserSpaces.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserSpaces.ascx
@@ -25,7 +25,7 @@
 
                     <asp:Repeater ID="PackageGroups" runat="server" DataSource='<%# GetIconsDataSource((int)Eval("PackageID"))  %>' > 
                         <ItemTemplate>
-                            <asp:hyperlink id="lnkGroup" runat="server">
+                            <asp:hyperlink id="lnkGroup" runat="server" NavigateUrl='<%# Eval("NavigateURL") %>'>
 		                        <%# Eval("Text") %>
 	                        </asp:hyperlink>
 
@@ -55,11 +55,11 @@
                     </asp:Repeater>
 
                 </div>
-                <asp:Panel ID="OrgPanel" runat="server" Visible='<%# IsOrgPanelVisible((int)Eval("PackageID")) %>'>
-                    <asp:hyperlink ID="linkOrg" runat="server" NavigateUrl='<%# GetOrgPageUrl((int)Eval("PackageID")) %>' meta:resourcekey="linkOrg" Text="Hosted Organization" />
-                    <wsp:UserOrganization ID="UserOrganization" runat="server" PackageId='<%# (int)Eval("PackageID") %>' />
-                </asp:Panel>
             </div>
+            <asp:Panel ID="OrgPanel" runat="server" Visible='<%# IsOrgPanelVisible((int)Eval("PackageID")) %>'>
+                <asp:hyperlink ID="linkOrg" runat="server" NavigateUrl='<%# GetOrgPageUrl((int)Eval("PackageID")) %>' meta:resourcekey="linkOrg" Text="Hosted Organization" />
+                <wsp:UserOrganization ID="UserOrganization" runat="server" PackageId='<%# (int)Eval("PackageID") %>' />
+            </asp:Panel>
         </ItemTemplate>
     </asp:Repeater>
     <asp:Panel ID="EmptyPackagesList" runat="server" Visible="false" CssClass="FormBody">
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserSpaces.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserSpaces.ascx.cs
index 3ed43f73..849ec12e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserSpaces.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserSpaces.ascx.cs
@@ -164,6 +164,10 @@ namespace WebsitePanel.Portal
             string quota = GetXmlAttribute(xmlNode, "quota");
             bool disabled = Utils.ParseBool(GetXmlAttribute(xmlNode, "disabled"), false);
 
+            string titleresourcekey = GetXmlAttribute(xmlNode, "titleresourcekey");
+            if (!String.IsNullOrEmpty(titleresourcekey))
+                title = GetLocalizedString(titleresourcekey + ".Text");
+
             // get custom page parameters
             XmlNodeList xmlParameters = xmlNode.SelectNodes("Parameters/Add");
             List<string> parameters = new List<string>();
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj b/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj
index c5ae723d..e0c79735 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/WebsitePanel.WebPortal.csproj
@@ -104,9 +104,34 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="App_Containers\Default\VPSForPC.ascx" />
+    <Content Include="App_Themes\Default\Icons\advancedstatistics_48.png" />
+    <Content Include="App_Themes\Default\Icons\applicationsinstaller_48.png" />
+    <Content Include="App_Themes\Default\Icons\blackberry_users_48.png" />
     <Content Include="App_Themes\Default\Icons\block.png" />
     <Content Include="App_Themes\Default\Icons\configureVLan.png" />
+    <Content Include="App_Themes\Default\Icons\crm_orgs_48.png" />
+    <Content Include="App_Themes\Default\Icons\crm_users_48.png" />
+    <Content Include="App_Themes\Default\Icons\domains_48.png" />
+    <Content Include="App_Themes\Default\Icons\enterprisestorage_folders_48.png" />
+    <Content Include="App_Themes\Default\Icons\filemanager_48.png" />
+    <Content Include="App_Themes\Default\Icons\ftp_48.png" />
+    <Content Include="App_Themes\Default\Icons\lync_users_48.png" />
+    <Content Include="App_Themes\Default\Icons\mailboxes_48.png" />
+    <Content Include="App_Themes\Default\Icons\mail_accounts_48.png" />
+    <Content Include="App_Themes\Default\Icons\mail_domains_48.png" />
+    <Content Include="App_Themes\Default\Icons\mail_forwardings_48.png" />
+    <Content Include="App_Themes\Default\Icons\mail_groups_48.png" />
+    <Content Include="App_Themes\Default\Icons\mail_lists_48.png" />
+    <Content Include="App_Themes\Default\Icons\odbc_48.png" />
     <Content Include="App_Themes\Default\Icons\OK.png" />
+    <Content Include="App_Themes\Default\Icons\scheduledtasks_48.png" />
+    <Content Include="App_Themes\Default\Icons\sharedssl_48.png" />
+    <Content Include="App_Themes\Default\Icons\sharepoint_sitecollections_48.png" />
+    <Content Include="App_Themes\Default\Icons\vpsforpc_48.png" />
+    <Content Include="App_Themes\Default\Icons\vps_48.png" />
+    <Content Include="App_Themes\Default\Icons\webapplicationsgallery_48.png" />
+    <Content Include="App_Themes\Default\Icons\webipaddresses_48.png" />
+    <Content Include="App_Themes\Default\Icons\websites_48.png" />
     <Content Include="App_Themes\Default\Images\Exchange\blank16.gif" />
     <Content Include="App_Themes\Default\Images\Exchange\disabled.png" />
     <Content Include="App_Themes\Default\Images\Exchange\disabled_16.png" />