From 3dc05cc1fb5184f4572938d9f271dba8b1f8202a Mon Sep 17 00:00:00 2001 From: Connor L Jackson Date: Fri, 31 Mar 2017 15:30:45 -0400 Subject: [PATCH] Switching Branch Still need to do work --- WebContent/html/css/stylesheet.css | 4 + .../html/webpages/adminDeviceSettings.jsp | 279 ++++++++---------- WebContent/html/webpages/adminLocation.jsp | 2 - WebContent/html/webpages/deviceRedirect.jsp | 70 +++++ src/database/MySQLAccess.java | 25 +- src/entities/Device.java | 55 +++- 6 files changed, 275 insertions(+), 160 deletions(-) create mode 100644 WebContent/html/webpages/deviceRedirect.jsp 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/webpages/adminDeviceSettings.jsp b/WebContent/html/webpages/adminDeviceSettings.jsp index 31c0744..5036700 100644 --- a/WebContent/html/webpages/adminDeviceSettings.jsp +++ b/WebContent/html/webpages/adminDeviceSettings.jsp @@ -32,13 +32,39 @@ } .table{ - width: auto; background-color: #E9EAEB; } tbody{ text-align: left; } + + .column{ + width: 10px; + } + + body{ + overflow: visible; + } + + div.sidebar{ + position: relative; + } + + div.displayDevice{ + padding-right: 30px; + } + + div.modal-content{ + max-height: 100%; + width: 100%; + } + + div.form-group{ + display: inline-block; + vertical-align: top; + } +