diff --git a/WebContent/html/imgs/computerStick.png b/WebContent/html/imgs/computerStick.png deleted file mode 100644 index 38a5a64..0000000 Binary files a/WebContent/html/imgs/computerStick.png and /dev/null differ diff --git a/WebContent/html/imgs/ipad.png b/WebContent/html/imgs/ipad.png deleted file mode 100644 index dd56f42..0000000 Binary files a/WebContent/html/imgs/ipad.png and /dev/null differ diff --git a/WebContent/html/imgs/iphone.png b/WebContent/html/imgs/iphone.png deleted file mode 100644 index d4e9ee4..0000000 Binary files a/WebContent/html/imgs/iphone.png and /dev/null differ diff --git a/WebContent/html/imgs/my-icons-collection-devices/license/license.pdf b/WebContent/html/imgs/my-icons-collection-devices/license/license.pdf new file mode 100644 index 0000000..bdeedb7 Binary files /dev/null and b/WebContent/html/imgs/my-icons-collection-devices/license/license.pdf differ diff --git a/WebContent/html/imgs/my-icons-collection-devices/png/Camera.png b/WebContent/html/imgs/my-icons-collection-devices/png/Camera.png new file mode 100644 index 0000000..6e2f1ee Binary files /dev/null and b/WebContent/html/imgs/my-icons-collection-devices/png/Camera.png differ diff --git a/WebContent/html/imgs/my-icons-collection-devices/png/Computer.png b/WebContent/html/imgs/my-icons-collection-devices/png/Computer.png new file mode 100644 index 0000000..ab31afd Binary files /dev/null and b/WebContent/html/imgs/my-icons-collection-devices/png/Computer.png differ diff --git a/WebContent/html/imgs/my-icons-collection-devices/png/Router.png b/WebContent/html/imgs/my-icons-collection-devices/png/Router.png new file mode 100644 index 0000000..0c9148a Binary files /dev/null and b/WebContent/html/imgs/my-icons-collection-devices/png/Router.png differ diff --git a/WebContent/html/imgs/my-icons-collection-devices/png/Smartphone.png b/WebContent/html/imgs/my-icons-collection-devices/png/Smartphone.png new file mode 100644 index 0000000..2256dc0 Binary files /dev/null and b/WebContent/html/imgs/my-icons-collection-devices/png/Smartphone.png differ diff --git a/WebContent/html/imgs/my-icons-collection-devices/png/Tablet.png b/WebContent/html/imgs/my-icons-collection-devices/png/Tablet.png new file mode 100644 index 0000000..c1011a1 Binary files /dev/null and b/WebContent/html/imgs/my-icons-collection-devices/png/Tablet.png differ diff --git a/WebContent/html/imgs/my-icons-collection-devices/png/iPod Touch.png b/WebContent/html/imgs/my-icons-collection-devices/png/iPod Touch.png new file mode 100644 index 0000000..c857d29 Binary files /dev/null and b/WebContent/html/imgs/my-icons-collection-devices/png/iPod Touch.png differ diff --git a/WebContent/html/javascript/listing.jsp b/WebContent/html/javascript/listing.jsp index 407abf5..d2cb072 100644 --- a/WebContent/html/javascript/listing.jsp +++ b/WebContent/html/javascript/listing.jsp @@ -1,3 +1,4 @@ +<<<<<<< HEAD <%@ page import = "database.MySQLAccess" %> <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%> @@ -170,4 +171,157 @@ function isUnavailable(id){ }
+<% +MySQLAccess myaccess = new MySQLAccess(); +myaccess.connectDB(); +String name = myaccess.getResult()[0][0]; +String description = myaccess.getResult()[0][1]; +String hardware = myaccess.getResult()[0][2]; +System.out.println(name); +//out.println(description); +//out.println(hardware); +%> + + ++======= +<%@ page import = "database.MySQLAccess" %> +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> + + +
+ +
+ +
+>>>>>>> refs/remotes/origin/master