diff --git a/.classpath b/.classpath index 09ba841..3cc104c 100644 --- a/.classpath +++ b/.classpath @@ -22,5 +22,6 @@ + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index a3bf73b..3b1bc05 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,6 +1,7 @@ + diff --git a/WebContent/html/css/stylesheet.css b/WebContent/html/css/stylesheet.css index 96b77b9..f063542 100644 --- a/WebContent/html/css/stylesheet.css +++ b/WebContent/html/css/stylesheet.css @@ -85,6 +85,10 @@ input[type=number]{ width: 60%; } +textarea{ + margin: 0 auto; +} + select{ margin:0 auto; width: 65%; diff --git a/WebContent/html/javascript/listing.jsp b/WebContent/html/javascript/listing.jsp index 7da247d..d709c5b 100644 --- a/WebContent/html/javascript/listing.jsp +++ b/WebContent/html/javascript/listing.jsp @@ -1,4 +1,4 @@ -<%@ page import = "database.*,entities.ListedDevice" %> +<%@ page import = "database.*,entities.Device" %> <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> @@ -8,24 +8,20 @@ <% - ListedDevice[] mydevices = DeviceQueries.getAllDevices(); - + Device[] mydevices = DeviceQueries.getAllDevices(); //string representation of array. - String deviceString = ListedDevice.arrayToString(mydevices); + String deviceString = Device.arrayToString(mydevices); //out.println(description); //out.println(hardware); - %> + + + + + + + + <%@ include file="navbar.html"%> + + + + + + + Admin Options + Approve Devices + Manage Admins + Manage Devices + + + + + + + + × + Add a New Device Below + + + + + + Device Name * + + + + Description + + + + Availability * + + + + + MAC Address + + + + Manufacturer * + + + + + Hardware Type * + + + + + Model Name * + + + + Serial Number + + + + NFC ID + + + Add + + + + + + + + + + × + Modify Device Below + + + + + + Device Name * + + + + Description + + + + Availability * + + + + + MAC Address + + + + Manufacturer * + + + + + Hardware Type * + + + + + Model Name * + + + + Serial Number + + + + NFC ID + + + Save Changes + Delete + + + + + + + + Device Listing + + + + + Name + Description + Availability + MAC Address + Manufacturer + Hardware Type + Model Name + Serial Number + NFC ID + + + + + + Add Device + +<% +//database query +Device[] devices = DeviceQueries.getAllDevices(); +//string representation of array. +String deviceString = Device.arrayToString(devices); +deviceString = deviceString.replace("'","\\'"); +%> + + + + +