diff --git a/WebContent/html/javascript/admin.js b/WebContent/html/javascript/admin.js index 468600d..3cbeb89 100644 --- a/WebContent/html/javascript/admin.js +++ b/WebContent/html/javascript/admin.js @@ -68,8 +68,8 @@ function show(){ } } - if(html.localeCompare("")==0) - html = "

There are no requests to approve

"; + if(html.localeCompare("

Please review the device requests below.

")==0) + html = "

There are no requests to approve.

"; //add to HTML page document.getElementById('devContainer').innerHTML = html; diff --git a/WebContent/html/javascript/shoppingCart.js b/WebContent/html/javascript/shoppingCart.js index 04cd257..b2d3f17 100644 --- a/WebContent/html/javascript/shoppingCart.js +++ b/WebContent/html/javascript/shoppingCart.js @@ -4,7 +4,7 @@ var dev1 = { id: 1, name:"George", description:"George is probably the coolest iPhone to exist. Ever. Point blank, period.", - hardware:"iphone", + hardware:"iPhone", software:"apple", }; @@ -12,15 +12,15 @@ var dev2 = { id: 2, name:"Greyson", description:"Greyson is pretty cool.. I guess.", - hardware:"iphone", + hardware:"iPhone", software:"apple", }; var dev3 = { id: 3, name:"Linkin Park", - description:'"The hardest part of ending is starting again."', - hardware:"ipad", + description:'"The hardest part of ending is starting again."', + hardware:"iPad", software:"apple", }; @@ -28,7 +28,7 @@ var dev4 = { id: 4, name:"Abercrombie", description:"To all the people that hated me in high school, I have the prettiest clothes you all wear now!!", - hardware:"ipad", + hardware:"iPad", software:"apple", }; @@ -36,7 +36,7 @@ var dev5 = { id: 5, name:"Hulk", description:"Go ahead and HULK SMASH! this awesome computer stick into your USB.", - hardware:"computerStick", + hardware:"Computer Stick", software:"intel", }; @@ -44,7 +44,7 @@ var dev6 = { id: 6, name:"Captain America", description:""Make America Great Again." Wait, thats someone else..", - hardware:"computerStick", + hardware:"Computer Stick", software:"intel", }; @@ -82,7 +82,7 @@ function show(){ var id = cart[i]; //this gets the id value from the cart for(var j = 0; j < devices.length; j++){ //iterate device list if(devices[j].id === id){ //match the id's "nhpup.popup(' ');" - html += '

' + devices[j].name + '

'; //create listing of all the devices + html += '

' + devices[j].name + '

'; //create listing of all the devices break; //break out of loop when we match } }