From 048eabc45d1c3e3417e1217863b701894c200926 Mon Sep 17 00:00:00 2001 From: Connor L Jackson Date: Sat, 15 Apr 2017 12:44:07 -0400 Subject: [PATCH] Website Reorganization Files are more organized now --- WebContent/adminLogin.jsp | 4 +- .../webpages/{ => administration}/admin.jsp | 18 ++--- .../{ => administration}/adminApprove.jsp | 37 +++++------ .../adminDeviceSettings.jsp | 28 ++++---- .../{ => administration}/adminLocation.jsp | 41 +++++------- .../{ => administration}/adminpassword.jsp | 29 ++++---- .../adminpasswordtryagain.jsp | 31 ++++----- .../html/webpages/components/adminnavbar.jsp | 66 +++++++++++++++++++ .../html/webpages/components/adminsidebar.jsp | 10 +++ .../html/webpages/{ => components}/navbar.jsp | 6 +- WebContent/html/webpages/error.jsp | 2 +- WebContent/html/webpages/index.jsp | 2 +- WebContent/html/webpages/listingPage.jsp | 2 +- WebContent/html/webpages/profileSettings.jsp | 4 +- .../{ => redirect}/adminpasswordchange.jsp | 57 +++++++++++++--- .../{ => redirect}/deviceRedirect.jsp | 10 ++- .../{ => redirect}/locationRedirect.jsp | 12 ++-- .../{ => redirect}/orderFormHandler.jsp | 10 ++- .../profileSettingsRedirect.jsp | 12 ++-- .../{ => redirect}/ticketAdminRedirect.jsp | 10 ++- WebContent/html/webpages/requestPage.jsp | 2 +- WebContent/html/webpages/returnComplete.jsp | 2 +- WebContent/html/webpages/returnPage.jsp | 2 +- WebContent/html/webpages/shoppingCart.jsp | 4 +- WebContent/html/webpages/somethingwrong.jsp | 2 +- WebContent/html/webpages/statisticsPage.jsp | 2 +- 26 files changed, 240 insertions(+), 165 deletions(-) rename WebContent/html/webpages/{ => administration}/admin.jsp (71%) rename WebContent/html/webpages/{ => administration}/adminApprove.jsp (85%) rename WebContent/html/webpages/{ => administration}/adminDeviceSettings.jsp (94%) rename WebContent/html/webpages/{ => administration}/adminLocation.jsp (92%) rename WebContent/html/webpages/{ => administration}/adminpassword.jsp (55%) rename WebContent/html/webpages/{ => administration}/adminpasswordtryagain.jsp (53%) create mode 100644 WebContent/html/webpages/components/adminnavbar.jsp create mode 100644 WebContent/html/webpages/components/adminsidebar.jsp rename WebContent/html/webpages/{ => components}/navbar.jsp (91%) rename WebContent/html/webpages/{ => redirect}/adminpasswordchange.jsp (54%) rename WebContent/html/webpages/{ => redirect}/deviceRedirect.jsp (86%) rename WebContent/html/webpages/{ => redirect}/locationRedirect.jsp (84%) rename WebContent/html/webpages/{ => redirect}/orderFormHandler.jsp (82%) rename WebContent/html/webpages/{ => redirect}/profileSettingsRedirect.jsp (77%) rename WebContent/html/webpages/{ => redirect}/ticketAdminRedirect.jsp (82%) 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" %> +