From c89d7f92f6eeb687649ae479e8e29693d02e4a24 Mon Sep 17 00:00:00 2001
From: Thomas Hochstein <thh@inter.net>
Date: Sat, 28 Mar 2020 15:12:50 +0100
Subject: [PATCH] Dashboard: Merge s9y and plugin update notifications.

Display either or both in one section.

Set dashboard_widget class to aid formatting.

Signed-off-by: Thomas Hochstein <thh@inter.net>
---
 templates/2k11/admin/overview.inc.tpl | 47 ++++++++++-----------------
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/templates/2k11/admin/overview.inc.tpl b/templates/2k11/admin/overview.inc.tpl
index 8306b7a72..314b355e4 100644
--- a/templates/2k11/admin/overview.inc.tpl
+++ b/templates/2k11/admin/overview.inc.tpl
@@ -13,37 +13,26 @@
         <hr class="separator">
     {/if}
 
-    {if $updateCheck == "stable" || $updateCheck == "beta"}
-        {if $curVersion == -1}
-            <section id="dashboard_update">
-                <h3>{$CONST.UPDATE_NOTIFICATION}</h3>
-
-                <span class="msg_notice"><span class="icon-info-circled" aria-hidden="true"></span> {$CONST.UPDATE_FAILMSG}</span>
-                <form id="updateCheckDisable" method="POST">
-                    <input type="hidden" name="serendipity[adminAction]" value="updateCheckDisable" />
-                    {$token}
-                    <button type="submit">{$CONST.UPDATE_FAILACTION}</button>
-                </form>
-            </section>
-            <hr class="separator">
-        {else if $update}
-            <section id="dashboard_update">
-                <h3>{$CONST.UPDATE_NOTIFICATION}</h3>
-
-                <span class="msg_notice"><span class="icon-info-circled" aria-hidden="true"></span> {$CONST.NEW_VERSION_AVAILABLE} {$curVersion|escape}</span>
-                {$updateButton}
-            </section>
-            <hr class="separator">
-        {/if}
-    {/if}
-
-    {if $pluginUpdates}
-        <section id="dashboard_plugin_updates">
+    {if (($updateCheck == "stable" || $updateCheck == "beta") && ($curVersion == -1 || $update)) || $pluginUpdates}
+        <section id="dashboard_update" class="dashboard_widget">
             <h3>{$CONST.UPDATE_NOTIFICATION}</h3>
-
-            <span class="msg_notice"><span class="icon-info-circled" aria-hidden="true"></span> {$pluginUpdates|escape}</span>
+            {if $updateCheck == "stable" || $updateCheck == "beta"}
+                {if $curVersion == -1}
+                    <span class="msg_notice"><span class="icon-info-circled" aria-hidden="true"></span> {$CONST.UPDATE_FAILMSG}</span>
+                    <form id="updateCheckDisable" method="POST">
+                        <input type="hidden" name="serendipity[adminAction]" value="updateCheckDisable" />
+                        {$token}
+                        <button type="submit">{$CONST.UPDATE_FAILACTION}</button>
+                    </form>
+                {else if $update}
+                    <span class="msg_notice"><span class="icon-info-circled" aria-hidden="true"></span> {$CONST.NEW_VERSION_AVAILABLE} {$curVersion|escape}</span>
+                    {$updateButton}
+                {/if}
+            {/if}
+            {if $pluginUpdates}
+                <span class="msg_notice"><span class="icon-info-circled" aria-hidden="true"></span> {$pluginUpdates}</span>
+            {/if}
         </section>
-        <hr class="separator">
     {/if}
 
     {if $no_create !== true}