dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

text of lesson title (no styling yet), place holder buttons for top functions laid in

Browse Source
This commit is contained in:
Jason White 2014-08-25 06:20:07 -04:00
parent eaad78099d
commit 48c31458aa
4 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/webapp/WEB-INF/pages/main_new.jsp
View File

@ -70,6 +70,12 @@
<button type="button" class="btn btn-default" id="toggle-left" data-toggle="tooltip" data-placement="right" title="Toggle Navigation"> <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> <i class="fa fa-bars"></i>
</button> </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--> </div><!--toggle navigation end-->
</header> </header>
@ -77,18 +83,17 @@
<aside class="sidebar"> <aside class="sidebar">
<div id="leftside-navigation" class="nano" > <div id="leftside-navigation" class="nano" >
<ul class="nano-content"> <ul class="nano-content">
<li class="sub-menu" ng-repeat="item in menuTopics"> <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>
<a ng-click="expanded = !expanded" href=""><i class="fa {{item.class}}"></i><span>{{item.name}}</span></a> <ul class="slideDown" ng-show="expanded">
<ul class="slideDown" ng-show="expanded"> <li ng-repeat="lesson in item.children">
<li ng-repeat="lesson in item.children"> <a ng-click="renderLesson(lesson.link)" title="link to {{lesson.name}}" href="">{{lesson.name}}</a>
<a ng-click="renderLesson(lesson.link)" title="link to {{lesson.name}}" href="">{{lesson.name}}</a> <span ng-repeat="stage in lesson.children" >
<span ng-repeat="stage in lesson.children" > <a ng-click="renderLesson(stage.link)" title="link to {{stage.name}}" href="">{{stage.name}}</a>
<a ng-click="renderLesson(stage.link)" title="link to {{stage.name}}" href="">{{stage.name}}</a> </span>
</span> </li>
</li> </ul>
</ul> </li>
</li>
</ul> </ul>
</div> </div>
@ -116,7 +121,7 @@
<h4>Lesson Source Code</h4> <h4>Lesson Source Code</h4>
<div class="panel" > <div class="panel" >
<div class="panel-body"> <div class="panel-body">
<pre>{{lessonSource}}</pre> <pre>{{lessonSource}}</pre>
</div> </div>
</div> </div>
</div> </div>
@ -208,10 +213,7 @@
} }
makeFormsAjax(); makeFormsAjax();
} }
function makeFormsAjax() {
//console.log("Hooking any lesson forms to make them ajax");
$("form").ajaxForm(options);
}
</script> </script>
</body> </body>
</html> </html>

2
src/main/webapp/js/application.js
View File

@ -62,6 +62,7 @@ var app = function() {
} }
/*
var menu = function() { var menu = function() {
$("#leftside-navigation .sub-menu a").click(function(e) { $("#leftside-navigation .sub-menu a").click(function(e) {
$("#leftside-navigation ul ul").slideUp(); $("#leftside-navigation ul ul").slideUp();
@ -71,6 +72,7 @@ var app = function() {
e.stopPropagation(); e.stopPropagation();
}); });
}; };
*/
//End functions //End functions
//Dashboard functions //Dashboard functions

11
src/main/webapp/js/goat.js
View File

@ -26,6 +26,7 @@ goat.controller('goatLesson', function($scope, $http) {
$("#lesson_content").html(reply); $("#lesson_content").html(reply);
// hook forms // hook forms
makeFormsAjax(); makeFormsAjax();
$('#lessonTitle').text(extractLessonTitle($(reply)));
// adjust menu to lessonContent size if necssary // adjust menu to lessonContent size if necssary
if ($('div.panel-body').height() > 400) { if ($('div.panel-body').height() > 400) {
$('#leftside-navigation').height($(window).height()); $('#leftside-navigation').height($(window).height());
@ -47,12 +48,12 @@ goat.controller('goatLesson', function($scope, $http) {
return { return {
beforeAddClass: function(element, className, done) { beforeAddClass: function(element, className, done) {
if (className === NgHideClassName) { if (className === NgHideClassName) {
jQuery(element).slideUp(done); $(element).slideUp(done);
} }
}, },
removeClass: function(element, className, done) { removeClass: function(element, className, done) {
if (className === NgHideClassName) { if (className === NgHideClassName) {
jQuery(element).hide().slideDown(done); $(element).hide().slideDown(done);
} }
} }
} }
@ -77,8 +78,10 @@ goat.addMenuClasses = function(arr) {
function loadLessonContent(_url) { function loadLessonContent(_url) {
//TODO: switch to $http (angular) //TODO: switch to $http (angular) later
return $.get(_url,{},null,"html"); //return $http({method:'GET', url: _url});
return $.get(_url,{},null,"html");
} }
function loadMenuData() { function loadMenuData() {

11
src/main/webapp/js/ui-util.js
View File

@ -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() { $(window).resize(function() {
//$('#leftside-navigation').css('height',$('div.panel-body').height()); //$('#leftside-navigation').css('height',$('div.panel-body').height());
console.log($(window).height()); console.log($(window).height());
}); });