Add a subjects sample and a numbers one to ten sample

rcjsuen · Jan 15, 2016 · 149ee93 · 149ee93
1 parent e9efd7f
commit 149ee93
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 13 deletions.
diff --git a/flashcard.html b/flashcard.html
@@ -354,7 +354,7 @@
 		var anchor = bullets[i].getElementsByTagName("a")[0];		
 		if (anchor.hasAttribute("class")) {
 			document.getElementById("sampleName").innerHTML = anchor.innerHTML;
-			handleSampleSelect(anchor.innerHTML + ".txt");
+			handleSampleSelect(anchor.getAttribute("data-filename"));
 			break;
 		}
 	}

diff --git a/list.html b/list.html
@@ -11,7 +11,7 @@
 ul {
 	position: fixed;
 	padding: 0;
-	width: 20%;
+	width: 35%;
 	height: 100%;
 	margin-top: 0;
 	margin-left: 0;
@@ -38,8 +38,8 @@
 
 .preview {
 	height: 100%;
-	width: 80%;
-	margin-left: 20%;
+	width: 65%;
+	margin-left: 35%;
 	background-color: #ffffff;
 }
 
@@ -53,19 +53,21 @@
 <body>
 
 <ul id="navbar">
-  <li><a id="daysAnchor" class="active">days</a></li>
-  <li><a id="fruitsAnchor">fruits</a></li>
-  <li><a id="monthsAnchor">months</a></li>
-  <li><a id="numbersAnchor">numbers</a></li>
-  <li><a id="sportsAnchor">sports</a></li>
+  <li><a id="daysAnchor" data-filename="days.txt" class="active">days</a></li>
+  <li><a id="fruitsAnchor" data-filename="fruits.txt">fruits</a></li>
+  <li><a id="monthsAnchor" data-filename="months.txt">months</a></li>
+  <li><a id="numbers1-10Anchor" data-filename="numbers-1-10.txt">numbers (1-10)</a></li>
+  <li><a id="numbers0-20Anchor" data-filename="numbers.txt">numbers (0-20)</a></li>
+  <li><a id="sportsAnchor" data-filename="sports.txt">sports</a></li>
+  <li><a id="subjectsAnchor" data-filename="subjects.txt">subjects</a></li>
 </ul>
 
 <div id="contentPanel" class="preview">
 	<div id="content"></div>
 </div>
 
 <script>
-var content = [ null, null, null, null, null ];
+var content = [ null, null, null, null, null, null, null ];
 var navbar = document.getElementById('navbar').getElementsByTagName('li');
 
 for (var i = 0; i < navbar.length; i++) {
@@ -84,11 +86,17 @@
 			loadFile("words/months.txt", i);
 			break;
 		case 3:
-			loadFile("words/numbers.txt", i);
+			loadFile("words/numbers-1-10.txt", i);
 			break;
 		case 4:
+			loadFile("words/numbers.txt", i);
+			break;
+		case 5:
 			loadFile("words/sports.txt", i);
 			break;
+		case 6:
+			loadFile("words/subjects.txt", i);
+			break;
 	}
 }
 
@@ -124,10 +132,14 @@
 			document.getElementById("content").innerHTML = content[1];
 		} else if (anchor.getAttribute("id") === "monthsAnchor") {
 			document.getElementById("content").innerHTML = content[2];
-		} else if (anchor.getAttribute("id") === "numbersAnchor") {
+		} else if (anchor.getAttribute("id") === "numbers1-10Anchor") {
 			document.getElementById("content").innerHTML = content[3];
-		} else if (anchor.getAttribute("id") === "sportsAnchor") {
+		} else if (anchor.getAttribute("id") === "numbers0-20Anchor") {
 			document.getElementById("content").innerHTML = content[4];
+		} else if (anchor.getAttribute("id") === "sportsAnchor") {
+			document.getElementById("content").innerHTML = content[5];
+		} else if (anchor.getAttribute("id") === "subjectsAnchor") {
+			document.getElementById("content").innerHTML = content[6];
 		}
 	}
 }

diff --git a/words/numbers-1-10.txt b/words/numbers-1-10.txt
@@ -0,0 +1,20 @@
+one
+一
+two
+二
+three
+三
+four
+四
+five
+五
+six
+六
+seven
+七
+eight
+八
+nine
+九
+ten
+十
diff --git a/words/subjects.txt b/words/subjects.txt
@@ -0,0 +1,19 @@
+English
+英語
+Japanese
+国語
+math
+数学
+social studies
+社会
+fine arts
+美術
+physical education
+体育
+health education
+保健
+industrial arts
+技術
+homemaking
+家庭
+science理科
-Original file line number
+Diff line change
@@ -0,0 +1,20 @@
+    one
+    一
+    two
+    二
+    three
+    三
+    four
+    四
+    five
+    五
+    six
+    六
+    seven
+    七
+    eight
+    八
+    nine
+    九
+    ten
+    十