From f6ac85168b56661abb12af6cf823cbd8bda165f9 Mon Sep 17 00:00:00 2001
From: Jason White <jsnsotheracct@gmail.com>
Date: Wed, 24 Sep 2014 21:07:30 -0400
Subject: [PATCH] change to fix WEB-164, some other UI updates

---
 src/main/webapp/WEB-INF/pages/main_new.jsp                 | 6 ++++--
 src/main/webapp/css/main.css                               | 7 ++++---
 src/main/webapp/js/goatUtil.js                             | 2 --
 src/main/webapp/lessons/CrossSiteScripting/ViewProfile.jsp | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/WEB-INF/pages/main_new.jsp b/src/main/webapp/WEB-INF/pages/main_new.jsp
index e804bb42f..8eb9daed9 100644
--- a/src/main/webapp/WEB-INF/pages/main_new.jsp
+++ b/src/main/webapp/WEB-INF/pages/main_new.jsp
@@ -176,9 +176,10 @@
                                         <div id="cookiesAndParamsView">
                                             <div class="cookiesView">
                                                 <h4>Cookies</h4>
-                                                <table class="cookieTable table-striped table-nonfluid" ng-repeat="cookie in cookies">
+                                                <div class="cookieContainer" ng-repeat="cookie in cookies">
+                                                <table class="cookieTable table-striped table-nonfluid" >
                                                     <thead>
-                                                        <tr><th class="col-sm-1">Field</th><th class="col-sm-1">Value</th></tr>
+                                                        <tr><th class="col-sm-1"></th><th class="col-sm-1"></th></tr> <!-- Field / Value -->
                                                     </thead>
                                                     <tbody>
                                                         <tr ng-repeat="(key, value) in cookie">
@@ -189,6 +190,7 @@
                                                     <!--<li ng-repeat="(key, value) in cookie">{{key}} :: {{ value}} </td>-->
                                                     <!--</ul>-->
                                                 </table>
+                                                </div>
                                             </div>
                                             <div id="paramsView"> <!--class="paramsView"-->
                                                 <h4>Params</h4>
diff --git a/src/main/webapp/css/main.css b/src/main/webapp/css/main.css
index 659ed76b1..87bbecd7d 100644
--- a/src/main/webapp/css/main.css
+++ b/src/main/webapp/css/main.css
@@ -716,10 +716,11 @@ fieldset[disabled] .btn-warning.active {
 
 .table-nonfluid {
   width:auto;
-  
+ margin-bottom:15px; 
 }
-.table-nonfluid {
- 
+
+cookieContainer {
+	margin-bottom:4px;
 }
 
 .cookieTable tr td, .paramsTable tr td {
diff --git a/src/main/webapp/js/goatUtil.js b/src/main/webapp/js/goatUtil.js
index 826e8c208..d2968e596 100644
--- a/src/main/webapp/js/goatUtil.js
+++ b/src/main/webapp/js/goatUtil.js
@@ -102,8 +102,6 @@ goat.utils = {
                     function() {
                         var _url = $(el).attr('link');
                         $.get(_url, {success:showResponse});
-                        //return $.get(_url, {}, null, "html");
-                        //angular.element($('#leftside-navigation')).scope().renderLesson(curMenuItem,url);
                     }
                 )
             }
diff --git a/src/main/webapp/lessons/CrossSiteScripting/ViewProfile.jsp b/src/main/webapp/lessons/CrossSiteScripting/ViewProfile.jsp
index e9d293a47..46822d95e 100644
--- a/src/main/webapp/lessons/CrossSiteScripting/ViewProfile.jsp
+++ b/src/main/webapp/lessons/CrossSiteScripting/ViewProfile.jsp
@@ -151,7 +151,7 @@ WebSession webSession = ((WebSession)session.getAttribute("websession"));
 					</td>
                       <td width="190">&nbsp;</td>
                       <td width="76">
-						<form method="POST">
+						<form method="POST" action="<%=webSession.getCurrentLesson().getFormAction()%>">
 							<input type="submit" name="action" value="<%=CrossSiteScripting.LOGOUT_ACTION%>"/>
 						</form>
 					</td>