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

Remove dependence to Domain Alias Quota on Add a Domain Page. This Quota has been removed.

Browse source 
Update Text on Domain Type page and Domain Add Page to reduce confusion on elimination of Aliases
This commit is contained in:
Virtuworks 2013-01-01 18:29:00 -05:00
parent 9d705568ec
commit 4e0d1d209b
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/DomainsAddDomain.ascx.resx
View file

@ -163,10 +163,10 @@
<value>Provisioning Options</value>
</data>
<data name="PointMailDomain.Text" xml:space="preserve">
<value>Point to existing Mail Domain</value>
<value>Assign to existing Mail Domain</value>
</data>
<data name="PointWebSite.Text" xml:space="preserve">
<value>Point to existing Web Site</value>
<value>Assign to existing Web Site</value>
</data>
<data name="SubDomainFormatValidator.ErrorMessage" xml:space="preserve">
<value>Please, enter correct sub-domain name, for example "subdomain" or "sub.subdomain".</value>

8
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/DomainsAddDomainSelectType.ascx.resx
View file

@ -121,13 +121,13 @@
<value>Cancel</value>
</data>
<data name="DomainDescription.Text" xml:space="preserve">
<value>Create a Top-Level Domain (TLD).</value>
<value>Create a Top-Level Domain (TLD). You can create a new web site for domain or assign it to an existing web site.</value>
</data>
<data name="DomainLink.Text" xml:space="preserve">
<value>Domain</value>
</data>
<data name="DomainPointerDescription.Text" xml:space="preserve">
<value>Create a Top-Level Domain (TLD) or sub-domain that could point to the existing web site only.</value>
<value>Create a Top-Level Domain (TLD) or sub-domain that can point to the existing web site only.</value>
</data>
<data name="DomainPointerLink.Text" xml:space="preserve">
<value>Domain Alias</value>
@ -136,13 +136,13 @@
<value>Please choose what type of domain you would like to add:</value>
</data>
<data name="ProviderSubDomainDescription.Text" xml:space="preserve">
<value>Create a sub-domain under domains allowed by your hosting provider. You could create a new web site for sub-domain or point it to existing one.</value>
<value>Create a sub-domain under domains allowed by your hosting provider. You can create a new web site for sub-domain or assign it to an existing web site.</value>
</data>
<data name="ProviderSubDomainLink.Text" xml:space="preserve">
<value>Provider Sub-domain</value>
</data>
<data name="SubDomainDescription.Text" xml:space="preserve">
<value>Create a sub-domain for already added top-level domain. You could create a new web site for sub-domain.</value>
<value>Create a sub-domain for already added top-level domain. You can create a new web site for sub-domain or assign it to an existing web site.</value>
</data>
<data name="SubDomainLink.Text" xml:space="preserve">
<value>Sub-domain</value>

4
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomain.ascx
View file

@ -47,7 +47,7 @@
</asp:Panel>
<asp:Panel id="PointWebSitePanel" runat="server" style="padding-bottom: 15px;">
<asp:CheckBox ID="PointWebSite" runat="server" meta:resourcekey="PointWebSite" Text="Point to Web Site" CssClass="Checkbox Bold"
<asp:CheckBox ID="PointWebSite" runat="server" meta:resourcekey="PointWebSite" Text="Assign to Web Site" CssClass="Checkbox Bold"
AutoPostBack="true" /><br />
<div style="padding-left: 20px;">
<asp:DropDownList ID="WebSitesList" Runat="server" CssClass="NormalTextBox" DataTextField="Name" DataValueField="ID"></asp:DropDownList>
@ -55,7 +55,7 @@
</asp:Panel>
<asp:Panel id="PointMailDomainPanel" runat="server" style="padding-bottom: 15px;">
<asp:CheckBox ID="PointMailDomain" runat="server" meta:resourcekey="PointMailDomain" Text="Point to Mail Domain" CssClass="Checkbox Bold"
<asp:CheckBox ID="PointMailDomain" runat="server" meta:resourcekey="PointMailDomain" Text="Assign to Mail Domain" CssClass="Checkbox Bold"
AutoPostBack="true" /><br />
<div style="padding-left: 20px;">
<asp:DropDownList ID="MailDomainsList" Runat="server" CssClass="NormalTextBox" DataTextField="Name" DataValueField="ID"></asp:DropDownList>

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

@ -130,12 +130,12 @@ namespace WebsitePanel.Portal
}
// point Web site
PointWebSitePanel.Visible = (type == DomainType.DomainPointer || (type == DomainType.Domain && !cntx.Quotas[Quotas.OS_DOMAINPOINTERS].QuotaExhausted))
PointWebSitePanel.Visible = (type == DomainType.DomainPointer || (type == DomainType.Domain))
&& cntx.Groups.ContainsKey(ResourceGroups.Web) && WebSitesList.Items.Count > 0;
WebSitesList.Enabled = PointWebSite.Checked;
// point mail domain
PointMailDomainPanel.Visible = (type == DomainType.DomainPointer || (type == DomainType.Domain && !cntx.Quotas[Quotas.OS_DOMAINPOINTERS].QuotaExhausted))
PointMailDomainPanel.Visible = (type == DomainType.DomainPointer || (type == DomainType.Domain))
&& cntx.Groups.ContainsKey(ResourceGroups.Mail) && MailDomainsList.Items.Count > 0;
MailDomainsList.Enabled = PointMailDomain.Checked;

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/DomainsAddDomain.ascx.designer.cs generated
View file

@ -1,4 +1,4 @@
// Copyright (c) 2011, Outercurve Foundation.
// Copyright (c) 2012, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,