diff --git a/WebContent/adminLogin.jsp b/WebContent/adminLogin.jsp index e4db5fc..3ac93cc 100644 --- a/WebContent/adminLogin.jsp +++ b/WebContent/adminLogin.jsp @@ -49,13 +49,13 @@ if (result.next()){ if(result.getInt("Password_Flag") == 1){ stmt.close(); connection.close(); - response.sendRedirect("html/webpages/admin.jsp"); + response.sendRedirect("html/webpages/administration/admin.jsp"); return; } else{ stmt.close(); connection.close(); - response.sendRedirect("html/webpages/adminpassword.jsp"); + response.sendRedirect("html/webpages/administration/adminpassword.jsp"); return; } } else { diff --git a/WebContent/html/webpages/admin.jsp b/WebContent/html/webpages/administration/admin.jsp similarity index 71% rename from WebContent/html/webpages/admin.jsp rename to WebContent/html/webpages/administration/admin.jsp index 9ddfd7b..6719058 100644 --- a/WebContent/html/webpages/admin.jsp +++ b/WebContent/html/webpages/administration/admin.jsp @@ -15,9 +15,9 @@ src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"> - + + href="../../imgs/synchrony-financial-logo-dlpx_1.ico">
- + <%@ include file = "../components/adminsidebar.jsp" %>
@@ -92,7 +83,7 @@ pageEncoding="ISO-8859-1"%>
-
+
@@ -147,7 +138,7 @@ pageEncoding="ISO-8859-1"%>

- +
@@ -252,7 +243,6 @@ populateDevices(devices); //adds event listeners to all table records $("tr.entry").click(modifyModal); - //Exits modal when x is clicked. $("#closeModifyForm").click(closeModifyModal); //Open the add modal @@ -263,6 +253,7 @@ $("#closeAddForm").click(closeAddModal); window.onkeydown = function(e){if (e.keyCode == 27){closeAddModal();closeModifyModal();}} //Event listener exits modal when click outside modal. window.onclick = function(e){var add = document.getElementById('addModal'); var modify = document.getElementById('modifyModal'); if(e.target == add || e.target == modify) {closeAddModal();closeModifyModal();}} + //set up options in modals var manuHTML = ''; var hardwareHTML = ''; @@ -430,6 +421,7 @@ function modifyModal(){ if(id == devices[i].id) break; } + //autofill modal $("#modifyName").val(devices[i].name.replace(/"/g,"\"")); $("#modifyDesc").val(devices[i].description.replace(/"/g,"\"")); $("#modifyAvailability").val(devices[i].status); @@ -443,10 +435,12 @@ function modifyModal(){ $("#modifyModal").show(); } +//close modify modal function closeModifyModal(){ $("#modifyModal").hide(); } +//find if a string is in the array function findInArray(string,array){ if (array.length == 0) return false @@ -458,6 +452,6 @@ function findInArray(string,array){ } - + \ No newline at end of file diff --git a/WebContent/html/webpages/adminLocation.jsp b/WebContent/html/webpages/administration/adminLocation.jsp similarity index 92% rename from WebContent/html/webpages/adminLocation.jsp rename to WebContent/html/webpages/administration/adminLocation.jsp index 1f53a3a..76d6d88 100644 --- a/WebContent/html/webpages/adminLocation.jsp +++ b/WebContent/html/webpages/administration/adminLocation.jsp @@ -12,16 +12,13 @@ Synchrony Financial - - - - - + + - +
- -
+ <%@ include file="../components/adminsidebar.jsp" %> +