Merge branch 'master' of https://github.com/team8/attendance

team8 · Nov 17, 2015 · d28f745 · d28f745
2 parents d45b70d + e07a66b
commit d28f745
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -215,3 +215,9 @@ pip-log.txt
 
 #Mr Developer
 .mr.developer.cfg
+
+#############
+## Other Things
+#############
+
+*.sqlite3
diff --git a/attendance-website/attendanceapp/static/attendanceapp/images/circuitBoard.png b/attendance-website/attendanceapp/static/attendanceapp/images/circuitBoard.png
diff --git a/attendance-website/attendanceapp/static/attendanceapp/images/roboticsHeader.jpg b/attendance-website/attendanceapp/static/attendanceapp/images/roboticsHeader.jpg
diff --git a/attendance-website/attendanceapp/static/attendanceapp/style.css b/attendance-website/attendanceapp/static/attendanceapp/style.css
@@ -0,0 +1,14 @@
+#page-wrap {
+  width: 800px;
+  margin: 10 auto;
+  /* background-image: url(images/circuitBoard.png); */
+  text-align: center;
+}
+
+#header {
+  /* width: idk man */
+  height: 500px
+  border: 5px solid #73AD21
+  text-align: center;
+  /* background-image: url(images/roboticsHeader.jpg); */
+}
diff --git a/attendance-website/attendanceapp/templates/attendanceapp/ScanCard.html b/attendance-website/attendanceapp/templates/attendanceapp/ScanCard.html
@@ -1,3 +1,7 @@
+{% load staticfiles %}
+
+<link rel="stylesheet" type="text/css" href="{% static 'attendanceapp/style.css' %}" />
+
 <html>
 <head>
 
@@ -7,16 +11,15 @@
 
 <body>
 
-  <div id="container">
-
-    <p>
-      Hi!
-    </p>
+  <div id="page-wrap">
+    <div id="header">
+      <img src="static/attendanceapp/images/roboticsHeader.jpg" alt="argh"/>
+    </div>
 
     <form action="{% url 'ScanCard' %}" method="post">
       {% csrf_token %}
       <input type="text" id="cardBox" name="studentID">
-      <input type="submit">
+      <input type="submit" value="Log in/out">
     </form>
 
     {{ message }}