Skip to content

Polishing #4

Merged
merged 4 commits into from
Dec 3, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions html/css/stylesheet.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
body{
background-color: #94969A;
padding-top: 50px;
height: 100vh;
}

a.divlink{
Expand Down
2 changes: 1 addition & 1 deletion html/javascript/navbar.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion html/javascript/request.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ function show(){
//iterate through the hardcoded device DB and select all the ones that match the selected option
for(var i = 0; i < devices.length; i++){
if((type.localeCompare(devices[i].hardware) == 0 || type.localeCompare(devices[i].software) == 0) && !isUnavailable(i)){
html += '<div class = "deviceContainer"><div class = "imgContainer"><img src="../imgs/' + devices[i].hardware + '.png" class = "device">' + devices[i].name + '</div><div class = "deviceDescp"><p>' + devices[i].description + '</p><button class = "requestbutton" id = "button' + (i+1) + '" type="button">Order device</button></div></div><br>'
html += '<div class = "deviceContainer"><div class = "imgContainer"><img src="../imgs/' + devices[i].hardware + '.png" class = "device">' + devices[i].name + '</div><div class = "deviceDescp"><p>' + devices[i].description + '</p><button class = "requestbutton" id = "button' + (i+1) + '" type="button">Order device</button></div></div><br><br>'
}
}

Expand Down
1 change: 1 addition & 0 deletions html/javascript/shoppingCart.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ function show(){
var cart = getCartItems(); //get all the cart items you want to show
var html = ''; //html string initially empty
if(cart.length !== 0){ //only continue if there are cart items
html += '<p>Tickets have been generated below based on your desired selections.</p><br>'
for(var i = 0; i < cart.length; i++){ //iterate cart
var id = cart[i]; //this gets the id value from the cart
for(var j = 0; j < devices.length; j++){ //iterate device list
Expand Down
15 changes: 9 additions & 6 deletions html/webpages/requestPage.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,17 @@
display: inline-block;
position: absolute;
padding-left: 30px;
overflow-y: scroll;
width: 100%;
height: 100%;
}

div.deviceContainer{
border: solid;
border-width: thin;
padding: 15px;
background-color: #E9EAEB;
display: inline-block;
}

div.imgContainer{
Expand All @@ -40,7 +44,6 @@
display: inline-block;
width: 200px;
text-align: center;
vertical-align: center;
}

button.requestbutton{
Expand All @@ -51,8 +54,7 @@
div.sidebar{
display: inline-block;
border-right-style: solid;
height: 100%;
width: 200px;
height: 100vh;
background-color: #E9EAEB;
}

Expand All @@ -61,13 +63,14 @@
top: 50%;
left: 50%;
position: fixed;
width: 100px;
height: 70px;
line-height: 70px;
width: 155px;
height: 85px;
line-height: 85px;
text-align: center;
background-color: #FBC600;
border: solid;
border-color: #3B3C43;
border-radius: 5px;
}

ul.nav{
Expand Down
8 changes: 4 additions & 4 deletions html/webpages/shoppingCart.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
div.sidebar{
display: inline-block;
border-right-style: solid;
height: 100%;
width: 200px;
height: 100vh;
background-color: #E9EAEB;
}

Expand All @@ -31,6 +30,7 @@
display: inline-block;
position: absolute;
padding-left: 30px;
width: 100%;
}

div.ticket{
Expand All @@ -57,9 +57,9 @@
<ul class="nav nav-sidebar">
<h4>Shopping Cart Options</h4>
<li class = "option" id = "os"><a href="#">Order Selected</a></li>
<li class = "option" id = "ds"><a href="#">Delete Selected</a></li>
<li class = "option" id = "ds"><a href="#">Remove Selected From Cart</a></li>
<li class = "option" id = "oa"><a href="#">Order All</a></li>
<li class = "option" id = "da"><a href="#">Delete All</a></li>
<li class = "option" id = "da"><a href="#">Remove All From Cart</a></li>
</ul>
</div>

Expand Down