moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 02:16:41 +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

2
admin/tool/capability/index.php
View file

@ -143,7 +143,7 @@ function print_report_tree($contextid, $contexts, $allroles) {
// If there are any role overrides here, print them.
if (!empty($contexts[$contextid]->rolecapabilities)) {
$rowcounter = 0;
echo '<table class="generaltable rolecaps"><tbody>';
echo '<table class="generaltable table-striped"><tbody>';
foreach ($allroles as $role) {
if (isset($contexts[$contextid]->rolecapabilities[$role->id])) {
$permission = $contexts[$contextid]->rolecapabilities[$role->id];

10
admin/tool/dataprivacy/templates/component_status.mustache
View file

@ -75,7 +75,7 @@
<hr />
<div class="p-l-3">
<dl class="row">
<dt class="col-xs-3">
<dt class="col-3">
{{#link}}
<a href="#{{name}}"><strong style="word-wrap:break-word">{{name}}</strong></a>
{{/link}}
@ -84,13 +84,13 @@
{{/link}}
<div class="small text-muted" style="word-wrap:break-word">{{type}}</div>
</dt>
<dd class="col-xs-9">{{summary}}</dd>
<dd class="col-9">{{summary}}</dd>
</dl>
<dl>
{{#fields}}
<div class="row">
<dt class="col-xs-3 font-weight-normal" style="word-wrap:break-word">{{field_name}}</dt>
<dd class="col-xs-9">{{field_summary}}</dd>
<dt class="col-3 font-weight-normal" style="word-wrap:break-word">{{field_name}}</dt>
<dd class="col-9">{{field_summary}}</dd>
</div>
{{/fields}}
</dl>
@ -100,7 +100,7 @@
<hr />
<div class="p-l-3">
<div class="row">
<div class="col-xs-12">
<div class="col-12">
{{nullprovider}}
</div>
</div>

2
admin/tool/filetypes/renderer.php
View file

@ -52,7 +52,7 @@ class tool_filetypes_renderer extends plugin_renderer_base {
$out = $this->heading(get_string('pluginname', 'tool_filetypes'));
if ($restricted) {
$out .= html_writer::div(
html_writer::div(get_string('configoverride', 'admin'), 'form-overridden'),
html_writer::div(get_string('configoverride', 'admin'), 'alert alert-info'),
'', array('id' => 'adminsettings'));
}
if (count($combined) > 1) {

7
admin/tool/filetypes/styles.css
View file

@ -23,10 +23,3 @@
.path-admin-tool-filetypes .generaltable .nonstandard {
font-weight: bold;
}
/* Spacing around the 'Defined in config.php' stripe */
.path-admin-tool-filetypes .form-overridden {
display: inline-block;
margin-bottom: 1em;
padding: 4px 6px;
}

3
admin/tool/xmldb/actions/main_view/main_view.class.php
View file

@ -120,7 +120,8 @@ class main_view extends XMLDBAction {
$result = $this->launch('get_db_directories');
// Display list of DB directories if everything is ok
if ($result && !empty($XMLDB->dbdirs)) {
$o .= '<table id="listdirectories" border="0" cellpadding="5" cellspacing="1" class="admintable generaltable">';
$o .= '<table id="listdirectories" border="0" cellpadding="5" cellspacing="1"' .
' class="table-striped table-sm admintable generaltable">';
$row = 0;
foreach ($XMLDB->dbdirs as $key => $dbdir) {
// Detect if this is the lastused dir