Permalink
Browse files

Fixed error with logon, cheers kerin, rearranges assets and pages to …

…deploy
  • Loading branch information...
1 parent 48259d3 commit 2db42d3e9ba5c5f8834dc6e942284414309157f7 iplk committed Oct 9, 2012
Showing with 531 additions and 307 deletions.
  1. +0 −113 Web/pages/Public/GridView.html
  2. +35 −35 Web/pages/Admin/ApproveComment.html → web/approvecomment.html
  3. +39 −36 Web/pages/Admin/ApproveIncident.html → web/approveincident.html
  4. 0 {Web → web}/assets/cslib/AjaxCommons.coffee
  5. 0 {Web → web}/assets/cslib/AjaxCommonsMock.coffee
  6. 0 {Web → web}/assets/cslib/ApproveComment.coffee
  7. 0 {Web → web}/assets/cslib/ApproveIncident.coffee
  8. 0 {Web → web}/assets/cslib/Feedback.coffee
  9. 0 {Web → web}/assets/cslib/GridView.coffee
  10. 0 {Web → web}/assets/cslib/IncidentModal.coffee
  11. 0 {Web → web}/assets/cslib/IncidentThumbnail.coffee
  12. 0 {Web → web}/assets/cslib/Index.coffee
  13. +5 −5 {Web → web}/assets/cslib/Users.coffee
  14. 0 {Web → web}/assets/cslib/mapview.coffee
  15. 0 {Web → web}/assets/css/bootstrap-responsive.css
  16. 0 {Web → web}/assets/css/bootstrap-responsive.min.css
  17. 0 {Web → web}/assets/css/bootstrap.css
  18. 0 {Web → web}/assets/css/bootstrap.min.css
  19. +10 −1 {Web → web}/assets/css/custom.css
  20. BIN {Web → web}/assets/img/1040x640.gif
  21. BIN {Web → web}/assets/img/540x320.gif
  22. BIN {Web → web}/assets/img/RWBanner.png
  23. BIN {Web → web}/assets/img/glyphicons-halflings-white.png
  24. BIN {Web → web}/assets/img/glyphicons-halflings.png
  25. BIN {Web → web}/assets/img/load.gif
  26. BIN {Web → web}/assets/img/logo.psd
  27. BIN {Web → web}/assets/img/rw.png
  28. BIN {Web → web}/assets/img/team.png
  29. 0 {Web → web}/assets/js/AjaxCommons.js
  30. 0 {Web → web}/assets/js/AjaxCommonsMock.js
  31. 0 {Web → web}/assets/js/ApproveComment.js
  32. 0 {Web → web}/assets/js/ApproveIncident.js
  33. 0 {Web → web}/assets/js/Feedback.js
  34. 0 {Web → web}/assets/js/GridView.js
  35. 0 {Web → web}/assets/js/IncidentModal.js
  36. 0 {Web → web}/assets/js/IncidentThumbnail.js
  37. 0 {Web → web}/assets/js/Index.js
  38. 0 {Web → web}/assets/js/MapView.js
  39. +13 −5 {Web → web}/assets/js/Users.js
  40. 0 {Web → web}/assets/js/bootstrap-carousel.js
  41. 0 {Web → web}/assets/js/bootstrap-modal.js
  42. 0 {Web → web}/assets/js/bootstrap-transition.js
  43. 0 {Web → web}/assets/js/bootstrap.js
  44. 0 {Web → web}/assets/js/bootstrap.min.js
  45. 0 {Web → web}/assets/js/jquery.js
  46. +188 −0 web/assets/js/mapview.js
  47. +39 −35 Web/pages/Public/Feedback.html → web/feedback.html
  48. +117 −0 web/gridview.html
  49. +44 −40 Web/pages/Public/Index.html → web/index.html
  50. +41 −37 Web/pages/Public/MapView.html → web/mapview.html
@@ -1,113 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>River Watch</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <!-- Le styles -->
- <link href="../../assets/css/bootstrap.css" rel="stylesheet">
- <style>
- body {
- padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
- }
- </style>
- <link href="../../assets/css/bootstrap-responsive.css" rel="stylesheet">
- <link href="../../assets/css/custom.css" rel="stylesheet">
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../../assets/ico/apple-touch-icon-57-precomposed.png">
-
-
- </head>
-
- <body>
-
- <div class="navbar navbar-fixed-top">
- <div class="navbar-inner">
- <div class="container">
- <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </a>
- <a class="brand" href="#">River Watch</a>
- <div class="nav-collapse">
- <ul class="nav">
- <li><a href="../Public/Index.html">Home</a></li>
- <li class = "active"><a href="../Public/GridView.html">Incident Gallery</a></li>
- <li><a href="../Public/MapView.html">Incident Map</a></li>
- <li><a href="../Public/Feedback.html">Contact Us</a></li>
- </ul>
- <ul class="nav pull-right">
- <li><img id = "ajaxLoader" src="../../assets/img/load.gif"></li>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">
- Administration <b class="caret"></b>
- </a>
- <ul class="dropdown-menu">
- <li><a href="../Admin/ApproveIncident.html">Approve Incidents</a></li>
- <li><a href="../Admin/ApproveComment.html">Approve Comments</a></li>
- </ul>
- </li>
- </ul>
- </div><!--/.nav-collapse -->
- </div>
- </div>
- </div>
-
- </div>
- <div class="container">
- <ul class="thumbnails" id = "picgrid">
- <!--
- This is where the thumbnails go
- -->
- </ul>
- </div>
-</div>
-
-
-
- <!-- /container -->
-
- <!-- Le javascript
- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster
- <script src="../../assets/js/jquery.js"></script>
- <script src="../../assets/js/bootstrap-transition.js"></script>
- <script src="../../assets/js/bootstrap-alert.js"></script>
-
- <script src="../../assets/js/bootstrap-dropdown.js"></script>
- <script src="../../assets/js/bootstrap-scrollspy.js"></script>
- <script src="../../assets/js/bootstrap-tab.js"></script>
- <script src="../../assets/js/bootstrap-tooltip.js"></script>
- <script src="../../assets/js/bootstrap-popover.js"></script>
- <script src="../../assets/js/bootstrap-button.js"></script>
- <script src="../../assets/js/bootstrap-collapse.js"></script>
- <script src="../../assets/js/bootstrap-carousel.js"></script>
- <script src="../../assets/js/bootstrap-typeahead.js"></script>
--->
-
- <script src="../../assets/js/jquery.js"></script>
- <script src="../../assets/js/bootstrap.js"></script>
- <script src="../../assets/js/bootstrap-transition.js"></script>
- <script src="../../assets/js/bootstrap-modal.js"></script>
-
- <script src="../../assets/js/AjaxCommons.js"></script>
- <script src="../../assets/js/IncidentModal.js"></script>
- <script src="../../assets/js/IncidentThumbnail.js"></script>
- <script src="../../assets/js/GridView.js"></script>
-
- </body>
-</html>
@@ -8,26 +8,26 @@
<meta name="author" content="">
<!-- Le styles -->
- <link href="../../assets/css/bootstrap.css" rel="stylesheet">
+ <link href="assets/css/bootstrap.css" rel="stylesheet">
<style>
body {
padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
}
</style>
- <link href="../../assets/css/bootstrap-responsive.css" rel="stylesheet">
- <link href="../../assets/css/custom.css" rel="stylesheet">
+ <link href="assets/css/bootstrap-responsive.css" rel="stylesheet">
+ <link href="assets/css/custom.css" rel="stylesheet">
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../../assets/ico/apple-touch-icon-57-precomposed.png">
+ <link rel="shortcut icon" href="assets/ico/favicon.ico">
+ <link rel="apple-touch-icon-precomposed" sizes="144x144" href="assets/ico/apple-touch-icon-144-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png">
</head>
@@ -45,19 +45,19 @@
<a class="brand" href="#">River Watch</a>
<div class="nav-collapse">
<ul class="nav">
- <li><a href="../Public/Index.html">Home</a></li>
- <li><a href="../Public/GridView.html">Incident Gallery</a></li>
- <li><a href="../Public/MapView.html">Incident Map</a></li>
- <li><a href="../Public/Feedback.html">Contact Us</a></li>
+ <li><a href="index.html">Home</a></li>
+ <li><a href="gridview.html">Incident Gallery</a></li>
+ <li><a href="mapview.html">Incident Map</a></li>
+ <li><a href="feedback.html">Contact Us</a></li>
</ul>
<ul class="nav pull-right">
<li id="adminMenu" class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
Administration <b class="caret"></b>
</a>
<ul class="dropdown-menu">
- <li><a href="../Admin/ApproveIncident.html">Approve Incidents</a></li>
- <li><a href="../Admin/ApproveComment.html">Approve Comments</a></li>
+ <li><a href="approveincident.html">Approve Incidents</a></li>
+ <li><a href="approvecomment.html">Approve Comments</a></li>
<li><a id = "logoutButton" href="#">Log out</a></li>
</ul>
</li>
@@ -68,13 +68,13 @@
<ul class="dropdown-menu">
<form action="" id="form_login" style= "padding:5px;margin:0px;" accept-charset="utf-8" method="post">
<input id="usernameInput" type="text" placeholder="UserName">
- <input id="passwordInput" type="text" placeholder="Password">
+ <input id="passwordInput" type="password" placeholder="Password">
</form>
<li><a class="" id = "loginButton" href="#">Log In</a></li>
</ul>
</li>
- <li><img id = "ajaxLoader" src="../../assets/img/load.gif"></li>
+ <li><img id = "ajaxLoader" src="assets/img/load.gif"></li>
</ul>
</div><!--/.nav-collapse -->
</div>
@@ -92,28 +92,28 @@ <h1>Approve Comments</h1>
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster
- <script src="../../assets/js/jquery.js"></script>
- <script src="../../assets/js/bootstrap-transition.js"></script>
- <script src="../../assets/js/bootstrap-alert.js"></script>
+ <script src="assets/js/jquery.js"></script>
+ <script src="assets/js/bootstrap-transition.js"></script>
+ <script src="assets/js/bootstrap-alert.js"></script>
- <script src="../../assets/js/bootstrap-dropdown.js"></script>
- <script src="../../assets/js/bootstrap-scrollspy.js"></script>
- <script src="../../assets/js/bootstrap-tab.js"></script>
- <script src="../../assets/js/bootstrap-tooltip.js"></script>
- <script src="../../assets/js/bootstrap-popover.js"></script>
- <script src="../../assets/js/bootstrap-button.js"></script>
- <script src="../../assets/js/bootstrap-collapse.js"></script>
- <script src="../../assets/js/bootstrap-carousel.js"></script>
- <script src="../../assets/js/bootstrap-typeahead.js"></script>
+ <script src="assets/js/bootstrap-dropdown.js"></script>
+ <script src="assets/js/bootstrap-scrollspy.js"></script>
+ <script src="assets/js/bootstrap-tab.js"></script>
+ <script src="assets/js/bootstrap-tooltip.js"></script>
+ <script src="assets/js/bootstrap-popover.js"></script>
+ <script src="assets/js/bootstrap-button.js"></script>
+ <script src="assets/js/bootstrap-collapse.js"></script>
+ <script src="assets/js/bootstrap-carousel.js"></script>
+ <script src="assets/js/bootstrap-typeahead.js"></script>
-->
- <script src="../../assets/js/jquery.js"></script>
- <script src="../../assets/js/bootstrap.js"></script>
- <script src="../../assets/js/bootstrap-transition.js"></script>
- <script src="../../assets/js/bootstrap-modal.js"></script>
- <script src="../../assets/js/AjaxCommons.js"></script>
- <script src="../../assets/js/ApproveComment.js"></script>
- <script src="../../assets/js/Users.js"></script>
+ <script src="assets/js/jquery.js"></script>
+ <script src="assets/js/bootstrap.js"></script>
+ <script src="assets/js/bootstrap-transition.js"></script>
+ <script src="assets/js/bootstrap-modal.js"></script>
+ <script src="assets/js/AjaxCommons.js"></script>
+ <script src="assets/js/ApproveComment.js"></script>
+ <script src="assets/js/Users.js"></script>
</body>
</html>
@@ -8,26 +8,26 @@
<meta name="author" content="">
<!-- Le styles -->
- <link href="../../assets/css/bootstrap.css" rel="stylesheet">
+ <link href="assets/css/bootstrap.css" rel="stylesheet">
<style>
body {
padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
}
</style>
- <link href="../../assets/css/bootstrap-responsive.css" rel="stylesheet">
- <link href="../../assets/css/custom.css" rel="stylesheet">
+ <link href="assets/css/bootstrap-responsive.css" rel="stylesheet">
+ <link href="assets/css/custom.css" rel="stylesheet">
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../../assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../../assets/ico/apple-touch-icon-57-precomposed.png">
+ <link rel="shortcut icon" href="assets/ico/favicon.ico">
+ <link rel="apple-touch-icon-precomposed" sizes="144x144" href="assets/ico/apple-touch-icon-144-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png">
</head>
@@ -45,23 +45,26 @@
<a class="brand" href="#">River Watch</a>
<div class="nav-collapse">
<ul class="nav">
- <li><a href="../Public/Index.html">Home</a></li>
- <li><a href="../Public/GridView.html">Incident Gallery</a></li>
- <li><a href="../Public/MapView.html">Incident Map</a></li>
- <li><a href="../Public/Feedback.html">Contact Us</a></li> </ul>
+ <li><a href="index.html">Home</a></li>
+ <li><a href="gridview.html">Incident Gallery</a></li>
+ <li><a href="mapview.html">Incident Map</a></li>
+ <li><a href="feedback.html">Contact Us</a></li> </ul>
</ul>
<ul class="nav pull-right">
- <li><img id = "ajaxLoader" src="../../assets/img/load.gif"></li>
- <li class="dropdown">
+ <li id="loginMenu" class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
- Administration <b class="caret"></b>
+ Log in <b class="caret"></b>
</a>
<ul class="dropdown-menu">
- <li><a href="../Admin/ApproveIncident.html">Approve Incidents</a></li>
- <li><a href="../Admin/ApproveComment.html">Approve Comments</a></li>
+ <form action="" id="form_login" style= "padding:5px;margin:0px;" accept-charset="utf-8" method="post">
+ <input id="usernameInput" type="text" placeholder="UserName">
+ <input id="passwordInput" type="password" placeholder="Password">
+
+ </form>
+ <li><a class="" id = "loginButton" href="#">Log In</a></li>
</ul>
</li>
- </ul>
+ <li><img id = "ajaxLoader" src="assets/img/load.gif"></li>
</ul>
</div><!--/.nav-collapse -->
</div>
@@ -104,27 +107,27 @@ <h5>Tags</h5>
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster
- <script src="../../assets/js/jquery.js"></script>
- <script src="../../assets/js/bootstrap-transition.js"></script>
- <script src="../../assets/js/bootstrap-alert.js"></script>
+ <script src="assets/js/jquery.js"></script>
+ <script src="assets/js/bootstrap-transition.js"></script>
+ <script src="assets/js/bootstrap-alert.js"></script>
- <script src="../../assets/js/bootstrap-dropdown.js"></script>
- <script src="../../assets/js/bootstrap-scrollspy.js"></script>
- <script src="../../assets/js/bootstrap-tab.js"></script>
- <script src="../../assets/js/bootstrap-tooltip.js"></script>
- <script src="../../assets/js/bootstrap-popover.js"></script>
- <script src="../../assets/js/bootstrap-button.js"></script>
- <script src="../../assets/js/bootstrap-collapse.js"></script>
- <script src="../../assets/js/bootstrap-carousel.js"></script>
- <script src="../../assets/js/bootstrap-typeahead.js"></script>
+ <script src="assets/js/bootstrap-dropdown.js"></script>
+ <script src="assets/js/bootstrap-scrollspy.js"></script>
+ <script src="assets/js/bootstrap-tab.js"></script>
+ <script src="assets/js/bootstrap-tooltip.js"></script>
+ <script src="assets/js/bootstrap-popover.js"></script>
+ <script src="assets/js/bootstrap-button.js"></script>
+ <script src="assets/js/bootstrap-collapse.js"></script>
+ <script src="assets/js/bootstrap-carousel.js"></script>
+ <script src="assets/js/bootstrap-typeahead.js"></script>
-->
- <script src="../../assets/js/jquery.js"></script>
- <script src="../../assets/js/bootstrap.js"></script>
- <script src="../../assets/js/bootstrap-transition.js"></script>
- <script src="../../assets/js/bootstrap-modal.js"></script>
- <script src="../../assets/js/AjaxCommons.js"></script>
- <script src="../../assets/js/ApproveIncident.js"></script>
+ <script src="assets/js/jquery.js"></script>
+ <script src="assets/js/bootstrap.js"></script>
+ <script src="assets/js/bootstrap-transition.js"></script>
+ <script src="assets/js/bootstrap-modal.js"></script>
+ <script src="assets/js/AjaxCommons.js"></script>
+ <script src="assets/js/ApproveIncident.js"></script>
</body>
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -19,17 +19,17 @@ getCookie = (name) ->
return unescape cookie[1]
isAdmin = () ->
- return getCookie "status" == "Admin"
+ return getCookie("status") == "Admin"
setLogInControl = () ->
if isAdmin()
console.log "Showing admin menu"
- adminMenu.show()
- loginMenu.hide()
+ adminMenu.css {display: "block"}
+ loginMenu.css {display: "none"}
else
console.log "Hiding admin menu"
- adminMenu.hide()
- loginMenu.show()
+ adminMenu.css {display: "none"}
+ loginMenu.css {display: "block"}
logoutButton.click ->
setCookie "status", "User"
File renamed without changes.
File renamed without changes.
File renamed without changes.
Oops, something went wrong.

0 comments on commit 2db42d3

Please sign in to comment.