<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[54165] trunk/src: Site health: Add a menu bubble with the critical issues count to the Tools -> Site Health submenu.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/54165">54165</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/54165","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-09-14 21:12:12 +0000 (Wed, 14 Sep 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Site health: Add a menu bubble with the critical issues count to the Tools -> Site Health submenu.
Props: Clorith
See: <a href="https://core.trac.wordpress.org/ticket/56199">#56199</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueuesadminsitehealthjs">trunk/src/js/_enqueues/admin/site-health.js</a></li>
<li><a href="#trunksrcwpadmincssadminmenucss">trunk/src/wp-admin/css/admin-menu.css</a></li>
<li><a href="#trunksrcwpadmincsscolors_adminscss">trunk/src/wp-admin/css/colors/_admin.scss</a></li>
<li><a href="#trunksrcwpadminmenuphp">trunk/src/wp-admin/menu.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueuesadminsitehealthjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/admin/site-health.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/site-health.js 2022-09-14 20:49:46 UTC (rev 54164)
+++ trunk/src/js/_enqueues/admin/site-health.js 2022-09-14 21:12:12 UTC (rev 54165)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,6 +15,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> isStatusTab = $( '.health-check-body.health-check-status-tab' ).length,
</span><span class="cx" style="display: block; padding: 0 10px"> isDebugTab = $( '.health-check-body.health-check-debug-tab' ).length,
</span><span class="cx" style="display: block; padding: 0 10px"> pathsSizesSection = $( '#health-check-accordion-block-wp-paths-sizes' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ menuCounterWrapper = $( '#adminmenu .site-health-counter' ),
+ menuCounter = $( '#adminmenu .site-health-counter .count' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> successTimeout;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Debug information copy section.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,8 +166,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $( '.site-health-issue-count-title', issueWrapper ).html( heading );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ menuCounter.text( SiteHealth.site_status.issues.critical );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 0 < parseInt( SiteHealth.site_status.issues.critical, 0 ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#health-check-issues-critical' ).removeClass( 'hidden' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ menuCounterWrapper.removeClass( 'count-0' );
+ } else {
+ menuCounterWrapper.addClass( 'count-0' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 < parseInt( SiteHealth.site_status.issues.recommended, 0 ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#health-check-issues-recommended' ).removeClass( 'hidden' );
</span></span></pre></div>
<a id="trunksrcwpadmincssadminmenucss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/admin-menu.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/admin-menu.css 2022-09-14 20:49:46 UTC (rev 54164)
+++ trunk/src/wp-admin/css/admin-menu.css 2022-09-14 21:12:12 UTC (rev 54165)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -427,6 +427,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* @todo: consider to use a single rule for these counters and the list table comments counters. */
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#adminmenu .menu-counter,
</ins><span class="cx" style="display: block; padding: 0 10px"> #adminmenu .awaiting-mod,
</span><span class="cx" style="display: block; padding: 0 10px"> #adminmenu .update-plugins {
</span><span class="cx" style="display: block; padding: 0 10px"> display: inline-block;
</span></span></pre></div>
<a id="trunksrcwpadmincsscolors_adminscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/colors/_admin.scss</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/colors/_admin.scss 2022-09-14 20:49:46 UTC (rev 54164)
+++ trunk/src/wp-admin/css/colors/_admin.scss 2022-09-14 21:12:12 UTC (rev 54165)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -350,6 +350,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Admin Menu: bubble */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#adminmenu .menu-counter,
</ins><span class="cx" style="display: block; padding: 0 10px"> #adminmenu .awaiting-mod,
</span><span class="cx" style="display: block; padding: 0 10px"> #adminmenu .update-plugins {
</span><span class="cx" style="display: block; padding: 0 10px"> color: $menu-bubble-text;
</span></span></pre></div>
<a id="trunksrcwpadminmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/menu.php 2022-09-14 20:49:46 UTC (rev 54164)
+++ trunk/src/wp-admin/menu.php 2022-09-14 21:12:12 UTC (rev 54165)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,11 +342,37 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$site_health_count = '';
+if ( ! is_multisite() && current_user_can( 'view_site_health_checks' ) ) {
+ $get_issues = get_transient( 'health-check-site-status-result' );
+
+ $issue_counts = array();
+
+ if ( false !== $get_issues ) {
+ $issue_counts = json_decode( $get_issues, true );
+ }
+
+ if ( ! is_array( $issue_counts ) || ! $issue_counts ) {
+ $issue_counts = array(
+ 'good' => 0,
+ 'recommended' => 0,
+ 'critical' => 0,
+ );
+ }
+
+ $site_health_count = sprintf(
+ '<span class="menu-counter site-health-counter count-%s"><span class="count">%s</span></span>',
+ $issue_counts['critical'],
+ number_format_i18n( $issue_counts['critical'] )
+ );
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $menu[75] = array( __( 'Tools' ), 'edit_posts', 'tools.php', '', 'menu-top menu-icon-tools', 'menu-tools', 'dashicons-admin-tools' );
</span><span class="cx" style="display: block; padding: 0 10px"> $submenu['tools.php'][5] = array( __( 'Available Tools' ), 'edit_posts', 'tools.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $submenu['tools.php'][10] = array( __( 'Import' ), 'import', 'import.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $submenu['tools.php'][15] = array( __( 'Export' ), 'export', 'export.php' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $submenu['tools.php'][20] = array( __( 'Site Health' ), 'view_site_health_checks', 'site-health.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: Number of critical Site Health checks. */
+ $submenu['tools.php'][20] = array( sprintf( __( 'Site Health %s' ), $site_health_count ), 'view_site_health_checks', 'site-health.php' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $submenu['tools.php'][25] = array( __( 'Export Personal Data' ), 'export_others_personal_data', 'export-personal-data.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $submenu['tools.php'][30] = array( __( 'Erase Personal Data' ), 'erase_others_personal_data', 'erase-personal-data.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() && ! is_main_site() ) {
</span></span></pre>
</div>
</div>
</body>
</html>