These got missed in the last commit

arc12012 · Apr 14, 2017 · 924f70e · 924f70e
1 parent 2a37d1e
commit 924f70e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/WebContent/html/webpages/admin.jsp b/WebContent/html/webpages/admin.jsp
@@ -73,9 +73,10 @@ div.approveConfirm {
 	<div class="col-sm-3 col-md-2 sidebar">
 		<ul class="nav nav-sidebar">
 			<h4>Admin Options</h4>
-			<li class="option"><a href="../webpages/adminApprove.jsp">Approve Devices</a></li>
-			<li class="option"><a href="#">Manage Admins</a></li>
-			<li class="option"><a href="#">Manage Devices</a></li>
+			<li class="option"><a href="adminApprove.jsp">Approve Devices</a></li>
+			<!-- will add in when maegan is done <li class="option"><a href="#">Manage Admins</a></li> -->
+			<li class="option"><a href="adminDeviceSettings.jsp">Manage Devices</a></li>
+			<li class="option"><a href="adminLocation.jsp">Manage Locations</a></li>
 		</ul>
 	</div>
 	<div class="displayDevice">

diff --git a/WebContent/html/webpages/adminLocation.jsp b/WebContent/html/webpages/adminLocation.jsp
@@ -48,13 +48,14 @@
 <body>
   <!-- Sidebar -->
   <div class="col-sm-3 col-md-2 sidebar">
-    <ul class="nav nav-sidebar">
-      <h4>Admin Options</h4>
-      <li class="option"><a href="../webpages/adminApprove.html">Approve Devices</a></li>
-      <li class="option"><a href="#">Manage Admins</a></li>
-      <li class="option"><a href="#">Manage Devices</a></li>
-    </ul>
-  </div>
+		<ul class="nav nav-sidebar">
+			<h4>Admin Options</h4>
+			<li class="option"><a href="adminApprove.jsp">Approve Devices</a></li>
+			<!-- will add in when maegan is done <li class="option"><a href="#">Manage Admins</a></li> -->
+			<li class="option"><a href="adminDeviceSettings.jsp">Manage Devices</a></li>
+			<li class="option"><a href="adminLocation.jsp">Manage Locations</a></li>
+		</ul>
+	</div>
 
   <!-- Modal for adding new location. -->
   <div id="addModal" class="modal">