Merge branch 'MDL-65382-master' of git://github.com/junpataleta/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2019-04-24 00:04:45 +02:00
commit fc8a72b4cb
3 changed files with 5 additions and 5 deletions

View File

@ -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

View File

@ -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);
}
/**

View File

@ -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}}