diff options
| author | Tony Anderson <tony@traveler.(none)> | 2011-01-09 10:12:49 (GMT) |
|---|---|---|
| committer | Tony Anderson <tony@traveler.(none)> | 2011-01-09 10:12:49 (GMT) |
| commit | 47e975f01d100d7d0af852774343d6a5f359255a (patch) | |
| tree | 817c25a20ec2427b7d247eb08f8e9a6d77450872 | |
| parent | 96f9f7061f1ac894ca93a37f54d5ee872f2f8703 (diff) | |
version 11
76 files changed, 537 insertions, 4803 deletions
diff --git a/activity/activity.info b/activity/activity.info index 8209902..980a87e 100755 --- a/activity/activity.info +++ b/activity/activity.info @@ -2,7 +2,7 @@ name = Learn service_name = org.olerwanda.Learn icon = activity-learn -activity_version = 10 +activity_version = 11 show_launcher = yes #exec = ./launch.py class = launch.Learn diff --git a/cgi-bin/fetch_milestone.py b/cgi-bin/fetch_milestone.py index fb60f38..0b13db7 100755 --- a/cgi-bin/fetch_milestone.py +++ b/cgi-bin/fetch_milestone.py @@ -8,10 +8,7 @@ from path import path DATAPATH = path(activity.get_activity_root())/ 'data' WORKPATH = DATAPATH / 'work' USB = path('/media/2011/content') -MOODLE_ENGLISH = [0,20,21,9,10,11,22] -MOODLE_ENGLISH11 = [0,23,24,25,26,27,28,29,30,31] -MOODLE_MATHEMATICS = [0,13,14,15,16,17,18] -MOODLE_MATHEMATICS11 = [0,32,33,34,35,36,37,38,39,40] +SS = path('/library/courseware') #executes sftp command contained in scrpt #note scrpt must be written to disk and read by sftp command @@ -50,148 +47,6 @@ def sftp(script, folder = None): flog.close() return result -def remove(year, milestone): - if str(milestone[:2]) == 'en': - if year == 0: - subject = 'English' - else: - subject = 'English11' - else: - if year == 0: - subject = 'Mathematics' - else: - subject = 'Mathematics11' - if year == 0: - subprocess.call('rm -rf content/' + subject + '/' + milestone, shell=True) - -def get_from_usb(milestone): - if str(milestone)[:2] == 'en': - subject = 'English' - else: - subject = 'Mathematics' - pth = '/media/' + str(2011) + '/' + subject + '/' + milestone - cwd = 'content/' + subject + '11' - subprocess.call('cp -r ' + pth + ' .', shell=True, cwd=cwd) - -def get_from_ss(year, course, milestone): - #use sftp, need to know Moodle course number - script = 'cd /var/lib/moodle/' + str(course) + '\nget ' + milestone + '*.msxo' - folder = 'content/' + subject - result = sftp(script, folder) - cmd = 'unzip ' + milestone + '*.msxo' - subprocess.call(cmd, shell = True, cwd=folder) - subprocess.call('rm -rf ' + folder + '/*.msxo', shell=True) - -def save_to_usb(milestone): - if str(milestone)[:2] == 'en': - subject = 'English' - else: - subject = 'Mathematics' - pth = '/media/' + 2011 + '/' + subject - cwd = 'content/' + subject + '11' - subprocess.call('cp -r ' + cwd + '/' + milestone + ' ' + pth, shell=True) - -def get_course(year, milestone): - ms = str(milestone) - grde = int(ms[3]) - if ms[:2] == 'en': - if year == '2011': - term = int(ms[5]) - idx = term + 3*(grde-4) - course = str(MOODLE_ENGLISH11[idx]) - else: - idx = int(grde) - course = MOODLE_ENGLISH[idx] - else: - if year == '2011': - term = int(ms[4]) - idx = term + 3*(grde-4) - course = str(MOODLE_MATHEMATICS11[idx]) - else: - idx = int(grde) - course = str(MOODLE_MATHEMATICS[idx]) - return course, grde - -def update_color(): - # - # update color in .js for grade - # - pth = path('content') / subject - fullpth = pth / 'p' + str(grde) + '.js' - #read p*.js - fin = open(pth / 'p' + str(grde) + '.js','r') - txt = fin.read() - fin.close() - lines = txt.split('\n') - newlines = [] - for line in lines: - if line.find('Blue')<0 and line.find('Cyan')<0: - newlines.append(line) - continue - entry = eval(line)[0] - if entry[4] == milestone: - if operation == 'download': - entry[5] = 'Blue' - else: - entry[5] = 'Cyan' - newlines.append(str(entry)+',') - txtout = "" - for line in newlines: - txtout = txtout + line + '\n' - fout = open(fullpth,'w') - fout.write(txtout) - fout.close() - -def update_activities_js(): - # - # update activities.js - # - #let's create a new activities.js file based on installed milestones - entry = ['0','0','milestone','m','x','color'] - #we add a line for each milestone that is installed - pth = path('content') / subject - temp = pth.dirs() - milestones = [] - for item in temp: - milestones.append(str(item.namebase)) - milestones.remove('karma') - txtout = 'var activities = [\n' - for milestone in milestones: - newentry = entry - newentry[3] = milestone.namebase[:4] - newentry[4] = milestone.namebase - newentry[5] = 'Blue' - txtout = txtout + str(newentry) + ',\n' - txtout = txtout + '];\nvar assetlist = [];\nvar logos = [];\n' - #write activities.js - fout = open(pth / 'activities.js','w') - fout.write(txtout) - fout.close() - -def process_cw_mode(year, milestone): - course, grde = get_course(year,milestone) - if milestone[:2] == 'en': - subject = 'English' - else: - subject = 'Mathematics' - if year == '2011': - subject = subject + '11' - pth = path('content') / subject / milestone - if pth.exists(): - operation = 'remove' - else: - operation = 'download' - #process request - if operation == 'download': - get_from_ss(year, course, milestone) - else: - #for now, do not remove 2011 milestones - if year == '2010': - pth = path('content') / subject / milestone - subprocess.call('rm -rf ' + pth, shell=True) - update_color() - update_activities_js() - def getInstalled(subject): pth = path('content') / subject temp = pth.dirs() @@ -201,68 +56,20 @@ def getInstalled(subject): milestones.remove('karma') return milestones -def getMilestone(subject, milestone): - #only from /media/CW/content for now - print >>log, 'getMilestone', subject, milestone - if(not USB.exists()): - print >> log, 'no usb drive installed' - return - pth = USB / subject - cmd = 'cp -r ' + pth / milestone + ' ' + 'content/'+ subject - subprocess.call(cmd,shell=True) - -def get_student_record(student, classe): - known = False - #read student record - try: - fin = open(DATAPATH / student,'r') - txt = fin.read() - fin.close() - student_record = eval(txt) - except: - student_record = {} - #student is known if there is a student record and the class is the same - try: - grade = student_record['grade'] - except: - grade = 'unknown' - if not grade == 'unknown': - if classe == 'unknown' or classe == grade: - known = True - try: - milestones = student_record['milestones'] - except: - student_record['milestones'] = ['1.1','1.1'] - else: - if classe == 'unknown': - grade = 'P4' - else: - grade = classe - if not known: - #create new student record - student_record = {} - student_record['grade'] = grade - student_record['milestones'] = ['1.1','1.1'] - student_record['progress'] = [] - txtout = str(student_record) - fout = open(DATAPATH / student,'w') - fout.write(txtout) - fout.close() - print >> log, 'student_record known',known - return student_record +def getMilestone(subject, grade, milestone): + print >>log, 'getMilestone', subject, grade, milestone + if USB.exists: #get from usb drive + pth = USB / subject + cmd = 'cp -r ' + pth / milestone + ' ' + 'content/'+ subject + subprocess.call(cmd,shell=True) + else: #get from schoolserver + folder = 'content/'+ subject + pth = SS / subject + script = 'cd ' + pth + '\nget -r ' + milestone + result = sftp(script, folder) def process_milestones(subject, grade, current_ms): - next_ms = str(int(current_ms)+1) - if len(current_ms)<2: - current_ms = '0'+current_ms - if len(current_ms)<2: - current_ms = '0'+current_ms - if len(next_ms)<2: - next_ms = '0'+next_ms - if subject == 'English': - sbj = 'en' - else: - sbj = 'ma' + #base on activities.js not milestone name current_milestone = (sbj+grade+'m'+current_ms).lower() next_milestone = (sbj+grade+'m'+next_ms).lower() print >> log, 'process_student_mode',grade,current_milestone,next_milestone @@ -274,6 +81,10 @@ def process_milestones(subject, grade, current_ms): getMilestone(subject, next_milestone) def process_student(student,student_record): + #copy grade activities.js to activities.js + subprocess.call('cp ' + 'content/English/activities_' + grade.lower()+'.js content/activities.js',shell=True) + subprocess.call('cp ' + 'content/Mathematics/activities_' + grade.lower()+'.js content/activities.js',shell=True) + #download needed milestones grade = student_record['grade'] en_milestone = student_record['milestones'][0] ma_milestone = student_record['milestones'][1] @@ -284,6 +95,29 @@ def process_student(student,student_record): #Mathematics current_ms = ma_milestone.split('.')[1] process_milestones('Mathematics',grade, current_ms) + #return student menu + fin = open('menu/student_menu','r') + txt = fin.read() + fin.close() + print txt + +def process_faculty(): + sbj = form.getfirst('code', default="") + if len(sbj) < 1: + #if firstrun, need only to return faculty main menu for #content + fin = open('menu/faculty_menu','r') + txt = fin.read() + fin.close() + print txt + else: + milestone = form.getfirst('milestone', default = "") + if len(milestone)>0: + #fetch requested milestone + if sbj[:2] == 'en': + subject = 'English' + else: + subject = 'Mathematics' + getMilestone(subject, grade, milestone) #main # @@ -292,27 +126,23 @@ def process_student(student,student_record): cgitb.enable(display=True) print 'Content-Type:text/html\n\n' log = open('/tmp/logfm','w') -form = cgi.FieldStorage() -mode = form.getfirst('mode', default='CW') +#get nick +fin = open(DATAPATH / 'learner','r') +learner = fin.read() +fin.close() +#read student record +fin = open(DATAPATH / learner, 'r') +txt = fin.read() +fin.close() +student_record = eval(txt) +grade = student_record['grade'] +if grade == 'F': + mode = 'CW' +else: + mode = 'student' print >> log, 'mode', mode if mode == 'CW': - year = form.getfirst('year', default='2010') - milestone = form.getfirst('milestone', default='enp4m1') - process_cw_mode(year, milestone) + process_faculty() else: - student = form.getfirst('student', default='student') - student = student.lower() - #log student in - fout = open('/tmp/learner','w') - fout.write(student) - fout.close() - classe = form.getfirst('class',default = 'unknown') - print >> log, 'student', student, 'grade', classe - student_record = get_student_record(student, classe) - print >> log, 'student_record returned',student, student_record - try: - process_student(student,student_record) - except: - print >> log, 'process_student failed', sys.exc_info()[:2] - log3.close() + process_student(learner,student_record) log.close() diff --git a/content/English/activities.js b/content/English/activities.js deleted file mode 100755 index df22748..0000000 --- a/content/English/activities.js +++ /dev/null @@ -1,9 +0,0 @@ -var activities = [ -['0', '01', 'milestone', 'enp4', 'enp4m01', 'red'], -['0', '02', 'milestone', 'enp4', 'enp4m02', 'blue'], -['0', '03', 'milestone', 'enp4', 'enp4m03', 'cyan'], -['0', '04', 'milestone', 'enp4', 'enp4m04', 'cyan'], -['0', '05', 'milestone', 'enp4', 'enp4m05', 'cyan'], -]; -var assetList = []; -var logos = []; diff --git a/content/English/activities_p4.js b/content/English/activities_p4.js new file mode 100644 index 0000000..154d973 --- /dev/null +++ b/content/English/activities_p4.js @@ -0,0 +1,9 @@ +var activities = [ + ['0',1,'enp4','milestone','enp411m01','cyan'], + ['0',2,'enp4','milestone','enp411m02','cyan'], + ['0',3,'enp4','milestone','enp411m03','cyan'], + ['0',4,'enp4','milestone','enp411m04','cyan'], + ['0',5,'enp4','milestone','enp411m05','cyan'], +]; +var assetList= []; +var logos = []; diff --git a/content/English/activities_p5.js b/content/English/activities_p5.js new file mode 100644 index 0000000..073d867 --- /dev/null +++ b/content/English/activities_p5.js @@ -0,0 +1,12 @@ +var activities = [ + ['0',1,'enp5','milestone','enp511m01','cyan'], + ['0',2,'enp5','milestone','enp511m02','cyan'], + ['0',3,'enp5','milestone','enp511m03','cyan'], + ['0',4,'enp5','milestone','enp511m04','cyan'], + ['0',5,'enp5','milestone','enp511m05','cyan'], + ['0',6,'enp5','milestone','enp511m06','cyan'], + ['0',7,'enp5','milestone','enp511m07','cyan'], + ['0',8,'enp5','milestone','enp511m08','cyan'], +]; +var assetList= []; +var logos = []; diff --git a/content/English/activities_p6.js b/content/English/activities_p6.js new file mode 100644 index 0000000..09d8f0a --- /dev/null +++ b/content/English/activities_p6.js @@ -0,0 +1,12 @@ +var activities = [ + ['0',1,'enp6','milestone','enp611m01','cyan'], + ['0',2,'enp6','milestone','enp611m02','cyan'], + ['0',3,'enp6','milestone','enp611m03','cyan'], + ['0',4,'enp6','milestone','enp611m04','cyan'], + ['0',5,'enp6','milestone','enp611m05','cyan'], + ['0',6,'enp6','milestone','enp611m06','cyan'], + ['0',7,'enp6','milestone','enp611m07','cyan'], + ['0',8,'enp6','milestone','enp611m08','cyan'], +]; +var assetList= []; +var logos = []; diff --git a/content/English/index.html b/content/English/index.html index da4592c..28ff111 100755 --- a/content/English/index.html +++ b/content/English/index.html @@ -10,67 +10,14 @@ <script type="text/javascript" src="../js/karma.js"></script> <script type="text/javascript" src="../js/global.js"></script> <script type="text/javascript" src="../js/jquery.svg.js"></script> + <script type="text/javascript" src="../js/learner_subject.js"></script> <script type="text/javascript" src="../js/navigation.js"></script> <script type="text/javascript" src="activities.js"></script> - <script type="text/javascript"> - - function getName(){ - - name = $('#login').val() - grade = $('#grade').val(); - if (name.length == 0){ - ('#line4') - .one('click',getName); - return; - }; - - - $('<div id="txtFetch")>') - .load('http://localhost:8008/cgi-bin/fetch_milestone.py', - {'mode':'Student','student':name,'class':grade}, - function(responseTxt, status, xhr){ - - $('<div id="txtMain">') - .load('http://localhost:8008/cgi-bin/set_up_main_menu.py', - {'mode':'Student','student':name,'subject':'English'}, - function(responseTxt, status, xhr){ - window.location = './ladder.html' - }) - }) - }; - - $(function(){ - $('<div id="line0" />') - .load('http://localhost:8008/cgi-bin/logged_in.py', - function(responseTxt, status, xhr){ - pos = responseTxt.indexOf('unknown'); - if (pos == -1){ - window.location = './ladder.html' - }; - }); - $('<div id="line1" />') - .html('<h1>Welcome to the Learn.activity</h1>') - .appendTo('#content') - $('<div id="line2" />') - .html('<p>Please enter your name and class ("P4","P5","P6")</p>') - .appendTo('#content') - $('<div id="line3" />') - .html("<p><input id='login' label='name' value ='' type='text' /></p>") - .appendTo('#content') - $('<div id="line3" />') - .html("<p><input id='grade' label='class' value ='' type='text' /></p>") - .appendTo('#content') - $('<div id="line4" />') - .html("<p>Click here when you are finished</p>") - .appendTo('#content') - $('#line4') - .one('click',getName) - }); - </script> </head> <body> <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> + <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /> + </div></div> <div id="lesson_title"> <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> English @@ -80,6 +27,6 @@ <div title="Quit" id="linkQuit" class="linkQuit"></div> </div> </div> - <div id="content" /> + <canvas id="ladder"/> </body> </html> diff --git a/content/English/ladder.html b/content/English/p4.html index 28ff111..7a0990e 100755 --- a/content/English/ladder.html +++ b/content/English/p4.html @@ -10,9 +10,9 @@ <script type="text/javascript" src="../js/karma.js"></script> <script type="text/javascript" src="../js/global.js"></script> <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/learner_subject.js"></script> + <script type="text/javascript" src="../js/subject.js"></script> <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="activities.js"></script> + <script type="text/javascript" src="activities_p4.js"></script> </head> <body> <div id="header"> diff --git a/content/Mathematics/ladder.html b/content/English/p5.html index 28ff111..9708735 100755 --- a/content/Mathematics/ladder.html +++ b/content/English/p5.html @@ -10,9 +10,9 @@ <script type="text/javascript" src="../js/karma.js"></script> <script type="text/javascript" src="../js/global.js"></script> <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/learner_subject.js"></script> + <script type="text/javascript" src="../js/subject.js"></script> <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="activities.js"></script> + <script type="text/javascript" src="activities_p5.js"></script> </head> <body> <div id="header"> diff --git a/content/Mathematics11/index.html b/content/English/p6.html index 62d7d1e..0406d84 100755 --- a/content/Mathematics11/index.html +++ b/content/English/p6.html @@ -9,15 +9,15 @@ <script type="text/javascript" src="../js/jquery-ui-1.js"></script> <script type="text/javascript" src="../js/karma.js"></script> <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> <script type="text/javascript" src="../js/jquery.svg.js"></script> <script type="text/javascript" src="../js/subject.js"></script> <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="activities.js"></script> + <script type="text/javascript" src="activities_p6.js"></script> </head> <body> <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> + <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /> + </div></div> <div id="lesson_title"> <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> English diff --git a/content/English11/activities.js b/content/English11/activities.js deleted file mode 100755 index d725a14..0000000 --- a/content/English11/activities.js +++ /dev/null @@ -1,4 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; diff --git a/content/English11/p4.html b/content/English11/p4.html deleted file mode 100755 index 74d61b7..0000000 --- a/content/English11/p4.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>English </title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link type="text/css" rel="stylesheet" href="../css/global.css" /> - <link type="image/ico" rel="icon" href="../assets/default/image/favicon.ico" /> - <script type="text/javascript" src="../js/jquery-1.4.js"></script> - <script type="text/javascript" src="../js/jquery-ui-1.js"></script> - <script type="text/javascript" src="../js/karma.js"></script> - <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> - <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/cw.js"></script> - <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="p4.js"></script> - </head> - <body> - <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> - <div id="lesson_title"> - <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> - English 2011 - <img src="../assets/image/title_block_rt.png" width="33" height="75" align = "absmiddle" /> - </div> - <div id="topbtn_right"> - <div title="Quit" id="linkQuit" class="linkQuit"></div> - </div> - </div> - <canvas id="ladder"/> - <div id='content' style = 'height:100px; width:100%'></div> - </body> -</html> diff --git a/content/English11/p4.js b/content/English11/p4.js deleted file mode 100755 index 6525810..0000000 --- a/content/English11/p4.js +++ /dev/null @@ -1,13 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; - - - - - - - - - diff --git a/content/English11/p41.html b/content/English11/p41.html deleted file mode 100755 index 2890e24..0000000 --- a/content/English11/p41.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>English </title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link type="text/css" rel="stylesheet" href="../css/global.css" /> - <link type="image/ico" rel="icon" href="../assets/default/image/favicon.ico" /> - <script type="text/javascript" src="../js/jquery-1.4.js"></script> - <script type="text/javascript" src="../js/jquery-ui-1.js"></script> - <script type="text/javascript" src="../js/karma.js"></script> - <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> - <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/cw.js"></script> - <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="p41.js"></script> - </head> - <body> - <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> - <div id="lesson_title"> - <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> - English 2011 - <img src="../assets/image/title_block_rt.png" width="33" height="75" align = "absmiddle" /> - </div> - <div id="topbtn_right"> - <div title="Quit" id="linkQuit" class="linkQuit"></div> - </div> - </div> - <canvas id="ladder"/> - <div id='content' style = 'height:100px; width:100%'></div> - </body> -</html> diff --git a/content/English11/p41.js b/content/English11/p41.js deleted file mode 100755 index 3cdd879..0000000 --- a/content/English11/p41.js +++ /dev/null @@ -1,180 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/content/English11/p42.html b/content/English11/p42.html deleted file mode 100755 index bec0b45..0000000 --- a/content/English11/p42.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>English </title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link type="text/css" rel="stylesheet" href="../css/global.css" /> - <link type="image/ico" rel="icon" href="../assets/default/image/favicon.ico" /> - <script type="text/javascript" src="../js/jquery-1.4.js"></script> - <script type="text/javascript" src="../js/jquery-ui-1.js"></script> - <script type="text/javascript" src="../js/karma.js"></script> - <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> - <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/cw.js"></script> - <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="p42.js"></script> - </head> - <body> - <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> - <div id="lesson_title"> - <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> - English 2011 - <img src="../assets/image/title_block_rt.png" width="33" height="75" align = "absmiddle" /> - </div> - <div id="topbtn_right"> - <div title="Quit" id="linkQuit" class="linkQuit"></div> - </div> - </div> - <canvas id="ladder"/> - <div id='content' style = 'height:100px; width:100%'></div> - </body> -</html> diff --git a/content/English11/p42.js b/content/English11/p42.js deleted file mode 100755 index 3cdd879..0000000 --- a/content/English11/p42.js +++ /dev/null @@ -1,180 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/content/English11/p43.html b/content/English11/p43.html deleted file mode 100755 index c300e57..0000000 --- a/content/English11/p43.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>English </title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link type="text/css" rel="stylesheet" href="../css/global.css" /> - <link type="image/ico" rel="icon" href="../assets/default/image/favicon.ico" /> - <script type="text/javascript" src="../js/jquery-1.4.js"></script> - <script type="text/javascript" src="../js/jquery-ui-1.js"></script> - <script type="text/javascript" src="../js/karma.js"></script> - <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> - <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/cw.js"></script> - <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="p43.js"></script> - </head> - <body> - <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> - <div id="lesson_title"> - <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> - English 2011 - <img src="../assets/image/title_block_rt.png" width="33" height="75" align = "absmiddle" /> - </div> - <div id="topbtn_right"> - <div title="Quit" id="linkQuit" class="linkQuit"></div> - </div> - </div> - <canvas id="ladder"/> - <div id='content' style = 'height:100px; width:100%'></div> - </body> -</html> diff --git a/content/English11/p43.js b/content/English11/p43.js deleted file mode 100755 index dbb23fa..0000000 --- a/content/English11/p43.js +++ /dev/null @@ -1,179 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/content/English11/p5.html b/content/English11/p5.html deleted file mode 100755 index a653c1d..0000000 --- a/content/English11/p5.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>English </title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link type="text/css" rel="stylesheet" href="../css/global.css" /> - <link type="image/ico" rel="icon" href="../assets/default/image/favicon.ico" /> - <script type="text/javascript" src="../js/jquery-1.4.js"></script> - <script type="text/javascript" src="../js/jquery-ui-1.js"></script> - <script type="text/javascript" src="../js/karma.js"></script> - <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> - <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/cw.js"></script> - <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="p5.js"></script> - </head> - <body> - <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> - <div id="lesson_title"> - <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> - English 2011 - <img src="../assets/image/title_block_rt.png" width="33" height="75" align = "absmiddle" /> - </div> - <div id="topbtn_right"> - <div title="Quit" id="linkQuit" class="linkQuit"></div> - </div> - </div> - <canvas id="ladder"/> - <div id='content' style = 'height:100px; width:100%'></div> - </body> -</html> diff --git a/content/English11/p5.js b/content/English11/p5.js deleted file mode 100755 index 63c962d..0000000 --- a/content/English11/p5.js +++ /dev/null @@ -1,10 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; - - - - - - diff --git a/content/English11/p51.html b/content/English11/p51.html deleted file mode 100755 index f0c2e9b..0000000 --- a/content/English11/p51.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>English </title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link type="text/css" rel="stylesheet" href="../css/global.css" /> - <link type="image/ico" rel="icon" href="../assets/default/image/favicon.ico" /> - <script type="text/javascript" src="../js/jquery-1.4.js"></script> - <script type="text/javascript" src="../js/jquery-ui-1.js"></script> - <script type="text/javascript" src="../js/karma.js"></script> - <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> - <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/cw.js"></script> - <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="p51.js"></script> - </head> - <body> - <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> - <div id="lesson_title"> - <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> - English 2011 - <img src="../assets/image/title_block_rt.png" width="33" height="75" align = "absmiddle" /> - </div> - <div id="topbtn_right"> - <div title="Quit" id="linkQuit" class="linkQuit"></div> - </div> - </div> - <canvas id="ladder"/> - <div id='content' style = 'height:100px; width:100%'></div> - </body> -</html> diff --git a/content/English11/p51.js b/content/English11/p51.js deleted file mode 100755 index 0948c76..0000000 --- a/content/English11/p51.js +++ /dev/null @@ -1,173 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/content/English11/p52.html b/content/English11/p52.html deleted file mode 100755 index 0725039..0000000 --- a/content/English11/p52.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>English </title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link type="text/css" rel="stylesheet" href="../css/global.css" /> - <link type="image/ico" rel="icon" href="../assets/default/image/favicon.ico" /> - <script type="text/javascript" src="../js/jquery-1.4.js"></script> - <script type="text/javascript" src="../js/jquery-ui-1.js"></script> - <script type="text/javascript" src="../js/karma.js"></script> - <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> - <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/cw.js"></script> - <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="p52.js"></script> - </head> - <body> - <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> - <div id="lesson_title"> - <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> - English 2011 - <img src="../assets/image/title_block_rt.png" width="33" height="75" align = "absmiddle" /> - </div> - <div id="topbtn_right"> - <div title="Quit" id="linkQuit" class="linkQuit"></div> - </div> - </div> - <canvas id="ladder"/> - <div id='content' style = 'height:100px; width:100%'></div> - </body> -</html> diff --git a/content/English11/p52.js b/content/English11/p52.js deleted file mode 100755 index 2c6f76f..0000000 --- a/content/English11/p52.js +++ /dev/null @@ -1,169 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/content/English11/p53.html b/content/English11/p53.html deleted file mode 100755 index f483f98..0000000 --- a/content/English11/p53.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>English </title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link type="text/css" rel="stylesheet" href="../css/global.css" /> - <link type="image/ico" rel="icon" href="../assets/default/image/favicon.ico" /> - <script type="text/javascript" src="../js/jquery-1.4.js"></script> - <script type="text/javascript" src="../js/jquery-ui-1.js"></script> - <script type="text/javascript" src="../js/karma.js"></script> - <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> - <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/cw.js"></script> - <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="p53.js"></script> - </head> - <body> - <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> - <div id="lesson_title"> - <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> - English 2011 - <img src="../assets/image/title_block_rt.png" width="33" height="75" align = "absmiddle" /> - </div> - <div id="topbtn_right"> - <div title="Quit" id="linkQuit" class="linkQuit"></div> - </div> - </div> - <canvas id="ladder"/> - <div id='content' style = 'height:100px; width:100%'></div> - </body> -</html> diff --git a/content/English11/p53.js b/content/English11/p53.js deleted file mode 100755 index d0165d6..0000000 --- a/content/English11/p53.js +++ /dev/null @@ -1,164 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/content/English11/p6.html b/content/English11/p6.html deleted file mode 100755 index 662222e..0000000 --- a/content/English11/p6.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>English </title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link type="text/css" rel="stylesheet" href="../css/global.css" /> - <link type="image/ico" rel="icon" href="../assets/default/image/favicon.ico" /> - <script type="text/javascript" src="../js/jquery-1.4.js"></script> - <script type="text/javascript" src="../js/jquery-ui-1.js"></script> - <script type="text/javascript" src="../js/karma.js"></script> - <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> - <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/cw.js"></script> - <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="p6.js"></script> - </head> - <body> - <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> - <div id="lesson_title"> - <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> - English 2011 - <img src="../assets/image/title_block_rt.png" width="33" height="75" align = "absmiddle" /> - </div> - <div id="topbtn_right"> - <div title="Quit" id="linkQuit" class="linkQuit"></div> - </div> - </div> - <canvas id="ladder"/> - <div id='content' style = 'height:100px; width:100%'></div> - </body> -</html> diff --git a/content/English11/p6.js b/content/English11/p6.js deleted file mode 100755 index 131313f..0000000 --- a/content/English11/p6.js +++ /dev/null @@ -1,11 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; - - - - - - - diff --git a/content/English11/p61.html b/content/English11/p61.html deleted file mode 100755 index 3d8a2c4..0000000 --- a/content/English11/p61.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>English </title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link type="text/css" rel="stylesheet" href="../css/global.css" /> - <link type="image/ico" rel="icon" href="../assets/default/image/favicon.ico" /> - <script type="text/javascript" src="../js/jquery-1.4.js"></script> - <script type="text/javascript" src="../js/jquery-ui-1.js"></script> - <script type="text/javascript" src="../js/karma.js"></script> - <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> - <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/cw.js"></script> - <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="p61.js"></script> - </head> - <body> - <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> - <div id="lesson_title"> - <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> - English 2011 - <img src="../assets/image/title_block_rt.png" width="33" height="75" align = "absmiddle" /> - </div> - <div id="topbtn_right"> - <div title="Quit" id="linkQuit" class="linkQuit"></div> - </div> - </div> - <canvas id="ladder"/> - <div id='content' style = 'height:100px; width:100%'></div> - </body> -</html> diff --git a/content/English11/p61.js b/content/English11/p61.js deleted file mode 100755 index 1c98352..0000000 --- a/content/English11/p61.js +++ /dev/null @@ -1,165 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/content/English11/p62.html b/content/English11/p62.html deleted file mode 100755 index 26db89c..0000000 --- a/content/English11/p62.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>English </title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link type="text/css" rel="stylesheet" href="../css/global.css" /> - <link type="image/ico" rel="icon" href="../assets/default/image/favicon.ico" /> - <script type="text/javascript" src="../js/jquery-1.4.js"></script> - <script type="text/javascript" src="../js/jquery-ui-1.js"></script> - <script type="text/javascript" src="../js/karma.js"></script> - <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> - <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/cw.js"></script> - <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="p62.js"></script> - </head> - <body> - <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> - <div id="lesson_title"> - <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> - English 2011 - <img src="../assets/image/title_block_rt.png" width="33" height="75" align = "absmiddle" /> - </div> - <div id="topbtn_right"> - <div title="Quit" id="linkQuit" class="linkQuit"></div> - </div> - </div> - <canvas id="ladder"/> - <div id='content' style = 'height:100px; width:100%'></div> - </body> -</html> diff --git a/content/English11/p62.js b/content/English11/p62.js deleted file mode 100755 index 1c98352..0000000 --- a/content/English11/p62.js +++ /dev/null @@ -1,165 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/content/English11/p63.html b/content/English11/p63.html deleted file mode 100755 index d11accd..0000000 --- a/content/English11/p63.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>English </title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link type="text/css" rel="stylesheet" href="../css/global.css" /> - <link type="image/ico" rel="icon" href="../assets/default/image/favicon.ico" /> - <script type="text/javascript" src="../js/jquery-1.4.js"></script> - <script type="text/javascript" src="../js/jquery-ui-1.js"></script> - <script type="text/javascript" src="../js/karma.js"></script> - <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> - <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/cw.js"></script> - <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="p63.js"></script> - </head> - <body> - <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> - <div id="lesson_title"> - <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> - English 2011 - <img src="../assets/image/title_block_rt.png" width="33" height="75" align = "absmiddle" /> - </div> - <div id="topbtn_right"> - <div title="Quit" id="linkQuit" class="linkQuit"></div> - </div> - </div> - <canvas id="ladder"/> - <div id='content' style = 'height:100px; width:100%'></div> - </body> -</html> diff --git a/content/English11/p63.js b/content/English11/p63.js deleted file mode 100755 index 1c98352..0000000 --- a/content/English11/p63.js +++ /dev/null @@ -1,165 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/content/Mathematics/activities.js b/content/Mathematics/activities.js deleted file mode 100755 index 73687a0..0000000 --- a/content/Mathematics/activities.js +++ /dev/null @@ -1,22 +0,0 @@ -var activities = [ -['0', '01', 'milestone', 'map6', 'map6m01', 'red'], -['0', '02', 'milestone', 'map6', 'map6m02', 'blue'], -['0', '03', 'milestone', 'map6', 'map6m03', 'cyan'], -['0', '04', 'milestone', 'map6', 'map6m04', 'cyan'], -['0', '05', 'milestone', 'map6', 'map6m05', 'cyan'], -['0', '06', 'milestone', 'map6', 'map6m06', 'cyan'], -['0', '07', 'milestone', 'map6', 'map6m07', 'cyan'], -['0', '08', 'milestone', 'map6', 'map6m08', 'cyan'], -['0', '09', 'milestone', 'map6', 'map6m09', 'cyan'], -['0', '10', 'milestone', 'map6', 'map6m10', 'cyan'], -['0', '11', 'milestone', 'map6', 'map6m11', 'cyan'], -['0', '12', 'milestone', 'map6', 'map6m12', 'cyan'], -['0', '13', 'milestone', 'map6', 'map6m13', 'cyan'], -['0', '14', 'milestone', 'map6', 'map6m14', 'cyan'], -['0', '15', 'milestone', 'map6', 'map6m15', 'cyan'], -['0', '16', 'milestone', 'map6', 'map6m16', 'cyan'], -['0', '17', 'milestone', 'map6', 'map6m17', 'cyan'], -['0', '18', 'milestone', 'map6', 'map6m18', 'cyan'], -]; -var assetList = []; -var logos = []; diff --git a/content/Mathematics/activities_p4.js b/content/Mathematics/activities_p4.js new file mode 100644 index 0000000..7e1c324 --- /dev/null +++ b/content/Mathematics/activities_p4.js @@ -0,0 +1,19 @@ +var activities = [ + ['0',1,'map4','milestone','map411m01','cyan'], + ['0',2,'map4','milestone','map411m02','cyan'], + ['0',3,'map4','milestone','map411m03','cyan'], + ['0',4,'map4','milestone','map411m04','cyan'], + ['0',5,'map4','milestone','map411m05','cyan'], + ['0',6,'map4','milestone','map411m06','cyan'], + ['0',7,'map4','milestone','map411m07','cyan'], + ['0',8,'map4','milestone','map411m08','cyan'], + ['0',9,'map4','milestone','map411m09','cyan'], + ['0',10,'map4','milestone','map411m10','cyan'], + ['0',11,'map4','milestone','map411m11','cyan'], + ['0',12,'map4','milestone','map411m12','cyan'], + ['0',13,'map4','milestone','map411m13','cyan'], + ['0',14,'map4','milestone','map411m14','cyan'], + ['0',15,'map4','milestone','map411m15','cyan'], +]; +var assetList= []; +var logos = []; diff --git a/content/Mathematics/activities_p5.js b/content/Mathematics/activities_p5.js new file mode 100644 index 0000000..cecb4b9 --- /dev/null +++ b/content/Mathematics/activities_p5.js @@ -0,0 +1,22 @@ +var activities = [ + ['0',1,'map5','milestone','map511m01','cyan'], + ['0',2,'map5','milestone','map511m02','cyan'], + ['0',3,'map5','milestone','map511m03','cyan'], + ['0',4,'map5','milestone','map511m04','cyan'], + ['0',5,'map5','milestone','map511m05','cyan'], + ['0',6,'map5','milestone','map511m06','cyan'], + ['0',7,'map5','milestone','map511m07','cyan'], + ['0',8,'map5','milestone','map511m08','cyan'], + ['0',9,'map5','milestone','map511m09','cyan'], + ['0',10,'map5','milestone','map511m10','cyan'], + ['0',11,'map5','milestone','map511m11','cyan'], + ['0',12,'map5','milestone','map511m12','cyan'], + ['0',13,'map5','milestone','map511m13','cyan'], + ['0',14,'map5','milestone','map511m14','cyan'], + ['0',15,'map5','milestone','map511m15','cyan'], + ['0',16,'map5','milestone','map511m16','cyan'], + ['0',17,'map5','milestone','map511m17','cyan'], + ['0',18,'map5','milestone','map511m18','cyan'], +]; +var assetList= []; +var logos = []; diff --git a/content/Mathematics/activities_p6.js b/content/Mathematics/activities_p6.js new file mode 100644 index 0000000..1d3cbd5 --- /dev/null +++ b/content/Mathematics/activities_p6.js @@ -0,0 +1,24 @@ +var activities = [ + ['0',1,'map6','milestone','map611m01','cyan'], + ['0',2,'map6','milestone','map611m02','cyan'], + ['0',3,'map6','milestone','map611m03','cyan'], + ['0',4,'map6','milestone','map611m04','cyan'], + ['0',5,'map6','milestone','map611m05','cyan'], + ['0',6,'map6','milestone','map611m06','cyan'], + ['0',7,'map6','milestone','map611m07','cyan'], + ['0',8,'map6','milestone','map611m08','cyan'], + ['0',9,'map6','milestone','map611m09','cyan'], + ['0',10,'map6','milestone','map611m10','cyan'], + ['0',11,'map6','milestone','map611m11','cyan'], + ['0',12,'map6','milestone','map611m12','cyan'], + ['0',13,'map6','milestone','map611m13','cyan'], + ['0',14,'map6','milestone','map611m14','cyan'], + ['0',15,'map6','milestone','map611m15','cyan'], + ['0',16,'map6','milestone','map611m16','cyan'], + ['0',17,'map6','milestone','map611m17','cyan'], + ['0',18,'map6','milestone','map611m18','cyan'], + ['0',19,'map6','milestone','map611m20','cyan'], + ['0',20,'map6','milestone','map611m21','cyan'], +]; +var assetList= []; +var logos = []; diff --git a/content/Mathematics/index.html b/content/Mathematics/index.html index febaaa4..28ff111 100755 --- a/content/Mathematics/index.html +++ b/content/Mathematics/index.html @@ -1,7 +1,7 @@ <!DOCTYPE html> <html> <head> - <title>Mathematics </title> + <title>English </title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <link type="text/css" rel="stylesheet" href="../css/global.css" /> <link type="image/ico" rel="icon" href="../assets/default/image/favicon.ico" /> @@ -10,76 +10,23 @@ <script type="text/javascript" src="../js/karma.js"></script> <script type="text/javascript" src="../js/global.js"></script> <script type="text/javascript" src="../js/jquery.svg.js"></script> + <script type="text/javascript" src="../js/learner_subject.js"></script> <script type="text/javascript" src="../js/navigation.js"></script> <script type="text/javascript" src="activities.js"></script> - <script type="text/javascript"> - - function getName(){ - - name = $('#login').val() - grade = $('#grade').val(); - if (name.length == 0){ - ('#line4') - .one('click',getName); - return; - }; - - - $('<div id="txtFetch")>') - .load('http://localhost:8008/cgi-bin/fetch_milestone.py', - {'mode':'Student','student':name,'class':grade}, - function(responseTxt, status, xhr){ - - $('<div id="txtMain">') - .load('http://localhost:8008/cgi-bin/set_up_main_menu.py', - {'mode':'Student','student':name,'subject':'Mathematics'}, - function(responseTxt, status, xhr){ - window.location = './ladder.html' - }) - }) - }; - - $(function(){ - $('<div id="line0" />') - .load('http://localhost:8008/cgi-bin/logged_in.py', - function(responseTxt, status, xhr){ - pos = responseTxt.indexOf('unknown'); - if (pos == -1){ - window.location = './ladder.html' - }; - }); - $('<div id="line1" />') - .html('<h1>Welcome to the Learn.activity</h1>') - .appendTo('#content') - $('<div id="line2" />') - .html('<p>Please enter your name and class ("P4","P5","P6")</p>') - .appendTo('#content') - $('<div id="line3" />') - .html("<p><input id='login' label='name' value ='' type='text' /></p>") - .appendTo('#content') - $('<div id="line3" />') - .html("<p><input id='grade' label='class' value ='' type='text' /></p>") - .appendTo('#content') - $('<div id="line4" />') - .html("<p>Click here when you are finished</p>") - .appendTo('#content') - $('#line4') - .one('click',getName) - }); - </script> </head> <body> <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> + <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /> + </div></div> <div id="lesson_title"> <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> - Mathematics + English <img src="../assets/image/title_block_rt.png" width="33" height="75" align = "absmiddle" /> </div> <div id="topbtn_right"> <div title="Quit" id="linkQuit" class="linkQuit"></div> </div> </div> - <div id="content" /> + <canvas id="ladder"/> </body> </html> diff --git a/content/English11/index.html b/content/Mathematics/p4.html index 62d7d1e..7a0990e 100755 --- a/content/English11/index.html +++ b/content/Mathematics/p4.html @@ -9,15 +9,15 @@ <script type="text/javascript" src="../js/jquery-ui-1.js"></script> <script type="text/javascript" src="../js/karma.js"></script> <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> <script type="text/javascript" src="../js/jquery.svg.js"></script> <script type="text/javascript" src="../js/subject.js"></script> <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="activities.js"></script> + <script type="text/javascript" src="activities_p4.js"></script> </head> <body> <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> + <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /> + </div></div> <div id="lesson_title"> <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> English diff --git a/content/Mathematics/ladder.html b/content/Mathematics/p5.html index 28ff111..9708735 100755 --- a/content/Mathematics/ladder.html +++ b/content/Mathematics/p5.html @@ -10,9 +10,9 @@ <script type="text/javascript" src="../js/karma.js"></script> <script type="text/javascript" src="../js/global.js"></script> <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/learner_subject.js"></script> + <script type="text/javascript" src="../js/subject.js"></script> <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="activities.js"></script> + <script type="text/javascript" src="activities_p5.js"></script> </head> <body> <div id="header"> diff --git a/content/English/ladder.html b/content/Mathematics/p6.html index 28ff111..0406d84 100755 --- a/content/English/ladder.html +++ b/content/Mathematics/p6.html @@ -10,9 +10,9 @@ <script type="text/javascript" src="../js/karma.js"></script> <script type="text/javascript" src="../js/global.js"></script> <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/learner_subject.js"></script> + <script type="text/javascript" src="../js/subject.js"></script> <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="activities.js"></script> + <script type="text/javascript" src="activities_p6.js"></script> </head> <body> <div id="header"> diff --git a/content/Mathematics11/activities.js b/content/Mathematics11/activities.js deleted file mode 100755 index d725a14..0000000 --- a/content/Mathematics11/activities.js +++ /dev/null @@ -1,4 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; diff --git a/content/Mathematics11/lesson.css b/content/Mathematics11/lesson.css deleted file mode 100755 index c6dedad..0000000 --- a/content/Mathematics11/lesson.css +++ /dev/null @@ -1,3 +0,0 @@ -#content{ - overflow-y:scroll; -}; diff --git a/content/Mathematics11/p4.html b/content/Mathematics11/p4.html deleted file mode 100755 index cc7af26..0000000 --- a/content/Mathematics11/p4.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>English </title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link type="text/css" rel="stylesheet" href="../css/global.css" /> - <link type="image/ico" rel="icon" href="../assets/default/image/favicon.ico" /> - <script type="text/javascript" src="../js/jquery-1.4.js"></script> - <script type="text/javascript" src="../js/jquery-ui-1.js"></script> - <script type="text/javascript" src="../js/karma.js"></script> - <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> - <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/cw.js"></script> - <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="p4.js"></script> - </head> - <body> - <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> - <div id="lesson_title"> - <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> - Mathematics 2011 - <img src="../assets/image/title_block_rt.png" width="33" height="75" align = "absmiddle" /> - </div> - <div id="topbtn_right"> - <div title="Quit" id="linkQuit" class="linkQuit"></div> - </div> - </div> - <canvas id="ladder"/> - <div id='content' style = 'height:100px; width:100%'></div> - </body> -</html> diff --git a/content/Mathematics11/p4.js b/content/Mathematics11/p4.js deleted file mode 100755 index 131313f..0000000 --- a/content/Mathematics11/p4.js +++ /dev/null @@ -1,11 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; - - - - - - - diff --git a/content/Mathematics11/p41.html b/content/Mathematics11/p41.html deleted file mode 100755 index 11a6e27..0000000 --- a/content/Mathematics11/p41.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>English </title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link type="text/css" rel="stylesheet" href="../css/global.css" /> - <link type="image/ico" rel="icon" href="../assets/default/image/favicon.ico" /> - <script type="text/javascript" src="../js/jquery-1.4.js"></script> - <script type="text/javascript" src="../js/jquery-ui-1.js"></script> - <script type="text/javascript" src="../js/karma.js"></script> - <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> - <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/cw.js"></script> - <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="p41.js"></script> - </head> - <body> - <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> - <div id="lesson_title"> - <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> - Mathematics 2011 - <img src="../assets/image/title_block_rt.png" width="33" height="75" align = "absmiddle" /> - </div> - <div id="topbtn_right"> - <div title="Quit" id="linkQuit" class="linkQuit"></div> - </div> - </div> - <canvas id="ladder"/> - <div id='content' style = 'height:100px; width:100%'></div> - </body> -</html> diff --git a/content/Mathematics11/p41.js b/content/Mathematics11/p41.js deleted file mode 100755 index d0165d6..0000000 --- a/content/Mathematics11/p41.js +++ /dev/null @@ -1,164 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/content/Mathematics11/p42.html b/content/Mathematics11/p42.html deleted file mode 100755 index 914e16a..0000000 --- a/content/Mathematics11/p42.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>English </title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link type="text/css" rel="stylesheet" href="../css/global.css" /> - <link type="image/ico" rel="icon" href="../assets/default/image/favicon.ico" /> - <script type="text/javascript" src="../js/jquery-1.4.js"></script> - <script type="text/javascript" src="../js/jquery-ui-1.js"></script> - <script type="text/javascript" src="../js/karma.js"></script> - <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> - <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/cw.js"></script> - <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="p42.js"></script> - </head> - <body> - <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> - <div id="lesson_title"> - <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> - Mathematics 2011 - <img src="../assets/image/title_block_rt.png" width="33" height="75" align = "absmiddle" /> - </div> - <div id="topbtn_right"> - <div title="Quit" id="linkQuit" class="linkQuit"></div> - </div> - </div> - <canvas id="ladder"/> - <div id='content' style = 'height:100px; width:100%'></div> - </body> -</html> diff --git a/content/Mathematics11/p42.js b/content/Mathematics11/p42.js deleted file mode 100755 index d0165d6..0000000 --- a/content/Mathematics11/p42.js +++ /dev/null @@ -1,164 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/content/Mathematics11/p43.html b/content/Mathematics11/p43.html deleted file mode 100755 index 6d809d1..0000000 --- a/content/Mathematics11/p43.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>English </title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link type="text/css" rel="stylesheet" href="../css/global.css" /> - <link type="image/ico" rel="icon" href="../assets/default/image/favicon.ico" /> - <script type="text/javascript" src="../js/jquery-1.4.js"></script> - <script type="text/javascript" src="../js/jquery-ui-1.js"></script> - <script type="text/javascript" src="../js/karma.js"></script> - <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> - <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/cw.js"></script> - <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="p43.js"></script> - </head> - <body> - <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> - <div id="lesson_title"> - <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> - Mathematics 2011 - <img src="../assets/image/title_block_rt.png" width="33" height="75" align = "absmiddle" /> - </div> - <div id="topbtn_right"> - <div title="Quit" id="linkQuit" class="linkQuit"></div> - </div> - </div> - <canvas id="ladder"/> - <div id='content' style = 'height:100px; width:100%'></div> - </body> -</html> diff --git a/content/Mathematics11/p43.js b/content/Mathematics11/p43.js deleted file mode 100755 index d0165d6..0000000 --- a/content/Mathematics11/p43.js +++ /dev/null @@ -1,164 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/content/Mathematics11/p5.html b/content/Mathematics11/p5.html deleted file mode 100755 index 6e09892..0000000 --- a/content/Mathematics11/p5.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>English </title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link type="text/css" rel="stylesheet" href="../css/global.css" /> - <link type="image/ico" rel="icon" href="../assets/default/image/favicon.ico" /> - <script type="text/javascript" src="../js/jquery-1.4.js"></script> - <script type="text/javascript" src="../js/jquery-ui-1.js"></script> - <script type="text/javascript" src="../js/karma.js"></script> - <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> - <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/cw.js"></script> - <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="p5.js"></script> - </head> - <body> - <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> - <div id="lesson_title"> - <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> - Mathematics 2011 - <img src="../assets/image/title_block_rt.png" width="33" height="75" align = "absmiddle" /> - </div> - <div id="topbtn_right"> - <div title="Quit" id="linkQuit" class="linkQuit"></div> - </div> - </div> - <canvas id="ladder"/> - <div id='content' style = 'height:100px; width:100%'></div> - </body> -</html> diff --git a/content/Mathematics11/p5.js b/content/Mathematics11/p5.js deleted file mode 100755 index 63c962d..0000000 --- a/content/Mathematics11/p5.js +++ /dev/null @@ -1,10 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; - - - - - - diff --git a/content/Mathematics11/p51.html b/content/Mathematics11/p51.html deleted file mode 100755 index e4ffd36..0000000 --- a/content/Mathematics11/p51.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>English </title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link type="text/css" rel="stylesheet" href="../css/global.css" /> - <link type="image/ico" rel="icon" href="../assets/default/image/favicon.ico" /> - <script type="text/javascript" src="../js/jquery-1.4.js"></script> - <script type="text/javascript" src="../js/jquery-ui-1.js"></script> - <script type="text/javascript" src="../js/karma.js"></script> - <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> - <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/cw.js"></script> - <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="p51.js"></script> - </head> - <body> - <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> - <div id="lesson_title"> - <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> - Mathematics 2011 - <img src="../assets/image/title_block_rt.png" width="33" height="75" align = "absmiddle" /> - </div> - <div id="topbtn_right"> - <div title="Quit" id="linkQuit" class="linkQuit"></div> - </div> - </div> - <canvas id="ladder"/> - <div id='content' style = 'height:100px; width:100%'></div> - </body> -</html> diff --git a/content/Mathematics11/p51.js b/content/Mathematics11/p51.js deleted file mode 100755 index dd16129..0000000 --- a/content/Mathematics11/p51.js +++ /dev/null @@ -1,163 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/content/Mathematics11/p52.html b/content/Mathematics11/p52.html deleted file mode 100755 index 0079b04..0000000 --- a/content/Mathematics11/p52.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>English </title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link type="text/css" rel="stylesheet" href="../css/global.css" /> - <link type="image/ico" rel="icon" href="../assets/default/image/favicon.ico" /> - <script type="text/javascript" src="../js/jquery-1.4.js"></script> - <script type="text/javascript" src="../js/jquery-ui-1.js"></script> - <script type="text/javascript" src="../js/karma.js"></script> - <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> - <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/cw.js"></script> - <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="p52.js"></script> - </head> - <body> - <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> - <div id="lesson_title"> - <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> - Mathematics 2011 - <img src="../assets/image/title_block_rt.png" width="33" height="75" align = "absmiddle" /> - </div> - <div id="topbtn_right"> - <div title="Quit" id="linkQuit" class="linkQuit"></div> - </div> - </div> - <canvas id="ladder"/> - <div id='content' style = 'height:100px; width:100%'></div> - </body> -</html> diff --git a/content/Mathematics11/p52.js b/content/Mathematics11/p52.js deleted file mode 100755 index dd16129..0000000 --- a/content/Mathematics11/p52.js +++ /dev/null @@ -1,163 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/content/Mathematics11/p53.html b/content/Mathematics11/p53.html deleted file mode 100755 index 58223ae..0000000 --- a/content/Mathematics11/p53.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>English </title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link type="text/css" rel="stylesheet" href="../css/global.css" /> - <link type="image/ico" rel="icon" href="../assets/default/image/favicon.ico" /> - <script type="text/javascript" src="../js/jquery-1.4.js"></script> - <script type="text/javascript" src="../js/jquery-ui-1.js"></script> - <script type="text/javascript" src="../js/karma.js"></script> - <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> - <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/cw.js"></script> - <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="p53.js"></script> - </head> - <body> - <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> - <div id="lesson_title"> - <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> - Mathematics 2011 - <img src="../assets/image/title_block_rt.png" width="33" height="75" align = "absmiddle" /> - </div> - <div id="topbtn_right"> - <div title="Quit" id="linkQuit" class="linkQuit"></div> - </div> - </div> - <canvas id="ladder"/> - <div id='content' style = 'height:100px; width:100%'></div> - </body> -</html> diff --git a/content/Mathematics11/p53.js b/content/Mathematics11/p53.js deleted file mode 100755 index dd16129..0000000 --- a/content/Mathematics11/p53.js +++ /dev/null @@ -1,163 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/content/Mathematics11/p6.html b/content/Mathematics11/p6.html deleted file mode 100755 index d9ed5a2..0000000 --- a/content/Mathematics11/p6.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>English </title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link type="text/css" rel="stylesheet" href="../css/global.css" /> - <link type="image/ico" rel="icon" href="../assets/default/image/favicon.ico" /> - <script type="text/javascript" src="../js/jquery-1.4.js"></script> - <script type="text/javascript" src="../js/jquery-ui-1.js"></script> - <script type="text/javascript" src="../js/karma.js"></script> - <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> - <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/cw.js"></script> - <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="p6.js"></script> - </head> - <body> - <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> - <div id="lesson_title"> - <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> - Mathematics 2011 - <img src="../assets/image/title_block_rt.png" width="33" height="75" align = "absmiddle" /> - </div> - <div id="topbtn_right"> - <div title="Quit" id="linkQuit" class="linkQuit"></div> - </div> - </div> - <canvas id="ladder"/> - <div id='content' style = 'height:100px; width:100%'></div> - </body> -</html> diff --git a/content/Mathematics11/p6.js b/content/Mathematics11/p6.js deleted file mode 100755 index 63c962d..0000000 --- a/content/Mathematics11/p6.js +++ /dev/null @@ -1,10 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; - - - - - - diff --git a/content/Mathematics11/p61.html b/content/Mathematics11/p61.html deleted file mode 100755 index 0cbc7b8..0000000 --- a/content/Mathematics11/p61.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>English </title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link type="text/css" rel="stylesheet" href="../css/global.css" /> - <link type="image/ico" rel="icon" href="../assets/default/image/favicon.ico" /> - <script type="text/javascript" src="../js/jquery-1.4.js"></script> - <script type="text/javascript" src="../js/jquery-ui-1.js"></script> - <script type="text/javascript" src="../js/karma.js"></script> - <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> - <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/cw.js"></script> - <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="p61.js"></script> - </head> - <body> - <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> - <div id="lesson_title"> - <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> - Mathematics 2011 - <img src="../assets/image/title_block_rt.png" width="33" height="75" align = "absmiddle" /> - </div> - <div id="topbtn_right"> - <div title="Quit" id="linkQuit" class="linkQuit"></div> - </div> - </div> - <canvas id="ladder"/> - <div id='content' style = 'height:100px; width:100%'></div> - </body> -</html> diff --git a/content/Mathematics11/p61.js b/content/Mathematics11/p61.js deleted file mode 100755 index dd16129..0000000 --- a/content/Mathematics11/p61.js +++ /dev/null @@ -1,163 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/content/Mathematics11/p62.html b/content/Mathematics11/p62.html deleted file mode 100755 index 3082b61..0000000 --- a/content/Mathematics11/p62.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>English </title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link type="text/css" rel="stylesheet" href="../css/global.css" /> - <link type="image/ico" rel="icon" href="../assets/default/image/favicon.ico" /> - <script type="text/javascript" src="../js/jquery-1.4.js"></script> - <script type="text/javascript" src="../js/jquery-ui-1.js"></script> - <script type="text/javascript" src="../js/karma.js"></script> - <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> - <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/cw.js"></script> - <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="p62.js"></script> - </head> - <body> - <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> - <div id="lesson_title"> - <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> - Mathematics 2011 - <img src="../assets/image/title_block_rt.png" width="33" height="75" align = "absmiddle" /> - </div> - <div id="topbtn_right"> - <div title="Quit" id="linkQuit" class="linkQuit"></div> - </div> - </div> - <canvas id="ladder"/> - <div id='content' style = 'height:100px; width:100%'></div> - </body> -</html> diff --git a/content/Mathematics11/p62.js b/content/Mathematics11/p62.js deleted file mode 100755 index dd16129..0000000 --- a/content/Mathematics11/p62.js +++ /dev/null @@ -1,163 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/content/Mathematics11/p63.html b/content/Mathematics11/p63.html deleted file mode 100755 index bb58af8..0000000 --- a/content/Mathematics11/p63.html +++ /dev/null @@ -1,33 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>English </title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link type="text/css" rel="stylesheet" href="../css/global.css" /> - <link type="image/ico" rel="icon" href="../assets/default/image/favicon.ico" /> - <script type="text/javascript" src="../js/jquery-1.4.js"></script> - <script type="text/javascript" src="../js/jquery-ui-1.js"></script> - <script type="text/javascript" src="../js/karma.js"></script> - <script type="text/javascript" src="../js/global.js"></script> - <script type="text/javascript" src="../js/lesson.js"></script> - <script type="text/javascript" src="../js/jquery.svg.js"></script> - <script type="text/javascript" src="../js/cw.js"></script> - <script type="text/javascript" src="../js/navigation.js"></script> - <script type="text/javascript" src="p63.js"></script> - </head> - <body> - <div id="header"> - <div id="topbtn_left"><div title="home" id="linkBack" class="linkHome" /></div></div> - <div id="lesson_title"> - <img src="../assets/image/title_block_lt.png" width="33" height="75" align = "absmiddle" /> - Mathematics 2011 - <img src="../assets/image/title_block_rt.png" width="33" height="75" align = "absmiddle" /> - </div> - <div id="topbtn_right"> - <div title="Quit" id="linkQuit" class="linkQuit"></div> - </div> - </div> - <canvas id="ladder"/> - <div id='content' style = 'height:100px; width:100%'></div> - </body> -</html> diff --git a/content/Mathematics11/p63.js b/content/Mathematics11/p63.js deleted file mode 100755 index dd16129..0000000 --- a/content/Mathematics11/p63.js +++ /dev/null @@ -1,163 +0,0 @@ -var activities = [ -]; -var assetList = []; -var logos = []; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/content/index.html b/content/index.html index a2c74ae..4023043 100755 --- a/content/index.html +++ b/content/index.html @@ -7,97 +7,11 @@ <script type="text/javascript" src="../js/jquery-1.4.js"></script> <script type="text/javascript" src="../js/jquery-ui-1.js"></script> <script type="text/javascript"> - $('<div id="txtMain">') - .load('http://localhost:8008/cgi-bin/set_up_main_menu.py', - {'mode':'CW'}) - .appendTo('#content') + $('#content') + .load('http://localhost:8008/cgi-bin/fetch_milestone.py') </script> </head> <body> -<div id="content"> - <div id='c1t'> - <div class = 'main'"> - <a href="English/index.html">English - <img src="assets/image/english.png" alt="English" width=175 height=175 /> - </a> - </div> - </div> - <div id='c2t'> - <div class = 'main'> - <a href="Mathematics/index.html">Mathematics - <img src="assets/image/mathematics.png" alt="Mathematics" width=175 height=175" /> - </a> - </div> - </div> - <div id='c1m'> - <div class = 'main'> - <a href="English11/index.html">English 2011 - <img src="assets/image/english.png" alt="English" width=175 height=175 "> - </a> - </div> - <div class = 'ladders'> - <p> - <a href="English11/p41.html">P4.1</a> - <a href="English11/p42.html">P4.2</a> - <a href="English11/p43.html">P4.3</a> - </p> - <p> - <a href="English11/p51.html">P5.1</a> - <a href="English11/p52.html">P5.2</a> - <a href="English11/p53.html">P5.3</a> - </p> - <p> - <a href="English11/p61.html">P6.1</a> - <a href="English11/p62.html">P6.2</a> - <a href="English11/p63.html">P6.3</a> - </p> - </div> - </div> - <div id = 'c2m'> - <div class = 'main'> - <a href="Mathematics11/index.html">Mathematics 2011 - <img src="assets/image/mathematics.png" alt="Mathematics" width=175 height=175 /> - </a> - </div> - <div class = 'ladders'> - <a href="Mathematics11/p41.html">P4.1</a> - <a href="Mathematics11/p42.html">P4.2</a> - <a href="Mathematics11/p43.html">P4.3</a> - </p> - <p> - <a href="Mathematics11/p51.html">P5.1</a> - <a href="Mathematics11/p52.html">P5.2</a> - <a href="Mathematics11/p53.html">P5.3</a> - </p> - <p> - <a href="Mathematics11/p61.html">P6.1</a> - <a href="Mathematics11/p62.html">P6.2</a> - <a href="Mathematics11/p63.html">P6.3</a> - </p> - </div> - </div> - <div id = 'c1b'> - <a href="http://schoolserver/fez"> - <img src="assets/image/library.gif" alt="Library" width=175 height=175> - Library - </a> - </div> - - <div id = 'c2b'> - <a href="Explore/index.html"> - <img src="assets/image/explore.png" alt="Explore" width=175 height=175> - Explore - </a> - </div> - </div> - <div id="footer"> - Karma.js is licensed under the - <a href="http://www.opensource.org/licenses/mit-license.php">MIT License</a>. - Karma is a sub-project of - <a href="http://sugarlabs.org">SugarLabs</a>. <br /> - Copyright (c) 2009 Bryan Willson Berry - </div> - </div> -<div id='dummy'/> +<div id="content"/> </body> </html> diff --git a/content/js/cw.js b/content/js/cw.js deleted file mode 100755 index 3140467..0000000 --- a/content/js/cw.js +++ /dev/null @@ -1,227 +0,0 @@ -$(document).ready( - function(){ - var k = Karma(assetList); - - k.ready(function() { - logos; - activities; - - k.ready(function(){ - - //game logic - function draw(){ - var canvas = document.getElementById('ladder'); - if (canvas.getContext){ - var ctx = canvas.getContext('2d'); - var cells = 6; - var rows = 2 + (activities.length / cells); - var maxx = 1200; - var cellsize = 64; - var sz = cellsize; - var maxy = rows * 1.5 * cellsize; - if (maxy < 500){ maxy = 800; }; - maxy = 800; - canvas.setAttribute('width', maxx); - canvas.setAttribute('height', maxy); - var x = 0; - var y = 0; - var odd = 1; - var xstart = 1.7 * cellsize; - var ystart = maxy - 0.5*cellsize; - var row = 0; - var cell = 0; - var id = -1; - var ix = 0; - var idm = 0; - var activity = 0; - var flag = 0; - var acts = new Array(); - var idx = 0 - var il = "" - var xy; - var pth; - var count = 0; - var year = 0 - var local = 0; - - $("canvas").click(function($e) { - // find out which act in acts was clicked - x = $e.pageX; - y = $e.pageY; - $.each(acts, function() { - xy = this; - // here we need to download - if ( (x > xy[1]) && (x < xy[1] + cellsize) && (y < xy[2]) && (y > xy[2] - cellsize) ) { - // find out if year is 2010 or 2011 - if (xy[6] == 0) { year = '2010'; - } else { year = '2011'; - }; - $('#content').load( - 'http://localhost:8008/cgi-bin/fetch_milestone.py', - {'year':year,'milestone':xy[4]}, - function(responseText, status, xhr) { - //return to main menu when done - window.onunload=function(){return true;}; - window.location.reload(true); - window.location = 'http://localhost:8008/content/index.html'; - window.onunload = function(){return true;}; - window.location.reload(true); - }); - }; - }); - }); - - //ladder - ctx.font = "14pt Arial"; - ctx.textAlign = "center"; - x = xstart; - y = ystart; - ctx.beginPath(); - sz = cellsize; - drawarrow(x,y,sz); - offset=0; - delta = 1; - for(row=0;row<rows;row++){ - if (activity == activities.length) {break;}; - if (offset == 0){ - x = xstart; - } else { - x = xstart+offset-sz*3/2; - }; - for(cell=0;cell<cells;cell++){ - xsave = x; - if (activity < activities.length){ - ctx.fillStyle = 'yellow'; - ctx.fillRect(x,y,sz*3/2, sz/4); - drawlogo(x,y,activity); - activity = activity + 1; - x = x + 3/2*sz; - if (delta > 0) { - if (cell+1 < cells) { - ctx.fillstyle='yellow'; - ctx.fillRect(x,y,sz,sz/4); - x = xsave + sz*5/2; - } else { - x = xsave + sz*3/2; - }; - } else { - if (cell > 0) { - ctx.fillStyle = 'yellow'; - ctx.fillRect(x,y,sz,sz/4); - }; - if (cell+1<cells){ - x = xsave - sz*5/2; - } else { - x = xsave-sz*3/2; - }; - }; - }; - }; - if ((row + 1 < rows) && (activity < activities.length)) { - x = drawloop(x,y,row); - y = y - 2.25 * cellsize; - offset = x - xstart; - delta = -delta - }; - }; - }; - - function drawloop(x,y,row) { - if (row % 2 == 0) { - ctx.beginPath(); - ctx.moveTo(x,y); - ctx.arc(x, y-cellsize, cellsize, Math.PI/2, 0, 1); - ctx.arc(x, y-cellsize, 1.25*cellsize, 0, Math.PI*3/2, 1); - ctx.arc(x, y-cellsize, cellsize, Math.PI*3/2, 0, 0); - ctx.arc(x, y-cellsize, 1.25*cellsize, 0, Math.PI/2, 0); - ctx.closePath(); - ctx.fillStyle='yellow' - ctx.fill() - } else { - x = xstart; - ctx.beginPath(); - ctx.moveTo(x,y); - ctx.arc(x, y-cellsize, cellsize, Math.PI/2, Math.PI, 0); - ctx.arc(x, y-cellsize, 1.25*cellsize, Math.PI, Math.PI*3/2, 0); - ctx.arc(x, y-cellsize, cellsize, Math.PI*3/2, Math.PI, 1); - ctx.arc(x, y-cellsize, 1.25*cellsize, Math.PI, Math.PI/2, 1); - ctx.closePath(); - ctx.fillStyle='yellow'; - ctx.fill(); - }; - return x; - }; - - function drawarrow(x,y,sz) { - ctx.fillStyle = 'black' - ctx.fillRect(x-sz*4/5,y+sz/8,sz/2,sz/8); - ctx.moveTo(x-sz/2,y); - ctx.lineTo(x-sz/5,y+sz/8); - ctx.moveTo(x-sz/2,y+sz/2); - ctx.lineTo(x-sz/5,y+sz/8); - ctx.stroke(); - }; - - function drawmilestone(activity){ - var capcolor; - x = activity[1]; - y = activity[2]; - capcolor = activity[5]; - ctx.fillStyle = 'chartreuse'; - ctx.fillRect(x,y-cellsize,cellsize,cellsize); - ctx.fillStyle = 'black' - ctx.fillText(ix, x + (cellsize * 0.3), y-(cellsize * 0.4), cellsize); - ctx.beginPath(); - ctx.moveTo(x, y-cellsize); - ctx.arc(x+0.5*cellsize,y-cellsize,0.5*cellsize,Math.PI,0,0); - ctx.closePath(); - ctx.fillStyle = capcolor; - ctx.fill(); - ctx.fillStyle = 'yellow'; - }; - - function drawlogo(x, y, activity) { - var il, ty, ls, cc; - id = activities[activity][0]; - ix = activities[activity][1]; - if ((activities[activity].length) > 1){ - il = activities[activity][2]; - } else { - il = ""; - }; - if ((activities[activity].length) > 2){ - ty = activities[activity][3]; - }else{ - ty = ""; - }; - if ((activities[activity].length) > 3){ - ls = activities[activity][4]; - }else{ - ls = ""; - }; - if ((activities[activity].length) > 4){ - cc = activities[activity][5]; - }else{ - cc = 'cyan'; - }; - idx = idx + 1; - acts[idx] = [il, x, y, ty, ls, cc, id]; - if (id < 2){ - drawmilestone(acts[idx]); - } else { - // draw logo - alert('draw logo - should not happen'); - ctx.drawImage(k.image[logos[id-1]].media, x, y - cellsize); - if (ix > 0) { - ctx.textAlign = 'center' - ctx.fillStyle = 'black' - ctx.fillText(ix, x + cellsize/2, y+cellsize/4, cellsize); - }; - }; - }; - }; - - draw(); - }); - }); -}); diff --git a/content/js/subject.js b/content/js/subject.js index df77f3d..e0e8fa2 100755 --- a/content/js/subject.js +++ b/content/js/subject.js @@ -1,215 +1,223 @@ $(document).ready( - function(){ - var k = Karma(assetList); + function(){ + var k = Karma(assetList); - k.ready(function() { - - logos; - - activities; + k.ready(function() { + logos; + activities; - k.ready(function(){ + k.ready(function(){ - //game logic - - function draw(){ - var canvas = document.getElementById('ladder'); - if (canvas.getContext){ - var ctx = canvas.getContext('2d'); - var cells = 6; - var rows = 2 + (activities.length / cells); - var maxx = 1200; - var cellsize = 64; - var sz = cellsize; - var maxy = rows * 1.5 * cellsize; - if (maxy < 673){ - maxy = 673;; - }; - canvas.setAttribute('width', maxx); - canvas.setAttribute('height', maxy); - var x = 0; - var y = 0; - var odd = 1; - var xstart = 1.7 * cellsize; - var ystart = maxy - cellsize; - var row = 0; - var cell = 0; - var id = -1; - var ix = 0; - var idm = 0; - var activity = 0; - var flag = 0; - var acts = new Array(); - var idx = 0 - var il = "" - var xy; - var pth; - var count = 0; + //game logic + function draw(){ + var canvas = document.getElementById('ladder'); + if (canvas.getContext){ + var ctx = canvas.getContext('2d'); + var cells = 6; + var rows = 2 + (activities.length / cells); + var maxx = 1200; + var cellsize = 64; + var sz = cellsize; + var maxy = rows * 1.5 * cellsize; + if (maxy < 500){ maxy = 800; }; + maxy = 800; + canvas.setAttribute('width', maxx); + canvas.setAttribute('height', maxy); + var x = 0; + var y = 0; + var odd = 1; + var xstart = 1.7 * cellsize; + var ystart = maxy - 0.5*cellsize; + var row = 0; + var cell = 0; + var id = -1; + var ix = 0; + var idm = 0; + var activity = 0; + var flag = 0; + var acts = new Array(); + var idx = 0 + var il = "" + var xy; + var pth; + var count = 0; + var year = 0 + var local = 0; - $("canvas").click(function($e) { - // find out which act in acts was clicked - x = $e.pageX - y = $e.pageY - $.each(acts, function() { - xy = this; - // directory structure: activity/karma/content/subject/bundle - if ( (x > xy[1]) && (x < xy[1] + cellsize) && (y < xy[2]) && (y > xy[2] - cellsize) ) { - pth = xy[4]+'/index.html'; - window.location = pth; - }; - }); - }); - // ladder - ctx.font = "14pt Arial"; - ctx.textAlign = "center"; - x = xstart; - y = ystart; - ctx.beginPath(); - sz = cellsize; - drawarrow(x,y,sz); - offset=0; - delta = 1; - for(row=0;row<rows;row++){ - if (activity == activities.length) { - break; - }; - if (offset == 0){ - x = xstart; - } else { - x = xstart+offset-sz*3/2; - }; - for(cell=0;cell<cells;cell++){ - xsave = x; - if (activity < activities.length){ - ctx.fillStyle = 'yellow'; - ctx.fillRect(x,y,sz*3/2, sz/4); - drawlogo(x,y,activity); - activity = activity + 1; - x = x + 3/2*sz; - if (delta > 0) { - if (cell+1 < cells) { - ctx.fillstyle='yellow'; - ctx.fillRect(x,y,sz,sz/4); - x = xsave + sz*5/2; - } else { - x = xsave + sz*3/2; - }; - } else { - if (cell > 0) { - ctx.fillStyle = 'yellow'; - ctx.fillRect(x,y,sz,sz/4); - }; - if (cell+1<cells){ - x = xsave - sz*5/2; - } else { - x = xsave-sz*3/2; - }; - }; - }; - }; - if ((row + 1 < rows) && - (activity < activities.length)) { - if (row % 2 == 0) { - ctx.beginPath(); - ctx.moveTo(x,y); - ctx.arc(x, y-cellsize, cellsize, Math.PI/2, 0, 1); - ctx.arc(x, y-cellsize, 1.25*cellsize, 0, Math.PI*3/2, 1); - ctx.arc(x, y-cellsize, cellsize, Math.PI*3/2, 0, 0); - ctx.arc(x, y-cellsize, 1.25*cellsize, 0, Math.PI/2, 0); - ctx.closePath(); - ctx.fillStyle='yellow' - ctx.fill() - } else { - x = xstart; - ctx.beginPath(); - ctx.moveTo(x,y); - ctx.arc(x, y-cellsize, cellsize, Math.PI/2, Math.PI, 0); - ctx.arc(x, y-cellsize, 1.25*cellsize, Math.PI, Math.PI*3/2, 0); - ctx.arc(x, y-cellsize, cellsize, Math.PI*3/2, Math.PI, 1); - ctx.arc(x, y-cellsize, 1.25*cellsize, Math.PI, Math.PI/2, 1); - ctx.closePath(); - ctx.fillStyle='yellow' - ctx.fill() - } - } - y = y - 2.25 * cellsize; - offset = x - xstart; - delta = -delta; - } - } - - function drawarrow(x,y,sz) { - ctx.fillStyle = 'black' - ctx.fillRect(x-sz*4/5,y+sz/8,sz/2,sz/8); - ctx.moveTo(x-sz/2,y); - ctx.lineTo(x-sz/5,y+sz/8); - ctx.moveTo(x-sz/2,y+sz/2); - ctx.lineTo(x-sz/5,y+sz/8); - ctx.stroke(); - }; + $("canvas").click(function($e) { + // find out which act in acts was clicked + x = $e.pageX; + y = $e.pageY; + $.each(acts, function() { + xy = this; + // here we need to download + if ( (x > xy[1]) && (x < xy[1] + cellsize) && (y < xy[2]) && (y > xy[2] - cellsize) ) { + // find out if year is 2010 or 2011 + if (xy[5] == 'cyan') { + $('#content').load( + 'http://localhost:8008/cgi-bin/fetch_milestone.py', + {'code':xy[2],'milestone':xy[4]}, + function(responseText, status, xhr) { + //refresh when done + window.onunload=function(){return true;}; + window.location.reload(true); + }); + }; + }; + }); + }); - function drawmilestone(activity){ - var capcolor; - x = activity[1]; - y = activity[2]; - capcolor = activity[5]; - ctx.fillStyle = 'chartreuse'; - ctx.fillRect(x,y-cellsize,cellsize,cellsize); - ctx.fillStyle = 'black' - ctx.fillText(ix, x + (cellsize * 0.3), y-(cellsize * 0.4), cellsize); - ctx.beginPath(); - ctx.moveTo(x, y-cellsize); - ctx.arc(x+0.5*cellsize,y-cellsize,0.5*cellsize,Math.PI,0,0); - ctx.closePath(); - ctx.fillStyle = capcolor; - ctx.fill(); - ctx.fillStyle = 'yellow'; - }; + //ladder + ctx.font = "14pt Arial"; + ctx.textAlign = "center"; + x = xstart; + y = ystart; + ctx.beginPath(); + sz = cellsize; + drawarrow(x,y,sz); + offset=0; + delta = 1; + for(row=0;row<rows;row++){ + if (activity == activities.length) {break;}; + if (offset == 0){ + x = xstart; + } else { + x = xstart+offset-sz*3/2; + }; + for(cell=0;cell<cells;cell++){ + xsave = x; + if (activity < activities.length){ + ctx.fillStyle = 'yellow'; + ctx.fillRect(x,y,sz*3/2, sz/4); + drawlogo(x,y,activity); + activity = activity + 1; + x = x + 3/2*sz; + if (delta > 0) { + if (cell+1 < cells) { + ctx.fillstyle='yellow'; + ctx.fillRect(x,y,sz,sz/4); + x = xsave + sz*5/2; + } else { + x = xsave + sz*3/2; + }; + } else { + if (cell > 0) { + ctx.fillStyle = 'yellow'; + ctx.fillRect(x,y,sz,sz/4); + }; + if (cell+1<cells){ + x = xsave - sz*5/2; + } else { + x = xsave-sz*3/2; + }; + }; + }; + }; + if ((row + 1 < rows) && (activity < activities.length)) { + x = drawloop(x,y,row); + y = y - 2.25 * cellsize; + offset = x - xstart; + delta = -delta + }; + }; + }; + + function drawloop(x,y,row) { + if (row % 2 == 0) { + ctx.beginPath(); + ctx.moveTo(x,y); + ctx.arc(x, y-cellsize, cellsize, Math.PI/2, 0, 1); + ctx.arc(x, y-cellsize, 1.25*cellsize, 0, Math.PI*3/2, 1); + ctx.arc(x, y-cellsize, cellsize, Math.PI*3/2, 0, 0); + ctx.arc(x, y-cellsize, 1.25*cellsize, 0, Math.PI/2, 0); + ctx.closePath(); + ctx.fillStyle='yellow' + ctx.fill() + } else { + x = xstart; + ctx.beginPath(); + ctx.moveTo(x,y); + ctx.arc(x, y-cellsize, cellsize, Math.PI/2, Math.PI, 0); + ctx.arc(x, y-cellsize, 1.25*cellsize, Math.PI, Math.PI*3/2, 0); + ctx.arc(x, y-cellsize, cellsize, Math.PI*3/2, Math.PI, 1); + ctx.arc(x, y-cellsize, 1.25*cellsize, Math.PI, Math.PI/2, 1); + ctx.closePath(); + ctx.fillStyle='yellow'; + ctx.fill(); + }; + return x; + }; - function drawlogo(x, y, activity) { - var il, ty, ls, cc; - id = 0; /* we always have a milestone here */ - ix = activities[activity][1]; - if ((activities[activity].length) > 1){ - il = activities[activity][2]; - } else { - il = ""; - }; - if ((activities[activity].length) > 2){ - ty = activities[activity][3]; - }else{ - ty = ""; - }; - if ((activities[activity].length) > 3){ - ls = activities[activity][4]; - }else{ - ls = ""; - }; - if ((activities[activity].length) > 4){ - cc = activities[activity][5]; - }else{ - cc = 'cyan'; - }; - idx = idx + 1; - acts[idx] = [il, x, y, ty, ls, cc]; - if (id < 2){ - drawmilestone(acts[idx]); - } else { - // draw logo - alert('draw logo - should not happen'); - ctx.drawImage(k.image[logos[id-1]].media, x, y - cellsize); - if (ix > 0) { - ctx.textAlign = 'center' - ctx.fillStyle = 'black' - ctx.fillText(ix, x + cellsize/2, y+cellsize/4, cellsize); - }; - }; - } - } + function drawarrow(x,y,sz) { + ctx.fillStyle = 'black' + ctx.fillRect(x-sz*4/5,y+sz/8,sz/2,sz/8); + ctx.moveTo(x-sz/2,y); + ctx.lineTo(x-sz/5,y+sz/8); + ctx.moveTo(x-sz/2,y+sz/2); + ctx.lineTo(x-sz/5,y+sz/8); + ctx.stroke(); + }; - draw(); + function drawmilestone(activity){ + var capcolor; + x = activity[1]; + y = activity[2]; + capcolor = activity[5]; + ctx.fillStyle = 'chartreuse'; + ctx.fillRect(x,y-cellsize,cellsize,cellsize); + ctx.fillStyle = 'black' + ctx.fillText(ix, x + (cellsize * 0.3), y-(cellsize * 0.4), cellsize); + ctx.beginPath(); + ctx.moveTo(x, y-cellsize); + ctx.arc(x+0.5*cellsize,y-cellsize,0.5*cellsize,Math.PI,0,0); + ctx.closePath(); + ctx.fillStyle = capcolor; + ctx.fill(); + ctx.fillStyle = 'yellow'; + }; - }); + function drawlogo(x, y, activity) { + var il, ty, ls, cc; + id = activities[activity][0]; + ix = activities[activity][1]; + if ((activities[activity].length) > 1){ + il = activities[activity][2]; + } else { + il = ""; + }; + if ((activities[activity].length) > 2){ + ty = activities[activity][3]; + }else{ + ty = ""; + }; + if ((activities[activity].length) > 3){ + ls = activities[activity][4]; + }else{ + ls = ""; + }; + if ((activities[activity].length) > 4){ + cc = activities[activity][5]; + }else{ + cc = 'cyan'; + }; + idx = idx + 1; + acts[idx] = [il, x, y, ty, ls, cc, id]; + if (id < 2){ + drawmilestone(acts[idx]); + } else { + // draw logo + alert('draw logo - should not happen'); + ctx.drawImage(k.image[logos[id-1]].media, x, y - cellsize); + if (ix > 0) { + ctx.textAlign = 'center' + ctx.fillStyle = 'black' + ctx.fillText(ix, x + cellsize/2, y+cellsize/4, cellsize); + }; + }; + }; + }; + + draw(); }); - + }); }); diff --git a/content/menu.css b/content/menu.css index 874ac55..f31bd05 100755 --- a/content/menu.css +++ b/content/menu.css @@ -26,25 +26,56 @@ height:200px; } -#c1m{ +#c11{ + position:absolute; + top:50px; + left:50px; + width:200px; + height:200px; +} + +#c12{ + position:absolute; + top:50px; + left:250px; + width:200px; + height:200px; +} + +#c13{ + position:absolute; + top:50px; + left:450px; + width:200px; + height:200px; +} + +#c21{ position:absolute; top:300px; left:50px; - width:350px; + width:200px; height:200px; } -#c2m{ +#c22{ position:absolute; top:300px; - left:600px; - width:350px; + left:250px; + width:200px; height:200px; } +#c23{ + position:absolute; + top:300px; + left:450px; + width:200px; + height:200px; +} #c1b{ position:absolute; - top:550px; + top:450px; left:50px; width:250px; height:200px; @@ -52,7 +83,7 @@ #c2b{ position:absolute; - top:550px; + top:450px; left:600px; width:250px; height:200px; @@ -21,21 +21,12 @@ import BaseHTTPServer DATAPATH = path(activity.get_activity_root()) / "data" WORKPATH = DATAPATH / "work" -SUBJECTS = ['English','English11','Mathematics','Mathematics11'] -MOODLE_ENGLISH = [0,20,21,9,10,11,22] -ENGLISH_MILESTONES = [0,8,8,8,6,4,4] -MOODLE_MATHEMATICS = [0,13,14,15,16,17,18] -MATHEMATICS_MILESTONES = [0,8,8,8,4,5,6] +SUBJECTS = ['Mathematics','Mathematics11'] class Learn(activity.Activity): def __init__(self, handle): self.flog = open('logfile','w') activity.Activity.__init__(self, handle) - - if path('firstrun').exists(): - subprocess.call('cp -rf .mozilla/ .macromedia /home/olpc', shell=True) - subprocess.call('rm firstrun', shell=True) - #get serial number and nick fin = open('/ofw/serial-number','r') self.serial = fin.read()[:11] @@ -56,6 +47,18 @@ class Learn(activity.Activity): self.nickname = 'newbuild' self.grade = 'P6' print >> self.flog, self.serial, self.nickname, self.grade + + if path('firstrun').exists(): + subprocess.call('cp -rf .mozilla/ .macromedia /home/olpc', shell=True) + subprocess.call('rm firstrun', shell=True) + #set up student record based on nick + fout = open(DATAPATH / self.nickname,'w') + fout.write("{'grade':'P4','progress':[],'milestones:['1.1','1.2']}") + fout.close() + #set up learner based on nick + fout = open(DATAPATH / 'learner', 'w') + fout.write(self.nickname) + fout.close() #add links for karma folder base = path(get_bundle_path()) / 'content' karma = base / 'karma' diff --git a/menu/faculty_menu b/menu/faculty_menu new file mode 100644 index 0000000..1912ff8 --- /dev/null +++ b/menu/faculty_menu @@ -0,0 +1,59 @@ + <div id='c11'> + <div class = 'main'> + <a href="English/p4.html">English P4 + <img src="assets/image/english.png" alt="English" width=175 height=175 "> + </a> + </div> + </div> + <div id='c12'> + <div class = 'main'> + <a href="English/p5.html">English P5 + <img src="assets/image/english.png" alt="English" width=175 height=175 "> + </a> + </div> + </div> + <div id='c13'> + <div class = 'main'> + <a href="English/p6.html">English P6 + <img src="assets/image/english.png" alt="English" width=175 height=175 "> + </a> + </div> + </div> + <div id = 'c21'> + <div class = 'main'> + <a href="Mathematics/p4.html">Mathematics P4 + <img src="assets/image/mathematics.png" alt="Mathematics" width=175 height=175 /> + </a> + </div> + <div id = 'c22'> + <div class = 'main'> + <a href="Mathematics/p5.html">Mathematics P5 + <img src="assets/image/mathematics.png" alt="Mathematics" width=175 height=175 /> + </a> + </div> + <div id = 'c23'> + <div class = 'main'> + <a href="Mathematics/p6.html">Mathematics P6 + <img src="assets/image/mathematics.png" alt="Mathematics" width=175 height=175 /> + </a> + </div> + </div> + <div id = 'c1b'> + <a href="http://schoolserver/fez"> + <img src="assets/image/library.gif" alt="Library" width=175 height=175> + Library + </a> + </div> + <div id = 'c2b'> + <a href="Explore/index.html"> + <img src="assets/image/explore.png" alt="Explore" width=175 height=175> + Explore + </a> + </div> + <div id="footer"> + Karma.js is licensed under the + <a href="http://www.opensource.org/licenses/mit-license.php">MIT License</a>. + Karma is a sub-project of + <a href="http://sugarlabs.org">SugarLabs</a>. <br /> + Copyright (c) 2009 Bryan Willson Berry + </div> diff --git a/menu/student_menu b/menu/student_menu new file mode 100644 index 0000000..c55b6b6 --- /dev/null +++ b/menu/student_menu @@ -0,0 +1,33 @@ + <div id='c1t'> + <div class = 'main'"> + <a href="English/index.html">English + <img src="assets/image/english.png" alt="English" width=175 height=175 /> + </a> + </div> + </div> + <div id='c2t'> + <div class = 'main'> + <a href="Mathematics/index.html">Mathematics + <img src="assets/image/mathematics.png" alt="Mathematics" width=175 height=175" /> + </a> + </div> + </div> + <div id = 'c1b'> + <a href="http://schoolserver/fez"> + <img src="assets/image/library.gif" alt="Library" width=175 height=175> + Library + </a> + </div> + <div id = 'c2b'> + <a href="Explore/index.html"> + <img src="assets/image/explore.png" alt="Explore" width=175 height=175> + Explore + </a> + </div> + <div id="footer"> + Karma.js is licensed under the + <a href="http://www.opensource.org/licenses/mit-license.php">MIT License</a>. + Karma is a sub-project of + <a href="http://sugarlabs.org">SugarLabs</a>. <br /> + Copyright (c) 2009 Bryan Willson Berry + </div> |