Skip to content

Commit

Permalink
Added device listing page
Browse files Browse the repository at this point in the history
Also renamed devicerequest.html to header.html, and moved moved orderPage.html to the folder with the rest of the html
  • Loading branch information
arc12012 committed Nov 9, 2016
1 parent 11ef153 commit a5d29a8
Show file tree
Hide file tree
Showing 6 changed files with 127 additions and 0 deletions.
39 changes: 39 additions & 0 deletions html/deviceListing.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<!DOCTYPE html>
<html>
<head>
<title></title>
<style>
table {
border-collapse: collapse;
}
tr:nth-child(even) {background-color: #f2f2f2}
th, td {
text-align: center;
width: 100px;
}
</style>
</head>
<body>
<table data-table="list">
<tr>
<th>Name</th>
<th>Device Type</th>
<th>Version/OS</th>
<th>Location</th>
</tr>
<tr>
<td>Abernathy</td>
<td>iPhone</td>
<td>Zebra</td>
<td>CT</td>
</tr>
<tr>
<td>Dolores</td>
<td>Nexus</td>
<td>Jaguar</td>
<td>MASS</td>
</tr>
</table>
<script type="text/javascript" src="deviceListing.js"></script>
</body>
</html>
13 changes: 13 additions & 0 deletions html/deviceListing.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@

console.log(harvestDevices());


function harvestDevices() {
var array = [
["Name1","Type1","Version1","Location1"],
["Name2","Type2","Version2","Location2"],
["Name3","Type3","Version3","Location3"],
["Name4","Type4","Version4","Location4"]
];
return array;
}
1 change: 1 addition & 0 deletions html/DeviceRequest.html → html/header.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<!DOCTYPE html>
<head>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
Expand Down
66 changes: 66 additions & 0 deletions html/orderPage.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<head>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
</head>
<body>
<style>
table {
margin-left: 10;
margin-right: 10;
}
</style>
<div class="row">
<div class="col-xs-12">
<h3 class="text-center">
Devices
</h3>
</div>
</div>
<div class="row">
<div class="col-xs-3">
<h4 class = "text-center">
<a href="deviceListing.html">Phones</a>
</h4>
<h6 class = "text-center">Android</h6>
<h6 class = "text-center">Apple</h6>
<h6 class = "text-center">Windows</h6>
</div>
<div class="col-xs-3">
<h4 class = "text-center">
<a href="deviceListing.html">Tablets</a>
</h4>
<h6 class = "text-center">Apple</h6>
<h6 class = "text-center">Android</h6>
<h6 class = "text-center">Windows</h6>
</div>
<div class="col-xs-3">
<h4 class = "text-center">
<a href="deviceListing.html">Computers</a>
</h4>
<h6 class = "text-center">Windows</h6>
<h6 class = "text-center">Apple</h6>
<h6 class = "text-center">Linux</h6>
</div>
<div class="col-xs-3">
<h4 class = "text-center">
<a href="deviceListing.html">Other devices</a>
</h4>
<h6 class = "text-center">Android</h6>
<h6 class = "text-center">Windows</h6>
<h6 class = "text-center">Linux</h6>
<h6 class = "text-center">Apple</h6>
<table class="table table-condensed">
</table>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<h3 class="text-center">
<a href="deviceListing.html"> Or, click here for a list of all devices </a>
</h3>
</div>
</div>

<!-- bootstrap -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
</body>
4 changes: 4 additions & 0 deletions html/table.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
table, th {
border: 1px solid black;
color: blue;
}
4 changes: 4 additions & 0 deletions lib/jquery-3.1.1.min.js

Large diffs are not rendered by default.

0 comments on commit a5d29a8

Please sign in to comment.