index return

jonathanlam · Jan 27, 2015 · 614a80e · 614a80e
1 parent d26eb79
commit 614a80e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 14 deletions.
diff --git a/edit.html b/edit.html
@@ -49,7 +49,7 @@
 		<button class="btn btn-primary" onclick="doReset()">Reset</button>
 
 		<p>Click a period to edit it!</p>
-
+<h3>Week A:</h3>
 		<table id="timetable-edit" class="table table-striped table-bordered table-hover">
 			<thead><tr><th>Period</th><th>Monday</th><th>Tuesday</th><th>Wednesday</th><th>Thursday</th><th>Friday</th></tr></thead>
 			<tbody>
@@ -62,7 +62,25 @@
 				<tr id="tt-p4"><td>6</td><td></td><td></td><td></td><td></td><td></td></tr>
 				<tr id="tt-p5"><td>Afternoon</td><td></td><td></td><td></td><td></td><td></td></tr>
 			</tbody>
+			</div>
+
+			<div>
+			<h3>Week B:</h3>
 		</table>
+			<table id="timetable-edit" class="table table-striped table-bordered table-hover">
+			<thead><tr><th>Period</th><th>Monday</th><th>Tuesday</th><th>Wednesday</th><th>Thursday</th><th>Friday</th></tr></thead>
+			<tbody>
+				<tr id="tt-p0"><td>Morning</td><td></td><td></td><td></td><td></td><td></td></tr>
+				<tr id="tt-p1"><td>1</td><td></td><td></td><td></td><td></td><td></td></tr>
+				<tr id="tt-p2"><td>2</td><td></td><td></td><td></td><td></td><td></td></tr>
+				<tr id="tt-p3"><td>3</td><td></td><td></td><td></td><td></td><td></td></tr>
+				<tr id="tt-p4"><td>4</td><td></td><td></td><td></td><td></td><td></td></tr>
+				<tr id="tt-p4"><td>5</td><td></td><td></td><td></td><td></td><td></td></tr>
+				<tr id="tt-p4"><td>6</td><td></td><td></td><td></td><td></td><td></td></tr>
+				<tr id="tt-p5"><td>Afternoon</td><td></td><td></td><td></td><td></td><td></td></tr>
+			</tbody>
+		</table>
+		</div>
 	</div>
 
 	<div id="import" class="modal fade" tabIndex="-1" role="dialog" aria-labelledby="modal-import-label" aria-hidden="true">

diff --git a/index.html b/index.html
@@ -63,14 +63,17 @@
 		</noscript>
 
 		<div id="bell">
-			<p id="bell-current" style="display:none"></p>
-			<p id="bell-descript">School resumes</p>
-			<p id="bell-descript">Wed 28: Year 7,11,12</p>
-			<p id="bell-descript">Thu 29: Year 8,9,10</p>
 			<p id="bell-in"><a href="belltimes.pdf">Click here to download the bell times</a></p>
-
+			<p id="bell-current" style="display:none"></p>
+			<p id="bell-descript">Something happens</p>
+			<p id="bell-in">in</p>
+			<p id="bell-countdown">a few seconds...</p>
 		</div>
 	</div>
 
+	<script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+	<script src="http://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.2.0/js/bootstrap.min.js" async defer></script>
+	<script src="http://cdn.rawgit.com/hilios/jQuery.countdown/2.0.4/dist/jquery.countdown.min.js"></script>
+	<script src="countdown.js" async defer></script>
 </body>
 </html>
diff --git a/index2.html → indexreturn.html b/index2.html → indexreturn.html
@@ -63,17 +63,14 @@
 		</noscript>
 
 		<div id="bell">
-			<p id="bell-in"><a href="belltimes.pdf">Click here to download the bell times</a></p>
 			<p id="bell-current" style="display:none"></p>
-			<p id="bell-descript">Something happens</p>
-			<p id="bell-in">in</p>
-			<p id="bell-countdown">a few seconds...</p>
+			<p id="bell-descript">School resumes</p>
+			<p id="bell-descript">Wed 28: Year 7,11,12</p>
+			<p id="bell-descript">Thu 29: Year 8,9,10</p>
+			<p id="bell-in"><a href="belltimes.pdf">Click here to download the bell times</a></p>
+
 		</div>
 	</div>
 
-	<script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-	<script src="http://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.2.0/js/bootstrap.min.js" async defer></script>
-	<script src="http://cdn.rawgit.com/hilios/jQuery.countdown/2.0.4/dist/jquery.countdown.min.js"></script>
-	<script src="countdown.js" async defer></script>
 </body>
 </html>