dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates to UI since last unsuccessful push attempt. Menus rendering now, but still need some work.

Browse Source
This commit is contained in:
Jason White 2014-08-13 06:13:17 -04:00
parent 6ffd8b95f4
commit a4807a026c
4 changed files with 89 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
webapp/WEB-INF/pages/main_new.jsp
View File

@ -13,8 +13,6 @@
<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]--> <!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
<!--[if gt IE 8]><!--> <!--[if gt IE 8]><!-->
<!-- IMPORT -->
<!-- Favicon -->
<!-- CSS --> <!-- CSS -->
<link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon"> <link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon">
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
@ -25,7 +23,7 @@
<link rel="stylesheet" href="css/animate.css"> <link rel="stylesheet" href="css/animate.css">
<!-- Custom styles for this theme --> <!-- Custom styles for this theme -->
<link rel="stylesheet" href="css/main.css"> <link rel="stylesheet" href="css/main.css">
<!-- removed unused items, see index.html in newDesign folder to diff -->
<!-- JS --> <!-- JS -->
<script src="js/angular/angular.min.js"></script> <script src="js/angular/angular.min.js"></script>
<script src="js/angular/angular-animate.min.js"></script> <script src="js/angular/angular-animate.min.js"></script>
@ -40,6 +38,7 @@
var goat=angular.module("goatApp",['ngAnimate']); var goat=angular.module("goatApp",['ngAnimate']);
</script> </script>
<script type="text/javascript" src="js/goat.js"></script> <script type="text/javascript" src="js/goat.js"></script>
<script type="text/javascript" src="js/goatConstants.js"></script>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
<title>WebGoat V6.0</title> <title>WebGoat V6.0</title>
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css"/> <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css"/>
@ -66,11 +65,11 @@
<div id="leftside-navigation" class="nano" ng-controller="goatMenu"> <div id="leftside-navigation" class="nano" ng-controller="goatMenu">
<ul class="nano-content"> <ul class="nano-content">
<li class="sub-menu" ng-repeat="item in menuTopics"> <li class="sub-menu" ng-repeat="item in menuTopics">
<!--//TODO: implement conditional rendering --> <!-- TODO: implement conditional rendering -->
<a href="javascript:void(0)"><span>{{item.name}}</span><i class="fa"> </i></a> <a ng-click="expanded = !expanded" href="#"><i class="fa {{item.class}}"></i><span>{{item.name}}</span></a>
<ul class=><!-- javascript:void(0); --> <ul ng-class="{slideDown: expanded}">
<li ng-repeat="child in item.children"> <li ng-repeat="child in item.children">
<a href="{{child.link}}">{{child.name}}</a> <a ng-click="renderLesson(child.link)" title="link to {{child.name}}">{{child.name}}</a>
</li> </li>
</ul> </ul>
</li> </li>
@ -110,7 +109,7 @@
<script src="js/jquery-1.10.2.min.js"></script> <script src="js/jquery-1.10.2.min.js"></script>
<script src="plugins/bootstrap/js/bootstrap.min.js"></script> <script src="plugins/bootstrap/js/bootstrap.min.js"></script>
<!-- <script src="plugins/waypoints/waypoints.min.js"></script> --> <!-- <script src="plugins/waypoints/waypoints.min.js"></script> -->
<script src="js/application.js"></script> <!-- <script src="js/application.js"></script> -->
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
@ -119,9 +118,6 @@
<script src="http://malsup.github.com/jquery.form.js"></script> <script src="http://malsup.github.com/jquery.form.js"></script>
<script> <script>
//Load global functions //Load global functions
$(document).ready(function() {
app.init();
});
// set this to true if you want to see form submissions // set this to true if you want to see form submissions
// set to false once we get all the kinks worked out // set to false once we get all the kinks worked out

8
webapp/js/angular/angular-animate.min.js.map Normal file
View File

File diff suppressed because one or more lines are too long

83
webapp/js/goat.js
View File

File diff suppressed because one or more lines are too long

40
webapp/js/goatConstants.js Normal file
View File

@ -0,0 +1,40 @@
//goatConstants
var goatConstants = {};
goatConstants.CATEGORYCLASS = 'fa-angle-right pull-right';
goatConstants.menuPrefix = [
{
name:'Home',
type:'STATIC',
complete:false,
link:'home.jsp',
children:null,
class:'fa-home'
},
{
name:'About',
type:'STATIC',
complete:false,
link:'about.jsp',
children:null,
class:'fa-users'
},
{
name:'Contact',
type:'STATIC',
complete:false,
link:'contact.jsp',
children:null,
class:'fa-envelope-o'
},
{
name:'LESSONS',
type:'STATIC',
complete:false,
link:'',
children:null,
class:'fa-bars'
}
];