From 1843b383ccd0a67217f71a687c7fcc881ea69c15 Mon Sep 17 00:00:00 2001 From: Adam R Claxton Date: Wed, 5 Apr 2017 16:36:44 -0400 Subject: [PATCH 1/7] Shoopingcart order popup-location name field hidden instead of disabled --- WebContent/html/webpages/shoppingCart.jsp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/WebContent/html/webpages/shoppingCart.jsp b/WebContent/html/webpages/shoppingCart.jsp index 49fa859..b0cfc27 100644 --- a/WebContent/html/webpages/shoppingCart.jsp +++ b/WebContent/html/webpages/shoppingCart.jsp @@ -88,9 +88,9 @@ if(c.getName().equals("ssoNum")) sso = Integer.parseInt(c.getValue()); -
+
- +
@@ -398,9 +398,9 @@ function forceUpdateLocationMetadata() { document.orderForm.state.value = selectedLocation.state; document.orderForm.zip.value = selectedLocation.zip; // if we're force updating metadata, it means we don't want the name to be editable - document.orderForm.locname.readOnly=true; + document.getElementsByName("locnamediv")[0].style.display="none"; } - else document.orderForm.locname.readOnly=false; //Should be editable with new location though + else document.getElementsByName("locnamediv")[0].style.display="initial"; //Should be editable with new location though } @@ -408,7 +408,7 @@ function forceUpdateLocationMetadata() { function forceDropdownCustomLocation() { document.orderForm.location_dropdown.selectedIndex=0; document.orderForm.locname.value=""; - document.orderForm.locname.readOnly=false; //let user edit name since they're making new location + document.getElementsByName("locnamediv")[0].style.display="initial"; //let user edit name since they're making new location } function getLocations() { From 8e8baf327b73e66ec0625122a3ae448a4e65ba78 Mon Sep 17 00:00:00 2001 From: Adam R Claxton Date: Wed, 5 Apr 2017 17:52:27 -0400 Subject: [PATCH 2/7] Search feature introduced to adimin device edit page-currently searches only by name Hopefully soon it will include more fields in its search --- .../html/webpages/adminDeviceSettings.jsp | 285 ++++++++++-------- 1 file changed, 165 insertions(+), 120 deletions(-) diff --git a/WebContent/html/webpages/adminDeviceSettings.jsp b/WebContent/html/webpages/adminDeviceSettings.jsp index 35a010d..44b1bbf 100644 --- a/WebContent/html/webpages/adminDeviceSettings.jsp +++ b/WebContent/html/webpages/adminDeviceSettings.jsp @@ -1,6 +1,6 @@ <%@ page import = "database.*,entities.Device" %> <%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> +pageEncoding="ISO-8859-1"%> @@ -84,121 +84,127 @@