From 219671061d788dac2549bb877b908ff1b748181d Mon Sep 17 00:00:00 2001
From: Jason White <jason.white@owasp.org>
Date: Thu, 4 Jun 2015 23:22:56 -0400
Subject: [PATCH] increment commit on menu

---
 src/main/webapp/js/goatApp/view/MenuView.js | 53 ++++++++++++++++-----
 1 file changed, 41 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/js/goatApp/view/MenuView.js b/src/main/webapp/js/goatApp/view/MenuView.js
index 18376b270..27a0f8639 100644
--- a/src/main/webapp/js/goatApp/view/MenuView.js
+++ b/src/main/webapp/js/goatApp/view/MenuView.js
@@ -2,9 +2,15 @@ define(['jquery',
 	'underscore',
 	'backbone',
 	'goatApp/model/MenuCollection',
-	'goatApp/view/MenuItemView'], 
-	function($,_,Backbone,MenuCollection,MenuItemView) {
-
+	'goatApp/view/MenuItemView',
+	'goatApp/support/GoatUtils'], 
+	function(
+		$,
+		_,
+		Backbone,
+		MenuCollection,
+		MenuItemView,
+		GoatUtils) {
 	return  Backbone.View.extend({
 		el:'#menuContainer',
 		//TODO: set template
@@ -14,20 +20,43 @@ define(['jquery',
 		},
 		// rendering top level menu
 		render: function (model){
-			var items = this.collection.models; // top level items
+			//for now, just brute force
+			//TODO: refactor into sub-views/components
+			var items, catItems, stages;
+			items = this.collection.models; // top level items
 			var menuMarkup = '';
 			var menuUl = $('<ul>',{class:'nano-content'});
-			for(var i=0;i<items.length;i++) {
-				var category = $('<li>',{class:'sub-menu'});
-				var catLink = $('<a>',{text:items[i].get('name')});
+			for(var i=0;i<items.length;i++) { //CATEGORY LEVEL
+				var category = $('<li>',{class:'sub-menu ng-scope'});
+				var catLink = $('<a>');
+				var catArrow = $('<i>',{class:'fa fa-angle-right pull-right'});
+				var catLinkText = $('<span>',{text:items[i].get('name')});
+				catLink.append(catArrow);
+				catLink.append(catLinkText);
+				//TODO: bind catLink to accordion and selection method
 				category.append(catLink);
 				// lesson level (first children level)
-				var categoryLessonList = $('<ul>',{class:'slideDown lessonsAndStages'});
-				var catItems = new MenuItemView({items:items[i].get('children')}).render();
-				for (var j=0;j< catItems.length;j++) {
-					categoryLessonList.append(catItems[j]);
+				//var lessons = new MenuItemView({items:items[i].get('children')}).render();
+				var lessons=items[i].get('children');
+				if (lessons) {
+					var categoryLessonList = $('<ul>',{class:'slideDown lessonsAndStages'}); //keepOpen
+					for (var j=0; j < lessons.length;j++) {
+						var lessonItem = $('<li>');
+						var lessonLink = $('<a>',{href:lessons[j].link,text:lessons[j].name,id:GoatUtils.makeId(lessons[j].name)});
+						lessonItem.append(lessonLink);
+						//check for lab/stages
+						categoryLessonList.append(lessonLink);
+						var stages = lessons[j].get('children');
+						for (k=0; k < stages.length; k++) {
+							var stageSpan = $('<span>');
+							var stageLink = $('<a>',{href:stages[k].link,text:stages[k].name,id:GoatUtils.makeId(stages[k].name)});
+							stageSpan.append(stageLink);
+							categoryLessonList.append(stageSpan);
+						}
+					}
+					category.append(categoryLessonList);
 				}
-				category.append(categoryLessonList);
+				
 				menuUl.append(category);
 			}
 			this.$el.append(menuUl);