diff --git a/XenAdmin/Controls/PDSection.cs b/XenAdmin/Controls/PDSection.cs index 6949668f0..3d1ad0709 100644 --- a/XenAdmin/Controls/PDSection.cs +++ b/XenAdmin/Controls/PDSection.cs @@ -394,10 +394,12 @@ namespace XenAdmin.Controls AddRow(CreateKeyCell(key), valueCell, null, contextMenuItems); } - internal void AddEntryWithNoteLink(string key, string value, string note, Action action, params ToolStripMenuItem[] contextMenuItems) + internal void AddEntryWithNoteLink(string key, string value, string note, Action action, Color fontColor, params ToolStripMenuItem[] contextMenuItems) { var valueCell = new DataGridViewTextBoxCell { Value = value }; var noteCell = new DataGridViewLinkCell { Value = note, Tag = action }; + valueCell.Style.ForeColor = fontColor; + valueCell.Style.SelectionForeColor = fontColor; AddRow(CreateKeyCell(key), valueCell, noteCell, contextMenuItems); } diff --git a/XenAdmin/Dialogs/LicenseManager/LicenseManagerController.cs b/XenAdmin/Dialogs/LicenseManager/LicenseManagerController.cs index 312b5aa24..f0ae8a400 100644 --- a/XenAdmin/Dialogs/LicenseManager/LicenseManagerController.cs +++ b/XenAdmin/Dialogs/LicenseManager/LicenseManagerController.cs @@ -116,13 +116,13 @@ namespace XenAdmin.Dialogs { if(!dataToSummarise.XenObject.Connection.IsConnected) { - View.DrawSummaryForHighlightedRow(dataToSummarise, new LicenseManagerSummaryComponent(), LaunchUrl(InvisibleMessages.LICENSE_BUY_URL), LaunchUrl(InvisibleMessages.LICENSE_BUY_URL)); + View.DrawSummaryForHighlightedRow(dataToSummarise, new LicenseManagerSummaryComponent(), LaunchUrl(InvisibleMessages.LICENSE_BUY_URL), LaunchUrl(InvisibleMessages.CSS_URL)); SetSummaryInformation(Messages.POOL_OR_HOST_IS_NOT_CONNECTED); return; } SummaryTextComponent component = BuildSummaryComponent(dataToSummarise); - View.DrawSummaryForHighlightedRow(dataToSummarise, component, LaunchUrl(InvisibleMessages.LICENSE_BUY_URL), LaunchUrl(InvisibleMessages.LICENSE_BUY_URL)); + View.DrawSummaryForHighlightedRow(dataToSummarise, component, LaunchUrl(InvisibleMessages.LICENSE_BUY_URL), LaunchUrl(InvisibleMessages.CSS_URL)); if(dataToSummarise.Disabled) SetSummaryInformation(dataToSummarise.DisabledReason); } diff --git a/XenAdmin/TabPages/GeneralTabPage.cs b/XenAdmin/TabPages/GeneralTabPage.cs index d5da64002..27b78d271 100644 --- a/XenAdmin/TabPages/GeneralTabPage.cs +++ b/XenAdmin/TabPages/GeneralTabPage.cs @@ -979,12 +979,13 @@ namespace XenAdmin.TabPages if (host.CanShowTrialEditionUpsell()) { pdSectionLicense.AddEntryWithNoteLink(Messages.WARNING, Messages.TRIAL_EDITION_UPSELLING_MESSAGE, - Messages.LICENSE_MANAGER_BUY_LICENSE_LINK_TEXT, () => Program.OpenURL(InvisibleMessages.LICENSE_BUY_URL)); + Messages.LICENSE_MANAGER_BUY_LICENSE_LINK_TEXT, () => Program.OpenURL(InvisibleMessages.LICENSE_BUY_URL), Color.Red); } - else if (host.CssLicenseHasExpired()) + + if (host.CssLicenseHasExpired() && !host.IsInPreviewRelease()) { pdSectionLicense.AddEntryWithNoteLink(Messages.WARNING, Messages.EXPIRED_CSS_UPSELLING_MESSAGE_HOST, - Messages.LICENSE_MANAGER_BUY_LICENSE_LINK_TEXT, () => Program.OpenURL(InvisibleMessages.LICENSE_BUY_URL)); + Messages.LICENSE_MANAGER_PURCHASE_SUPPORT_LINK_TEXT, () => Program.OpenURL(InvisibleMessages.CSS_URL), Color.Red); } if (host.license_params == null) diff --git a/XenModel/InvisibleMessages.Designer.cs b/XenModel/InvisibleMessages.Designer.cs index eb6cdd00f..6ec9174aa 100644 --- a/XenModel/InvisibleMessages.Designer.cs +++ b/XenModel/InvisibleMessages.Designer.cs @@ -78,6 +78,15 @@ namespace XenAdmin { } } + /// + /// Looks up a localized string similar to https://www.citrix.com/support/programs/. + /// + public static string CSS_URL { + get { + return ResourceManager.GetString("CSS_URL", resourceCulture); + } + } + /// /// Looks up a localized string similar to http://docs.citrix.com/en-us/citrix-hypervisor/whats-new/removed-features.html. /// diff --git a/XenModel/InvisibleMessages.resx b/XenModel/InvisibleMessages.resx index e6210c910..88c43c2eb 100644 --- a/XenModel/InvisibleMessages.resx +++ b/XenModel/InvisibleMessages.resx @@ -1,4 +1,4 @@ - +