From eecb7dc093994425812d17509e0bac1ecca9e6f9 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Thu, 18 Apr 2019 13:29:28 +0800
Subject: [PATCH 1/3] MDL-65382 admin: Fix appearance of status labels

---
 admin/renderer.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/renderer.php b/admin/renderer.php
index 3bc74ec8963..922617ad278 100644
--- a/admin/renderer.php
+++ b/admin/renderer.php
@@ -1062,7 +1062,7 @@ class core_admin_renderer extends plugin_renderer_base {
 
                 if ($isstandard = $plugin->is_standard()) {
                     $row->attributes['class'] .= ' standard';
-                    $sourcelabel = html_writer::span(get_string('sourcestd', 'core_plugin'), 'sourcetext label');
+                    $sourcelabel = html_writer::span(get_string('sourcestd', 'core_plugin'), 'sourcetext badge badge-secondary');
                 } else {
                     $row->attributes['class'] .= ' extension';
                     $sourcelabel = html_writer::span(get_string('sourceext', 'core_plugin'), 'sourcetext badge badge-info');
@@ -1074,7 +1074,7 @@ class core_admin_renderer extends plugin_renderer_base {
 
                 $statuscode = $plugin->get_status();
                 $row->attributes['class'] .= ' status-' . $statuscode;
-                $statusclass = 'statustext label ';
+                $statusclass = 'statustext badge ';
                 switch ($statuscode) {
                     case core_plugin_manager::PLUGIN_STATUS_NEW:
                         $statusclass .= $dependenciesok ? 'badge-success' : 'badge-warning';
@@ -2025,7 +2025,7 @@ class core_admin_renderer extends plugin_renderer_base {
                     $messagetype = 'ok';
                     $statusclass = 'badge-success';
                 }
-                $status = html_writer::span($status, 'label ' . $statusclass);
+                $status = html_writer::span($status, 'badge ' . $statusclass);
                 // Here we'll store all the feedback found
                 $feedbacktext = '';
                 // Append the feedback if there is some

From 83d4204ef199d6b478640035f93d3c1e1ec4fd8d Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Thu, 18 Apr 2019 13:47:30 +0800
Subject: [PATCH 2/3] MDL-65382 mod_lti: Fix appearance of status labels

---
 mod/lti/templates/tool_proxy_card.mustache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/lti/templates/tool_proxy_card.mustache b/mod/lti/templates/tool_proxy_card.mustache
index b2781ebbb88..45daf6e5966 100644
--- a/mod/lti/templates/tool_proxy_card.mustache
+++ b/mod/lti/templates/tool_proxy_card.mustache
@@ -54,7 +54,7 @@
     <div class="tool-card-content">
         <div class="tool-card-header">
             <div class="tool-card-subheader">
-                <div class="tag
+                <div class="badge
                             {{#state.pending}}badge-info{{/state.pending}}
                             {{#state.configured}}badge-success{{/state.configured}}
                             {{#state.rejected}}badge-danger{{/state.rejected}}

From a0653e5c4a7e0b1ac1ac655d886ed6f845ec92fb Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Thu, 18 Apr 2019 13:47:50 +0800
Subject: [PATCH 3/3] MDL-65382 tool_dataprivacy: Fix appearance of status
 labels

---
 admin/tool/dataprivacy/classes/output/data_requests_table.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/tool/dataprivacy/classes/output/data_requests_table.php b/admin/tool/dataprivacy/classes/output/data_requests_table.php
index 303c774622c..af33f98904d 100644
--- a/admin/tool/dataprivacy/classes/output/data_requests_table.php
+++ b/admin/tool/dataprivacy/classes/output/data_requests_table.php
@@ -190,7 +190,7 @@ class data_requests_table extends table_sql {
      * @return mixed
      */
     public function col_status($data) {
-        return html_writer::span($data->statuslabel, 'label ' . $data->statuslabelclass);
+        return html_writer::span($data->statuslabel, 'badge ' . $data->statuslabelclass);
     }
 
     /**