moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-66999-master' of git://github.com/bmbrands/moodle

Browse source
This commit is contained in:
Adrian Greeve 2019-12-23 14:26:39 +08:00
commit f00542c485
69 changed files with 1487 additions and 2168 deletions
Download patch file Download diff file Expand all files Collapse all files

20
report/backups/index.php
View file

@ -63,13 +63,13 @@ if ($courseid) {
// Get the backup status.
if ($backup->status == backup::STATUS_FINISHED_OK) {
$status = $strok;
$statusclass = 'backup-ok'; // Green.
$statusclass = 'table-success'; // Green.
} else if ($backup->status == backup::STATUS_AWAITING || $backup->status == backup::STATUS_EXECUTING) {
$status = $strunfinished;
$statusclass = 'backup-unfinished'; // Red.
$statusclass = 'table-danger'; // Red.
} else { // Else show error.
$status = $strerror;
$statusclass = 'backup-error'; // Red.
$statusclass = 'table-danger'; // Red.
}
$table = new html_table();
@ -140,25 +140,25 @@ foreach ($rs as $backuprow) {
// Prepare a cell to display the status of the entry.
if ($backuprow->laststatus == backup_cron_automated_helper::BACKUP_STATUS_OK) {
$status = $strok;
$statusclass = 'backup-ok'; // Green.
$statusclass = 'table-success'; // Green.
} else if ($backuprow->laststatus == backup_cron_automated_helper::BACKUP_STATUS_UNFINISHED) {
$status = $strunfinished;
$statusclass = 'backup-unfinished'; // Red.
$statusclass = 'table-danger'; // Red.
} else if ($backuprow->laststatus == backup_cron_automated_helper::BACKUP_STATUS_SKIPPED) {
$status = $strskipped;
$statusclass = 'backup-skipped'; // Green.
$statusclass = 'table-success'; // Green.
} else if ($backuprow->laststatus == backup_cron_automated_helper::BACKUP_STATUS_WARNING) {
$status = $strwarning;
$statusclass = 'backup-warning'; // Orange.
$statusclass = 'table-warning'; // Orange.
} else if ($backuprow->laststatus == backup_cron_automated_helper::BACKUP_STATUS_NOTYETRUN) {
$status = $strnotyetrun;
$statusclass = 'backup-notyetrun';
$statusclass = 'table-success';
} else if ($backuprow->laststatus == backup_cron_automated_helper::BACKUP_STATUS_QUEUED) {
$status = $strqueued;
$statusclass = 'backup-queued';
$statusclass = 'table-success';
} else {
$status = $strerror;
$statusclass = 'backup-error'; // Red.
$statusclass = 'table-danger'; // Red.
}
$status = new html_table_cell($status);
$status->attributes = array('class' => $statusclass);

6
report/insights/templates/insight.mustache
View file

@ -46,16 +46,16 @@
}
}}
<tr data-prediction-id="{{predictionid}}" class="d-flex">
<td class="insight-checkbox-cell col-xs-1{{^bulkactions}} hidden{{/bulkactions}}">
<td class="insight-checkbox-cell col-1{{^bulkactions}} hidden{{/bulkactions}}">
{{{toggleslave}}}
</td>
<td class="col-xs-8">
<td class="col-8">
{{#sampleimage}}
{{{sampleimage}}}
{{/sampleimage}}
{{{sampledescription}}}
</td>
<td class="col-xs-3{{^actions}} hidden{{/actions}}">
<td class="col-3{{^actions}} hidden{{/actions}}">
{{#actions}}
{{> core/action_menu}}
{{/actions}}

6
report/insights/templates/insight_details.mustache
View file

@ -108,9 +108,9 @@
{{/showpredictionheading}}
<thead>
<tr class="d-flex">
<th scope="col" class="col-xs-1{{^bulkactions}} hidden{{/bulkactions}}">{{{hiddencheckboxtoggleall}}}</th>
<th scope="col" class="col-xs-8">{{#str}}description{{/str}}</th>
<th scope="col" class="col-xs-3{{^actions}} hidden{{/actions}}">{{#str}}actions{{/str}}</th>
<th scope="col" class="col-1{{^bulkactions}} hidden{{/bulkactions}}">{{{hiddencheckboxtoggleall}}}</th>
<th scope="col" class="col-8">{{#str}}description{{/str}}</th>
<th scope="col" class="col-3{{^actions}} hidden{{/actions}}">{{#str}}actions{{/str}}</th>
</tr>
</thead>
<tbody>

2
report/log/classes/table_log.php
View file

@ -59,7 +59,7 @@ class report_log_table_log extends table_sql {
public function __construct($uniqueid, $filterparams = null) {
parent::__construct($uniqueid);
$this->set_attribute('class', 'reportlog generaltable generalbox');
$this->set_attribute('class', 'reportlog generaltable generalbox table-sm');
$this->filterparams = $filterparams;
// Add course column if logs are displayed for site.
$cols = array();

2
report/loglive/classes/table_log.php
View file

@ -64,7 +64,7 @@ class report_loglive_table_log extends table_sql {
public function __construct($uniqueid, $filterparams = null) {
parent::__construct($uniqueid);
$this->set_attribute('class', 'reportloglive generaltable generalbox');
$this->set_attribute('class', 'reportloglive generaltable table-sm');
$this->set_attribute('aria-live', 'polite');
$this->filterparams = $filterparams;
// Add course column if logs are displayed for site.

8
report/performance/locallib.php
View file

@ -117,10 +117,10 @@ class report_performance {
*/
public function add_issue_to_table(&$table, $issueresult, $detailed = false) {
global $OUTPUT;
$statusarr = array(self::REPORT_PERFORMANCE_OK => 'statusok',
self::REPORT_PERFORMANCE_WARNING => 'statuswarning',
self::REPORT_PERFORMANCE_SERIOUS => 'statusserious',
self::REPORT_PERFORMANCE_CRITICAL => 'statuscritical');
$statusarr = array(self::REPORT_PERFORMANCE_OK => 'badge badge-success',
self::REPORT_PERFORMANCE_WARNING => 'badge badge-warning',
self::REPORT_PERFORMANCE_SERIOUS => 'badge badge-danger',
self::REPORT_PERFORMANCE_CRITICAL => 'badge badge-danger');
$row = array();
if ($detailed) {

10
report/security/index.php
View file

@ -51,11 +51,11 @@ echo $OUTPUT->heading(get_string('pluginname', 'report_security'));
echo '<div id="timewarning">'.get_string('timewarning', 'report_security').'</div>';
$strok = '<span class="statusok">'.get_string('statusok', 'report_security').'</span>';
$strinfo = '<span class="statusinfo">'.get_string('statusinfo', 'report_security').'</span>';
$strwarning = '<span class="statuswarning">'.get_string('statuswarning', 'report_security').'</span>';
$strserious = '<span class="statusserious">'.get_string('statusserious', 'report_security').'</span>';
$strcritical = '<span class="statuscritical">'.get_string('statuscritical', 'report_security').'</span>';
$strok = '<span class="badge badge-success">'.get_string('statusok', 'report_security').'</span>';
$strinfo = '<span class="badge badge-info">'.get_string('statusinfo', 'report_security').'</span>';
$strwarning = '<span class="badge badge-warning">'.get_string('statuswarning', 'report_security').'</span>';
$strserious = '<span class="badge badge-danger">'.get_string('statusserious', 'report_security').'</span>';
$strcritical = '<span class="badge badge-danger">'.get_string('statuscritical', 'report_security').'</span>';
$strissue = get_string('issue', 'report_security');
$strstatus = get_string('status', 'report_security');