From 58df8d6afb3a372fb2ee1e283eb7f0214aab2e9d Mon Sep 17 00:00:00 2001
From: Connor L Jackson <connor.jackson@uconn.edu>
Date: Wed, 19 Apr 2017 09:22:53 -0400
Subject: [PATCH] More bug fixes

---
 .../html/webpages/components/adminnavbar.jsp  | 21 +++++++++++++----
 .../html/webpages/components/navbar.jsp       | 23 ++++++++++++++-----
 WebContent/html/webpages/profileSettings.jsp  |  4 ++--
 WebContent/html/webpages/returnComplete.jsp   | 10 ++++++--
 4 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/WebContent/html/webpages/components/adminnavbar.jsp b/WebContent/html/webpages/components/adminnavbar.jsp
index 12663db..1a5ec3c 100644
--- a/WebContent/html/webpages/components/adminnavbar.jsp
+++ b/WebContent/html/webpages/components/adminnavbar.jsp
@@ -19,10 +19,21 @@
 		<ul class="nav navbar-nav navbar-right">
 			<li><a href="../../webpages/">Home</a></li>
 			<li id = "adminbar"></li>
-			<li><a href="../requestPage.jsp">Request Device</a></li>
-			<li><a href="../returnPage.jsp">My Devices</a></li>
-			<li><a href="../listingPage.jsp">Device Library</a></li>
-			<li><a href="../shoppingCart.jsp">Shopping Cart</a></li>
+			<li class="dropdown">
+			<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Device Library <span class="caret"></span></a>
+			<ul class="dropdown-menu">
+	            <li><a href="../requestPage.jsp">Request Hub</a></li>
+	            <li><a href="../listingPage.jsp">Full Inventory Listing</a></li>
+          	</ul>
+			</li>
+			<li class="dropdown">
+			<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">My Stuff <span class="caret"></span></a>
+			<ul class="dropdown-menu">
+	            <li><a href="../returnPage.jsp">My Devices</a></li>
+	            <li><a href="../shoppingCart.jsp">My Shopping Cart</a></li>
+	            <li><a href="../profileSettings.jsp">Profile Settings</a></li>
+          	</ul>
+			</li>
 			<li><a href="../logout.jsp">Logout</a></li>
 		</ul>
 	</div>
@@ -68,5 +79,5 @@
 var name = '<%=navname%>';
 document.getElementById('user').innerHTML = "Hi " + name + "!";
 if(<%=admin%> == 1)
-document.getElementById('adminbar').innerHTML = '<a href="admin.jsp">Admin Hub</a>'
+document.getElementById('adminbar').innerHTML = '<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Admin Hub <span class="caret"></span></a><ul class="dropdown-menu"><li><a href="admin.jsp">Admin Hub Main</a></li><li><a href="adminApprove.jsp">Ticket Hub</a></li><li><a href="adminDeviceSettings.jsp">Device Hub</a></li><li><a href="adminLocation.jsp">Location Hub</a></li></ul>'
 </script>
\ No newline at end of file
diff --git a/WebContent/html/webpages/components/navbar.jsp b/WebContent/html/webpages/components/navbar.jsp
index 70e6caa..f2385ff 100644
--- a/WebContent/html/webpages/components/navbar.jsp
+++ b/WebContent/html/webpages/components/navbar.jsp
@@ -18,11 +18,22 @@
 	<div id="navbar" class="navbar-collapse collapse" aria-expanded="false">
 		<ul class="nav navbar-nav navbar-right">
 			<li><a href="../webpages/">Home</a></li>
-			<li id = "adminbar"></li>
-			<li><a href="requestPage.jsp">Request Device</a></li>
-			<li><a href="returnPage.jsp">My Devices</a></li>
-			<li><a href="listingPage.jsp">Device Library</a></li>
-			<li><a href="shoppingCart.jsp">Shopping Cart</a></li>
+			<li class = "dropdown" id = "adminbar"></li>
+			<li class="dropdown">
+			<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Device Library <span class="caret"></span></a>
+			<ul class="dropdown-menu">
+	            <li><a href="requestPage.jsp">Request Hub</a></li>
+	            <li><a href="listingPage.jsp">Full Inventory Listing</a></li>
+          	</ul>
+			</li>
+			<li class="dropdown">
+			<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">My Stuff <span class="caret"></span></a>
+			<ul class="dropdown-menu">
+	            <li><a href="returnPage.jsp">My Devices</a></li>
+	            <li><a href="shoppingCart.jsp">My Shopping Cart</a></li>
+	            <li><a href="profileSettings.jsp">Profile Settings</a></li>
+          	</ul>
+			</li>
 			<li><a href="logout.jsp">Logout</a></li>
 		</ul>
 	</div>
@@ -62,5 +73,5 @@
 var name = '<%=navname%>';
 document.getElementById('user').innerHTML = "Hi " + name + "!";
 if(<%=admin%> == 1)
-document.getElementById('adminbar').innerHTML = '<a href="administration/admin.jsp">Admin Hub</a>'
+document.getElementById('adminbar').innerHTML = '<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Admin Hub <span class="caret"></span></a><ul class="dropdown-menu"><li><a href="administration/admin.jsp">Admin Hub Main</a></li><li><a href="administration/adminApprove.jsp">Ticket Hub</a></li><li><a href="administration/adminDeviceSettings.jsp">Device Hub</a></li><li><a href="administration/adminLocation.jsp">Location Hub</a></li></ul>'
 </script>
\ No newline at end of file
diff --git a/WebContent/html/webpages/profileSettings.jsp b/WebContent/html/webpages/profileSettings.jsp
index 71cd20b..e7ae4ea 100644
--- a/WebContent/html/webpages/profileSettings.jsp
+++ b/WebContent/html/webpages/profileSettings.jsp
@@ -86,7 +86,7 @@
 </div>
 
 <!-- Profile Settings -->
-<div class = "profileContainer" style="visibility: visible;">
+<div class = "profileContainer">
     <div style = "display: inline-block;">
         <!-- Where profile image gets edited -->
         <div class = "imageContainer">
@@ -123,7 +123,7 @@
     </form>
 </div>
 <!-- Notification Settings -->
-<div class = "notificationContainer">
+<div class = "notificationContainer" style = "visibility: hidden;">
     <!-- Where main user information is edited -->
     <form action = "redirect/notificationSettingsRedirect.jsp" class = "infobar">
         <h2>Email Notification Settings</h2>
diff --git a/WebContent/html/webpages/returnComplete.jsp b/WebContent/html/webpages/returnComplete.jsp
index 9496be2..fa0fb05 100644
--- a/WebContent/html/webpages/returnComplete.jsp
+++ b/WebContent/html/webpages/returnComplete.jsp
@@ -24,15 +24,21 @@
   </nav>
 </head>
 <body>
+<div style = "margin-left: 15px;">
   <h2>Returning Devices</h2>
   <p>Thanks for returning some devices!</p>
+  <p>You can ship the devices to the following address:</p>
+  <div style = "background-color: white; display: inline-block; padding: 10px; margin-bottom: 5px; border-radius: 5px;">
+  Synchrony Financial<br>777 Long Ridge Road<br>Stamford, CT<br>06902
+  </div>
   <form action = "returnPage.jsp">
   	<button type = "submit" class = "btn btn-primary">Go Back</button>
   </form>
+</div>
 <%
 //get string from request form
-String devices = request.getParameter("devicesToReturn");
-DeviceQueries.returnDevices(devices);
+//String devices = request.getParameter("devicesToReturn");
+//DeviceQueries.returnDevices(devices);
 %>
 </body>
 </html>
\ No newline at end of file