Merge "Bug 1850566: Render the profile page in new layout if needed"

htdocs/artefact/internal/export/html/lib.php

@@ -33,8 +33,13 @@ class HtmlExportInternal extends HtmlExportArtefactPlugin {
                 $smarty->assign('breadcrumbs', array(array('text' => 'Profile page', 'path' => 'profilepage.html')));
                 $view = $this->exporter->get('user')->get_profile_view();
                 $outputfilter = new HtmlExportOutputFilter('../../', $this->exporter);
-                $smarty->assign('view', $outputfilter->filter($view->build_rows(false, true)));
-
+                if (!$view->uses_new_layout()) {
+                    $smarty->assign('view', $outputfilter->filter($view->build_rows(false, true)));
+                }
+                else {
+                    $smarty->assign('newlayout', true);
+                    $smarty->assign('blocks', $view->get_blocks(false, true));
+                }
                 $content = $smarty->fetch('export:html/internal:profilepage.tpl');
                 if (!file_put_contents($this->fileroot . 'profilepage.html', $content)) {
                     throw new SystemException("Unable to write profile page");

htdocs/theme/raw/plugintype/artefact/internal/export/html/templates/profilepage.tpl

 {include file="export:html:header.tpl"}
 
+{if $newlayout}
+<script>
+$(function () {
+    var options = {
+        verticalMargin: 10,
+        float: true,
+        ddPlugin: false,
+    };
+    var grid = $('.grid-stack');
+    grid.gridstack(options);
+    grid = $('.grid-stack').data('gridstack');
+    // should add the blocks one by one
+    var blocks = {json_encode arg=$blocks};
+    loadGrid(grid, blocks);
+    jQuery(document).trigger('blocksloaded');
+});
+</script>
+<div class="container-fluid">
+    <div class="grid-stack">
+    </div>
+</div>
+{else}
 {$view|safe}
-
+{/if}
 {include file="export:html:footer.tpl"}