From 48c31458aac7a3a5b92d654000b00669185c5f12 Mon Sep 17 00:00:00 2001
From: Jason White <jsnsotheracct@gmail.com>
Date: Mon, 25 Aug 2014 06:20:07 -0400
Subject: [PATCH] text of lesson title (no styling yet), place holder buttons
 for top functions laid in

---
 src/main/webapp/WEB-INF/pages/main_new.jsp | 40 ++++++++++++----------
 src/main/webapp/js/application.js          |  2 ++
 src/main/webapp/js/goat.js                 | 11 +++---
 src/main/webapp/js/ui-util.js              | 13 ++++++-
 4 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/src/main/webapp/WEB-INF/pages/main_new.jsp b/src/main/webapp/WEB-INF/pages/main_new.jsp
index 72872fb3f..a5bf2da80 100644
--- a/src/main/webapp/WEB-INF/pages/main_new.jsp
+++ b/src/main/webapp/WEB-INF/pages/main_new.jsp
@@ -70,26 +70,31 @@
                 <button type="button" class="btn btn-default" id="toggle-left" data-toggle="tooltip" data-placement="right" title="Toggle Navigation">
                     <i class="fa fa-bars"></i>
                 </button>
+		<span id="lessonTitle">Welcome To WebGoat</span>
+		<button type="button" class="btn btn-primary btn-sm">Params/Cookies</button>
+		<button type="button" class="btn btn-primary btn-sm">Hints</button>
+		<button type="button" class="btn btn-primary btn-sm">Lesson Plan</button>
+		<button type="button" class="btn btn-primary btn-sm">Java [Source]</button>
+		<button type="button" class="btn btn-primary btn-sm">Solution</button>
             </div><!--toggle navigation end-->
         </header>
 		
 		        <!--sidebar left start-->
         <aside class="sidebar">
             <div id="leftside-navigation" class="nano" >
-                <ul class="nano-content">                
-                    <li class="sub-menu" ng-repeat="item in menuTopics">
-                    <!-- TODO: implement conditional rendering -->
-                            <a ng-click="expanded = !expanded" href=""><i class="fa {{item.class}}"></i><span>{{item.name}}</span></a>
-                            <ul class="slideDown" ng-show="expanded">
-                                    <li ng-repeat="lesson in item.children">
-                                            <a ng-click="renderLesson(lesson.link)" title="link to {{lesson.name}}" href="">{{lesson.name}}</a>
-                                            <span ng-repeat="stage in lesson.children" >
-                                                <a ng-click="renderLesson(stage.link)" title="link to {{stage.name}}" href="">{{stage.name}}</a>
-                                            </span>
-                                    </li>
-                            </ul>
-                    </li>
-		</ul>
+                <ul class="nano-content">
+		    <li class="sub-menu" ng-repeat="item in menuTopics">
+			<a ng-click="expanded = !expanded" href=""><i class="fa {{item.class}}"></i><span>{{item.name}}</span></a>
+			<ul class="slideDown" ng-show="expanded">
+			    <li ng-repeat="lesson in item.children">
+				<a ng-click="renderLesson(lesson.link)" title="link to {{lesson.name}}" href="">{{lesson.name}}</a>
+				<span ng-repeat="stage in lesson.children" >
+				    <a ng-click="renderLesson(stage.link)" title="link to {{stage.name}}" href="">{{stage.name}}</a>
+				</span>
+			    </li>
+		    	</ul>
+		    </li>
+		</ul> 
 						
             </div>
 
@@ -116,7 +121,7 @@
                             <h4>Lesson Source Code</h4>
                			<div class="panel" >
                                     <div class="panel-body">
-<pre>{{lessonSource}}</pre>
+					<pre>{{lessonSource}}</pre>
                                     </div>                                    
                			</div>
                		</div>
@@ -208,10 +213,7 @@
                 }
                 makeFormsAjax();
             }
-            function makeFormsAjax() {
-                //console.log("Hooking any lesson forms to make them ajax");
-                $("form").ajaxForm(options);
-            }
+
         </script>
     </body>
 </html>
diff --git a/src/main/webapp/js/application.js b/src/main/webapp/js/application.js
index 0872bfeb9..a962cd01e 100644
--- a/src/main/webapp/js/application.js
+++ b/src/main/webapp/js/application.js
@@ -62,6 +62,7 @@ var app = function() {
 
     }
 
+    /*
     var menu = function() {
         $("#leftside-navigation .sub-menu a").click(function(e) {
             $("#leftside-navigation ul ul").slideUp();
@@ -71,6 +72,7 @@ var app = function() {
               e.stopPropagation();
         });
     };
+    */
     //End functions
 
     //Dashboard functions
diff --git a/src/main/webapp/js/goat.js b/src/main/webapp/js/goat.js
index 743045b3a..1c53c82a8 100644
--- a/src/main/webapp/js/goat.js
+++ b/src/main/webapp/js/goat.js
@@ -26,6 +26,7 @@ goat.controller('goatLesson', function($scope, $http) {
 				$("#lesson_content").html(reply);
 				// hook forms
 				makeFormsAjax();
+				$('#lessonTitle').text(extractLessonTitle($(reply)));
 				// adjust menu to lessonContent size if necssary
 				if ($('div.panel-body').height() > 400) {
 				    $('#leftside-navigation').height($(window).height());
@@ -47,12 +48,12 @@ goat.controller('goatLesson', function($scope, $http) {
             return {
                 beforeAddClass: function(element, className, done) {
                     if (className === NgHideClassName) {
-                        jQuery(element).slideUp(done);
+                        $(element).slideUp(done);
                     }
                 },
                 removeClass: function(element, className, done) {
                     if (className === NgHideClassName) {
-                        jQuery(element).hide().slideDown(done);
+                        $(element).hide().slideDown(done);
                     }
                 }
             }
@@ -77,8 +78,10 @@ goat.addMenuClasses = function(arr) {
 
 
 function loadLessonContent(_url) {
-	//TODO: switch to $http (angular)
-	return $.get(_url,{},null,"html");
+    //TODO: switch to $http (angular) later
+    //return $http({method:'GET', url: _url});
+    return $.get(_url,{},null,"html");
+    
 }
 
 function loadMenuData() {
diff --git a/src/main/webapp/js/ui-util.js b/src/main/webapp/js/ui-util.js
index 1bf320882..b67534369 100644
--- a/src/main/webapp/js/ui-util.js
+++ b/src/main/webapp/js/ui-util.js
@@ -1,4 +1,15 @@
+function makeFormsAjax() {
+    //console.log("Hooking any lesson forms to make them ajax");
+    $("form").ajaxForm(options);
+}
+
+function extractLessonTitle(el) {
+    var title = $('h1',el).text();
+    return title;
+}
+
 $(window).resize(function() {
     //$('#leftside-navigation').css('height',$('div.panel-body').height());
     console.log($(window).height());
-});
\ No newline at end of file
+});
+