Skip to content

Commit 91029ed

Browse files
author
Jason White
committed
reworked cookies/params and modified button layout some
1 parent 2a87ee6 commit 91029ed

File tree

3 files changed

+71
-42
lines changed

3 files changed

+71
-42
lines changed

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

Lines changed: 51 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -118,36 +118,21 @@
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">Java [Source]</button>
122-
<button type="button" id="showSolutionBtn" class="btn btn-primary">Solution</button>
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>
123124
</div>
124125
</div>
125126
</div>
126127
<div class="col-md-12">
127-
<div class="panel" id="buttonPanel">
128-
<button type="button" id="showParamsCookiesBtn" class="btn btn-primary btn-xs" ng-click="viewCookiesAndParams()">Params/Cookies</button>
129-
<button type="button" id="showHintsBtn" class="btn btn-primary btn-xs lessonHelpBtn">Hints</button>
130-
<button type="button" id="showPlanBtn" class="btn btn-primary btn-xs lessonHelpBtn">Lesson Plan</button>
131-
<button type="button" id="showSourceBtn" class="btn btn-primary btn-xs lessonHelpBtn">Java [Source]</button> <!-- ng-click="showSource('lg') -->
132-
<button type="button" id="showSolutionBtn" class="btn btn-primary btn-xs lessonHelpBtn">Solution</button> <!-- ng-click="showSolution('lg') -->
133-
</div>
134-
135-
<div class="panel" id="cookiesAndParams">
136-
<div class="cookiesView">
137-
cookies:
138-
<ul ng-repeat="cookie in cookies">
139-
<li ng-repeat="(key, value) in cookie">{{key}} :: {{ value}} </td>
140-
</ul>
141-
</div>
142-
<div> <!--class="paramsView"-->
143-
params:<br/>
144-
<ul>
145-
<li ng-repeat="param in params">
146-
{{param.name}} = {{param.value}}
147-
</li>
148-
</ul>
149-
</div>
150-
</div>
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> -->
151136
<div class="panel" >
152137
<div class="panel-body" id="lesson_content">
153138
<b>This should default to the "How to Work with Webgoat" lesson</b>
@@ -161,13 +146,48 @@
161146
<div class="panel">
162147
<div class="panel-body">
163148
<div align="left">
164-
<button id="showParamsCookiesBtn" type="button" class="btn btn-default">Params / Cookies</button>
165-
<button id="showHintsBtn" type="button" class="btn btn-default">Hints</button>
166-
<button id="showPlanBtn" type="button" class="btn btn-default">Lesson Plan</button>
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+
167152
</div>
168153
<hr />
169-
<h3>Hints</h3>
170-
<p>Nam placerat magna in massa euismod fringilla. Pellentesque in cursus risus, eu hendrerit ligula. Quisque ultrices eget tortor ut eleifend. Praesent auctor libero nec quam fringilla faucibus. Curabitur cursus risus eu faucibus rutrum. Morbi dapibus nulla risus, et euismod eros posuere volutpat. Quisque ut diam diam. Quisque sed enim tortor. Suspendisse commodo magna nec felis ultricies laoreet. Donec sit amet vehicula eros. Phasellus at dapibus enim. Sed massa quam, aliquet eu mattis at, porttitor a nisi.</p>
154+
<div id="hintsView">
155+
<h3>Hints</h3>
156+
<p>{{scope.hints}}</p>
157+
</div>
158+
<div id="cookiesAndParamsView">
159+
<div class="cookiesView">
160+
<h4>Cookies</h4>
161+
<table class="cookieTable table-striped table-nonfluid" ng-repeat="cookie in cookies">
162+
<thead>
163+
<tr><th>Field</th><th>Value</th></tr>
164+
</thead>
165+
<tbody>
166+
<tr ng-repeat="(key, value) in cookie">
167+
<td>{{key}}</td>
168+
<td>{{value}}</td>
169+
</tr>
170+
</tbody>
171+
<!--<li ng-repeat="(key, value) in cookie">{{key}} :: {{ value}} </td>-->
172+
<!--</ul>-->
173+
</table>
174+
</div>
175+
<div id="paramsView"> <!--class="paramsView"-->
176+
<h4>Params</h4>
177+
<table class="paramsTable table-striped table-nonfluid" id="paramsTable">
178+
<thead>
179+
<tr><th>Param</th><th>Value</th></tr>
180+
</thead>
181+
<tbody>
182+
<tr ng-repeat="param in params">
183+
<td>{{param.name}}</td>
184+
<td>{{param.value}}</td>
185+
</tr>
186+
</tbody>
187+
</table>
188+
</ul>
189+
</div>
190+
</div>
171191
</div>
172192
</div>
173193
</div>

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -781,11 +781,17 @@ fieldset[disabled] .btn-warning.active {
781781
.lessonHelp, .lessonHelpBtn {
782782
display: none;
783783
}
784-
/*
785-
.paramsView {
786-
float:right;
787-
width 50%;
788-
margin-right:10px;
789-
border-left:2px solid #333;
784+
785+
#hintsView, #cookiesAndParamsView {
786+
display:none;
787+
}
788+
789+
.table-nonfluid {
790+
width:auto;
790791
}
791-
*/
792+
793+
.cookieTable tr td, .paramsTable tr td {
794+
padding: 3px;
795+
max-width: 200px;
796+
font-size: x-small;
797+
}

‎src/main/webapp/js/goatControllers.js‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,13 @@ goat.controller('lessonHelpController', function($scope) {
5959
$scope.cookies=[];
6060
$scope.params=[];
6161
$scope.viewCookiesAndParams = function() {
62-
$scope.cookies=goat.lesson.lessonInfo.cookies;
63-
console.log($scope.cookies);
64-
$scope.params=goat.lesson.lessonInfo.params;
65-
62+
$('#hintsView').hide();
63+
if (goat.lesson.lessonInfo.cookies && goat.lesson.lessonInfo.cookies.length > 0) {
64+
$scope.cookies=goat.lesson.lessonInfo.cookies;
65+
console.log($scope.cookies);
66+
$scope.params=goat.lesson.lessonInfo.params;
67+
}
68+
$('#cookiesAndParamsView').show();
6669
//@TODO: issue callback to track view
6770
};
6871
//$scope.watch()

0 commit comments

Comments
 (0)