Skip to content

Commit b06a0a2

Browse files
author
Jason White
committed
cookies and params modification. Hints update as well
1 parent 8ae1204 commit b06a0a2

File tree

6 files changed

+185
-122
lines changed

6 files changed

+185
-122
lines changed

‎src/main/webapp/WEB-INF/pages/main_new.jsp‎

Lines changed: 35 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
</head>
6161

6262
<body class="animated fadeIn" ng-app="goatApp">
63-
<section id="container">
63+
<section id="container" ng-controller="goatLesson">
6464
<header id="header">
6565
<!--logo start-->
6666
<div class="brand">
@@ -72,8 +72,8 @@
7272
<i class="fa fa-bars"></i>
7373
</button>
7474
</div><!--toggle navigation end-->
75-
<div class="lessonTitle">
76-
<h1>Lesson Title in here</h1>
75+
<div class="lessonTitle" >
76+
<h1 id="lessonTitle">Lesson Title in here</h1>
7777
</div><!--lesson title end-->
7878
<div class="user-nav pull-right">
7979
<button type="button" class="btn btn-default">
@@ -90,7 +90,7 @@
9090

9191
<!--sidebar left start-->
9292
<aside class="sidebar">
93-
<div id="leftside-navigation" class="nano" ng-controller="goatLessonMenu">
93+
<div id="leftside-navigation" class="nano">
9494
<ul class="nano-content">
9595
<li class="sub-menu" ng-repeat="item in menuTopics">
9696
<a ng-click="expanded = !expanded" href=""><i class="fa {{item.class}}"></i><span>{{item.name}}</span></a>
@@ -112,27 +112,21 @@
112112
<!--main content start-->
113113
<section class="main-content-wrapper">
114114

115-
<section id="main-content" ng-controller="lessonHelpController">
115+
<section id="main-content" > <!-- ng-controller="lessonController" -->
116116
<div class="row">
117117
<div class="col-md-8">
118118
<div class="col-md-12" align="left">
119119
<div class="panel">
120120
<div class="panel-body">
121-
<button type="button" id="showSourceBtn" class="btn btn-primary btn-xs">Java [Source]</button>
122-
<button type="button" id="showSolutionBtn" class="btn btn-primary btn-xs">Solution</button>
123-
<button type="button" id="showPlanBtn" class="btn btn-primary btn-xs">Lesson Plan</button>
121+
<button type="button" id="showSourceBtn" class="btn btn-primary btn-xs" ng-click="showLessonSource()">Java [Source]</button>
122+
<button type="button" id="showSolutionBtn" class="btn btn-primary btn-xs" ng-click="showLessonSolution()">Solution</button>
123+
<button type="button" id="showPlanBtn" class="btn btn-primary btn-xs" ng-click="showLessonPlan()">Lesson Plan</button>
124+
<button type="button" id="showHintsBtn" class="btn btn-primary btn-xs" ng-click="viewHints()">Hints</button>
124125
</div>
125126
</div>
127+
126128
</div>
127129
<div class="col-md-12">
128-
<!--<div class="panel" id="buttonPanel">-->
129-
<!--<button type="button" id="showParamsCookiesBtn" class="btn btn-primary btn-xs">Params/Cookies</button>-->
130-
<!--<button type="button" id="showHintsBtn" class="btn btn-primary btn-xs lessonHelpBtn">Hints</button>-->
131-
<!--<button type="button" id="showPlanBtn" class="btn btn-primary btn-xs lessonHelpBtn">Lesson Plan</button>-->
132-
<!--<button type="button" id="showSourceBtn" class="btn btn-primary btn-xs lessonHelpBtn">Java [Source]</button> <!-- ng-click="showSource('lg') -->
133-
<!--<button type="button" id="showSolutionBtn" class="btn btn-primary btn-xs lessonHelpBtn">Solution</button>-->
134-
<!-- ng-click="showSolution('lg') -->
135-
<!--</div> -->
136130
<div class="panel" >
137131
<div class="panel-body" id="lesson_content">
138132
<b>This should default to the "How to Work with Webgoat" lesson</b>
@@ -146,15 +140,9 @@
146140
<div class="panel">
147141
<div class="panel-body">
148142
<div align="left">
149-
<button id="tshowParamsCookiesBtn" type="button" class="btn btn-xs" ng-click="viewCookiesAndParams()">Params / Cookies</button>
150-
<button id="showHintsBtn" type="button" class="btn btn-xs">Hints</button>
151-
143+
<h3>Cookies / Parameters</h3>
152144
</div>
153145
<hr />
154-
<div id="hintsView">
155-
<h3>Hints</h3>
156-
<p>{{scope.hints}}</p>
157-
</div>
158146
<div id="cookiesAndParamsView">
159147
<div class="cookiesView">
160148
<h4>Cookies</h4>
@@ -179,7 +167,7 @@
179167
<tr><th>Param</th><th>Value</th></tr>
180168
</thead>
181169
<tbody>
182-
<tr ng-repeat="param in params">
170+
<tr ng-repeat="param in parameters">
183171
<td>{{param.name}}</td>
184172
<td>{{param.value}}</td>
185173
</tr>
@@ -194,6 +182,19 @@
194182
</div><!--col-md-4 end-->
195183
</div>
196184
<div id="lessonHelpsWrapper">
185+
<div class="row lessonHelp" id="lesson_hint_row">
186+
<div class="col-md-12">
187+
<h4>Hints</h4>
188+
<div class="panel" >
189+
<div class="panel-body" id="lesson_hint">
190+
<span class="glyphicon-class glyphicon glyphicon-circle-arrow-left" id="showPrevHintBtn" ng-click="viewPrevHint()"></span>
191+
<span class="glyphicon-class glyphicon glyphicon-circle-arrow-right" id="showNextHintBtn" ng-click="viewNextHint()"></span>
192+
<br/>
193+
{{curHint}}
194+
</div>
195+
</div>
196+
</div>
197+
</div>
197198
<div class="row lessonHelp" id="lesson_cookies_row">
198199
<div class="col-md-12">
199200
<h4>Lesson Parameters and Cookies</h4>
@@ -218,26 +219,27 @@
218219
<div class="col-md-12">
219220
<h4>Lesson Plan</h4>
220221
<div class="panel" >
221-
<div class="panel-body" id="lesson_plan">
222-
222+
<div class="panel-body" id="lesson_plan">
223+
<!-- allowing jQuery to handle this one -->
223224
</div>
224225
</div>
225226
</div>
226227
</div>
227228
<div class="row lessonHelp" id="lesson_solution_row">
228229
<div class="col-md-12">
229230
<h4>Lesson Solution</h4>
230-
<div class="panel" >
231-
<div class="panel-body" id="lesson_solution">
231+
<div class="panel">
232+
<div class="panel-body" id="lesson_solution">
232233
</div>
233234
</div>
234235
</div>
235236
</div>
236237
<div class="row lessonHelp" id="lesson_source_row">
237238
<div class="col-md-12">
238239
<h4>Lesson Source Code</h4>
239-
<div class="panel" >
240-
<div class="panel-body" id="lesson_source">
240+
<div class="panel">
241+
<div class="panel-body" id="lesson_source">
242+
<pre>{{source}}</pre>
241243
</div>
242244
</div>
243245
</div>
@@ -260,17 +262,10 @@
260262
var DEBUG_FORM_SUBMISSION = false;
261263
262264
$(document).ready(function() {
263-
// bind to click events on menu links
264-
/*$('.menu-link').bind('click', function(event) {
265-
event.preventDefault();
266-
$.get(this.href, {}, function(reply) {
267-
$("#lesson_content").html(reply);
268-
goat.utils.showLessonSource();
269-
}, "html");
270-
});*/
271-
272265
app.init();
273-
266+
//can be augmented later to 'resume' for a given user ... currently kluged to start at fixed lesson
267+
var url = 'attack?Screen=32&menu=5';
268+
angular.element($('#leftside-navigation')).scope().renderLesson(url);
274269
});
275270
// make all forms ajax forms
276271
var options = {

‎src/main/webapp/css/main.css‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ img {
250250
}
251251

252252
.main-content-wrapper #main-content {
253-
background: url('img/webBg.png') no-repeat top left;
253+
/*background: url('img/webBg.png') no-repeat top left;*/
254254
border-top: solid thin #e7e8ec;
255255
display: inline-block;
256256
padding: 15px 15px 0 15px;
@@ -782,10 +782,6 @@ fieldset[disabled] .btn-warning.active {
782782
display: none;
783783
}
784784

785-
#hintsView, #cookiesAndParamsView {
786-
display:none;
787-
}
788-
789785
.table-nonfluid {
790786
width:auto;
791787
}
@@ -796,6 +792,11 @@ fieldset[disabled] .btn-warning.active {
796792
font-size: x-small;
797793
}
798794

795+
/* HINTS */
796+
#hintsViewTop{
797+
display: none;
798+
background-color: #eee;
799+
}
799800
.info {
800801
color:#e84c3d;
801802
font-weight: bold;

‎src/main/webapp/js/goatConstants.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ var goatConstants = {
2020
lessonPlanService:'service/lessonplan.mvc',
2121
menuService: 'service/lessonmenu.mvc',
2222
// literals
23-
notFound: 'Could not find'
23+
notFound: 'Could not find',
24+
noHints: 'There are no hints defined.'
25+
2426
};
2527

2628

0 commit comments

Comments
 (0)