';
- $content .= $this->htmllize_tree($tree, array('files' => array(), 'subdirs' => array($tree->dir)));
- $content .= '
';
- $showexpanded = true;
- if (empty($tree->folder->showexpanded)) {
- $showexpanded = false;
- }
- $this->page->requires->js_init_call('M.mod_folder.init_tree', array($id, $showexpanded));
- return $content;
+ return $this->render_from_template('mod_folder/folder', $data);
}
/**
* Internal function - creates htmls structure suitable for YUI tree.
+ *
+ * @deprecated since Moodle 4.3
*/
protected function htmllize_tree($tree, $dir) {
global $CFG;
+ debugging(
+ 'Method htmllize_tree() is deprecated. Please use renderable_tree_elements instead',
+ DEBUG_DEVELOPER
+ );
+
if (empty($dir['subdirs']) and empty($dir['files'])) {
return '';
}
@@ -123,14 +110,14 @@ class mod_folder_renderer extends plugin_renderer_base {
foreach ($dir['subdirs'] as $subdir) {
$image = $this->output->pix_icon(file_folder_icon(), $subdir['dirname'], 'moodle');
$filename = html_writer::tag('span', $image, array('class' => 'fp-icon')).
- html_writer::tag('span', s($subdir['dirname']), array('class' => 'fp-filename'));
+ html_writer::tag('span', s($subdir['dirname']), array('class' => 'fp-filename'));
$filename = html_writer::tag('div', $filename, array('class' => 'fp-filename-icon'));
$result .= html_writer::tag('li', $filename. $this->htmllize_tree($tree, $subdir));
}
foreach ($dir['files'] as $file) {
$filename = $file->get_filename();
$url = moodle_url::make_pluginfile_url($file->get_contextid(), $file->get_component(),
- $file->get_filearea(), $file->get_itemid(), $file->get_filepath(), $filename, false);
+ $file->get_filearea(), $file->get_itemid(), $file->get_filepath(), $filename, false);
$filenamedisplay = clean_filename($filename);
if (file_extension_in_typegroup($filename, 'web_image')) {
$image = $url->out(false, array('preview' => 'tinyicon', 'oid' => $file->get_timemodified()));
@@ -139,7 +126,7 @@ class mod_folder_renderer extends plugin_renderer_base {
$image = $this->output->pix_icon(file_file_icon($file), $filenamedisplay, 'moodle');
}
$filename = html_writer::tag('span', $image, array('class' => 'fp-icon')).
- html_writer::tag('span', $filenamedisplay, array('class' => 'fp-filename'));
+ html_writer::tag('span', $filenamedisplay, array('class' => 'fp-filename'));
$urlparams = null;
if ($tree->folder->forcedownload) {
$urlparams = ['forcedownload' => 1];
@@ -154,6 +141,57 @@ class mod_folder_renderer extends plugin_renderer_base {
return $result;
}
+
+ /**
+ * Internal function - Creates elements structure suitable for mod_folder/folder template.
+ *
+ * @param folder_tree $tree The folder tree to work with.
+ * @param array $dir The subdir and files structure to convert into a tree.
+ * @return array The structure to be rendered by mod_folder/folder template.
+ */
+ protected function renderable_tree_elements(folder_tree $tree, array $dir): array {
+ if (empty($dir['subdirs']) && empty($dir['files'])) {
+ return [];
+ }
+ $elements = [];
+ foreach ($dir['subdirs'] as $subdir) {
+ $htmllize = $this->renderable_tree_elements($tree, $subdir);
+ $image = $this->output->pix_icon(file_folder_icon(), $subdir['dirname'], 'moodle');
+ $elements[] = [
+ 'name' => $subdir['dirname'],
+ 'icon' => $image,
+ 'subdirs' => $htmllize,
+ 'hassubdirs' => !empty($htmllize),
+ ];
+ }
+ foreach ($dir['files'] as $file) {
+ $filename = $file->get_filename();
+ $filenamedisplay = clean_filename($filename);
+
+ $url = moodle_url::make_pluginfile_url($file->get_contextid(), $file->get_component(),
+ $file->get_filearea(), $file->get_itemid(), $file->get_filepath(), $filename, false);
+ if (file_extension_in_typegroup($filename, 'web_image')) {
+ $image = $url->out(false, ['preview' => 'tinyicon', 'oid' => $file->get_timemodified()]);
+ $image = html_writer::empty_tag('img', ['src' => $image]);
+ } else {
+ $image = $this->output->pix_icon(file_file_icon($file), $filenamedisplay, 'moodle');
+ }
+
+ if ($tree->folder->forcedownload) {
+ $url->param('forcedownload', 1);
+ }
+
+ $elements[] = [
+ 'name' => $filenamedisplay,
+ 'icon' => $image,
+ 'url' => $url,
+ 'subdirs' => null,
+ 'hassubdirs' => false,
+ ];
+ }
+
+ return $elements;
+ }
}
class folder_tree implements renderable {
diff --git a/mod/folder/templates/folder.mustache b/mod/folder/templates/folder.mustache
new file mode 100644
index 00000000000..d846885e56f
--- /dev/null
+++ b/mod/folder/templates/folder.mustache
@@ -0,0 +1,102 @@
+{{!
+ This file is part of Moodle - http://moodle.org/
+
+ Moodle is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Moodle is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Moodle. If not, see
+ {{{intro}}}
+ {{#hasbuttons}}
+
+
+ {{#edit_button}}
+ {{>core/single_button}}
+ {{/edit_button}}
+ {{#download_button}}
+ {{>core/single_button}}
+ {{/download_button}}
+
+
+ {{/hasbuttons}}
+
+
+ {{#dir}}
+
+ -
+ {{>mod_folder/tree}}
+
+
+ {{/dir}}
+
+
+