Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-23 20:36:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CP-43000: Update link and text shown in the hosts' general tabs

Browse Source 
Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
This commit is contained in:
Danilo Del Busso 2023-07-19 15:15:20 +01:00
parent 75faf093a9
commit 6fa8cfa10b
No known key found for this signature in database
5 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
XenAdmin/Controls/PDSection.cs
View File

@ -394,10 +394,12 @@ namespace XenAdmin.Controls
AddRow(CreateKeyCell(key), valueCell, null, contextMenuItems); 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 valueCell = new DataGridViewTextBoxCell { Value = value };
var noteCell = new DataGridViewLinkCell { Value = note, Tag = action }; var noteCell = new DataGridViewLinkCell { Value = note, Tag = action };
valueCell.Style.ForeColor = fontColor;
valueCell.Style.SelectionForeColor = fontColor;
AddRow(CreateKeyCell(key), valueCell, noteCell, contextMenuItems); AddRow(CreateKeyCell(key), valueCell, noteCell, contextMenuItems);
} }

4
XenAdmin/Dialogs/LicenseManager/LicenseManagerController.cs
View File

@ -116,13 +116,13 @@ namespace XenAdmin.Dialogs
{ {
if(!dataToSummarise.XenObject.Connection.IsConnected) 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); SetSummaryInformation(Messages.POOL_OR_HOST_IS_NOT_CONNECTED);
return; return;
} }
SummaryTextComponent component = BuildSummaryComponent(dataToSummarise); 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) if(dataToSummarise.Disabled)
SetSummaryInformation(dataToSummarise.DisabledReason); SetSummaryInformation(dataToSummarise.DisabledReason);
} }

7
XenAdmin/TabPages/GeneralTabPage.cs
View File

@ -979,12 +979,13 @@ namespace XenAdmin.TabPages
if (host.CanShowTrialEditionUpsell()) if (host.CanShowTrialEditionUpsell())
{ {
pdSectionLicense.AddEntryWithNoteLink(Messages.WARNING, Messages.TRIAL_EDITION_UPSELLING_MESSAGE, 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, 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) if (host.license_params == null)

9
XenModel/InvisibleMessages.Designer.cs generated
View File

@ -78,6 +78,15 @@ namespace XenAdmin {
} }
} }
/// <summary>
/// Looks up a localized string similar to https://www.citrix.com/support/programs/.
/// </summary>
public static string CSS_URL {
get {
return ResourceManager.GetString("CSS_URL", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to http://docs.citrix.com/en-us/citrix-hypervisor/whats-new/removed-features.html. /// Looks up a localized string similar to http://docs.citrix.com/en-us/citrix-hypervisor/whats-new/removed-features.html.
/// </summary> /// </summary>

5
XenModel/InvisibleMessages.resx
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<root> <root>
<!-- <!--
Microsoft ResX Schema Microsoft ResX Schema
@ -120,6 +120,9 @@
<data name="CIS_URL" xml:space="preserve"> <data name="CIS_URL" xml:space="preserve">
<value>https://cis.citrix.com</value> <value>https://cis.citrix.com</value>
</data> </data>
<data name="CSS_URL" xml:space="preserve">
<value>https://www.citrix.com/support/programs/</value>
</data>
<data name="CLIENT_ID_URL" xml:space="preserve"> <data name="CLIENT_ID_URL" xml:space="preserve">
<value>https://support.citrix.com/xencenterclientiddownload</value> <value>https://support.citrix.com/xencenterclientiddownload</value>
</data> </data>