CP-43000: Separate support and license warnings in License Manager

Contains placeholder values

Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>

XenAdmin/Controls/CheckableDataGridView/CheckableDataGridViewRow.cs

@@ -78,9 +78,13 @@ namespace XenAdmin.Controls.CheckableDataGridView
 
         public bool LockDisabledState { get; set; }
 
-        public abstract bool WarningRequired { get; }
+        public abstract bool LicenseWarningRequired { get; }
 
-        public abstract string WarningText { get; }
+        public abstract string LicenseWarningText { get; }
+
+        public abstract bool SupportWarningRequired { get; }
+
+        public abstract string SupportWarningText { get; }
 
         /// <summary>
         /// Override this if you cells data is loaded after it is first drawn

XenAdmin/Controls/SummaryPanel/IsummaryPanelView.cs

@@ -36,15 +36,21 @@ namespace XenAdmin.Controls.SummaryPanel
     public interface ISummaryPanelView
     {
         string DrawTitle { set; }
-        string DrawWarningMessage { set; }
+        string DrawLicenseWarningMessage { set; }
-        Bitmap DrawWarningIcon { set; }
+        string DrawSupportWarningMessage { set; }
-        string DrawHelperUrl { set; }
+        Bitmap DrawLicenseWarningIcon { set; }
-        bool WarningTextVisiblity { set; }
+        Bitmap DrawSupportWarningIcon { set; }
-        bool WarningIconVisiblity { set; }
+        string DrawLicenseHelperUrlText { set; }
+        string DrawSupportHelperUrlText { set; }
+        bool LicenseWarningTextVisibility { set; }
+        bool LicenseWarningIconVisibility { set; }
+        bool SupportWarningTextVisibility { set; }
+        bool SupportWarningIconVisibility { set; }
         string DrawSummaryText { set; }
         string DrawSummaryLink { set; }
         LinkArea DrawSummaryLinkArea { set; }
-        bool DrawHelperUrlVisible { set; }
+        bool DrawLicenseUrlVisible { set; }
+        bool DrawSupportUrlVisible { set; }
         bool DrawInformationVisible { set; }
         string DrawInformationText { set; }
         Bitmap DrawInformationIcon { set; }

XenAdmin/Controls/SummaryPanel/SummaryPanel.Designer.cs

@@ -32,18 +32,26 @@
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.titleLabel = new System.Windows.Forms.Label();
             this.information = new System.Windows.Forms.LinkLabel();
-            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
+            this.supportWarningTableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
-            this.warningImage = new System.Windows.Forms.PictureBox();
+            this.supportWarningImage = new System.Windows.Forms.PictureBox();
-            this.warningLabel = new System.Windows.Forms.Label();
+            this.supportWarningLabel = new System.Windows.Forms.Label();
+            this.licenseWarningTableLayoutPabel = new System.Windows.Forms.TableLayoutPanel();
+            this.licenseWarningImage = new System.Windows.Forms.PictureBox();
+            this.licenseWarningLabel = new System.Windows.Forms.Label();
             this.informationLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
             this.informationImage = new System.Windows.Forms.PictureBox();
             this.informationLabel = new System.Windows.Forms.Label();
-            this.helperLink = new System.Windows.Forms.LinkLabel();
+            this.licenseHelperLinkLabel = new System.Windows.Forms.LinkLabel();
+            this.helperLinksFlowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
+            this.supportHelperLinkLabel = new System.Windows.Forms.LinkLabel();
             this.tableLayoutPanel1.SuspendLayout();
-            this.tableLayoutPanel2.SuspendLayout();
+            this.supportWarningTableLayoutPanel.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.warningImage)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.supportWarningImage)).BeginInit();
+            this.licenseWarningTableLayoutPabel.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.licenseWarningImage)).BeginInit();
             this.informationLayoutPanel.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.informationImage)).BeginInit();
+            this.helperLinksFlowLayoutPanel.SuspendLayout();
             this.SuspendLayout();
             // 
             // tableLayoutPanel1
@@ -51,9 +59,10 @@
             resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
             this.tableLayoutPanel1.Controls.Add(this.titleLabel, 0, 0);
             this.tableLayoutPanel1.Controls.Add(this.information, 0, 1);
-            this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel2, 0, 2);
+            this.tableLayoutPanel1.Controls.Add(this.supportWarningTableLayoutPanel, 0, 2);
-            this.tableLayoutPanel1.Controls.Add(this.informationLayoutPanel, 0, 3);
+            this.tableLayoutPanel1.Controls.Add(this.licenseWarningTableLayoutPabel, 0, 3);
-            this.tableLayoutPanel1.Controls.Add(this.helperLink, 0, 4);
+            this.tableLayoutPanel1.Controls.Add(this.informationLayoutPanel, 0, 4);
+            this.tableLayoutPanel1.Controls.Add(this.helperLinksFlowLayoutPanel, 0, 6);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             // 
             // titleLabel
@@ -67,24 +76,43 @@
             resources.ApplyResources(this.information, "information");
             this.information.Name = "information";
             // 
-            // tableLayoutPanel2
+            // supportWarningTableLayoutPanel
             // 
-            resources.ApplyResources(this.tableLayoutPanel2, "tableLayoutPanel2");
+            resources.ApplyResources(this.supportWarningTableLayoutPanel, "supportWarningTableLayoutPanel");
-            this.tableLayoutPanel2.Controls.Add(this.warningImage, 0, 0);
+            this.supportWarningTableLayoutPanel.Controls.Add(this.supportWarningImage, 0, 0);
-            this.tableLayoutPanel2.Controls.Add(this.warningLabel, 1, 0);
+            this.supportWarningTableLayoutPanel.Controls.Add(this.supportWarningLabel, 1, 0);
-            this.tableLayoutPanel2.Name = "tableLayoutPanel2";
+            this.supportWarningTableLayoutPanel.Name = "supportWarningTableLayoutPanel";
             // 
-            // warningImage
+            // supportWarningImage
             // 
-            resources.ApplyResources(this.warningImage, "warningImage");
+            resources.ApplyResources(this.supportWarningImage, "supportWarningImage");
-            this.warningImage.Name = "warningImage";
+            this.supportWarningImage.Name = "supportWarningImage";
-            this.warningImage.TabStop = false;
+            this.supportWarningImage.TabStop = false;
             // 
-            // warningLabel
+            // supportWarningLabel
             // 
-            resources.ApplyResources(this.warningLabel, "warningLabel");
+            resources.ApplyResources(this.supportWarningLabel, "supportWarningLabel");
-            this.warningLabel.AutoEllipsis = true;
+            this.supportWarningLabel.AutoEllipsis = true;
-            this.warningLabel.Name = "warningLabel";
+            this.supportWarningLabel.Name = "supportWarningLabel";
+            // 
+            // licenseWarningTableLayoutPabel
+            // 
+            resources.ApplyResources(this.licenseWarningTableLayoutPabel, "licenseWarningTableLayoutPabel");
+            this.licenseWarningTableLayoutPabel.Controls.Add(this.licenseWarningImage, 0, 0);
+            this.licenseWarningTableLayoutPabel.Controls.Add(this.licenseWarningLabel, 1, 0);
+            this.licenseWarningTableLayoutPabel.Name = "licenseWarningTableLayoutPabel";
+            // 
+            // licenseWarningImage
+            // 
+            resources.ApplyResources(this.licenseWarningImage, "licenseWarningImage");
+            this.licenseWarningImage.Name = "licenseWarningImage";
+            this.licenseWarningImage.TabStop = false;
+            // 
+            // licenseWarningLabel
+            // 
+            resources.ApplyResources(this.licenseWarningLabel, "licenseWarningLabel");
+            this.licenseWarningLabel.AutoEllipsis = true;
+            this.licenseWarningLabel.Name = "licenseWarningLabel";
             // 
             // informationLayoutPanel
             // 
@@ -105,11 +133,24 @@
             this.informationLabel.AutoEllipsis = true;
             this.informationLabel.Name = "informationLabel";
             // 
-            // helperLink
+            // licenseHelperLinkLabel
             // 
-            this.helperLink.AutoEllipsis = true;
+            this.licenseHelperLinkLabel.AutoEllipsis = true;
-            resources.ApplyResources(this.helperLink, "helperLink");
+            resources.ApplyResources(this.licenseHelperLinkLabel, "licenseHelperLinkLabel");
-            this.helperLink.Name = "helperLink";
+            this.licenseHelperLinkLabel.Name = "licenseHelperLinkLabel";
+            // 
+            // helperLinksFlowLayoutPanel
+            // 
+            this.helperLinksFlowLayoutPanel.Controls.Add(this.licenseHelperLinkLabel);
+            this.helperLinksFlowLayoutPanel.Controls.Add(this.supportHelperLinkLabel);
+            resources.ApplyResources(this.helperLinksFlowLayoutPanel, "helperLinksFlowLayoutPanel");
+            this.helperLinksFlowLayoutPanel.Name = "helperLinksFlowLayoutPanel";
+            // 
+            // supportHelperLinkLabel
+            // 
+            this.supportHelperLinkLabel.AutoEllipsis = true;
+            resources.ApplyResources(this.supportHelperLinkLabel, "supportHelperLinkLabel");
+            this.supportHelperLinkLabel.Name = "supportHelperLinkLabel";
             // 
             // SummaryPanel
             // 
@@ -119,12 +160,17 @@
             this.Name = "SummaryPanel";
             this.tableLayoutPanel1.ResumeLayout(false);
             this.tableLayoutPanel1.PerformLayout();
-            this.tableLayoutPanel2.ResumeLayout(false);
+            this.supportWarningTableLayoutPanel.ResumeLayout(false);
-            this.tableLayoutPanel2.PerformLayout();
+            this.supportWarningTableLayoutPanel.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.warningImage)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.supportWarningImage)).EndInit();
+            this.licenseWarningTableLayoutPabel.ResumeLayout(false);
+            this.licenseWarningTableLayoutPabel.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.licenseWarningImage)).EndInit();
             this.informationLayoutPanel.ResumeLayout(false);
             this.informationLayoutPanel.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.informationImage)).EndInit();
+            this.helperLinksFlowLayoutPanel.ResumeLayout(false);
+            this.helperLinksFlowLayoutPanel.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -132,14 +178,19 @@
         #endregion
 
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-        private System.Windows.Forms.PictureBox warningImage;
+        private System.Windows.Forms.PictureBox licenseWarningImage;
-        private System.Windows.Forms.Label warningLabel;
+        private System.Windows.Forms.Label licenseWarningLabel;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
+        private System.Windows.Forms.TableLayoutPanel licenseWarningTableLayoutPabel;
-        private System.Windows.Forms.LinkLabel helperLink;
+        private System.Windows.Forms.LinkLabel licenseHelperLinkLabel;
         private System.Windows.Forms.Label titleLabel;
         private System.Windows.Forms.LinkLabel information;
         private System.Windows.Forms.TableLayoutPanel informationLayoutPanel;
         private System.Windows.Forms.PictureBox informationImage;
         private System.Windows.Forms.Label informationLabel;
+        private System.Windows.Forms.TableLayoutPanel supportWarningTableLayoutPanel;
+        private System.Windows.Forms.PictureBox supportWarningImage;
+        private System.Windows.Forms.Label supportWarningLabel;
+        private System.Windows.Forms.FlowLayoutPanel helperLinksFlowLayoutPanel;
+        private System.Windows.Forms.LinkLabel supportHelperLinkLabel;
     }
 }

XenAdmin/Controls/SummaryPanel/SummaryPanel.cs

@@ -41,7 +41,8 @@ namespace XenAdmin.Controls.SummaryPanel
         public SummaryPanel()
         {
             InitializeComponent();
-            helperLink.LinkClicked += helperLink_LinkClicked;
+            licenseHelperLinkLabel.LinkClicked += licenseHelperLink_LinkClicked;
+            supportHelperLinkLabel.LinkClicked += supportHelperLink_LinkClicked;
             information.LinkClicked += information_LinkClicked;
         }
 
@@ -50,19 +51,34 @@ namespace XenAdmin.Controls.SummaryPanel
             set{ Controller.Title = value; }
         }
 
-        public string HelperUrl
+        public string LicenseHelperUrlText
         {
-            set { Controller.HelperUrl = value; }
+            set { Controller.LicenseHelperUrlText = value; }
         }
 
-        public bool HelperUrlVisible
+        public string SupportHelperUrlText
         {
-            set { Controller.HelperUrlVisible = value; }
+            set { Controller.SupportHelperUrlText = value; }
         }
 
-        public bool WarningVisible
+        public bool LicenseHelperUrlVisible
         {
-            set { Controller.DisplayWarning = value; }
+            set { Controller.LicenseHelperUrlVisible = value; }
+        }
+
+        public bool SupportHelperUrlVisible
+        {
+            set { Controller.SupportHelperUrlVisible = value; }
+        }
+
+        public bool LicenseWarningVisible
+        {
+            set { Controller.DisplayLicenseWarning = value; }
+        }
+
+        public bool SupportWarningVisible
+        {
+            set { Controller.DisplaySupportWarning = value; }
         }
 
         public bool InformationVisible
@@ -70,14 +86,24 @@ namespace XenAdmin.Controls.SummaryPanel
             set { Controller.InformationVisible = value; }
         }
 
-        public string WarningText
+        public string LicenseWarningText
         {
-            set { Controller.WarningMessage = value; }
+            set { Controller.LicenseWarningMessage = value; }
         }
 
-        public Action RunOnUrlClick
+        public string SupportWarningText
         {
-            set { Controller.RunOnUrlClick = value; }
+            set { Controller.SupportWarningMessage = value; }
+        }
+
+        public Action RunOnLicenseUrlClick
+        {
+            set { Controller.RunOnLicenseUrlClick = value; }
+        }
+
+        public Action RunOnSupportUrlClick
+        {
+            set { Controller.RunOnSupportUrlClick = value; }
         }
 
         public SummaryTextComponent SummaryText
@@ -90,14 +116,25 @@ namespace XenAdmin.Controls.SummaryPanel
             set { Controller.InformationText = value; }
         }
 
-        public Bitmap WarningIcon
+        public Bitmap LicenseWarningIcon
         {
-            set { Controller.WarningIcon = value; }
+            set { Controller.LicenseWarningIcon = value; }
+
         }
 
-        private void helperLink_LinkClicked(object sender, EventArgs e)
+        public Bitmap SupportWarningIcon
             {
-            Controller.UrlClicked();
+                set { Controller.SupportWarningIcon = value; }
+            }
+
+        private void licenseHelperLink_LinkClicked(object sender, EventArgs e)
+        {
+            Controller.LicenseUrlClicked();
+        }
+
+        private void supportHelperLink_LinkClicked(object sender, EventArgs e)
+        {
+            Controller.SupportUrlClicked();
         }
 
         private string summaryLink;
@@ -116,15 +153,27 @@ namespace XenAdmin.Controls.SummaryPanel
         }
 
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public string DrawWarningMessage
+        public string DrawLicenseWarningMessage
         {
-            set { warningLabel.Text = value; }
+            set { licenseWarningLabel.Text = value; }
         }
 
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public Bitmap DrawWarningIcon
+        public string DrawSupportWarningMessage
         {
-            set { warningImage.Image = value;  }
+            set { supportWarningLabel.Text = value; }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public Bitmap DrawLicenseWarningIcon
+        {
+            set { licenseWarningImage.Image = value;  }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public Bitmap DrawSupportWarningIcon
+        {
+            set { supportWarningImage.Image = value; }
         }
 
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -134,21 +183,39 @@ namespace XenAdmin.Controls.SummaryPanel
         }
 
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public string DrawHelperUrl
+        public string DrawLicenseHelperUrlText
         {
-            set { helperLink.Text = value; }
+            set { licenseHelperLinkLabel.Text = value; }
         }
 
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool WarningTextVisiblity
+        public string DrawSupportHelperUrlText
         {
-            set { warningLabel.Visible = value; }
+            set { supportHelperLinkLabel.Text = value; }
         }
 
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool WarningIconVisiblity
+        public bool LicenseWarningTextVisibility
         {
-            set { warningImage.Visible = value; }
+            set { licenseWarningLabel.Visible = value; }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool SupportWarningTextVisibility
+        {
+            set { supportWarningLabel.Visible = value; }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool LicenseWarningIconVisibility
+        {
+            set { licenseWarningImage.Visible = value; }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool SupportWarningIconVisibility
+        {
+            set { supportWarningImage.Visible = value; }
         }
 
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -174,9 +241,15 @@ namespace XenAdmin.Controls.SummaryPanel
         }
 
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public bool DrawHelperUrlVisible
+        public bool DrawLicenseUrlVisible
         {
-            set { helperLink.Visible = value; }
+            set { licenseHelperLinkLabel.Visible = value; }
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public bool DrawSupportUrlVisible
+        {
+            set { supportHelperLinkLabel.Visible = value; }
         }
 
         [EditorBrowsable(EditorBrowsableState.Never)]

XenAdmin/Controls/SummaryPanel/SummaryPanel.resx

@@ -183,104 +183,206 @@
   <data name="&gt;&gt;information.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <data name="tableLayoutPanel2.AutoSize" type="System.Boolean, mscorlib">
+  <data name="supportWarningTableLayoutPanel.ColumnCount" type="System.Int32, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="tableLayoutPanel2.ColumnCount" type="System.Int32, mscorlib">
     <value>2</value>
   </data>
-  <data name="warningImage.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="supportWarningImage.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>3, 0</value>
-  </data>
-  <data name="warningImage.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 0, 3, 0</value>
-  </data>
-  <data name="warningImage.Size" type="System.Drawing.Size, System.Drawing">
-    <value>16, 45</value>
-  </data>
-  <data name="warningImage.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
-    <value>CenterImage</value>
-  </data>
-  <data name="warningImage.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;warningImage.Name" xml:space="preserve">
-    <value>warningImage</value>
-  </data>
-  <data name="&gt;&gt;warningImage.Type" xml:space="preserve">
-    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;warningImage.Parent" xml:space="preserve">
-    <value>tableLayoutPanel2</value>
-  </data>
-  <data name="&gt;&gt;warningImage.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="warningLabel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Left, Right</value>
-  </data>
-  <data name="warningLabel.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="warningLabel.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Microsoft Sans Serif, 8.25pt, style=Bold</value>
-  </data>
-  <data name="warningLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
-  <data name="warningLabel.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="supportWarningImage.Location" type="System.Drawing.Point, System.Drawing">
-    <value>25, 16</value>
+    <value>3, 0</value>
   </data>
-  <data name="warningLabel.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="supportWarningImage.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>201, 13</value>
-  </data>
-  <data name="warningLabel.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;warningLabel.Name" xml:space="preserve">
-    <value>warningLabel</value>
-  </data>
-  <data name="&gt;&gt;warningLabel.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;warningLabel.Parent" xml:space="preserve">
-    <value>tableLayoutPanel2</value>
-  </data>
-  <data name="&gt;&gt;warningLabel.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="tableLayoutPanel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="tableLayoutPanel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 55</value>
-  </data>
-  <data name="tableLayoutPanel2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>3, 0, 3, 0</value>
   </data>
-  <data name="tableLayoutPanel2.RowCount" type="System.Int32, mscorlib">
+  <data name="supportWarningImage.Size" type="System.Drawing.Size, System.Drawing">
+    <value>16, 45</value>
+  </data>
+  <data name="supportWarningImage.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
+    <value>CenterImage</value>
+  </data>
+  <data name="supportWarningImage.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;supportWarningImage.Name" xml:space="preserve">
+    <value>supportWarningImage</value>
+  </data>
+  <data name="&gt;&gt;supportWarningImage.Type" xml:space="preserve">
+    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;supportWarningImage.Parent" xml:space="preserve">
+    <value>supportWarningTableLayoutPanel</value>
+  </data>
+  <data name="&gt;&gt;supportWarningImage.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="supportWarningLabel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Left, Right</value>
+  </data>
+  <data name="supportWarningLabel.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="supportWarningLabel.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Microsoft Sans Serif, 8.25pt, style=Bold</value>
+  </data>
+  <data name="supportWarningLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="supportWarningLabel.Location" type="System.Drawing.Point, System.Drawing">
+    <value>25, 16</value>
+  </data>
+  <data name="supportWarningLabel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>201, 13</value>
+  </data>
+  <data name="supportWarningLabel.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
   </data>
-  <data name="tableLayoutPanel2.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="&gt;&gt;supportWarningLabel.Name" xml:space="preserve">
+    <value>supportWarningLabel</value>
+  </data>
+  <data name="&gt;&gt;supportWarningLabel.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;supportWarningLabel.Parent" xml:space="preserve">
+    <value>supportWarningTableLayoutPanel</value>
+  </data>
+  <data name="&gt;&gt;supportWarningLabel.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="supportWarningTableLayoutPanel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="supportWarningTableLayoutPanel.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 55</value>
+  </data>
+  <data name="supportWarningTableLayoutPanel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 0, 3, 0</value>
+  </data>
+  <data name="supportWarningTableLayoutPanel.RowCount" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="supportWarningTableLayoutPanel.Size" type="System.Drawing.Size, System.Drawing">
     <value>229, 45</value>
   </data>
-  <data name="tableLayoutPanel2.TabIndex" type="System.Int32, mscorlib">
+  <data name="supportWarningTableLayoutPanel.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
+    <value>7</value>
   </data>
-  <data name="&gt;&gt;tableLayoutPanel2.Name" xml:space="preserve">
+  <data name="&gt;&gt;supportWarningTableLayoutPanel.Name" xml:space="preserve">
-    <value>tableLayoutPanel2</value>
+    <value>supportWarningTableLayoutPanel</value>
   </data>
-  <data name="&gt;&gt;tableLayoutPanel2.Type" xml:space="preserve">
+  <data name="&gt;&gt;supportWarningTableLayoutPanel.Type" xml:space="preserve">
     <value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;tableLayoutPanel2.Parent" xml:space="preserve">
+  <data name="&gt;&gt;supportWarningTableLayoutPanel.Parent" xml:space="preserve">
     <value>tableLayoutPanel1</value>
   </data>
-  <data name="&gt;&gt;tableLayoutPanel2.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;supportWarningTableLayoutPanel.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
-  <data name="tableLayoutPanel2.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
+  <data name="supportWarningTableLayoutPanel.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
-    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="warningImage" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="warningLabel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
+    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="supportWarningImage" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="supportWarningLabel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="Percent,100,Absolute,45" /&gt;&lt;/TableLayoutSettings&gt;</value>
+  </data>
+  <data name="licenseWarningTableLayoutPabel.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="licenseWarningTableLayoutPabel.ColumnCount" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="licenseWarningImage.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="licenseWarningImage.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 0</value>
+  </data>
+  <data name="licenseWarningImage.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 0, 3, 0</value>
+  </data>
+  <data name="licenseWarningImage.Size" type="System.Drawing.Size, System.Drawing">
+    <value>16, 45</value>
+  </data>
+  <data name="licenseWarningImage.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
+    <value>CenterImage</value>
+  </data>
+  <data name="licenseWarningImage.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;licenseWarningImage.Name" xml:space="preserve">
+    <value>licenseWarningImage</value>
+  </data>
+  <data name="&gt;&gt;licenseWarningImage.Type" xml:space="preserve">
+    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;licenseWarningImage.Parent" xml:space="preserve">
+    <value>licenseWarningTableLayoutPabel</value>
+  </data>
+  <data name="&gt;&gt;licenseWarningImage.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="licenseWarningLabel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Left, Right</value>
+  </data>
+  <data name="licenseWarningLabel.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="licenseWarningLabel.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Microsoft Sans Serif, 8.25pt, style=Bold</value>
+  </data>
+  <data name="licenseWarningLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="licenseWarningLabel.Location" type="System.Drawing.Point, System.Drawing">
+    <value>25, 16</value>
+  </data>
+  <data name="licenseWarningLabel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>201, 13</value>
+  </data>
+  <data name="licenseWarningLabel.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;licenseWarningLabel.Name" xml:space="preserve">
+    <value>licenseWarningLabel</value>
+  </data>
+  <data name="&gt;&gt;licenseWarningLabel.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;licenseWarningLabel.Parent" xml:space="preserve">
+    <value>licenseWarningTableLayoutPabel</value>
+  </data>
+  <data name="&gt;&gt;licenseWarningLabel.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="licenseWarningTableLayoutPabel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="licenseWarningTableLayoutPabel.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 100</value>
+  </data>
+  <data name="licenseWarningTableLayoutPabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 0, 3, 0</value>
+  </data>
+  <data name="licenseWarningTableLayoutPabel.RowCount" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="licenseWarningTableLayoutPabel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>229, 45</value>
+  </data>
+  <data name="licenseWarningTableLayoutPabel.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;licenseWarningTableLayoutPabel.Name" xml:space="preserve">
+    <value>licenseWarningTableLayoutPabel</value>
+  </data>
+  <data name="&gt;&gt;licenseWarningTableLayoutPabel.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TableLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;licenseWarningTableLayoutPabel.Parent" xml:space="preserve">
+    <value>tableLayoutPanel1</value>
+  </data>
+  <data name="&gt;&gt;licenseWarningTableLayoutPabel.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="licenseWarningTableLayoutPabel.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
+    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="licenseWarningImage" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="licenseWarningLabel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="Percent,100,Absolute,45" /&gt;&lt;/TableLayoutSettings&gt;</value>
   </data>
   <data name="informationLayoutPanel.ColumnCount" type="System.Int32, mscorlib">
     <value>2</value>
@@ -343,7 +445,7 @@
     <value>1</value>
   </data>
   <data name="informationLayoutPanel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 103</value>
+    <value>3, 148</value>
   </data>
   <data name="informationLayoutPanel.RowCount" type="System.Int32, mscorlib">
     <value>1</value>
@@ -364,37 +466,94 @@
     <value>tableLayoutPanel1</value>
   </data>
   <data name="&gt;&gt;informationLayoutPanel.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>4</value>
   </data>
   <data name="informationLayoutPanel.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
     <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="informationImage" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="informationLabel" Row="0" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="AutoSize,0,Percent,100" /&gt;&lt;Rows Styles="Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
   </data>
-  <data name="helperLink.AutoSize" type="System.Boolean, mscorlib">
+  <data name="licenseHelperLinkLabel.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="helperLink.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="licenseHelperLinkLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>8, 274</value>
+    <value>NoControl</value>
   </data>
-  <data name="helperLink.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+  <data name="licenseHelperLinkLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 3, 3, 8</value>
+    <value>3, 3</value>
   </data>
-  <data name="helperLink.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="licenseHelperLinkLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 3, 3, 3</value>
+  </data>
+  <data name="licenseHelperLinkLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>0, 13</value>
   </data>
-  <data name="helperLink.TabIndex" type="System.Int32, mscorlib">
+  <data name="licenseHelperLinkLabel.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
   </data>
-  <data name="&gt;&gt;helperLink.Name" xml:space="preserve">
+  <data name="&gt;&gt;licenseHelperLinkLabel.Name" xml:space="preserve">
-    <value>helperLink</value>
+    <value>licenseHelperLinkLabel</value>
   </data>
-  <data name="&gt;&gt;helperLink.Type" xml:space="preserve">
+  <data name="&gt;&gt;licenseHelperLinkLabel.Type" xml:space="preserve">
     <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;helperLink.Parent" xml:space="preserve">
+  <data name="&gt;&gt;licenseHelperLinkLabel.Parent" xml:space="preserve">
+    <value>helperLinksFlowLayoutPanel</value>
+  </data>
+  <data name="&gt;&gt;licenseHelperLinkLabel.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="supportHelperLinkLabel.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="supportHelperLinkLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="supportHelperLinkLabel.Location" type="System.Drawing.Point, System.Drawing">
+    <value>9, 3</value>
+  </data>
+  <data name="supportHelperLinkLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 3, 3, 3</value>
+  </data>
+  <data name="supportHelperLinkLabel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>0, 13</value>
+  </data>
+  <data name="supportHelperLinkLabel.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="&gt;&gt;supportHelperLinkLabel.Name" xml:space="preserve">
+    <value>supportHelperLinkLabel</value>
+  </data>
+  <data name="&gt;&gt;supportHelperLinkLabel.Type" xml:space="preserve">
+    <value>System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;supportHelperLinkLabel.Parent" xml:space="preserve">
+    <value>helperLinksFlowLayoutPanel</value>
+  </data>
+  <data name="&gt;&gt;supportHelperLinkLabel.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="helperLinksFlowLayoutPanel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="helperLinksFlowLayoutPanel.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 268</value>
+  </data>
+  <data name="helperLinksFlowLayoutPanel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>229, 24</value>
+  </data>
+  <data name="helperLinksFlowLayoutPanel.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
+  </data>
+  <data name="&gt;&gt;helperLinksFlowLayoutPanel.Name" xml:space="preserve">
+    <value>helperLinksFlowLayoutPanel</value>
+  </data>
+  <data name="&gt;&gt;helperLinksFlowLayoutPanel.Type" xml:space="preserve">
+    <value>System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;helperLinksFlowLayoutPanel.Parent" xml:space="preserve">
     <value>tableLayoutPanel1</value>
   </data>
-  <data name="&gt;&gt;helperLink.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;helperLinksFlowLayoutPanel.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>5</value>
   </data>
   <data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
@@ -403,7 +562,7 @@
     <value>0, 0</value>
   </data>
   <data name="tableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
-    <value>5</value>
+    <value>7</value>
   </data>
   <data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
     <value>235, 295</value>
@@ -424,7 +583,7 @@
     <value>0</value>
   </data>
   <data name="tableLayoutPanel1.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
-    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="titleLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="information" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="tableLayoutPanel2" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="informationLayoutPanel" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="helperLink" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,Absolute,20" /&gt;&lt;/TableLayoutSettings&gt;</value>
+    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="titleLabel" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="information" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="supportWarningTableLayoutPanel" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="licenseWarningTableLayoutPabel" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="informationLayoutPanel" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="helperLinksFlowLayoutPanel" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Percent,100,AutoSize,0,Absolute,30" /&gt;&lt;/TableLayoutSettings&gt;</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>

XenAdmin/Controls/SummaryPanel/SummaryPanelController.cs

@@ -51,19 +51,37 @@ namespace XenAdmin.Controls.SummaryPanel
            set { View.DrawTitle = value; }
         }
 
-        public string HelperUrl
+        public string LicenseHelperUrlText
         {
-            set { View.DrawHelperUrl = value; }
+            set { View.DrawLicenseHelperUrlText = value; }
         }
 
-        public bool HelperUrlVisible
+        public string SupportHelperUrlText
         {
-            set { View.DrawHelperUrlVisible = value; }
+            set { View.DrawSupportHelperUrlText = value; }
         }
 
-        public string WarningMessage
+        public bool LicenseHelperUrlVisible
         {
-            set { View.DrawWarningMessage = value; }
+            set { View.DrawLicenseUrlVisible = value; }
+        }
+
+        public bool SupportHelperUrlVisible
+        {
+            set { View.DrawSupportUrlVisible = value; }
+        }
+
+        public string LicenseWarningMessage
+        {
+            set { View.DrawLicenseWarningMessage = value; }
+        }
+
+        public string SupportWarningMessage
+        {
+            set
+            {
+                View.DrawSupportWarningMessage = value;
+            }
         }
 
         public bool InformationVisible
@@ -76,9 +94,14 @@ namespace XenAdmin.Controls.SummaryPanel
             set { View.DrawInformationText = value; }
         }
 
-        public Bitmap WarningIcon
+        public Bitmap LicenseWarningIcon
         {
-            set { View.DrawWarningIcon = value; }
+            set { View.DrawLicenseWarningIcon = value; }
+        }
+
+        public Bitmap SupportWarningIcon
+        {
+            set { View.DrawSupportWarningIcon = value; }
         }
         
         public SummaryTextComponent TextSummary
@@ -91,20 +114,35 @@ namespace XenAdmin.Controls.SummaryPanel
             }
         }
 
-        public Action RunOnUrlClick { private get; set; }
+        public Action RunOnLicenseUrlClick { private get; set; }
 
-        public void UrlClicked()
+        public Action RunOnSupportUrlClick { private get; set; }
+
+        public void LicenseUrlClicked()
         {
-            if (RunOnUrlClick != null)
+            RunOnLicenseUrlClick?.Invoke();
-                RunOnUrlClick.Invoke();
         }
 
-        public bool DisplayWarning
+        public void SupportUrlClicked()
+        {
+            RunOnSupportUrlClick?.Invoke();
+        }
+
+        public bool DisplayLicenseWarning
         {
             set
             {
-                View.WarningIconVisiblity = value;
+                View.LicenseWarningIconVisibility = value;
-                View.WarningTextVisiblity = value;
+                View.LicenseWarningTextVisibility = value;
+            }
+        }
+
+        public bool DisplaySupportWarning
+        {
+            set
+            {
+                View.SupportWarningIconVisibility = value;
+                View.SupportWarningTextVisibility = value;
             }
         }
     }

XenAdmin/Dialogs/LicenseManager/ILicenseManagerView.cs

@@ -41,7 +41,7 @@ namespace XenAdmin.Dialogs
         LicenseManagerController Controller { set; }
         void DrawRowsInGrid(List<CheckableDataGridViewRow> itemsToShow);
         void DrawSelectedRowsAsChecked(List<CheckableDataGridViewRow> rows);
-        void DrawSummaryForHighlightedRow(CheckableDataGridViewRow row, SummaryTextComponent component, Action runOnUrlClick);
+        void DrawSummaryForHighlightedRow(CheckableDataGridViewRow row, SummaryTextComponent component, Action runOnLicenseUrlClick, Action runOnSupportUrlClick);
         void DrawHighlightedRow(CheckableDataGridViewRow row);
         void DrawRowStatusIcon(int rowIndex, LicenseDataGridViewRow.Status rowStatus);
         void DrawAssignButtonAsDisabled(bool isDisabled);

XenAdmin/Dialogs/LicenseManager/LicenseDataGridViewRow.cs

@@ -136,7 +136,7 @@ namespace XenAdmin.Dialogs
             }
         }
 
-        public override bool WarningRequired
+        public override bool LicenseWarningRequired
         {
             get
             {
@@ -150,7 +150,7 @@ namespace XenAdmin.Dialogs
             }
         }
 
-        public override string WarningText
+        public override string LicenseWarningText
         {
             get
             {
@@ -190,10 +190,13 @@ namespace XenAdmin.Dialogs
             }
         }
 
-        public bool HelperUrlRequired
+        public override bool SupportWarningRequired => XenObjectHost?.CssLicenseHasExpired() ?? false;
-        {
+
-            get { return XenObject != null; }  
+        public override string SupportWarningText => "css expired!";
-        }
+
+        public bool LicenseHelperUrlRequired => XenObject != null;
+
+        public bool SupportHelperUrlRequired => XenObject != null;
 
         public Status RowStatus
         {

XenAdmin/Dialogs/LicenseManager/LicenseManager.cs

@@ -173,7 +173,7 @@ namespace XenAdmin.Dialogs
         }
 
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public void DrawSummaryForHighlightedRow(CheckableDataGridViewRow row, SummaryTextComponent summaryComponent, Action runOnUrlClick)
+        public void DrawSummaryForHighlightedRow(CheckableDataGridViewRow row, SummaryTextComponent summaryComponent, Action runOnLicenseUrlClick, Action runOnSupportUrlClick)
         {
             Program.Invoke(this, delegate
                                      {
@@ -182,25 +182,31 @@ namespace XenAdmin.Dialogs
                                              return;
 
                                          summaryPanel.Title = lRow.XenObject.Name();
-                                         summaryPanel.HelperUrl = Messages.LICENSE_MANAGER_BUY_LICENSE_LINK_TEXT;
+                                         summaryPanel.LicenseHelperUrlText = Messages.LICENSE_MANAGER_BUY_LICENSE_LINK_TEXT;
-                                         summaryPanel.HelperUrlVisible = lRow.HelperUrlRequired && !Controller.ReadOnlyView;
+                                         summaryPanel.SupportHelperUrlText = "Purchase support...";
-                                         summaryPanel.WarningVisible = lRow.WarningRequired;
+                                         summaryPanel.LicenseHelperUrlVisible = lRow.LicenseHelperUrlRequired && !Controller.ReadOnlyView;
-                                         summaryPanel.WarningText = lRow.WarningText;
+                                         summaryPanel.SupportHelperUrlVisible = lRow.SupportHelperUrlRequired &&
+                                             !Controller.ReadOnlyView;
+                                         summaryPanel.LicenseWarningVisible = lRow.LicenseWarningRequired;
+                                         summaryPanel.SupportWarningVisible = lRow.SupportWarningRequired;
+                                         summaryPanel.LicenseWarningText = lRow.LicenseWarningText;
+                                         summaryPanel.SupportWarningText = lRow.SupportWarningText;
                                          summaryPanel.SummaryText = summaryComponent;
                                          switch (lRow.RowStatus)
                                          {
                                              case LicenseDataGridViewRow.Status.Information:
-                                                 summaryPanel.WarningIcon = Images.StaticImages._000_Alert2_h32bit_16;
+                                                 summaryPanel.LicenseWarningIcon = summaryPanel.SupportWarningIcon = Images.StaticImages._000_Alert2_h32bit_16;
                                                  break;
                                              case LicenseDataGridViewRow.Status.Warning:
-                                                 summaryPanel.WarningIcon = Images.StaticImages._000_error_h32bit_16;
+                                                 summaryPanel.LicenseWarningIcon = summaryPanel.SupportWarningIcon = Images.StaticImages._000_error_h32bit_16;
                                                  break;
                                              default:
-                                                 summaryPanel.WarningIcon = Images.StaticImages._000_Tick_h32bit_16;
+                                                 summaryPanel.LicenseWarningIcon = summaryPanel.SupportWarningIcon = Images.StaticImages._000_Tick_h32bit_16;
                                                  break;
                                          }
                                          summaryPanel.InformationVisible = false;
-                                         summaryPanel.RunOnUrlClick = runOnUrlClick;
+                                         summaryPanel.RunOnLicenseUrlClick = runOnLicenseUrlClick;
+                                         summaryPanel.RunOnSupportUrlClick = runOnSupportUrlClick;
                                      });
         }
 

XenAdmin/Dialogs/LicenseManager/LicenseManager.resx

@@ -184,7 +184,7 @@
     <value>3, 3</value>
   </data>
   <data name="checkableDataGridView.Size" type="System.Drawing.Size, System.Drawing">
-    <value>631, 399</value>
+    <value>631, 444</value>
   </data>
   <data name="checkableDataGridView.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -217,7 +217,7 @@
     <value>NoControl</value>
   </data>
   <data name="downloadLicenseServerLink.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 444</value>
+    <value>3, 489</value>
   </data>
   <data name="downloadLicenseServerLink.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>3, 3, 3, 3</value>
@@ -322,7 +322,7 @@
     <value>Segoe UI, 9pt</value>
   </data>
   <data name="tableLayoutPanel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 405</value>
+    <value>0, 450</value>
   </data>
   <data name="tableLayoutPanel2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>0, 0, 0, 0</value>
@@ -361,7 +361,7 @@
     <value>640, 3</value>
   </data>
   <data name="summaryPanel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>267, 399</value>
+    <value>267, 444</value>
   </data>
   <data name="summaryPanel.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -385,7 +385,7 @@
     <value>Segoe UI, 9pt</value>
   </data>
   <data name="cancelButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>832, 439</value>
+    <value>832, 484</value>
   </data>
   <data name="cancelButton.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 25</value>
@@ -421,7 +421,7 @@
     <value>3</value>
   </data>
   <data name="tableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>910, 467</value>
+    <value>910, 512</value>
   </data>
   <data name="tableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -448,7 +448,7 @@
     <value>96, 96</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>934, 491</value>
+    <value>934, 536</value>
   </data>
   <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 9pt</value>

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));
+                View.DrawSummaryForHighlightedRow(dataToSummarise, new LicenseManagerSummaryComponent(), LaunchUrl(InvisibleMessages.LICENSE_BUY_URL), LaunchUrl(InvisibleMessages.LICENSE_BUY_URL));
                 SetSummaryInformation(Messages.POOL_OR_HOST_IS_NOT_CONNECTED);
                 return;
             }
 
             SummaryTextComponent component = BuildSummaryComponent(dataToSummarise);
-            View.DrawSummaryForHighlightedRow(dataToSummarise, component, LaunchUrl(InvisibleMessages.LICENSE_BUY_URL));
+            View.DrawSummaryForHighlightedRow(dataToSummarise, component, LaunchUrl(InvisibleMessages.LICENSE_BUY_URL), LaunchUrl(InvisibleMessages.LICENSE_BUY_URL));
             if(dataToSummarise.Disabled)
                 SetSummaryInformation(dataToSummarise.DisabledReason);
         }