diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc
index f9c49c7..52b0137 100644
--- a/core/modules/system/system.admin.inc
+++ b/core/modules/system/system.admin.inc
@@ -146,6 +146,12 @@ function template_preprocess_status_report(&$variables) {
),
);
+ // Count number of items with different severity for summary.
+ $counters = array('error', 'warning', 'info');
+ foreach ($counters as $counter) {
+ $variables[$counter] = 0;
+ }
+
foreach ($variables['requirements'] as $i => $requirement) {
// Always use the explicit requirement severity, if defined. Otherwise,
// default to REQUIREMENT_OK in the installer to visually confirm that
@@ -162,6 +168,10 @@ function template_preprocess_status_report(&$variables) {
}
$variables['requirements'][$i]['severity_title'] = $severity['title'];
$variables['requirements'][$i]['severity_status'] = $severity['status'];
+
+ if (in_array($severity['status'], $counters)) {
+ $variables[$severity['status']]++;
+ }
}
}
diff --git a/core/modules/system/templates/status-report.html.twig b/core/modules/system/templates/status-report.html.twig
index b6ad739..d7e581a 100644
--- a/core/modules/system/templates/status-report.html.twig
+++ b/core/modules/system/templates/status-report.html.twig
@@ -11,12 +11,53 @@
* - description: (optional) The requirement's description.
* - severity_title: The title of the severity.
* - severity_status: Indicates the severity status.
+ * - error: number of errors found if any
+ * - warning: number of warnings found if any
+ * - info: number of items which are neither errors nor warnings
*
* @see template_preprocess_status_report()
*
* @ingroup themeable
*/
#}
+{% if error != 0 and warning != 0 and info != 0 %}
+
+
+
+ {{ error }} {{'error'|t }}
+
+
+
+
+
+ {{ warning }} {{ 'warning'|t }}
+
+
+
+
+
+ {{ info }} {{ 'checked'|t }}
+
+
+{% elseif error != 0 and checked != 0 %}
+
+ {{ error }} {{'error'|t }}
+
+
+ {{ info }} {{ 'checked'|t }}
+
+{% elseif warning != 0 and checked != 0 %}
+
+ {{ warning }} {{ 'warning'|t }}
+
+
+ {{ info }} {{ 'checked'|t }}
+
+{% else %}
+
+ {{ info }} {{ 'checked'|t }}
+
+{% endif %}
{% for requirement in requirements %}
diff --git a/core/themes/stable/css/system/system.admin.css b/core/themes/stable/css/system/system.admin.css
index c8e20cf..d8930c9 100644
--- a/core/themes/stable/css/system/system.admin.css
+++ b/core/themes/stable/css/system/system.admin.css
@@ -200,39 +200,6 @@ small .admin-link:after {
background-position: top 50% right 0;
}
-/* Status report. */
-.system-status-report__status-title {
- position: relative;
- vertical-align: top;
- width: 25%;
- padding: 10px 6px 10px 40px; /* LTR */
- box-sizing: border-box;
- font-weight: normal;
-}
-[dir="rtl"] .system-status-report__status-title {
- padding: 10px 40px 10px 6px;
-}
-.system-status-report__status-icon:before {
- content: "";
- background-repeat: no-repeat;
- height: 16px;
- width: 16px;
- display: block;
- position: absolute;
- left: 12px; /* LTR */
- top: 12px;
-}
-[dir="rtl"] .system-status-report__status-icon:before {
- left: auto;
- right: 12px;
-}
-.system-status-report__status-icon--error:before {
- background-image: url(../../images/core/icons/e32700/error.svg);
-}
-.system-status-report__status-icon--warning:before {
- background-image: url(../../images/core/icons/e29700/warning.svg);
-}
-
/**
* Appearance page.
*/
@@ -387,3 +354,105 @@ small .admin-link:after {
[dir="rtl"] .system-themes-admin-form {
clear: right;
}
+
+/**
+ * Status report.
+ */
+.system-status-report__status-title {
+ position: relative;
+ vertical-align: top;
+ width: 25%;
+ padding: 10px 6px;
+ box-sizing: border-box;
+ font-weight: normal;
+}
+.system-status-report__status-icon:before {
+ content: "";
+ background-repeat: no-repeat;
+ height: 16px;
+ width: 16px;
+ display: block;
+ float: left; /* LTR */
+}
+[dir="rtl"] .system-status-report__status-icon:before {
+ float: right;
+}
+.system-status-report .system-status-report__status-icon:before {
+ margin-right: 10px; /* LTR */
+}
+[dir="rtl"] .system-status-report .system-status-report__status-icon:before {
+ margin-left: 10px;
+}
+.system-status-report__status-icon--error:before {
+ background-image: url(../../images/core/icons/e32700/error.svg);
+}
+.system-status-report__status-icon--warning:before {
+ background-image: url(../../images/core/icons/e29700/warning.svg);
+}
+.system-status-report__status-icon--checked:before {
+ background-image: url(../../images/core/icons/73b355/check.svg);
+}
+.system-status-report-counter {
+ border: 1px solid #e6e4df;
+ margin: 10px 15px 20px 0; /* LTR */
+ border-radius: 5px;
+ height: 85px;
+ vertical-align: middle;
+ line-height: 85px;
+ font-size: 20px;
+ font-weight: bold;
+}
+[dir="rtl"].system-status-report-counter {
+ margin: 10px 0 20px 15px;
+}
+[dir="ltr"] .system-status-report-counter:nth-child(3) {
+ margin-right: 0;
+}
+[dir="rtl"] .system-status-report-counter:nth-child(1) {
+ margin-right: 0;
+}
+span.all-exits.system-status-report-counter {
+ width: 32.1%;
+ display: inline-block;
+}
+.system-status-report-counter .system-status-report__status-icon:before {
+ background-size: 35px;
+ background-position: 50% center;
+ width: 100%;
+ height: 100%;
+ left: 0;
+ top: 0;
+}
+.system-status-report-counter .system-status-report__status-icon {
+ display: inline-block;
+ height: 85px;
+ border-right: 1px solid #e6e4df; /* LTR */
+ border-left: 0; /* LTR */
+}
+[dir="rtl"] .system-status-report-counter .system-status-report__status-icon {
+ border-right: 0;
+ border-left: 1px solid #e6e4df;
+}
+.er-wr-detail {
+ display: inline-block;
+ padding: 0 5px;
+ height: 85px;
+}
+/**
+ * Status report for mobile.
+ */
+@media screen and (max-width: 48em) {
+ [dir="rtl"] .system-status-report__status-icon:before {
+ right: 0;
+ }
+ span.all-exits.system-status-report-counter {
+ width: 100%;
+ }
+ .system-status-report-counter {
+ margin: 10px 0;
+ }
+ .system-status-report {
+ table-layout: fixed;
+ word-wrap: break-word;
+ }
+}
diff --git a/core/themes/stable/templates/admin/status-report.html.twig b/core/themes/stable/templates/admin/status-report.html.twig
index 7f4c600..8ce6814 100644
--- a/core/themes/stable/templates/admin/status-report.html.twig
+++ b/core/themes/stable/templates/admin/status-report.html.twig
@@ -11,10 +11,51 @@
* - description: (optional) The requirement's description.
* - severity_title: The title of the severity.
* - severity_status: Indicates the severity status.
+ * - error: number of errors found if any
+ * - warning: number of warnings found if any
+ * - info: number of items which are neither errors nor warnings
*
* @see template_preprocess_status_report()
*/
#}
+{% if error != 0 and warning != 0 and info != 0 %}
+
+
+
+ {{ error }} {{'error'|t }}
+
+
+
+
+
+ {{ warning }} {{ 'warning'|t }}
+
+
+
+
+
+ {{ info }} {{ 'checked'|t }}
+
+
+ {% elseif error != 0 and checked != 0 %}
+
+ {{ error }} {{'error'|t }}
+
+
+ {{ info }} {{ 'checked'|t }}
+
+ {% elseif warning != 0 and checked != 0 %}
+
+ {{ warning }} {{ 'warning'|t }}
+
+
+ {{ info }} {{ 'checked'|t }}
+
+ {% else %}
+
+ {{ info }} {{ 'checked'|t }}
+
+{% endif %}
{% for requirement in requirements %}