zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Account Home Organization module fix

Browse source
This commit is contained in:
dev_amdtel 2014-08-07 18:45:46 +04:00
parent 7696614304
commit 8ade43624a
8 changed files with 70 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

19
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/UserSpaces.ascx.resx
View file

@ -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>

22
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx
View file

@ -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>

4
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserOrganization.ascx.cs
View file

@ -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");

10
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserSpaces.ascx
View file

@ -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">

4
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserSpaces.ascx.cs
View file

@ -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>();