chg: [UI] Asset loader for statistics

app/Controller/UsersController.php

@@ -2138,7 +2138,6 @@ class UsersController extends AppController
             }
             $treemap['children'][] = $newElement;
         }
-        $taxonomyColourCodes = array();
         $taxonomies = array_merge(array('custom'), $taxonomies);
         if ($this->_isRest()) {
             $data = array(
@@ -2147,12 +2146,11 @@ class UsersController extends AppController
             );
             return $this->RestResponse->viewData($data, $this->response->type());
         } else {
-            $this->set('taxonomyColourCodes', $taxonomyColourCodes);
             $this->set('taxonomies', $taxonomies);
             $this->set('flatData', $flatData);
             $this->set('treemap', $treemap);
             $this->set('tags', $tags);
-            $this->layout = 'treemap';
+            $this->layout = false;
             $this->render('ajax/tag_statistics_graph');
         }
     }

app/View/Layouts/treemap.ctp

@@ -1,3 +0,0 @@
-<?php
-    echo $this->Html->css('treemap');
-    echo $content_for_layout;

app/View/Users/ajax/tag_statistics_graph.ctp

@@ -1,5 +1,7 @@
-<?php
-    echo $this->Html->script('d3');
+<?= $this->element('genericElements/assetLoader', [
+    'css' => ['treemap'],
+    'js' => ['d3', 'treemap'],
+]);
 ?>
 <div id="treemapSettings">
     <div class="row">
@@ -25,4 +27,3 @@
     var taxonomies = <?php echo json_encode($taxonomies); ?>;
     var hiddenTaxonomies = [];
 </script>
-<?php echo $this->Html->script('treemap'); ?>

app/View/Users/statistics_data.ctp

@@ -1,7 +1,7 @@
-<?php
-    echo $this->Html->script('d3');
-    echo $this->Html->script('cal-heatmap');
-    echo $this->Html->css('cal-heatmap');
+<?= $this->element('genericElements/assetLoader', [
+    'css' => ['cal-heatmap'],
+    'js' => ['d3', 'cal-heatmap'],
+]);
 ?>
 <div class = "index">
 <h2><?php echo __('Statistics');?></h2>

app/View/Users/statistics_histogram.ctp

@@ -1,7 +1,7 @@
-<?php
-    echo $this->Html->script('d3');
-    echo $this->Html->script('cal-heatmap');
-    echo $this->Html->css('cal-heatmap');
+<?= $this->element('genericElements/assetLoader', [
+    'css' => ['cal-heatmap'],
+    'js' => ['d3', 'cal-heatmap'],
+]);
 ?>
 <div class = "index">
 <h2><?php echo __('Statistics');?></h2>

app/View/Users/statistics_orgs.ctp

@@ -1,7 +1,7 @@
-<?php
-    echo $this->Html->script('d3');
-    echo $this->Html->script('cal-heatmap');
-    echo $this->Html->css('cal-heatmap');
+<?= $this->element('genericElements/assetLoader', [
+    'css' => ['cal-heatmap'],
+    'js' => ['d3', 'cal-heatmap'],
+]);
 ?>
 <div class = "index">
     <h2><?php echo __('Statistics');?></h2>

app/View/Users/statistics_tags.ctp

@@ -1,7 +1,7 @@
-<?php
-    echo $this->Html->script('d3');
-    echo $this->Html->script('cal-heatmap');
-    echo $this->Html->css('cal-heatmap');
+<?= $this->element('genericElements/assetLoader', [
+    'css' => ['cal-heatmap'],
+    'js' => ['d3', 'cal-heatmap'],
+]);
 ?>
 <div class = "index">
 <h2><?php echo __('Statistics');?></h2>