Commit f7b443c7 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

HTML export to use new path to plugin templates (Bug #1417319)



- also updated the location of the file/folder icons so that one can
test/verify this patch.

Note: this patch doesn't fix all the problems of html export but does
fix the regression of where the html export would never complete

Change-Id: I8096e82cfde3dd2f060a05cc6157b201306089e6
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent 393e1608
......@@ -500,7 +500,11 @@ class PluginExportHtml extends PluginExport {
if (!check_dir_exists($staticdir . $destinationdir)) {
$SESSION->add_error_msg(get_string('couldnotcreatestaticdirectory', 'export', $destinationdir));
}
$directoriestocopy[get_config('docroot') . 'artefact/' . $dir] = $staticdir . $destinationdir;
foreach ($themestaticdirs as $theme => $themedir) {
if (file_exists(get_config('docroot') . 'theme/' . $theme . '/' . $dir)) {
$directoriestocopy[get_config('docroot') . 'theme/' . $theme . '/' . $dir] = $staticdir . $destinationdir;
}
}
}
foreach ($directoriestocopy as $from => $to) {
......
......@@ -20,7 +20,7 @@
</tr>
{if $folder != '/'}
<tr class="{cycle values='r0,r1'}">
<td><img src="{$rootpath}static/file/theme/raw/static/images/folder.png" alt="{str tag=Folder section=artefact.file}"></td>
<td><img src="{$rootpath}static/artefact/file/static/images/folder.png" alt="{str tag=Folder section=artefact.file}"></td>
<td><a href="../index.html">{str tag=parentfolder section=artefact.file}</a></td>
<td>{str tag=parentfolder section=artefact.file}</td>
<td></td>
......@@ -29,7 +29,7 @@
{/if}
{foreach from=$folders item=folder}
<tr class="{cycle values='r0,r1'}">
<td><img src="{$rootpath}static/file/theme/raw/static/images/folder.png" alt="{str tag=Folder section=artefact.file}"></td>
<td><img src="{$rootpath}static/artefact/file/static/images/folder.png" alt="{str tag=Folder section=artefact.file}"></td>
<td><a href="{$folder.path|rawurlencode|safe}/index.html">{$folder.title}</a></td>
<td>{$folder.description}</td>
<td>{$folder.size}</td>
......@@ -38,7 +38,7 @@
{/foreach}
{foreach from=$files item=file}
<tr class="{cycle values='r0,r1'}">
<td><img src="{$rootpath}static/file/theme/raw/static/images/file.png" alt="{str tag=File section=artefact.file}"></td>
<td><img src="{$rootpath}static/artefact/file/static/images/file.png" alt="{str tag=File section=artefact.file}"></td>
<td><a href="{$file.path|rawurlencode|safe}">{$file.title}</a></td>
<td>{$file.description}</td>
<td>{$file.size}</td>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment