Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java
===================================================================
diff -u -r1df79e8f3202227e5d076d5823aa74c58c48504c -re1d9ed4b09a58b1da0f50a56642926a00f9673e6
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java	(.../HomeController.java)	(revision 1df79e8f3202227e5d076d5823aa74c58c48504c)
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java	(.../HomeController.java)	(revision e1d9ed4b09a58b1da0f50a56642926a00f9673e6)
@@ -258,9 +258,6 @@
 	    return null;
 	}
 
-	// get all user accessible folders and LD descriptions as JSON
-	String folderContentsJSON = workspaceManagementService.getFolderContentsJSON(null, userDTO.getUserID(), false);
-	req.setAttribute("folderContents", folderContentsJSON);
 	ObjectNode users = JsonNodeFactory.instance.objectNode();
 
 	// get learners available for newly created lesson
Index: lams_central/web/addLesson.jsp
===================================================================
diff -u -rae05b164c9f505d387c1e49c02a36c4e92861150 -re1d9ed4b09a58b1da0f50a56642926a00f9673e6
--- lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision ae05b164c9f505d387c1e49c02a36c4e92861150)
+++ lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision e1d9ed4b09a58b1da0f50a56642926a00f9673e6)
@@ -8,26 +8,22 @@
 <lams:html>
 <lams:head>
 	<lams:css/>
-	<link rel="stylesheet" href="${lams}css/yui/treeview.css" type="text/css" media="screen" />
-	<link rel="stylesheet" href="${lams}css/yui/folders.css" type="text/css" media="screen" />
 	<link rel="stylesheet" href="${lams}css/jquery-ui.timepicker.css" type="text/css" media="screen" />
 	<link rel="stylesheet" href="${lams}css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="${lams}css/bootstrap-treeview.css" type="text/css" media="screen" />
 	<link rel="stylesheet" href="${lams}css/addLesson.css" type="text/css" media="screen" />
 
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/yui/yahoo-dom-event.js" ></script>
-	<script type="text/javascript" src="${lams}includes/javascript/yui/animation-min.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/yui/json-min.js" ></script> 
-	<script type="text/javascript" src="${lams}includes/javascript/yui/treeview-min.js" ></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap-treeview.js" ></script>
+	<script type="text/javascript" src="${lams}includes/javascript/learning-design-treeview.js" ></script>
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/addLesson.js"></script>
 	<script type="text/javascript">
 		var userId = '<lams:user property="userID"/>',
-			folderContents = ${folderContents},
 			users = ${users},
 			
 			LAMS_URL = '<lams:LAMSURL/>',
Fisheye: Tag e1d9ed4b09a58b1da0f50a56642926a00f9673e6 refers to a dead (removed) revision in file `lams_central/web/css/yui/folders.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e1d9ed4b09a58b1da0f50a56642926a00f9673e6 refers to a dead (removed) revision in file `lams_central/web/css/yui/treeview.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/images/css/yui/folders/lm.gif
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re1d9ed4b09a58b1da0f50a56642926a00f9673e6
Binary files differ
Index: lams_central/web/images/css/yui/folders/lmh.gif
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re1d9ed4b09a58b1da0f50a56642926a00f9673e6
Binary files differ
Index: lams_central/web/images/css/yui/folders/ln.gif
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re1d9ed4b09a58b1da0f50a56642926a00f9673e6
Binary files differ
Index: lams_central/web/images/css/yui/folders/loading.gif
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re1d9ed4b09a58b1da0f50a56642926a00f9673e6
Binary files differ
Index: lams_central/web/images/css/yui/folders/lp.gif
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re1d9ed4b09a58b1da0f50a56642926a00f9673e6
Binary files differ
Index: lams_central/web/images/css/yui/folders/lph.gif
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re1d9ed4b09a58b1da0f50a56642926a00f9673e6
Binary files differ
Index: lams_central/web/images/css/yui/folders/tm.gif
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re1d9ed4b09a58b1da0f50a56642926a00f9673e6
Binary files differ
Index: lams_central/web/images/css/yui/folders/tmh.gif
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re1d9ed4b09a58b1da0f50a56642926a00f9673e6
Binary files differ
Index: lams_central/web/images/css/yui/folders/tn.gif
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re1d9ed4b09a58b1da0f50a56642926a00f9673e6
Binary files differ
Index: lams_central/web/images/css/yui/folders/tp.gif
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re1d9ed4b09a58b1da0f50a56642926a00f9673e6
Binary files differ
Index: lams_central/web/images/css/yui/folders/tph.gif
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re1d9ed4b09a58b1da0f50a56642926a00f9673e6
Binary files differ
Index: lams_central/web/images/css/yui/folders/vline.gif
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re1d9ed4b09a58b1da0f50a56642926a00f9673e6
Binary files differ
Index: lams_central/web/images/css/yui/sam/check0.gif
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re1d9ed4b09a58b1da0f50a56642926a00f9673e6
Binary files differ
Index: lams_central/web/images/css/yui/sam/check1.gif
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re1d9ed4b09a58b1da0f50a56642926a00f9673e6
Binary files differ
Index: lams_central/web/images/css/yui/sam/check2.gif
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re1d9ed4b09a58b1da0f50a56642926a00f9673e6
Binary files differ
Index: lams_central/web/images/css/yui/sam/loading.gif
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re1d9ed4b09a58b1da0f50a56642926a00f9673e6
Binary files differ
Index: lams_central/web/images/css/yui/sam/treeview-loading.gif
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re1d9ed4b09a58b1da0f50a56642926a00f9673e6
Binary files differ
Index: lams_central/web/images/css/yui/sam/treeview-sprite.gif
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -re1d9ed4b09a58b1da0f50a56642926a00f9673e6
Binary files differ
Index: lams_central/web/includes/javascript/addLesson.js
===================================================================
diff -u -rae05b164c9f505d387c1e49c02a36c4e92861150 -re1d9ed4b09a58b1da0f50a56642926a00f9673e6
--- lams_central/web/includes/javascript/addLesson.js	(.../addLesson.js)	(revision ae05b164c9f505d387c1e49c02a36c4e92861150)
+++ lams_central/web/includes/javascript/addLesson.js	(.../addLesson.js)	(revision e1d9ed4b09a58b1da0f50a56642926a00f9673e6)
@@ -18,75 +18,34 @@
  * Sets up widgets on the main.jsp page
  */
 function initLessonTab(){
+	tree = $('#learningDesignTree');
 	
-	// generate LD initial tree; folderContents is declared in newLesson.jsp
-	var treeNodes = parseFolderContents(folderContents);
-	// there should be no focus, just highlight
-	YAHOO.widget.TreeView.FOCUS_CLASS_NAME = null;
-	tree = new YAHOO.widget.TreeView('learningDesignTree', treeNodes);
-	tree.setDynamicLoad(function(node, callback){
-		// load subfolder contents
-		$.ajax({
-			url : LAMS_URL + 'home/getFolderContents.do',
-			data : {
-				'folderID' : node.data.folderID
-			},
-			cache : false,
-			async: false,
-			dataType : 'json',
-			success : function(result) {
-				var childNodeData = parseFolderContents(result);
-				$.each(childNodeData, function(){
-						new YAHOO.widget.TextNode(this, node);
-					});
+	ldTreeview.init('#learningDesignTree', 
+	   function(event, node) {
+			$('.ldChoiceDependentCanvasElement').css('display', 'none');
+			if (node.state.selected && node.learningDesignId) {
+				$('#lessonNameInput').val(node.label);
+				//focus element only if it's visible in the current viewport (to avoid unwanted scrolling)
+				if (isElementInViewport($('#lessonNameInput'))) {
+					$('#lessonNameInput').focus();
 				}
+				// display "loading" animation and finally LD thumbnail
+				loadLearningDesignSVG(node.learningDesignId);
+			} else {
+				$('#lessonNameInput').val(null);
+				toggleCanvasResize(CANVAS_RESIZE_OPTION_NONE);
 			}
-		);
-		
-		// required by YUI
-		callback();
-	});
+		},
+	  function(event, node) {
+			// if it's a folder - do nothing
+			if (!node.learningDesignId) {
+				return false;
+			}
+			
+			// start lesson
+			addLesson();
+	  });
 	
-	tree.singleNodeHighlight = true;
-	tree.subscribe('clickEvent', function(event) {
-		// if it's a folder - do not select it. if design is already selected - do not allow deselecting it on subsequent click
-		if (!event.node.data.learningDesignId || event.node.highlightState == 1) {
-			return false;
-		}
-		
-		$('#lessonNameInput').val(event.node.label);
-		//focus element only if it's visible in the current viewport (to avoid unwanted scrolling)
-		if (isElementInViewport($('#lessonNameInput'))) {
-			$('#lessonNameInput').focus();
-		}
-		
-		// display "loading" animation and finally LD thumbnail
-		$('.ldChoiceDependentCanvasElement').css('display', 'none');
-		if (event.node.highlightState == 0) {
-			loadLearningDesignSVG(event.node.data.learningDesignId);
-		} else {
-			toggleCanvasResize(CANVAS_RESIZE_OPTION_NONE);
-		}
-	});
-	tree.subscribe('clickEvent',tree.onEventToggleHighlight);
-	tree.subscribe('dblClickEvent', function(event){
-		
-		// if it's a folder - do not select it
-		if (!event.node.data.learningDesignId) {
-			return false;
-		}
-		
-		//trigger "clickEvent" first so that addLesson() function will know which element is selected 
-		tree.fireEvent("clickEvent", event);
-		
-		// start lesson
-		addLesson();
-	});
-	tree.render();
-	
-	// expand the first (user) folder
-	tree.getRoot().children[0].expand();
-	
 	// ability to start a lesson on pressing Enter button in a lesson name input
 	$('#lessonNameInput').on('keyup', function (e) {
 	    if (e.keyCode == 13) {
@@ -321,13 +280,13 @@
 		$('#lessonNameInput').removeClass('errorBorder');
 	}
 	
-	var ldNode = tree.getHighlightedNode();
-	if (!ldNode || !ldNode.data.learningDesignId) {
+	var ldNode = tree.treeview('getSelected')[0];
+	if (!ldNode || !ldNode.learningDesignId) {
 		$('#ldNotChosenError').show();
 		doSelectTab(1);
 		return;
 	}
-	$('#ldIdField').val(ldNode.data.learningDesignId);
+	$('#ldIdField').val(ldNode.learningDesignId);
 	
 	if (lessonName){
 		var nameValidator = /^[^<>^*@%$]*$/igm;	
@@ -395,11 +354,11 @@
 }
 
 function previewLesson(){
-	var ldNode = tree.getHighlightedNode(),
+	var ldNode = tree.treeview('getSelected')[0],
 		popupWidth = 1280,
 		popupHeight = 720;
 
-	if (!ldNode || !ldNode.data.learningDesignId) {
+	if (!ldNode || !ldNode.learningDesignId) {
 		$('#ldNotChosenError').show();
 		doSelectTab(1);
 		return;
@@ -409,7 +368,7 @@
 	$.ajax({
 		url : LAMS_URL + 'monitoring/monitoring/initializeLesson.do',
 		data : {
-			'learningDesignID' : ldNode.data.learningDesignId,
+			'learningDesignID' : ldNode.learningDesignId,
 			'copyType' : 3,
 			'lessonName' : LABEL_PREVIEW_LESSON_DEFAULT_TITLE
 		},
@@ -559,35 +518,6 @@
 	}
 }
 
-
-/**
- * Parses response in JSON format into readable for YUI.
- */
-function parseFolderContents(nodeJSON) {
-	var result = [];
-
-	if (nodeJSON.folders) {
-		$.each(nodeJSON.folders, function(){
-			result.push({'type'            : 'text',
-					  	 'label'           : this.isRunSequencesFolder ?
-					  			 				LABEL_RUN_SEQUENCES_FOLDER : this.name,
-					  	 'folderID'		   : this.folderID
-						 });
-		});
-	}
-	if (nodeJSON.learningDesigns) {
-		$.each(nodeJSON.learningDesigns, function(){
-			result.push({'type'             : 'text',
-			  	         'label'            : this.name,
-			  	         'isLeaf'           : true,
-			  	         'learningDesignId' : this.learningDesignId
-				        });
-		});
-	}
-	
-	return result;
-}
-
 // ********** CLASS TAB FUNCTIONS **********
 
 function fillUserContainer(users, containerId) {
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -r658453b9f8bdfbf78bc9151b2cc711796081abc2 -re1d9ed4b09a58b1da0f50a56642926a00f9673e6
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 658453b9f8bdfbf78bc9151b2cc711796081abc2)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision e1d9ed4b09a58b1da0f50a56642926a00f9673e6)
@@ -746,7 +746,7 @@
 			'data' : {
 				'prepareForOpen' : function(dialogTitle, learningDesignTitle, shownElementIDs, highlightFolder){
 					// only Save As uses highlightFolder; otherwise the first folder in top level gets expanded and highlighted
-					layout.folderPathCurrent = highlightFolder && layout.ld.folderPath ? layout.ld.folderPath.slice() : [];
+					ldTreeview.preselectedFolderPath = highlightFolder && layout.ld.folderPath ? layout.ld.folderPath.slice() : [];
 					
 					$('#ldStoreDialogNameContainer input', layout.ldStoreDialog).val(learningDesignTitle);
 					$('.modal-title', layout.ldStoreDialog).text(dialogTitle);
@@ -927,6 +927,7 @@
 		var ldTree = $('#ldStoreDialogTree');
 		layout.ldStoreDialog.data('ldTree', ldTree);
 		
+		ldTreeview.allowInvalidDesigns = true;
 		ldTreeview.init('#ldStoreDialogTree', 
 		   function(event, node) {
 				var isOpenDialog = $('#ldStoreDialogSaveButton', layout.ldStoreDialog).is(':hidden'),
Index: lams_central/web/includes/javascript/learning-design-treeview.js
===================================================================
diff -u -r658453b9f8bdfbf78bc9151b2cc711796081abc2 -re1d9ed4b09a58b1da0f50a56642926a00f9673e6
--- lams_central/web/includes/javascript/learning-design-treeview.js	(.../learning-design-treeview.js)	(revision 658453b9f8bdfbf78bc9151b2cc711796081abc2)
+++ lams_central/web/includes/javascript/learning-design-treeview.js	(.../learning-design-treeview.js)	(revision e1d9ed4b09a58b1da0f50a56642926a00f9673e6)
@@ -1,4 +1,6 @@
 var ldTreeview = {
+		allowInvalidDesigns : false,
+		preselectedFolderPath : null,
 		DOUBLE_CLICK_PERIOD : 1000,
 		nodeLastSelectedTime : null,
 		nodeLastSelectedId : null,
@@ -16,6 +18,7 @@
 				showBorder : false,
 				expandIcon : 'fa fa-folder',
 				collapseIcon : 'fa fa-folder-open',
+				emptyIcon : '',
 				lazyLoad : true,
 				lazyLoadFunction : function(parentNode, callback, options) {
 					callback(parentNode, ldTreeview.getFolderContents(parentNode), options);
@@ -36,7 +39,7 @@
 				url : LAMS_URL + 'home/getFolderContents.do',
 				data : {
 					'folderID' : folderID,
-					'allowInvalidDesigns' : true
+					'allowInvalidDesigns' : this.allowInvalidDesigns
 				},
 				cache : false,
 				async: false,
@@ -114,14 +117,14 @@
 		 */
 		selectFolder :  function(folder) {
 			// if there are no children or stop condition (no path) was reached
-			if (!folder.nodes || folder.nodes.length === 0 || layout.folderPathCurrent == null) {
+			if (!this.preselectedFolderPath || !folder.nodes || folder.nodes.length === 0) {
 				return;
 			}
 			var chosenFolder = null;
 			// are there any steps left?
-			if (layout.folderPathCurrent.length > 0) {
+			if (this.preselectedFolderPath.length > 0) {
 				// look for target folder in children
-				var folderID = layout.folderPathCurrent.shift();
+				var folderID = this.preselectedFolderPath.shift();
 				$.each(folder.nodes, function(index, child){
 					if (folderID == child.folderID) {
 						chosenFolder = child;
@@ -130,8 +133,8 @@
 				});
 			}
 			// if last piece of folder path was consumed, set stop condition
-			if (layout.folderPathCurrent.length === 0) {
-				layout.folderPathCurrent = null;
+			if (this.preselectedFolderPath.length === 0) {
+				this.preselectedFolderPath = null;
 			}
 			// no folder found or path was empty from the beginning
 			if (!chosenFolder) {
Fisheye: Tag e1d9ed4b09a58b1da0f50a56642926a00f9673e6 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/yui/animation-min.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e1d9ed4b09a58b1da0f50a56642926a00f9673e6 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/yui/json-min.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e1d9ed4b09a58b1da0f50a56642926a00f9673e6 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/yui/treeview-min.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag e1d9ed4b09a58b1da0f50a56642926a00f9673e6 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/yui/yahoo-dom-event.js'.
Fisheye: No comparison available.  Pass `N' to diff?