From 2a87ee669cd58d51c10134ba76a58969d0f283d3 Mon Sep 17 00:00:00 2001 From: lawson89 <> Date: Wed, 3 Sep 2014 21:58:10 -0400 Subject: [PATCH] pull in changes from Ali --- src/main/webapp/WEB-INF/pages/main_new.jsp | 528 +++++++++++---------- src/main/webapp/css/main.css | 33 +- 2 files changed, 308 insertions(+), 253 deletions(-) diff --git a/src/main/webapp/WEB-INF/pages/main_new.jsp b/src/main/webapp/WEB-INF/pages/main_new.jsp index 91c0c0dfd..88b771305 100644 --- a/src/main/webapp/WEB-INF/pages/main_new.jsp +++ b/src/main/webapp/WEB-INF/pages/main_new.jsp @@ -8,275 +8,307 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - WebGoat V6.0 -
- - - - - - -
- -
-
-
-
- - - - - -
- -
-
- cookies: -
    -
  • {{key}} :: {{ value }} -
-
-
- params:
-
    -
  • - {{param.name}} = {{param.value}} -
    • -
-
-
-
-
- This should default to the "How to Work with Webgoat" lesson -
- -
-
+
+ + + + + + +
+ +
+
+
+
+
+
+ + +
+
+
+
+
+ + + + + +
+ +
+
+ cookies: +
    +
  • {{key}} :: {{ value}} +
+
+
+ params:
+
    +
  • + {{param.name}} = {{param.value}} +
    • +
+
+
+
+
+ This should default to the "How to Work with Webgoat" lesson +
+ +
+
+
+
+
+
+
+
+ + + +
+
+

Hints

+

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.

+
+
+
+
+
+
+
+
+

Lesson Parameters and Cookies

+
+
+ +
+
+
+
+
+
+

Lesson Hints

+
+
+ +
+
+
+
+
+
+

Lesson Plan

+
+
+ +
+
+
+
+
+
+

Lesson Solution

+
+
+
+
+
+
+
+
+

Lesson Source Code

+
+
+
+
+
+
+
+
+ + +
- - -
- diff --git a/src/main/webapp/css/main.css b/src/main/webapp/css/main.css index ea2dad842..8f92c46c6 100644 --- a/src/main/webapp/css/main.css +++ b/src/main/webapp/css/main.css @@ -100,7 +100,8 @@ img { color: #F6F6F6; } #header .toggle-navigation.toggle-left { - margin: 23px 0 0 20px; + margin-top: 5px; + margin-left: 20px; display: inline-block; } #header .btn-default { @@ -119,9 +120,31 @@ img { cursor: pointer; color: #797979; } +#header .btn-default .fa-info, +#header .btn-default .fa-envelope, +#header .btn-default .fa-user { + color: #797979; +} +#header .user-nav button:hover, +#header .user-nav button:active { + background: #e84c3d; +} +#header .user-nav button:hover i { + color: #F6F6F6; +} +#header .lessonTitle { + display: inline-block; + margin:0 0 0 20px; +} +#header .pull-right { + float: right !important; + margin-top:25px; + margin-right:20px; +} /* Sidebar */ .sidebar { width: 240px; + /*height: 100%;*/ background: #222; position: absolute; -webkit-transition: all 0.3s ease-in-out; @@ -341,8 +364,8 @@ a.btn-primary:visited { a.btn-primary:hover, a.btn-primary:active { color: #ffffff; - background-color: #1dd2af; - border-color: #1dd2af; + background-color: #C62F28; + border-color: #C62F28; } .btn-primary:hover, .btn-primary:focus, @@ -350,8 +373,8 @@ a.btn-primary:active { .btn-primary.active, .open .dropdown-toggle.btn-primary { color: #ffffff; - background-color: #1dd2af; - border-color: #1dd2af; + background-color: #C62F28; + border-color: #C62F28; } .btn-primary:active, .btn-primary.active,