Return confirmation messege

arc12012 · Dec 3, 2016 · 4d48735 · 4d48735
1 parent b371e2a
commit 4d48735
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/html/javascript/return.js b/html/javascript/return.js
@@ -149,6 +149,9 @@ function returnDevice()
 		var unavailable = getUnavailableIDs();
 		unavailable.splice(unavailable.indexOf(id),1);
 		localStorage.setItem('unavailable',JSON.stringify(unavailable));
+		$('#return').fadeIn(1000);
+		$('#return').fadeIn(1000);
+		$('#return').fadeOut(1000);
 	}
 	else
 		alert("That's already marked available. Something may have gone wrong.");

diff --git a/html/webpages/returnPage.html b/html/webpages/returnPage.html
@@ -34,7 +34,20 @@
     img.device{
       display: block;
     }
-
+    div.returnConfirm{
+      display: none;
+      top: 50%;
+      left: 50%;
+      position: fixed;
+      width: 155px;
+      height: 85px;
+      line-height: 85px;
+      text-align: center;
+      background-color: #FBC600;
+      border: solid;
+      border-color: #3B3C43;
+      border-radius: 5px;
+    }
     div.deviceInfo{
       display: inline-block; 
       vertical-align: top;
@@ -61,7 +74,11 @@ <h4>Filter by Time Ordered</h4>
     <h2>Devices to Be Returned</h2>
     <div id = "devContainer">
     </div>
-    <script src="../javascript/return.js" href></script>
-    <script src = "../javascript/navbar.js"></script>
-    <!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script> -->
-  </body>
+  </div>
+  <div class="returnConfirm" id="return">
+    <p>Returned</p>
+  </div>
+  <script src="../javascript/return.js" href></script>
+  <script src = "../javascript/navbar.js"></script>
+  <!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script> -->
+</body>