diff --git a/documentation/diagrams/SDP_MobileUI.pptx b/WebContent/html/frameworks/Mobile UI Frameworks.pptx similarity index 100% rename from documentation/diagrams/SDP_MobileUI.pptx rename to WebContent/html/frameworks/Mobile UI Frameworks.pptx 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/navbar.js b/WebContent/html/javascript/navbar.js index 0dac4ad..963f850 100644 --- a/WebContent/html/javascript/navbar.js +++ b/WebContent/html/javascript/navbar.js @@ -1 +1 @@ -document.getElementById('navbaruniversal').innerHTML = '
' \ No newline at end of file +document.getElementById('navbaruniversal').innerHTML = '
' 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 } } diff --git a/WebContent/html/webpages/map.html b/WebContent/html/webpages/map.html index a44985c..5256954 100644 --- a/WebContent/html/webpages/map.html +++ b/WebContent/html/webpages/map.html @@ -70,134 +70,12 @@

Our Wonderful Synchrony Financial Map!

{imagePath: 'https://developers.google.com/maps/documentation/javascript/examples/markerclusterer/m'}); } var locations = [ - {lat: 47.610150, lng: -122.201516}, //Bellevue, WA - {lat: 47.610150, lng: -122.201516}, //Bellevue, WA {lat: 37.774929, lng: -122.419416}, //San Francisco, CA - {lat: 37.338208, lng: -121.886329}, //San Jose, CA - {lat: 33.641132, lng: -117.918669}, //Costa Mesa, CA - {lat: 40.760779, lng: -111.891047}, //Salt Lake City, UT - {lat: 40.760779, lng: -111.891047}, //Salt Lake City, UT - {lat: 33.448377, lng: -112.074037}, //Phoenix, AZ - {lat: 33.448377, lng: -112.074037}, //Phoenix, AZ - {lat: 33.448377, lng: -112.074037}, //Phoenix, AZ - {lat: 33.448377, lng: -112.074037}, //Phoenix, AZ - {lat: 33.448377, lng: -112.074037}, //Phoenix, AZ - {lat: 33.448377, lng: -112.074037}, //Phoenix, AZ - {lat: 33.448377, lng: -112.074037}, //Phoenix, AZ - {lat: 33.448377, lng: -112.074037}, //Phoenix, AZ - {lat: 33.448377, lng: -112.074037}, //Phoenix, AZ - {lat: 33.448377, lng: -112.074037}, //Phoenix, AZ - {lat: 33.448377, lng: -112.074037}, //Phoenix, AZ {lat: 14.599512, lng: 120.984219}, //Manilla, Philippines - {lat: 14.599512, lng: 120.984219}, //Manilla, Philippines - {lat: 14.599512, lng: 120.984219}, //Manilla, Philippines - {lat: 14.599512, lng: 120.984219}, //Manilla, Philippines - {lat: 14.599512, lng: 120.984219}, //Manilla, Philippines - {lat: 14.599512, lng: 120.984219}, //Manilla, Philippines - {lat: 17.385044, lng: 78.486671}, //Hyderabad, India - {lat: 17.385044, lng: 78.486671}, //Hyderabad, India - {lat: 17.385044, lng: 78.486671}, //Hyderabad, India {lat: 17.385044, lng: 78.486671}, //Hyderabad, India - {lat: 44.080543, lng: -103.231015}, //Rapid City, SD - {lat: 44.080543, lng: -103.231015}, //Rapid City, SD - {lat: 44.080543, lng: -103.231015}, //Rapid City, SD - {lat: 44.080543, lng: -103.231015}, //Rapid City, SD - {lat: 44.080543, lng: -103.231015}, //Rapid City, SD - {lat: 44.080543, lng: -103.231015}, //Rapid City, SD - {lat: 44.080543, lng: -103.231015}, //Rapid City, SD - {lat: 44.080543, lng: -103.231015}, //Rapid City, SD - {lat: 44.080543, lng: -103.231015}, //Rapid City, SD - {lat: 44.080543, lng: -103.231015}, //Rapid City, SD - {lat: 44.080543, lng: -103.231015}, //Rapid City, SD - {lat: 39.023617, lng: -94.69357}, //Merriam, KS - {lat: 39.023617, lng: -94.69357}, //Merriam, KS - {lat: 36.372854, lng: -94.208817}, //Bentonville, AR - {lat: 36.372854, lng: -94.208817}, //Bentonville, AR - {lat: 36.372854, lng: -94.208817}, //Bentonville, AR - {lat: 36.372854, lng: -94.208817}, //Bentonville, AR - {lat: 36.372854, lng: -94.208817}, //Bentonville, AR - {lat: 36.372854, lng: -94.208817}, //Bentonville, AR - {lat: 36.372854, lng: -94.208817}, //Bentonville, AR - {lat: 36.372854, lng: -94.208817}, //Bentonville, AR - {lat: 36.372854, lng: -94.208817}, //Bentonville, AR - {lat: 33.150674, lng: -96.823612}, //Frisco, TX - {lat: 33.150674, lng: -96.823612}, //Frisco, TX - {lat: 33.150674, lng: -96.823612}, //Frisco, TX - {lat: 33.150674, lng: -96.823612}, //Frisco, TX - {lat: 33.150674, lng: -96.823612}, //Frisco, TX - {lat: 33.150674, lng: -96.823612}, //Frisco, TX - {lat: 33.150674, lng: -96.823612}, //Frisco, TX - {lat: 33.150674, lng: -96.823612}, //Frisco, TX - {lat: 44.953703, lng: -93.089958}, //St. Paul, MN - {lat: 44.953703, lng: -93.089958}, //St. Paul, MN - {lat: 44.953703, lng: -93.089958}, //St. Paul, MN {lat: 41.878114, lng: -87.629798}, //Chicago, IL - {lat: 41.878114, lng: -87.629798}, //Chicago, IL - {lat: 41.878114, lng: -87.629798}, //Chicago, IL - {lat: 41.878114, lng: -87.629798}, //Chicago, IL - {lat: 41.878114, lng: -87.629798}, //Chicago, IL - {lat: 41.878114, lng: -87.629798}, //Chicago, IL - {lat: 41.878114, lng: -87.629798}, //Chicago, IL - {lat: 39.689504, lng: -84.168827}, //Kettering, OH - {lat: 39.689504, lng: -84.168827}, //Kettering, OH - {lat: 39.689504, lng: -84.168827}, //Kettering, OH - {lat: 39.689504, lng: -84.168827}, //Kettering, OH - {lat: 34.075376, lng: -84.29409}, //Alpharetta, GA - {lat: 40.798947, lng: -81.378447}, //Canton, OH - {lat: 40.798947, lng: -81.378447}, //Canton, OH - {lat: 40.798947, lng: -81.378447}, //Canton, OH - {lat: 40.798947, lng: -81.378447}, //Canton, OH - {lat: 40.798947, lng: -81.378447}, //Canton, OH - {lat: 40.798947, lng: -81.378447}, //Canton, OH - {lat: 35.227087, lng: -80.843127}, //Charloette, NC - {lat: 28.538335, lng: -81.379236}, //Orlando, FL - {lat: 28.538335, lng: -81.379236}, //Orlando, FL - {lat: 28.538335, lng: -81.379236}, //Orlando, FL - {lat: 28.538335, lng: -81.379236}, //Orlando, FL - {lat: 28.538335, lng: -81.379236}, //Orlando, FL - {lat: 28.538335, lng: -81.379236}, //Orlando, FL - {lat: 28.538335, lng: -81.379236}, //Orlando, FL - {lat: 28.538335, lng: -81.379236}, //Orlando, FL - {lat: 28.538335, lng: -81.379236}, //Orlando, FL - {lat: 28.538335, lng: -81.379236}, //Orlando, FL - {lat: 28.538335, lng: -81.379236}, //Orlando, FL - {lat: 28.538335, lng: -81.379236}, //Orlando, FL - {lat: 28.538335, lng: -81.379236}, //Orlando, FL - {lat: 28.538335, lng: -81.379236}, //Orlando, FL - {lat: 28.538335, lng: -81.379236}, //Orlando, FL - {lat: 40.593964, lng: -74.604906}, //Bridgewater, NJ - {lat: 40.593964, lng: -74.604906}, //Bridgewater, NJ - {lat: 40.593964, lng: -74.604906}, //Bridgewater, NJ - {lat: 40.593964, lng: -74.604906}, //Bridgewater, NJ - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 41.053430, lng: -73.538734}, //Stamford, CT {lat: 41.053430, lng: -73.538734}, //Stamford, CT - {lat: 42.345927, lng: -71.552287} //Marlborough, MA + {lat: 41.053430, lng: -73.538734} //Stamford, CT ]