#964 Allow import pages in editor for Bootstrap projects

thexerteproject · Oct 7, 2020 · b73b05e · b73b05e
1 parent 4e0f9ab
commit b73b05e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/editor/importpages/import-choose.php b/editor/importpages/import-choose.php
@@ -19,13 +19,20 @@
 }
 
 $version = getVersion();
+$template = $_GET["template"];
 
 $workspace = json_decode(get_users_projects("date_down", true));
 
 $items = array();
-$Nottingham = simplexml_load_file("../../modules/xerte/parent_templates/Nottingham/wizards/en-GB/data.xwd");
+if ($template == "site") {
+	$Nottingham = simplexml_load_file("../../modules/site/parent_templates/site/wizards/en-GB/data.xwd");
+} else {
+	$Nottingham = simplexml_load_file("../../modules/xerte/parent_templates/Nottingham/wizards/en-GB/data.xwd");
+}
+
 $nodes = $Nottingham->xpath("/wizard/learningObject/newNodes/*");
 $pageIcons = array();
+
 foreach($nodes as $node)
 {
     $name = $node->getName();
@@ -47,7 +54,7 @@
         array_splice($workspace->items, $i, 1);
         continue;
     }
-    if ($item->type != "nottingham" && $item->type != "workspace" && $item->type != "folder")
+    if ((($template == "xerte" && $item->type != "nottingham") || ($template == "site" && $item->type != "site")) && $item->type != "workspace" && $item->type != "folder")
     {
         unset($workspace->nodes->{$item->id});
         array_splice($workspace->items, $i, 1);
@@ -151,6 +158,7 @@
 <script>
     jsonData = JSON.parse('<?php echo str_replace("'", "\\'", json_encode($items));?>');
     workspace = JSON.parse('<?php echo str_replace("'", "\\'",$workspace_json); ?>');
+	var x_mergeTemplate = '<?php echo $template?>';
 </script>
 
 <?php

diff --git a/editor/js/import-choose.js b/editor/js/import-choose.js
@@ -177,7 +177,7 @@ function showPageData(xot_id, data) {
 						html += "<label><input class=\"allCheck\" type=\"checkbox\" id=\"select-all\"  onClick=\"CheckAll()\"/> Select/Deselect All</label>";
 					}
 					$.each(data.pages, function(x){
-							html += "<label><input class=\"pageCheckbox checkAll\" type=\"checkbox\" id=\"page_"+this.index+"\"'>" + '<img class=\"merge_page_icon\" src="modules/xerte/icons/'+this.icon+'.png">' + atob(this.name) + "</label>";
+							html += "<label><input class=\"pageCheckbox checkAll\" type=\"checkbox\" id=\"page_"+this.index+"\"'>" + '<img class=\"merge_page_icon\" src="modules/'+x_mergeTemplate+'/icons/'+this.icon+'.png">' + atob(this.name) + "</label>";
 					});
 					$("#merge").show();
 				}

diff --git a/editor/js/tree.js b/editor/js/tree.js
@@ -52,6 +52,7 @@ var EDITOR = (function ($, parent) {
         var now = new Date().getTime();
         $.ajax({
             type: "GET",
+			data: { template: templateframework },
             url: url + "&t=" + now,
             dataType: "html",
             success: function (data) {
@@ -126,7 +127,7 @@ var EDITOR = (function ($, parent) {
 
 		create_tree_buttons = function() {
             var buttons = $('<div />').attr('id', 'top_buttons');
-            if (templateframework == "xerte") {
+			if (templateframework == "xerte" || templateframework == "site") {
                 var button_def =
                     [
                         {