More bug fixes

arc12012 · Apr 6, 2017 · 8a01c2c · 8a01c2c
1 parent eeb1fcd
commit 8a01c2c
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 58 deletions.
diff --git a/WebContent/html/css/stylesheet.css b/WebContent/html/css/stylesheet.css
@@ -14,7 +14,6 @@ div.sidebar{
     border-right-style: solid; 
     height: 100vh;
     background-color: #E9EAEB;
-    width: 300px;
     position: fixed;
 }
 

diff --git a/WebContent/html/webpages/admin.jsp b/WebContent/html/webpages/admin.jsp
@@ -67,7 +67,7 @@ div.approveConfirm {
 
 <body>
 	<nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal">
-		<%@ include file="navbar.html"%>
+		<%@ include file="navbar.jsp"%>
     </nav>
 
 	<div class="col-sm-3 col-md-2 sidebar">

diff --git a/WebContent/html/webpages/adminApprove.jsp b/WebContent/html/webpages/adminApprove.jsp
@@ -66,7 +66,7 @@
 
   <body>
     <nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal">
-      <%@ include file="navbar.html"%>
+      <%@ include file="navbar.jsp"%>
     </nav>
 
     <div class = "displayDevice">

diff --git a/WebContent/html/webpages/adminDeviceSettings.jsp b/WebContent/html/webpages/adminDeviceSettings.jsp
@@ -68,7 +68,7 @@
   </style>
   <!-- Header -->
   <nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal">
-  	<%@ include file="navbar.html"%>
+  	<%@ include file="navbar.jsp"%>
   </nav>
 </head>
 <body>

diff --git a/WebContent/html/webpages/adminLocation.jsp b/WebContent/html/webpages/adminLocation.jsp
@@ -42,7 +42,7 @@
   </style>
   <!-- Header -->
   <nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal">
-    <%@ include file="navbar.html"%>
+    <%@ include file="navbar.jsp"%>
   </nav>
 </head>
 <body>

diff --git a/WebContent/html/webpages/index.jsp b/WebContent/html/webpages/index.jsp
@@ -42,7 +42,7 @@
 <body>
 
   <nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal">
-        <%@ include file="navbar.html"%>
+        <%@ include file="navbar.jsp"%>
   </nav>
 
   <div class = "menuBox">

diff --git a/WebContent/html/webpages/listingPage.jsp b/WebContent/html/webpages/listingPage.jsp
@@ -51,7 +51,7 @@
 
 <body>
   <nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal">
-    <%@ include file="navbar.html"%>
+    <%@ include file="navbar.jsp"%>
   </nav>
   <div class="col-sm-3 col-md-2 sidebar">
    <ul class="nav nav-sidebar">

diff --git a/WebContent/html/webpages/locationRedirect.jsp b/WebContent/html/webpages/locationRedirect.jsp
@@ -20,7 +20,7 @@
   <link rel = "stylesheet" type = "text/css" href = "../css/stylesheet.css">
   <link rel = "shortcut icon" href = "../imgs/synchrony-financial-logo-dlpx_1.ico">
   <nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal">
-    <%@ include file="navbar.html"%>
+    <%@ include file="navbar.jsp"%>
   </nav>
 </head>
 <body>
@@ -36,7 +36,7 @@ String state = request.getParameter("state");
 String zip = request.getParameter("zip");
 //add form was submitted
 if(request.getParameter("add") != null){
-  Location location = new Location(name,address,town,state,zip);
+  Location location = new Location(name,address,town,state,zip,0);
   LocationQueries.addLocation(location);
 }
 //modify form was submitted

diff --git a/WebContent/html/webpages/map.jsp b/WebContent/html/webpages/map.jsp
@@ -37,7 +37,7 @@
   <body>
 
     <nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal">
-      <%@ include file="navbar.html"%>
+      <%@ include file="navbar.jsp"%>
     </nav>
 
     <h2>Our Wonderful Synchrony Financial Map!</h2>

diff --git a/WebContent/html/webpages/navbar.html b/WebContent/html/webpages/navbar.html
diff --git a/WebContent/html/webpages/navbar.jsp b/WebContent/html/webpages/navbar.jsp
@@ -33,10 +33,10 @@
 		}
 	}
 	User self = EmployeeQueries.getEmployeeByID(navsso);
-	String name = self.getName();
+	String navname = self.getName();
 	%>
 </div>
 <script>
-var name = '<%=name%>';
+var name = '<%=navname%>';
 document.getElementById('user').innerHTML = "Hi " + name + "!";
 </script>
diff --git a/WebContent/html/webpages/profileSettings.jsp b/WebContent/html/webpages/profileSettings.jsp
@@ -59,7 +59,7 @@
 <body>
     <!-- Header. -->
     <nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal">
-        <%@ include file="navbar.html"%>
+        <%@ include file="navbar.jsp"%>
     </nav>
     <!-- Sidebar -->
     <div class="col-sm-3 col-md-2 sidebar">

diff --git a/WebContent/html/webpages/requestPage.jsp b/WebContent/html/webpages/requestPage.jsp
@@ -62,7 +62,7 @@
 
 <body>
   <nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal">
-    <%@ include file="navbar.html"%>
+    <%@ include file="navbar.jsp"%>
   </nav>
   <div class="col-sm-3 col-md-2 sidebar">
     <ul class="nav nav-sidebar">

diff --git a/WebContent/html/webpages/returnComplete.jsp b/WebContent/html/webpages/returnComplete.jsp
@@ -20,7 +20,7 @@
   <link rel = "stylesheet" type = "text/css" href = "../css/stylesheet.css">
   <link rel = "shortcut icon" href = "../imgs/synchrony-financial-logo-dlpx_1.ico">
   <nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal">
-    <%@ include file="navbar.html"%>
+    <%@ include file="navbar.jsp"%>
   </nav>
 </head>
 <body>

diff --git a/WebContent/html/webpages/shoppingCart.jsp b/WebContent/html/webpages/shoppingCart.jsp
@@ -61,7 +61,7 @@ if(c.getName().equals("ssoNum")) sso = Integer.parseInt(c.getValue());
 
 <body>
     <nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal">
-        <%@ include file="navbar.html"%>
+        <%@ include file="navbar.jsp"%>
     </nav>
     <div id="orderInfoModal" class="modal">
         <div class="modal-content" style="overflow-y: auto; overflow-x: hidden">