L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-63660 privacy: Include CSS locally for data export

Browse Source
This commit is contained in:
Mark Johnson
2018-11-14 16:12:38 +00:00
parent 270ba66408
commit d9cab9de67
5 changed files with 17002 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.stylelintignore
+1
View File
@@ -2,6 +2,7 @@
theme/bootstrapbase/style/
theme/clean/style/custom.css
theme/more/style/custom.css
theme/boost/style/moodle.css
node_modules/
vendor/
admin/tool/policy/amd/src/jquery-eu-cookie-law-popup.js
Gruntfile.js
+2 -1
View File
@@ -214,7 +214,8 @@ module.exports = function(grunt) {
'# Generated by "grunt ignorefiles"',
'theme/bootstrapbase/style/',
'theme/clean/style/custom.css',
'theme/more/style/custom.css'
'theme/more/style/custom.css',
'theme/boost/style/moodle.css'
].concat(thirdPartyPaths);
grunt.file.write('.stylelintignore', stylelintIgnores.join('\n'));
};
privacy/classes/local/request/moodle_content_writer.php
+4 -28
View File
@@ -635,16 +635,9 @@ class moodle_content_writer implements content_writer {
$this->copy_data($moodleimgpath, ['pix', 'moodlelogo.svg']);
// Additional required css.
// Determine what direction to show the data export page according to the user preference.
$rtl = right_to_left();
if (!$rtl) {
$bootstrapdestination = 'bootstrap.min.css';
$this->write_url_content('https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css',
$bootstrapdestination);
} else {
$rtldestination = 'rtlbootstrap.min.css';
$this->write_url_content('https://cdn.rtlcss.com/bootstrap/v4.0.0/css/bootstrap.min.css', $rtldestination);
}
$csspath = ['theme', 'boost', 'style', 'moodle.css'];
$destination = ['moodle.css'];
$this->copy_data($csspath, $destination);
$csspath = ['privacy', 'export_files', 'general.css'];
$destination = ['general.css'];
@@ -666,6 +659,7 @@ class moodle_content_writer implements content_writer {
$siteurl = $CFG->wwwroot;
// Create custom index.html file.
$rtl = right_to_left();
$htmlpage = new \core_privacy\output\exported_html_page($navigationhtml, $systemname, $fullusername, $rtl, $siteurl);
$outputpage = $output->render_html_page($htmlpage);
$this->write_data('index.html', $outputpage);
@@ -720,22 +714,4 @@ class moodle_content_writer implements content_writer {
}
return $content;
}
/**
* Write url files to the export.
*
* @param string $url Url of the file.
* @param string $path Path to store the file.
*/
protected function write_url_content(string $url, string $path) {
$filepointer = fopen($url, 'r');
$targetpath = $this->path . DIRECTORY_SEPARATOR . $path;
check_dir_exists(dirname($targetpath), true, true);
$status = file_put_contents($targetpath, $filepointer);
if ($status === false) {
// There was an error. Throw an exception to allow the download status to remain as requiring download.
throw new \moodle_exception('Content download was incomplete');
}
$this->files[$path] = $targetpath;
}
}
privacy/templates/htmlpage.mustache
+1 -6
View File
@@ -49,12 +49,7 @@
<head>
<meta charset="UTF-8">
<title>Data export</title>
{{^righttoleft}}
<link rel="stylesheet" href="bootstrap.min.css">
{{/righttoleft}}
{{#righttoleft}}
<link rel="stylesheet" href="rtlbootstrap.min.css">
{{/righttoleft}}
<link rel="stylesheet" type="text/css" href="moodle.css" />
<link rel="stylesheet" type="text/css" href="general.css" />
</head>
<body>
theme/boost/style/moodle.css
+16994
View File
File diff suppressed because it is too large Load Diff