From 8fc2ed59d66a47eec331ae13545c1f1f17c41f0d Mon Sep 17 00:00:00 2001
From: Peter Donker <peter@bring2mind.net>
Date: Tue, 9 Mar 2021 17:11:50 +0100
Subject: [PATCH 1/8] Add code to fix update warning

---
 DNN Platform/Library/Common/Globals.cs        |  23 ++++
 .../Services/Dto/GithubLatestReleaseDTO.cs    |  22 ++++
 .../Services/ServerSummaryController.cs       | 107 ++++++------------
 3 files changed, 81 insertions(+), 71 deletions(-)
 create mode 100644 Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/Dto/GithubLatestReleaseDTO.cs

diff --git a/DNN Platform/Library/Common/Globals.cs b/DNN Platform/Library/Common/Globals.cs
index 09414f40fbc..ccac8bac40f 100644
--- a/DNN Platform/Library/Common/Globals.cs	
+++ b/DNN Platform/Library/Common/Globals.cs	
@@ -2060,6 +2060,29 @@ public static void SetFormFocus(Control control)
             }
         }
 
+        /// <summary>
+        /// Gets JSON string from url and deserializes this to type T.
+        /// </summary>
+        /// <typeparam name="T">Object type to return.</typeparam>
+        /// <param name="url">Complete url to fetch JSON data from.</param>
+        /// <returns>Object of type T</returns>
+        public static T GetJsonObject<T>(string url)
+        {
+            var request = GetExternalRequest(url);
+            using (HttpWebResponse response = (HttpWebResponse)request.GetResponse())
+            {
+                if (response.StatusCode == HttpStatusCode.OK)
+                {
+                    var dataStream = response.GetResponseStream();
+                    var reader = new StreamReader(dataStream);
+                    var responseFromServer = reader.ReadToEnd();
+                    return Newtonsoft.Json.JsonConvert.DeserializeObject<T>(responseFromServer);
+                }
+            }
+
+            return default(T);
+        }
+
         /// <summary>
         /// Gets the external request.
         /// </summary>
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/Dto/GithubLatestReleaseDTO.cs b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/Dto/GithubLatestReleaseDTO.cs
new file mode 100644
index 00000000000..8b6086a5a1f
--- /dev/null
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/Dto/GithubLatestReleaseDTO.cs
@@ -0,0 +1,22 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information
+
+namespace Dnn.PersonaBar.UI.Services.DTO
+{
+    using System.Collections.Generic;
+    using System.Runtime.Serialization;
+
+    [DataContract]
+    public class GithubLatestReleaseDTO
+    {
+        [DataMember(Name = "name")]
+        public string Name { get; set; }
+
+        [DataMember(Name = "tag_name")]
+        public string TagName { get; set; }
+
+        [DataMember(Name = "html_url")]
+        public string Url { get; set; }
+    }
+}
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/ServerSummaryController.cs b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/ServerSummaryController.cs
index d93ed627a7c..e8ada9729cb 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/ServerSummaryController.cs
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/ServerSummaryController.cs
@@ -9,7 +9,8 @@ namespace Dnn.PersonaBar.UI.Services
     using System.Net;
     using System.Net.Http;
     using System.Security.Cryptography;
-    using System.Text;
+    using System.Text;
+    using System.Text.RegularExpressions;
     using System.Web;
     using System.Web.Caching;
     using System.Web.Http;
@@ -70,10 +71,9 @@ public HttpResponseMessage GetServerInfo()
 
         [HttpGet]
         public HttpResponseMessage GetUpdateLink()
-        {
-            UpdateType updateType;
-            var url = this.NeedUpdate(out updateType) ? Upgrade.UpgradeRedirect() : string.Empty;
-
+        {
+            var url = this.UpdateUrl();
+            var updateType = url == string.Empty ? UpdateType.None : UpdateType.Normal;
             return this.Request.CreateResponse(HttpStatusCode.OK, new { Url = url, Type = updateType });
         }
 
@@ -83,72 +83,37 @@ private bool GetVisibleSetting(string settingName)
             return !portalSettings.ContainsKey(settingName)
                    || string.IsNullOrEmpty(portalSettings[settingName])
                    || portalSettings[settingName] == "true";
-        }
-
-        private bool NeedUpdate(out UpdateType updateType)
-        {
-            updateType = UpdateType.None;
-
-            if (HttpContext.Current == null || !Host.CheckUpgrade || !this.UserInfo.IsSuperUser)
-            {
-                return false;
-            }
-
-            var version = DotNetNukeContext.Current.Application.Version;
-            var request = HttpContext.Current.Request;
-
-            var imageUrl = Upgrade.UpgradeIndicator(version, request.IsLocal, request.IsSecureConnection);
-            imageUrl = Globals.AddHTTP(imageUrl.TrimStart('/'));
-
-            try
-            {
-                string hash;
-                const string cacheKey = "UpdateServiceUrlCacheKey";
-                var cachedData = DataCache.GetCache(cacheKey) as string;
-                if (cachedData != null)
-                {
-                    hash = cachedData;
-                }
-                else
-                {
-                    var webRequest = WebRequest.CreateHttp(imageUrl);
-                    webRequest.Timeout = Host.WebRequestTimeout;
-                    webRequest.UserAgent = request.UserAgent;
-                    webRequest.Referer = request.RawUrl;
-
-                    using (var stream = ((HttpWebResponse)webRequest.GetResponse()).GetResponseStream())
-                    {
-                        if (stream == null)
-                        {
-                            return false;
-                        }
-
-                        using (var sha256 = SHA256.Create())
-                        {
-                            hash =
-                                BitConverter.ToString(sha256.ComputeHash(stream)).Replace("-", string.Empty).ToLowerInvariant();
-                            DataCache.SetCache(cacheKey, hash, (DNNCacheDependency)null,
-                                Cache.NoAbsoluteExpiration, TimeSpan.FromDays(1), CacheItemPriority.Normal, null);
-                        }
-                    }
-                }
-
-                switch (hash)
-                {
-                    case NormalUpdateHash:
-                        updateType = UpdateType.Normal;
-                        return true;
-                    case CriticalUpdateHash:
-                        updateType = UpdateType.Critical;
-                        return true;
-                    default:
-                        return false;
-                }
-            }
-            catch (Exception)
-            {
-                return false;
-            }
+        }
+
+        private string UpdateUrl()
+        {
+            return CBO.GetCachedObject<string>(null, this.RetrieveUpdateUrl);
+        }
+
+        private string RetrieveUpdateUrl(CacheItemArgs args)
+        {
+            try
+            {
+                var latestRelease = Globals.GetJsonObject<DTO.GithubLatestReleaseDTO>("https://api.github.com/repos/dnnsoftware/dnn.platform/releases/latest");
+                if (latestRelease != null)
+                {
+                    var m = Regex.Match(latestRelease.TagName, @"(\d+\.\d+\.\d+)$");
+                    if (m.Success)
+                    {
+                        var latestVersion = new Version(m.Groups[1].Value);
+                        if (latestVersion.CompareTo(DotNetNukeContext.Current.Application.Version) < 0)
+                        {
+                            return latestRelease.Url;
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+            }
+
+            return string.Empty;
         }
     }
 }

From 2a6aacaafd78887427b163ed66cb6a6c6f533eb6 Mon Sep 17 00:00:00 2001
From: Peter Donker <peter@bring2mind.net>
Date: Tue, 9 Mar 2021 17:20:32 +0100
Subject: [PATCH 2/8] Add to proj

---
 .../Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.csproj           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.csproj b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.csproj
index 6a53dbddb3c..e38684143c1 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.csproj
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.csproj
@@ -119,6 +119,7 @@
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Services\Dto\GithubLatestReleaseDTO.cs" />
     <Compile Include="Services\Dto\SuggestionDto.cs" />
     <Compile Include="Services\Dto\RoleGroupDto.cs" />
     <Compile Include="Services\ServerSummaryController.cs" />

From 9861c099730f7eddee021a7bca108f0cfc4a5716 Mon Sep 17 00:00:00 2001
From: Peter Donker <peter@bring2mind.net>
Date: Tue, 9 Mar 2021 17:37:35 +0100
Subject: [PATCH 3/8] Fix to comparison

---
 .../Dnn.PersonaBar.UI/Services/ServerSummaryController.cs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/ServerSummaryController.cs b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/ServerSummaryController.cs
index e8ada9729cb..094de93d11f 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/ServerSummaryController.cs
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/ServerSummaryController.cs
@@ -87,7 +87,7 @@ private bool GetVisibleSetting(string settingName)
 
         private string UpdateUrl()
         {
-            return CBO.GetCachedObject<string>(null, this.RetrieveUpdateUrl);
+            return CBO.GetCachedObject<string>(new CacheItemArgs("DnnUpdateUrl"), this.RetrieveUpdateUrl);
         }
 
         private string RetrieveUpdateUrl(CacheItemArgs args)
@@ -101,7 +101,7 @@ private string RetrieveUpdateUrl(CacheItemArgs args)
                     if (m.Success)
                     {
                         var latestVersion = new Version(m.Groups[1].Value);
-                        if (latestVersion.CompareTo(DotNetNukeContext.Current.Application.Version) < 0)
+                        if (latestVersion.CompareTo(DotNetNukeContext.Current.Application.Version) > 0)
                         {
                             return latestRelease.Url;
                         }

From 53eb1b7bfb8f2c412bda162ddfc6fd35a9f1a626 Mon Sep 17 00:00:00 2001
From: Peter Donker <peter@bring2mind.net>
Date: Tue, 9 Mar 2021 19:16:23 +0100
Subject: [PATCH 4/8] Fixes

---
 .../Services/Dto/GithubLatestReleaseDTO.cs    |  7 ++++-
 .../Services/ServerSummaryController.cs       | 30 +++++++++++++------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/Dto/GithubLatestReleaseDTO.cs b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/Dto/GithubLatestReleaseDTO.cs
index 8b6086a5a1f..d4260a9afa5 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/Dto/GithubLatestReleaseDTO.cs
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/Dto/GithubLatestReleaseDTO.cs
@@ -4,7 +4,6 @@
 
 namespace Dnn.PersonaBar.UI.Services.DTO
 {
-    using System.Collections.Generic;
     using System.Runtime.Serialization;
 
     [DataContract]
@@ -18,5 +17,11 @@ public class GithubLatestReleaseDTO
 
         [DataMember(Name = "html_url")]
         public string Url { get; set; }
+
+        [DataMember(Name = "draft")]
+        public bool Draft { get; set; }
+
+        [DataMember(Name = "prerelease")]
+        public bool PreRelease { get; set; }
     }
 }
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/ServerSummaryController.cs b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/ServerSummaryController.cs
index 094de93d11f..d6e8bc6c996 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/ServerSummaryController.cs
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/ServerSummaryController.cs
@@ -4,7 +4,8 @@
 
 namespace Dnn.PersonaBar.UI.Services
 {
-    using System;
+    using System;
+    using System.Collections.Generic;
     using System.IO;
     using System.Net;
     using System.Net.Http;
@@ -94,23 +95,34 @@ private string RetrieveUpdateUrl(CacheItemArgs args)
         {
             try
             {
-                var latestRelease = Globals.GetJsonObject<DTO.GithubLatestReleaseDTO>("https://api.github.com/repos/dnnsoftware/dnn.platform/releases/latest");
-                if (latestRelease != null)
+                if (HttpContext.Current == null || !Host.CheckUpgrade || !this.UserInfo.IsSuperUser)
                 {
-                    var m = Regex.Match(latestRelease.TagName, @"(\d+\.\d+\.\d+)$");
-                    if (m.Success)
+                    return string.Empty;
+                }
+
+                var latestReleases = Globals.GetJsonObject<List<DTO.GithubLatestReleaseDTO>>("https://api.github.com/repos/dnnsoftware/dnn.platform/releases?per_page=5");
+                if (latestReleases != null)
+                {
+                    foreach (var release in latestReleases)
                     {
-                        var latestVersion = new Version(m.Groups[1].Value);
-                        if (latestVersion.CompareTo(DotNetNukeContext.Current.Application.Version) > 0)
+                        if (!release.Draft && !release.PreRelease)
                         {
-                            return latestRelease.Url;
+                            var m = Regex.Match(release.TagName, @"(\d+\.\d+\.\d+)$");
+                            if (m.Success)
+                            {
+                                var latestVersion = new Version(m.Groups[1].Value);
+                                if (latestVersion.CompareTo(DotNetNukeContext.Current.Application.Version) > 0)
+                                {
+                                    return release.Url;
+                                }
+                            }
                         }
                     }
                 }
             }
             catch (Exception ex)
             {
-                DotNetNuke.Services.Exceptions.Exceptions.LogException(ex);
+                Exceptions.LogException(ex);
             }
 
             return string.Empty;

From cfe04b533d9f4896ee1a60f3b2f5bed4a47bd707 Mon Sep 17 00:00:00 2001
From: Peter Donker <peter@bring2mind.net>
Date: Tue, 9 Mar 2021 23:17:22 +0100
Subject: [PATCH 5/8] Styling the result

---
 .../Services/ServerSummaryController.cs             | 13 +++++++------
 .../personaBar/App_LocalResources/PersonaBar.resx   |  6 ++++++
 .../Dnn.PersonaBar.UI/admin/personaBar/index.html   |  4 ++--
 .../admin/personaBar/scripts/main.js                |  2 +-
 .../admin/personaBar/scripts/serversummary.js       |  1 +
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/ServerSummaryController.cs b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/ServerSummaryController.cs
index d6e8bc6c996..bf1dfd3416a 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/ServerSummaryController.cs
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/ServerSummaryController.cs
@@ -58,7 +58,8 @@ public HttpResponseMessage GetServerInfo()
                     FrameworkVersion = isHost ? Globals.NETFrameworkVersion.ToString(2) : string.Empty,
                     ServerName = isHost ? Globals.ServerName : string.Empty,
                     LicenseVisible = isHost && this.GetVisibleSetting("LicenseVisible"),
-                    DocCenterVisible = this.GetVisibleSetting("DocCenterVisible"),
+                    DocCenterVisible = this.GetVisibleSetting("DocCenterVisible"),
+                    UpdateUrl = this.UpdateUrl(),
                 };
 
                 return this.Request.CreateResponse(HttpStatusCode.OK, response);
@@ -88,6 +89,11 @@ private bool GetVisibleSetting(string settingName)
 
         private string UpdateUrl()
         {
+            if (HttpContext.Current == null || !Host.CheckUpgrade || !this.UserInfo.IsSuperUser)
+            {
+                return string.Empty;
+            }
+
             return CBO.GetCachedObject<string>(new CacheItemArgs("DnnUpdateUrl"), this.RetrieveUpdateUrl);
         }
 
@@ -95,11 +101,6 @@ private string RetrieveUpdateUrl(CacheItemArgs args)
         {
             try
             {
-                if (HttpContext.Current == null || !Host.CheckUpgrade || !this.UserInfo.IsSuperUser)
-                {
-                    return string.Empty;
-                }
-
                 var latestReleases = Globals.GetJsonObject<List<DTO.GithubLatestReleaseDTO>>("https://api.github.com/repos/dnnsoftware/dnn.platform/releases?per_page=5");
                 if (latestReleases != null)
                 {
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/App_LocalResources/PersonaBar.resx b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/App_LocalResources/PersonaBar.resx
index 5251f50e654..64add7124c6 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/App_LocalResources/PersonaBar.resx
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/App_LocalResources/PersonaBar.resx
@@ -321,4 +321,10 @@
   <data name="UnlockEditMode.Text" xml:space="preserve">
     <value>Click to unlock Edit Mode.</value>
   </data>
+  <data name="Update.Text" xml:space="preserve">
+    <value>Update</value>
+  </data>
+  <data name="NewVersion.Text" xml:space="preserve">
+    <value>Get New Version</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/index.html b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/index.html
index f3049db8b6a..cfe156b715e 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/index.html
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/index.html
@@ -26,8 +26,8 @@
 <body>
     <div id="personabar-wrap">
         <div class="personabar" id="personabar">
-            <div class="personabarLogo">
-                <a class="update" target="_blank" data-bind="attr: {'href': updateLink}, html: updateText, css: {'normal-update': updateType() === 1, 'critical-update': updateType() === 2}"></a>
+            <div class="personabarLogo" data-bind="css: { 'updateLogo': updateLink().length > 0 }">
+                <a class="update" target="_blank" data-bind="visible: updateLink().length > 0, attr: {'href': updateLink}, html: updateText"></a>
             </div>
             <div id="topLevelMenu">
                 <ul class="personabarnav">
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/main.js b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/main.js
index 1d6cbeefe08..7ce161b2c2e 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/main.js
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/main.js
@@ -770,7 +770,7 @@ require(['jquery', 'knockout', 'moment', '../util', '../sf', '../config', './../
                         };
 
                         viewModel.updateText = ko.computed(function() {
-                            return viewModel.updateType() === 2 ? util.resx.PersonaBar.CriticalUpdate : util.resx.PersonaBar.NormalUpdate;
+                            return util.resx.PersonaBar.Update;
                         });
 
                         ko.applyBindings(viewModel, document.getElementById('personabar'));
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/serversummary.js b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/serversummary.js
index f41a87596a5..9612711a146 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/serversummary.js
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/serversummary.js
@@ -12,6 +12,7 @@ define(['jquery', 'knockout', 'jquery.hoverIntent.min'], function ($, ko) {
                     '<ul>' +
                         '<li class="title" data-bind="html: ProductName"></li>' +
                         '<li class="version-info" data-bind="html: ProductVersion"></li>' +
+                        '<li class="new-version-info" data-bind="visible: UpdateUrl.length > 0"><a data-bind="attr: { \'href\': UpdateUrl }, html: resx.NewVersion"></a></li>' +
                         '<li class="framework" data-bind="visible: FrameworkVersion.length > 0"><span data-bind="html: FrameworkVersion"></span><label data-bind="html: resx.Framework"></label></li>' +
                         '<li class="server-name" data-bind="visible: ServerName.length > 0"><span data-bind="html: ServerName"></span><label data-bind="html: resx.ServerName"></label></li>' +
                         '<li class="separator"></li>' +

From ccfb3d8abc3d3ad3838f47be07a7a0281b9d0b84 Mon Sep 17 00:00:00 2001
From: Peter Donker <peter@bring2mind.net>
Date: Tue, 23 Mar 2021 22:54:46 +0100
Subject: [PATCH 6/8] Implement new approach using DNN's update service

---
 DNN Platform/Library/Common/Globals.cs        | 23 -----
 .../Dnn.PersonaBar.UI.csproj                  |  2 +-
 .../Services/Dto/FrameworkQueryDTO.cs         | 28 ++++++
 .../Services/Dto/GithubLatestReleaseDTO.cs    | 27 ------
 .../Services/ServerSummaryController.cs       | 89 ++++++++++++-------
 .../App_LocalResources/PersonaBar.resx        |  4 +-
 .../admin/personaBar/index.html               |  4 +-
 .../admin/personaBar/scripts/main.js          |  8 +-
 .../admin/personaBar/scripts/serversummary.js | 10 +--
 9 files changed, 98 insertions(+), 97 deletions(-)
 create mode 100644 Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/Dto/FrameworkQueryDTO.cs
 delete mode 100644 Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/Dto/GithubLatestReleaseDTO.cs

diff --git a/DNN Platform/Library/Common/Globals.cs b/DNN Platform/Library/Common/Globals.cs
index ccac8bac40f..09414f40fbc 100644
--- a/DNN Platform/Library/Common/Globals.cs	
+++ b/DNN Platform/Library/Common/Globals.cs	
@@ -2060,29 +2060,6 @@ public static void SetFormFocus(Control control)
             }
         }
 
-        /// <summary>
-        /// Gets JSON string from url and deserializes this to type T.
-        /// </summary>
-        /// <typeparam name="T">Object type to return.</typeparam>
-        /// <param name="url">Complete url to fetch JSON data from.</param>
-        /// <returns>Object of type T</returns>
-        public static T GetJsonObject<T>(string url)
-        {
-            var request = GetExternalRequest(url);
-            using (HttpWebResponse response = (HttpWebResponse)request.GetResponse())
-            {
-                if (response.StatusCode == HttpStatusCode.OK)
-                {
-                    var dataStream = response.GetResponseStream();
-                    var reader = new StreamReader(dataStream);
-                    var responseFromServer = reader.ReadToEnd();
-                    return Newtonsoft.Json.JsonConvert.DeserializeObject<T>(responseFromServer);
-                }
-            }
-
-            return default(T);
-        }
-
         /// <summary>
         /// Gets the external request.
         /// </summary>
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.csproj b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.csproj
index e38684143c1..31e0e352dd4 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.csproj
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.csproj
@@ -119,7 +119,7 @@
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Services\Dto\GithubLatestReleaseDTO.cs" />
+    <Compile Include="Services\Dto\FrameworkQueryDTO.cs" />
     <Compile Include="Services\Dto\SuggestionDto.cs" />
     <Compile Include="Services\Dto\RoleGroupDto.cs" />
     <Compile Include="Services\ServerSummaryController.cs" />
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/Dto/FrameworkQueryDTO.cs b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/Dto/FrameworkQueryDTO.cs
new file mode 100644
index 00000000000..99a8854bea2
--- /dev/null
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/Dto/FrameworkQueryDTO.cs
@@ -0,0 +1,28 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information
+
+namespace Dnn.PersonaBar.UI.Services.DTO
+{
+    using System;
+    using System.Runtime.Serialization;
+
+    [DataContract]
+    public class FrameworkQueryDTO
+    {
+        [DataMember(Name = "UpToDate")]
+        public bool UpToDate { get; set; }
+
+        [DataMember(Name = "Version")]
+        public string Version { get; set; }
+
+        [DataMember(Name = "Url")]
+        public string Url { get; set; }
+
+        [DataMember(Name = "Critical")]
+        public bool IsCritical { get; set; }
+
+        [DataMember(Name = "Published")]
+        public DateTime Published { get; set; }
+    }
+}
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/Dto/GithubLatestReleaseDTO.cs b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/Dto/GithubLatestReleaseDTO.cs
deleted file mode 100644
index d4260a9afa5..00000000000
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/Dto/GithubLatestReleaseDTO.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information
-
-namespace Dnn.PersonaBar.UI.Services.DTO
-{
-    using System.Runtime.Serialization;
-
-    [DataContract]
-    public class GithubLatestReleaseDTO
-    {
-        [DataMember(Name = "name")]
-        public string Name { get; set; }
-
-        [DataMember(Name = "tag_name")]
-        public string TagName { get; set; }
-
-        [DataMember(Name = "html_url")]
-        public string Url { get; set; }
-
-        [DataMember(Name = "draft")]
-        public bool Draft { get; set; }
-
-        [DataMember(Name = "prerelease")]
-        public bool PreRelease { get; set; }
-    }
-}
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/ServerSummaryController.cs b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/ServerSummaryController.cs
index bf1dfd3416a..564d51e507d 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/ServerSummaryController.cs
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/ServerSummaryController.cs
@@ -17,7 +17,8 @@ namespace Dnn.PersonaBar.UI.Services
     using System.Web.Http;
 
     using Dnn.PersonaBar.Library;
-    using Dnn.PersonaBar.Library.Attributes;
+    using Dnn.PersonaBar.Library.Attributes;
+    using Dnn.PersonaBar.UI.Services.DTO;
     using DotNetNuke.Application;
     using DotNetNuke.Common;
     using DotNetNuke.Common.Utilities;
@@ -31,9 +32,6 @@ namespace Dnn.PersonaBar.UI.Services
     [MenuPermission(Scope = ServiceScope.Regular)]
     public class ServerSummaryController : PersonaBarApiController
     {
-        private const string CriticalUpdateHash = "e67b666fb40c4f304a41d1706d455c09017b7bcf4ec1e411450ebfcd2c8f12d0";
-        private const string NormalUpdateHash = "df29e1cda367bb8fa8534b5fb2415406100252dec057138b8d63cbadb44fb8e7";
-
         private enum UpdateType
         {
             None = 0,
@@ -59,7 +57,7 @@ public HttpResponseMessage GetServerInfo()
                     ServerName = isHost ? Globals.ServerName : string.Empty,
                     LicenseVisible = isHost && this.GetVisibleSetting("LicenseVisible"),
                     DocCenterVisible = this.GetVisibleSetting("DocCenterVisible"),
-                    UpdateUrl = this.UpdateUrl(),
+                    Update = this.UpdateInfo(),
                 };
 
                 return this.Request.CreateResponse(HttpStatusCode.OK, response);
@@ -71,14 +69,16 @@ public HttpResponseMessage GetServerInfo()
             }
         }
 
+        /// <summary>
+        /// Returns update information about current framework version.
+        /// </summary>
+        /// <returns>A serialized FrameworkQueryDTO object.</returns>
         [HttpGet]
-        public HttpResponseMessage GetUpdateLink()
+        public HttpResponseMessage GetUpdateInfo()
         {
-            var url = this.UpdateUrl();
-            var updateType = url == string.Empty ? UpdateType.None : UpdateType.Normal;
-            return this.Request.CreateResponse(HttpStatusCode.OK, new { Url = url, Type = updateType });
-        }
-
+            return this.Request.CreateResponse(HttpStatusCode.OK, this.UpdateInfo());
+        }
+
         private bool GetVisibleSetting(string settingName)
         {
             var portalSettings = PortalController.Instance.GetPortalSettings(this.PortalId);
@@ -87,46 +87,67 @@ private bool GetVisibleSetting(string settingName)
                    || portalSettings[settingName] == "true";
         }
 
-        private string UpdateUrl()
+        private FrameworkQueryDTO UpdateInfo()
         {
             if (HttpContext.Current == null || !Host.CheckUpgrade || !this.UserInfo.IsSuperUser)
             {
-                return string.Empty;
+                return new FrameworkQueryDTO();
             }
 
-            return CBO.GetCachedObject<string>(new CacheItemArgs("DnnUpdateUrl"), this.RetrieveUpdateUrl);
+            return CBO.GetCachedObject<FrameworkQueryDTO>(new CacheItemArgs("DnnUpdateUrl"), this.RetrieveUpdateUrl);
         }
 
-        private string RetrieveUpdateUrl(CacheItemArgs args)
+        private FrameworkQueryDTO RetrieveUpdateUrl(CacheItemArgs args)
         {
             try
             {
-                var latestReleases = Globals.GetJsonObject<List<DTO.GithubLatestReleaseDTO>>("https://api.github.com/repos/dnnsoftware/dnn.platform/releases?per_page=5");
-                if (latestReleases != null)
+                var url = $"{DotNetNukeContext.Current.Application.UpgradeUrl}/Update/FrameworkStatus";
+                url += "?core=" + Globals.FormatVersion(DotNetNukeContext.Current.Application.Version, "00", 3, string.Empty);
+                url += "&type=" + DotNetNukeContext.Current.Application.Type;
+                url += "&name=" + DotNetNukeContext.Current.Application.Name;
+                url += "&id=" + Host.GUID;
+                url += "&no=" + PortalController.Instance.GetPortals().Count;
+                url += "&os=" + Globals.FormatVersion(Globals.OperatingSystemVersion, "00", 2, string.Empty);
+                url += "&net=" + Globals.FormatVersion(Globals.NETFrameworkVersion, "00", 2, string.Empty);
+                url += "&db=" + Globals.FormatVersion(Globals.DatabaseEngineVersion, "00", 2, string.Empty);
+                var response = this.GetJsonObject<FrameworkQueryDTO>(url);
+                if (response.Version.Length == 6)
                 {
-                    foreach (var release in latestReleases)
-                    {
-                        if (!release.Draft && !release.PreRelease)
-                        {
-                            var m = Regex.Match(release.TagName, @"(\d+\.\d+\.\d+)$");
-                            if (m.Success)
-                            {
-                                var latestVersion = new Version(m.Groups[1].Value);
-                                if (latestVersion.CompareTo(DotNetNukeContext.Current.Application.Version) > 0)
-                                {
-                                    return release.Url;
-                                }
-                            }
-                        }
-                    }
+                    response.Version = $"v. {response.Version.Substring(0, 2)}.{response.Version.Substring(2, 2)}.{response.Version.Substring(4, 2)}";
                 }
+
+                return response;
             }
             catch (Exception ex)
             {
                 Exceptions.LogException(ex);
             }
 
-            return string.Empty;
-        }
+            return new FrameworkQueryDTO();
+        }
+
+        private T GetJsonObject<T>(string url)
+        {
+            var request = Globals.GetExternalRequest(url);
+            using (HttpWebResponse response = (HttpWebResponse)request.GetResponse())
+            {
+                if (response.StatusCode == HttpStatusCode.OK)
+                {
+                    var dataStream = response.GetResponseStream();
+                    var reader = new StreamReader(dataStream);
+                    var responseFromServer = reader.ReadToEnd();
+                    return Newtonsoft.Json.JsonConvert.DeserializeObject<T>(responseFromServer);
+                }
+            }
+
+            return default(T);
+        }
+
+        private string UpdateUrl()
+        {
+            var url = DotNetNukeContext.Current.Application.UpgradeUrl;
+
+            return url;
+        }
     }
 }
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/App_LocalResources/PersonaBar.resx b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/App_LocalResources/PersonaBar.resx
index 64add7124c6..43d70d09b6c 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/App_LocalResources/PersonaBar.resx
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/App_LocalResources/PersonaBar.resx
@@ -324,7 +324,7 @@
   <data name="Update.Text" xml:space="preserve">
     <value>Update</value>
   </data>
-  <data name="NewVersion.Text" xml:space="preserve">
-    <value>Get New Version</value>
+  <data name="LatestVersion.Text" xml:space="preserve">
+    <value>Latest Version</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/index.html b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/index.html
index cfe156b715e..d1fe93f3280 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/index.html
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/index.html
@@ -26,8 +26,8 @@
 <body>
     <div id="personabar-wrap">
         <div class="personabar" id="personabar">
-            <div class="personabarLogo" data-bind="css: { 'updateLogo': updateLink().length > 0 }">
-                <a class="update" target="_blank" data-bind="visible: updateLink().length > 0, attr: {'href': updateLink}, html: updateText"></a>
+            <div class="personabarLogo" data-bind="css: { 'updateLogo': !upToDate() }">
+                <a class="update" target="_blank" data-bind="visible: !upToDate(), attr: {'href': updateLink}, html: updateText, css: { 'critical': updateCritical() }"></a>
             </div>
             <div id="topLevelMenu">
                 <ul class="personabarnav">
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/main.js b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/main.js
index 7ce161b2c2e..1e26ac0fb40 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/main.js
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/main.js
@@ -754,8 +754,9 @@ require(['jquery', 'knockout', 'moment', '../util', '../sf', '../config', './../
                         var viewModel = {
                             resx: util.resx.PersonaBar,
                             menu: menuViewModel.menu,
+                            upToDate: ko.observable(true),
                             updateLink: ko.observable(''),
-                            updateType: ko.observable(0),
+                            updateCritical: ko.observable(false),
                             logOff: function() {
                                 function onLogOffSuccess() {
                                     if (typeof window.top.dnn != "undefined" && typeof window.top.dnn.PersonaBar != "undefined") {
@@ -779,9 +780,10 @@ require(['jquery', 'knockout', 'moment', '../util', '../sf', '../config', './../
 
                         util.sf.moduleRoot = 'personabar';
                         util.sf.controller = "serversummary";
-                        util.sf.getsilence('GetUpdateLink', {}, function (data) {
+                        util.sf.getsilence('GetUpdateInfo', {}, function (data) {
+                            viewModel.upToDate(data.UpToDate);
                             viewModel.updateLink(data.Url);
-                            viewModel.updateType(data.Type);
+                            viewModel.updateCritical(data.Critical);
                         });
 
                         document.addEventListener("click", function(e) {
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/serversummary.js b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/serversummary.js
index 9612711a146..f0eb3659087 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/serversummary.js
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/serversummary.js
@@ -10,11 +10,11 @@ define(['jquery', 'knockout', 'jquery.hoverIntent.min'], function ($, ko) {
             $summary = $('' +
                 '<div class="server-summary hoverSummaryMenu">' +
                     '<ul>' +
-                        '<li class="title" data-bind="html: ProductName"></li>' +
-                        '<li class="version-info" data-bind="html: ProductVersion"></li>' +
-                        '<li class="new-version-info" data-bind="visible: UpdateUrl.length > 0"><a data-bind="attr: { \'href\': UpdateUrl }, html: resx.NewVersion"></a></li>' +
-                        '<li class="framework" data-bind="visible: FrameworkVersion.length > 0"><span data-bind="html: FrameworkVersion"></span><label data-bind="html: resx.Framework"></label></li>' +
-                        '<li class="server-name" data-bind="visible: ServerName.length > 0"><span data-bind="html: ServerName"></span><label data-bind="html: resx.ServerName"></label></li>' +
+                        '<li class="border version-info"><label data-bind="html: ProductName"></label><span data-bind="html: ProductVersion"></span></li>' +
+                        '<li class="border new-version-info" data-bind="visible: !Update.UpToDate "><label data-bind="html: resx.LatestVersion"></label>' +
+                        '<span><a target="_blank" data-bind="attr: { \'href\': Update.Url }, html: Update.Version"></a><span class="update-critical" data-bind="visible: Update.Critical ">Critical</span></span></li>' +
+                        '<li class="border framework" data-bind="visible: FrameworkVersion.length > 0"><label data-bind="html: resx.Framework"></label><span data-bind="html: FrameworkVersion"></span></li>' +
+                        '<li class="border server-name" data-bind="visible: ServerName.length > 0"><label data-bind="html: resx.ServerName"></label><span data-bind="html: ServerName"></span></li>' +
                         '<li class="separator"></li>' +
                         '<li class="doc-center"><a href="https://dnndocs.com/" data-bind="html: resx.Documentation, visible: visibleCheck(\'DocCenterVisible\')" target="_blank"></a></li>' +
                         '<li id="Logout" class="logout" data-bind="html: resx.nav_Logout"></li>' +

From cfa8fd3ed4c132200b630fc3d5fa4cb907949e3e Mon Sep 17 00:00:00 2001
From: Peter Donker <peter@bring2mind.net>
Date: Wed, 24 Mar 2021 11:08:15 +0100
Subject: [PATCH 7/8] Fixes and UI tweaks

---
 .../Services/Dto/FrameworkQueryDTO.cs         |   8 +-
 .../App_LocalResources/PersonaBar.resx        |   4 +-
 .../admin/personaBar/scripts/serversummary.js | 156 +++++++++---------
 3 files changed, 85 insertions(+), 83 deletions(-)

diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/Dto/FrameworkQueryDTO.cs b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/Dto/FrameworkQueryDTO.cs
index 99a8854bea2..12b5a2d51cf 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/Dto/FrameworkQueryDTO.cs
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/Dto/FrameworkQueryDTO.cs
@@ -11,16 +11,16 @@ namespace Dnn.PersonaBar.UI.Services.DTO
     public class FrameworkQueryDTO
     {
         [DataMember(Name = "UpToDate")]
-        public bool UpToDate { get; set; }
+        public bool UpToDate { get; set; } = true;
 
         [DataMember(Name = "Version")]
-        public string Version { get; set; }
+        public string Version { get; set; } = string.Empty;
 
         [DataMember(Name = "Url")]
-        public string Url { get; set; }
+        public string Url { get; set; } = string.Empty;
 
         [DataMember(Name = "Critical")]
-        public bool IsCritical { get; set; }
+        public bool IsCritical { get; set; } = false;
 
         [DataMember(Name = "Published")]
         public DateTime Published { get; set; }
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/App_LocalResources/PersonaBar.resx b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/App_LocalResources/PersonaBar.resx
index 43d70d09b6c..a17f0da1f84 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/App_LocalResources/PersonaBar.resx
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/App_LocalResources/PersonaBar.resx
@@ -297,8 +297,8 @@
   <data name="btn_CloseDialog.Text" xml:space="preserve">
     <value>OK</value>
   </data>
-  <data name="CriticalUpdate.Text" xml:space="preserve">
-    <value>[ Critical Update ]</value>
+  <data name="Critical.Text" xml:space="preserve">
+    <value>Critical</value>
   </data>
   <data name="NormalUpdate.Text" xml:space="preserve">
     <value>[ New Update ]</value>
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/serversummary.js b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/serversummary.js
index f0eb3659087..1c748f4a897 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/serversummary.js
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/scripts/serversummary.js
@@ -1,93 +1,95 @@
 'use strict';
 define(['jquery', 'knockout', 'jquery.hoverIntent.min'], function ($, ko) {
-    var mainFrame = window.parent.document.getElementById("personaBar-iframe");
-    var personaBarWidth = 80;
-    var util = null;
+  var mainFrame = window.parent.document.getElementById("personaBar-iframe");
+  var personaBarWidth = 80;
+  var util = null;
 
-    var getSummaryContainer = function () {
-        var $summary = $('.server-summary');
-        if (!$summary.length) {
-            $summary = $('' +
-                '<div class="server-summary hoverSummaryMenu">' +
-                    '<ul>' +
-                        '<li class="border version-info"><label data-bind="html: ProductName"></label><span data-bind="html: ProductVersion"></span></li>' +
-                        '<li class="border new-version-info" data-bind="visible: !Update.UpToDate "><label data-bind="html: resx.LatestVersion"></label>' +
-                        '<span><a target="_blank" data-bind="attr: { \'href\': Update.Url }, html: Update.Version"></a><span class="update-critical" data-bind="visible: Update.Critical ">Critical</span></span></li>' +
-                        '<li class="border framework" data-bind="visible: FrameworkVersion.length > 0"><label data-bind="html: resx.Framework"></label><span data-bind="html: FrameworkVersion"></span></li>' +
-                        '<li class="border server-name" data-bind="visible: ServerName.length > 0"><label data-bind="html: resx.ServerName"></label><span data-bind="html: ServerName"></span></li>' +
-                        '<li class="separator"></li>' +
-                        '<li class="doc-center"><a href="https://dnndocs.com/" data-bind="html: resx.Documentation, visible: visibleCheck(\'DocCenterVisible\')" target="_blank"></a></li>' +
-                        '<li id="Logout" class="logout" data-bind="html: resx.nav_Logout"></li>' +
-                    '</ul>' +
-                '</div>');
+  var getSummaryContainer = function () {
+    var $summary = $('.server-summary');
+    if (!$summary.length) {
+      $summary = $('' +
+        '<div class="server-summary hoverSummaryMenu">' +
+        '<ul>' +
+        '<li class="border version-info"><label data-bind="html: ProductName"></label><span data-bind="html: ProductVersion"></span></li>' +
+        '<li class="border new-version-info" data-bind="visible: !Update.UpToDate, css: { \'critical\': Update.Critical }"><label data-bind="html: resx.LatestVersion"></label>' +
+        '<span><a target="_blank" data-bind="attr: { \'href\': Update.Url }, html: Update.Version"></a><span class="update-critical" data-bind="visible: Update.Critical, html: resx.Critical"></span></span></li>' +
+        '<li class="border framework" data-bind="visible: FrameworkVersion.length > 0"><label data-bind="html: resx.Framework"></label><span data-bind="html: FrameworkVersion"></span></li>' +
+        '<li class="border server-name" data-bind="visible: ServerName.length > 0"><label data-bind="html: resx.ServerName"></label><span data-bind="html: ServerName"></span></li>' +
+        '<li class="separator"></li>' +
+        '<li class="doc-center"><a href="https://dnndocs.com/" data-bind="html: resx.Documentation, visible: visibleCheck(\'DocCenterVisible\')" target="_blank"></a></li>' +
+        '<li id="Logout" class="logout" data-bind="html: resx.nav_Logout"></li>' +
+        '</ul>' +
+        '</div>');
 
-            $('#personabar').find('.personabarLogo').append($summary);
-        }
-
-        return $summary;
-    }
-    var showServerSummary = function () {
-        mainFrame.style.width = '100%';
-        $('.hoverSummaryMenu, .hovermenu').hide();
-        getSummaryContainer().addClass('shown');
+      $('#personabar').find('.personabarLogo').append($summary);
     }
 
-    var hideServerSummary = function () {
-        if (!$('.hovermenu:visible').length && !$('.socialpanel:visible').length) {
-            mainFrame.style.width = personaBarWidth + "px";
-        }
-        getSummaryContainer().removeClass('shown');
+    return $summary;
+  }
+  var showServerSummary = function () {
+    mainFrame.style.width = '100%';
+    $('.hoverSummaryMenu, .hovermenu').hide();
+    getSummaryContainer().addClass('shown');
+  }
+
+  var hideServerSummary = function () {
+    if (!$('.hovermenu:visible').length && !$('.socialpanel:visible').length) {
+      mainFrame.style.width = personaBarWidth + "px";
     }
+    getSummaryContainer().removeClass('shown');
+  }
 
-    var getServerInfo = function(callback) {
-        util.sf.moduleRoot = "personaBar";
-        util.sf.controller = "ServerSummary";
-        util.sf.getsilence("GetServerInfo", {}, function (data) {
-            if (typeof callback === "function") {
-                callback(data);
-            }
-        });
+  var getServerInfo = function (callback) {
+    util.sf.moduleRoot = "personaBar";
+    util.sf.controller = "ServerSummary";
+    util.sf.getsilence("GetServerInfo", {}, function (data) {
+      if (typeof callback === "function") {
+        callback(data);
+      }
+    });
+  }
+
+  var initialize = function () {
+    if (!util.resx) {
+      setTimeout(initialize, 500);
+      return;
     }
+    var $logo = $('#personabar').find('.personabarLogo');
+    var $summaryContainer = getSummaryContainer();
 
-    var initialize = function () {
-        if (!util.resx) {
-            setTimeout(initialize, 500);
-            return;
+    getServerInfo(function (info) {
+      var viewModel = $.extend({}, info, {
+        resx: util.resx.PersonaBar, visibleCheck: function (name) {
+          return info[name];
         }
-        var $logo = $('#personabar').find('.personabarLogo');
-        var $summaryContainer = getSummaryContainer();
+      });
+      try {
+        ko.applyBindings(viewModel, $summaryContainer[0]);
+      } catch (ex) {
 
-        getServerInfo(function (info) {
-            var viewModel = $.extend({}, info, { resx: util.resx.PersonaBar, visibleCheck: function(name) {
-                return info[name];
-            } });
-            try {
-                ko.applyBindings(viewModel, $summaryContainer[0]);
-            } catch (ex) {
-                
-            }
-        });
-        
-        $logo.hoverIntent({
-            over: function() {
-                showServerSummary();
-            },
-            out: function () {
-                hideServerSummary();
-            },
-            timeout: 200
-        });
-    }
+      }
+    });
 
-    return {
-        init: function (utility) {
-            util = utility;
+    $logo.hoverIntent({
+      over: function () {
+        showServerSummary();
+      },
+      out: function () {
+        hideServerSummary();
+      },
+      timeout: 200
+    });
+  }
 
-            initialize();
-        },
-        load: function () {
-        },
-        leave: function() {
-        }
+  return {
+    init: function (utility) {
+      util = utility;
+
+      initialize();
+    },
+    load: function () {
+    },
+    leave: function () {
     }
+  }
 });

From 2db85c40f8e5ec921df364d98b372056fa531502 Mon Sep 17 00:00:00 2001
From: Peter Donker <peter@bring2mind.net>
Date: Mon, 31 May 2021 22:23:06 +0200
Subject: [PATCH 8/8] Fix rebase

---
 .../admin/personaBar/css/main.css             | 60 +++++++++++++++++--
 1 file changed, 54 insertions(+), 6 deletions(-)

diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/css/main.css b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/css/main.css
index dd78ff01b3f..80bf7751d58 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/css/main.css
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/admin/personaBar/css/main.css
@@ -1,4 +1,4 @@
-@font-face {
+@font-face {
     font-family: 'pb_regular';
     src: url('open-sans.semibold.ttf') format('truetype');
     font-weight: normal;
@@ -732,27 +732,42 @@ transform: rotate(180deg);
     background-size: 32px auto;
     position: relative;
     border-bottom: 1px solid var(--dnn-color-pb-menu-divider);
+    text-align: center;
 }
+    .personabar .personabarLogo.updateLogo {
+      background-position: center 14px;
+    }
 .personabar .personabarLogo:hover {
     background-color: var(--dnn-color-pb-menu-background-hover);
 }
 .personabar .personabarLogo a.update {
     text-decoration: none;
     text-transform: uppercase;
-    font-size: 7px;
+      font-size: 10px;
     font-family: pb_semibold;
     display: none;
     position: absolute;
     bottom: 8px;
-    width: 100%;
+      width: 64px;
     text-align: center;
+      background-color: #21a3da;
+      border-radius: 3px;
+      color: #fff;
+      display: block;
+      padding: 2px;
+      margin-left: 5px;
 }
+
+      .personabar .personabarLogo a.update.critical {
+        background-color: #D63333;
+      }
+
 .personabar .personabarLogo a.update.normal-update {
     color: #21A3DA;
     display: block;
 }
 .personabar .personabarLogo a.update.critical-update {
-    color: #D9577A;
+        color: #D63333;
     display: block;
 }
 
@@ -1943,7 +1958,13 @@ div.ui-dialog-titlebar > .ui-dialog-titlebar-close:hover {
     color: #fff;
     margin-top: 18px;
     cursor: default;
+    padding-bottom: 6px;
 }
+
+    .hoverSummaryMenu ul li.border {
+      border-bottom: 1px solid #868484;
+    }
+
 .hoverSummaryMenu ul li span, .hoverSummaryMenu ul li label {
     display: block;
     line-height: 13px;
@@ -1956,8 +1977,7 @@ div.ui-dialog-titlebar > .ui-dialog-titlebar-close:hover {
 .hoverSummaryMenu ul li label {
     font-size: 12px;
     color: var(--dnn-color-pb-menu-text-highlight);
-    padding: 11px 0 18px 0;
-    border-bottom: 1px solid var(--dnn-color-pb-menu-divider);
+      padding: 2px 0 5px 0;
     text-transform: uppercase;
     -moz-word-break: break-all;
     -o-word-break: break-all;
@@ -1994,6 +2014,8 @@ div.ui-dialog-titlebar > .ui-dialog-titlebar-close:hover {
     text-decoration: none;
     cursor: pointer;
 }
+
+  .server-summary li.update a:hover,
 .server-summary li.doc-center a:hover, 
 .server-summary li.logout:hover {
     color: #FFF;
@@ -2002,6 +2024,32 @@ div.ui-dialog-titlebar > .ui-dialog-titlebar-close:hover {
     margin-top: 12px;
 }
 
+.server-summary li.new-version-info.border {
+  border-color: #21a3da;
+}
+
+.server-summary li.new-version-info label {
+  color: #21a3da;
+}
+
+.server-summary li.new-version-info.border.critical {
+  border-color: #D63333;
+}
+
+.server-summary li.new-version-info.critical label {
+  color: #D63333;
+}
+
+.server-summary li.new-version-info span.update-critical {
+  font-size: 10px;
+  background-color: #D63333;
+  color: white;
+  text-transform: uppercase;
+  border-radius: 4px;
+  padding: 2px 4px;
+  float: right;
+}
+
 /* Popup Style END */
 
 /* Dropdown Style */