basic updates to UI, some js clean-up (moving some literals into goatConstants)

This commit is contained in:
Jason White 2014-08-30 21:33:20 -04:00
parent 1c72097c24
commit d414d1a5e4
5 changed files with 25 additions and 9 deletions

View File

@ -64,7 +64,7 @@
<header id="header">
<!--logo start-->
<div class="brand">
<a href="/webgoat/start.mvc" class="logo"><span>Web</span>Goat</a>
<a href="${pageContext.request.contextPath}/start.mvc" class="logo"><span>Web</span>Goat</a>
</div>
<!--logo end-->
<div class="toggle-navigation toggle-left">
@ -74,6 +74,11 @@
<span id="lessonTitle">Welcome To WebGoat</span>
</div><!--toggle navigation end-->
<div id="topLinks">
<span><a href="#">About</a></span><br/>
<span><a href="#">Contact</a></span><br/>
<span><a href="${pageContext.request.contextPath}/j_spring_security_logout">Log out</a></span><br/>
</div>
</header>
<!--sidebar left start-->

View File

@ -747,4 +747,10 @@ fieldset[disabled] .btn-warning.active {
#buttonPanel {
padding:3px;
width:auto;
}
#topLinks {
float:right;
margin-right:5px;
margin-top:3px;
}

View File

@ -11,6 +11,11 @@ var goatConstants = {
children:null,
class:'fa-bars static'
}],
lessonService: 'service/lessonmenu.mvc'
lessonService: 'service/lessonmenu.mvc',
cookieService: 'service/cookies_widget.mvc',
hintService:'service/hint_widget.mvc',
sourceService:'service/source.mvc',
solutionService:'service/solution.mvc',
lessonPlanService:'service/lessonplan.mvc'
};

View File

@ -24,27 +24,27 @@ goat.utils = {
return title;
},
showLessonCookiesAndParams: function() {
$.get("service/cookies_widget.mvc", {}, function(reply) {
$.get(goatConstants.cookieService, {}, function(reply) {
$("#lesson_cookies").html(reply);
}, "html");
},
showLessonHint: function() {
$.get("service/hint_widget.mvc", {}, function(reply) {
$.get(goatConstants.hintService, {}, function(reply) {
$("#lesson_hint").html(reply);
}, "html");
},
showLessonSource: function() {
$.get("service/source.mvc", {}, function(reply) {
$.get(goatConstants.sourceService, {}, function(reply) {
$("#lesson_source").html("<pre>"+reply+"</pre>");
}, "html");
},
showLessonSolution: function() {
$.get("service/solution.mvc", {}, function(reply) {
$.get(goatConstants.solutionService, {}, function(reply) {
$("#lesson_solution").html(reply);
}, "html");
},
showLessonPlan: function() {
$.get("service/lessonplan.mvc", {}, function(reply) {
$.get(goatConstants.lessonPlanService, {}, function(reply) {
$("#lesson_plan").html(reply);
}, "html");
}

View File

@ -7,8 +7,8 @@ function submitXHR(){
document.getElementById("responseArea").innerHTML="";
alert("creating XHR request for: " + document.getElementById("requestedURL").value);
//alert("creating XHR request for: " + document.getElementById("requestedURL").value);
console.log("creating XHR request for: " + document.getElementById("requestedURL").value);
try{