diff options
| -rw-r--r-- | demos/index.html | 2 | ||||
| -rw-r--r-- | gf.cabal | 4 | ||||
| -rw-r--r-- | src/www/TransQuiz/brushed-metal.png (renamed from demos/TransQuiz/brushed-metal.png) | bin | 36233 -> 36233 bytes | |||
| -rw-r--r-- | src/www/TransQuiz/minibar_quiz.css (renamed from demos/TransQuiz/minibar_quiz.css) | 0 | ||||
| -rw-r--r-- | src/www/TransQuiz/minibar_quiz.js (renamed from demos/TransQuiz/minibar_quiz.js) | 0 | ||||
| -rw-r--r-- | src/www/TransQuiz/pgf_online.js (renamed from demos/TransQuiz/pgf_online.js) | 0 | ||||
| -rw-r--r-- | src/www/TransQuiz/quiz_about.html (renamed from demos/TransQuiz/quiz_about.html) | 0 | ||||
| -rw-r--r-- | src/www/TransQuiz/quiz_help.html (renamed from demos/TransQuiz/quiz_help.html) | 0 | ||||
| -rw-r--r-- | src/www/TransQuiz/quiz_pre_start.js (renamed from demos/TransQuiz/quiz_pre_start.js) | 0 | ||||
| -rw-r--r-- | src/www/TransQuiz/quiz_support.js (renamed from demos/TransQuiz/quiz_support.js) | 0 | ||||
| -rw-r--r-- | src/www/TransQuiz/support.js (renamed from demos/TransQuiz/support.js) | 0 | ||||
| -rw-r--r-- | src/www/TransQuiz/translation_quiz.html (renamed from demos/TransQuiz/translation_quiz.html) | 0 | ||||
| -rw-r--r-- | src/www/TransQuiz/translation_quiz.js (renamed from demos/TransQuiz/translation_quiz.js) | 0 | ||||
| -rw-r--r-- | src/www/gfse/editor.js | 19 | ||||
| -rw-r--r-- | src/www/index.html | 1 |
15 files changed, 24 insertions, 2 deletions
diff --git a/demos/index.html b/demos/index.html index a09b294e2..86449bd6f 100644 --- a/demos/index.html +++ b/demos/index.html @@ -19,7 +19,7 @@ Phrasebook</a> <p><a href="http://www.grammaticalframework.org:41297/syllogism/syllogism.html">Online syllogism solver</a> -<p><a href="TransQuiz/">Translation Quiz</a> +<p><a href="../src/www/TransQuiz/translation_quiz.html">Translation Quiz</a> <P><a href="minibar/minibar.html">Minibar online</A> @@ -23,6 +23,10 @@ data-files: www/index.html www/minibar/*.css www/minibar/*.js www/minibar/*.png + www/TransQuiz/*.html + www/TransQuiz/*.css + www/TransQuiz/*.js + www/TransQuiz/*.png source-repository head type: darcs diff --git a/demos/TransQuiz/brushed-metal.png b/src/www/TransQuiz/brushed-metal.png Binary files differindex c2f03fe7d..c2f03fe7d 100644 --- a/demos/TransQuiz/brushed-metal.png +++ b/src/www/TransQuiz/brushed-metal.png diff --git a/demos/TransQuiz/minibar_quiz.css b/src/www/TransQuiz/minibar_quiz.css index 0b625f88d..0b625f88d 100644 --- a/demos/TransQuiz/minibar_quiz.css +++ b/src/www/TransQuiz/minibar_quiz.css diff --git a/demos/TransQuiz/minibar_quiz.js b/src/www/TransQuiz/minibar_quiz.js index 70d796390..70d796390 100644 --- a/demos/TransQuiz/minibar_quiz.js +++ b/src/www/TransQuiz/minibar_quiz.js diff --git a/demos/TransQuiz/pgf_online.js b/src/www/TransQuiz/pgf_online.js index 06ed87a60..06ed87a60 100644 --- a/demos/TransQuiz/pgf_online.js +++ b/src/www/TransQuiz/pgf_online.js diff --git a/demos/TransQuiz/quiz_about.html b/src/www/TransQuiz/quiz_about.html index 4728e8e7d..4728e8e7d 100644 --- a/demos/TransQuiz/quiz_about.html +++ b/src/www/TransQuiz/quiz_about.html diff --git a/demos/TransQuiz/quiz_help.html b/src/www/TransQuiz/quiz_help.html index 6b84f787c..6b84f787c 100644 --- a/demos/TransQuiz/quiz_help.html +++ b/src/www/TransQuiz/quiz_help.html diff --git a/demos/TransQuiz/quiz_pre_start.js b/src/www/TransQuiz/quiz_pre_start.js index 81a8697da..81a8697da 100644 --- a/demos/TransQuiz/quiz_pre_start.js +++ b/src/www/TransQuiz/quiz_pre_start.js diff --git a/demos/TransQuiz/quiz_support.js b/src/www/TransQuiz/quiz_support.js index 2a078a191..2a078a191 100644 --- a/demos/TransQuiz/quiz_support.js +++ b/src/www/TransQuiz/quiz_support.js diff --git a/demos/TransQuiz/support.js b/src/www/TransQuiz/support.js index 562bab96a..562bab96a 100644 --- a/demos/TransQuiz/support.js +++ b/src/www/TransQuiz/support.js diff --git a/demos/TransQuiz/translation_quiz.html b/src/www/TransQuiz/translation_quiz.html index bb67588e8..bb67588e8 100644 --- a/demos/TransQuiz/translation_quiz.html +++ b/src/www/TransQuiz/translation_quiz.html diff --git a/demos/TransQuiz/translation_quiz.js b/src/www/TransQuiz/translation_quiz.js index b6d957f45..b6d957f45 100644 --- a/demos/TransQuiz/translation_quiz.js +++ b/src/www/TransQuiz/translation_quiz.js diff --git a/src/www/gfse/editor.js b/src/www/gfse/editor.js index 18782b91f..809aee4df 100644 --- a/src/www/gfse/editor.js +++ b/src/www/gfse/editor.js @@ -148,6 +148,7 @@ function draw_namebar(g,files) { return div_class("namebar", [table([tr([td(draw_name(g)), td_right([minibar_button(g,files), + quiz_button(g), compile_button(g), draw_plainbutton(g,files), draw_closebutton(g)])])])]) @@ -184,7 +185,7 @@ function show_compile_error(res) { var dst=compiler_output if(dst) { clear(dst); - var minibarlink=a(res.minibar_url,[text("Minibar")]) + //var minibarlink=a(res.minibar_url,[text("Minibar")]) if(res.errorcode=="OK") dst.appendChild(wrap("h3",text("OK"))) else @@ -243,6 +244,22 @@ function minibar_button(g,files) { return b; } +function quiz_button(g) { + function goto_quiz(res) { + show_compile_error(res); + if(res.errorcode=="OK") + location.href="../TransQuiz/translation_quiz.html?"+local.get("dir")+"/" + } + function compile() { + replaceInnerHTML(compiler_output,"<h3>Compiling...</h3>"); + upload(g,goto_quiz); + } + var b=button("Quiz",compile); + b.title="Upload the grammar and go to the translation quiz"; + return b; +} + + function lang(code,name) { return { code:code, name:name} } function lang1(name) { var ws=name.split("/"); diff --git a/src/www/index.html b/src/www/index.html index 7a924e808..ab571fe70 100644 --- a/src/www/index.html +++ b/src/www/index.html @@ -9,6 +9,7 @@ <ul> <li><a href="minibar/minibar.html">Minibar</a> + <li><a href="TransQuiz/translation_quiz.html">Translation Quiz</a> <li><a href="gfse/">GF online editor for simple multilingual grammars</a> </ul> |
