Skip to content

Commit

Permalink
Last minute aestethics improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
clj13001 committed Dec 7, 2016
1 parent 0ec98ce commit d6a8f0f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions WebContent/html/javascript/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ function show(){
}
}

if(html.localeCompare("")==0)
html = "<p>There are no requests to approve</p>";
if(html.localeCompare("<p>Please review the device requests below.</p>")==0)
html = "<p>There are no requests to approve.</p>";

//add to HTML page
document.getElementById('devContainer').innerHTML = html;
Expand Down
16 changes: 8 additions & 8 deletions WebContent/html/javascript/shoppingCart.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,47 +4,47 @@ 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",
};

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:'&quotThe hardest part of ending is starting again.&quot',
hardware:"iPad",
software:"apple",
};

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",
};

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",
};

var dev6 = {
id: 6,
name:"Captain America",
description:"&quotMake America Great Again.&quot Wait, thats someone else..",
hardware:"computerStick",
hardware:"Computer Stick",
software:"intel",
};

Expand Down Expand Up @@ -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 += '<div> <input class = "deviceCheckbox" type = "checkbox" id = "' + id + '"> </input><a class = "divlink" href = "#" onmouseover = "'+ part1 + devices[j].description + part2 + '"><div id = "ticket' + id +'" class = "ticket"><p class = "tickettext">' + devices[j].name + '</p></div></a></div>'; //create listing of all the devices
html += '<div> <input class = "deviceCheckbox" type = "checkbox" id = "' + id + '"> </input><a class = "divlink" href = "#" onmouseover = "'+ part1 + 'Hardware type: ' + devices[j].hardware + '<br><br>' + devices[j].description + part2 + '"><div id = "ticket' + id +'" class = "ticket"><p class = "tickettext">' + devices[j].name + '</p></div></a></div>'; //create listing of all the devices
break; //break out of loop when we match
}
}
Expand Down

0 comments on commit d6a8f0f

Please sign in to comment.