commit for merge

arc12012 · Nov 30, 2016 · bd14d5d · bd14d5d
1 parent 4f84080
commit bd14d5d
Show file tree

Hide file tree

Showing 2 changed files with 109 additions and 4 deletions.
diff --git a/html/webpages/homePage.html b/html/webpages/homePage.html
@@ -71,10 +71,12 @@ <h2>Request</h2>
 			  <p>Check out our selection of devices that YOU have the chance to check out!</p>  
 			</div>
 		</a>
-		<div class = "menuOption">
-		  <h2>Return</h2>
-		  <p>All set with a device? No problem! You can return it here!</p>   
-		</div> 
+    <a class = "divlink" href="returnPage.html">
+		  <div class = "menuOption">  
+		    <h2>Return</h2> 
+		    <p>All set with a device? No problem! You can   return it here!</p>   
+		  </div> 
+    </a>
       </div>
       <div>
 		<a class = "divlink" href = "listingPage.html">

diff --git a/html/webpages/returnPage.html b/html/webpages/returnPage.html
@@ -0,0 +1,103 @@
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+    <meta name="description" content="">
+    <meta name="author" content="">
+
+    <title>Synchrony Financial</title>
+
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+    <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>
+    <link rel = "stylesheet" type = "text/css" href = "../css/stylesheet.css">
+    <style>
+    div.displayDevice{
+        display: inline-block; 
+        position: absolute; 
+        padding-left: 30px;
+    }
+
+    div.deviceContainer{
+      border: solid; 
+      border-width: thin; 
+      padding: 15px;
+      background-color: #E9EAEB;
+    }
+
+    div.imgContainer{
+      display: inline-block; 
+      text-align: center;
+    }
+
+    img.device{
+      display: block;
+    }
+
+    div.deviceDescp{
+      display: inline-block; 
+      width: 200px; 
+      text-align: center; 
+      vertical-align: center;
+    }
+
+    div.sidebar{
+      display: inline-block; 
+      border-right-style: solid; 
+      height: 100%; 
+      width: 200px;
+      background-color: #E9EAEB;
+    }
+
+    ul.nav{
+      padding: 0px;
+    }
+    </style>
+    <nav class="navbar navbar-inverse navbar-fixed-top">
+      <div class="container-fluid">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="#"><img src="../imgs/synchrony-financial-logo-dlpx.png" style = "height: 100%"></a>
+        </div>
+        <div id="navbar" class="navbar-collapse collapse" aria-expanded="false">
+          <ul class="nav navbar-nav navbar-right">
+            <li><a href="homePage.html">Home</a></li>
+            <li><a href="requestPage.html">Request Device</a></li>
+            <li><a href="#">Return Device</a></li>
+            <li><a href="listingPage.html">Device Listing</a></li>
+            <li><a href="#">User Information</a></li>
+          </ul>
+        </div>
+      </div>
+    </nav>
+</head>
+<body>
+<div class="displayDevice">
+  <h2>Devices to Be Returned</h2>
+  <div id = "devContainer">
+    <div class="deviceContainer">
+      <div class="imgContainer">
+        <img src="../imgs/iphone.png" class="device">name
+      </div>
+      <div class="deviceDescp">
+        <p>description</p>
+      </div>
+    </div>
+    <br>
+    <div class="deviceContainer">
+      <div class="imgContainer">
+        <img src="../imgs/ipad.png" class="device">name
+      </div>
+      <div class="deviceDescp">
+        <p>description</p>
+      </div>
+    </div>
+    <br>
+  </div>
+</body>