summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/runtime/javascript/minibar/about.html13
-rw-r--r--src/runtime/javascript/minibar/minibar.html16
-rw-r--r--src/runtime/javascript/minibar/minibar.js113
-rw-r--r--src/runtime/javascript/minibar/phrasebook.html37
-rw-r--r--src/runtime/javascript/minibar/support.js9
5 files changed, 145 insertions, 43 deletions
diff --git a/src/runtime/javascript/minibar/about.html b/src/runtime/javascript/minibar/about.html
index a7f275869..11e4f46f0 100644
--- a/src/runtime/javascript/minibar/about.html
+++ b/src/runtime/javascript/minibar/about.html
@@ -59,9 +59,6 @@ Some implementation details:
<li>[Added 2010-02-25] Next to each translation, there is now a little tree icon that
you can click on to see a drawing of an abstract syntax tree or a parse tree. If you click
on a drawing it collapses back into a tree icon.
-</ul>
-Work in progress:
-<ul>
<li>[Added 2010-04-09] Preparations to support different ways to access the grammar:
currently we access a PGF server via JSONP, but I would also like to support AJAX,
and local/downloaded JavaScript grammars.
@@ -77,12 +74,20 @@ Work in progress:
<code>{show_abstract:true,show_trees:true}</code> to show the abstract syntax of parsed
sentences, and to show icons that expand to syntax/parse trees next each translation.
These features can be turned off by setting the fields to <code>false</code>.
+ <li>[Added 2010-04-30] Grammar menu is omitted if there is only one grammar in
+ the grammar list.
+ <li>[Added 2010-04-30] Fewer hardwired constants and new
+ <code>start_minibar</code> options (server, grammars_url, grammar_list,
+ show_grouped_translations, delete_button_text) to make
+ <code>minibar.js</code> more resuable.)
</ul>
<hr>
+<small class=modtime>
+<!-- hhmts start --> Last modified: Fri Apr 30 16:47:43 CEST 2010 <!-- hhmts end -->
+</small>
<address>
<a href="http://www.cs.chalmers.se/~hallgren/">TH</a>
<img src="http://www.altocumulus.org/~hallgren/online.cgi?icon" alt=""></address>
</address>
-<!-- hhmts start --> Last modified: Mon Apr 19 18:43:48 CEST 2010 <!-- hhmts end -->
</body> </html>
diff --git a/src/runtime/javascript/minibar/minibar.html b/src/runtime/javascript/minibar/minibar.html
index 345c91e0a..1d80deb53 100644
--- a/src/runtime/javascript/minibar/minibar.html
+++ b/src/runtime/javascript/minibar/minibar.html
@@ -4,9 +4,21 @@
<link rel=stylesheet type="text/css" href="minibar.css">
<script type="text/JavaScript" src="support.js"></script>
<script type="text/JavaScript" src="minibar.js"></script>
+<script type="text/JavaScript">
+
+var my_options= {
+ server: "http://www.grammaticalframework.org:41296",
+ //server: "http://tournesol.cs.chalmers.se:41296",
+ //server: "http://localhost:41296",
+ //grammar_list: ["Foods.pgf"],
+ show_abstract: false,
+ show_trees: true,
+ show_grouped_translations: false
+}
+</script>
</head>
-<body onload="start_minibar({show_abstract:false, show_trees: false})">
+<body onload="start_minibar(my_options)">
<h1>Minibar</h1>
<div id=minibar>
</div>
@@ -18,7 +30,7 @@
&amp; <a href="http://www.grammaticalframework.org:41296/translate/">Translator</a>]
</small>
<small class=modtime>
-HTML <!-- hhmts start --> Last modified: Mon Apr 19 18:16:40 CEST 2010 <!-- hhmts end -->
+HTML <!-- hhmts start --> Last modified: Fri Apr 30 16:48:36 CEST 2010 <!-- hhmts end -->
</small>
<address>
<a href="http://www.cs.chalmers.se/~hallgren/">TH</a>
diff --git a/src/runtime/javascript/minibar/minibar.js b/src/runtime/javascript/minibar/minibar.js
index 124a7e1b9..f20fd96c5 100644
--- a/src/runtime/javascript/minibar/minibar.js
+++ b/src/runtime/javascript/minibar/minibar.js
@@ -2,30 +2,33 @@
/* --- Configuration -------------------------------------------------------- */
-var server="http://www.grammaticalframework.org:41296"
-//var server="http://tournesol.cs.chalmers.se:41296";
-//var server="http://localhost:41296";
-var grammars_url=server+"/grammars/";
-var tree_icon=server+"/translate/se.chalmers.cs.gf.gwt.TranslateApp/tree-btn.png";
+var default_server="http://www.grammaticalframework.org:41296"
+var tree_icon=default_server+"/translate/se.chalmers.cs.gf.gwt.TranslateApp/tree-btn.png";
+// default values for options:
var options={
- show_abstract: true,
- show_trees: true
+ server: default_server,
+ grammars_url: null, // if left null, start_minibar() fills in server+"/grammars/"
+ grammar_list: null, // if left null, start_minibar() will fetch a list from the server
+ show_abstract: false,
+ show_trees: false,
+ show_grouped_translations: true,
+ delete_button_text: "⌫",
}
/* --- Grammar access object ------------------------------------------------ */
var server = {
// State variables (private):
- current_grammar_url: grammars_url+"Foods.pgf",
+ current_grammar_url: options.grammars_url+"Foods.pgf",
// Methods:
switch_grammar: function(grammar_name) {
- this.current_grammar_url=grammars_url+grammar_name;
+ this.current_grammar_url=options.grammars_url+grammar_name;
},
get_grammarlist: function(cont_name) {
- jsonp(grammars_url+"grammars.cgi",cont_name);
+ jsonp(options.grammars_url+"grammars.cgi",cont_name);
},
get_languages: function(cont_name) {
jsonp(this.current_grammar_url,cont_name);
@@ -51,6 +54,13 @@ var server = {
+"&from="+encodeURIComponent(from)
+"&input="+encodeURIComponent(input),
cont_name)
+ },
+ translategroup: function(from,input,cont_name) {
+ jsonp(this.current_grammar_url
+ +"?command=translategroup"
+ +"&from="+encodeURIComponent(from)
+ +"&input="+encodeURIComponent(input),
+ cont_name)
}
};
@@ -59,7 +69,6 @@ var server = {
function start_minibar(opts) { // typically called when the HTML document is loaded
if(opts) for(var o in opts) options[o]=opts[o];
-
var surface=div_id("surface");
surface.setAttribute("onclick","surface_click(this)");
appendChildren(element("minibar"),
@@ -67,31 +76,36 @@ function start_minibar(opts) { // typically called when the HTML document is loa
surface,
div_id("words"),
div_id("translations")]);
- server.get_grammarlist("show_grammarlist");
+ if(!options.grammars_url) options.grammars_url=options.server+"/grammars/";
+ if(options.grammar_list) show_grammarlist(options.grammar_list)
+ else server.get_grammarlist("show_grammarlist");
}
/* --- Functions ------------------------------------------------------------ */
function show_grammarlist(grammars) {
- var menu=empty("select");
- for(var i=0;i<grammars.length;i++) {
- var opt=empty("option");
- opt.setAttribute("value",grammars[i]);
- opt.innerHTML=grammars[i];
- menu.appendChild(opt);
- }
- menu.setAttribute("onchange","new_grammar(this)");
- var menubar=element("menubar");
- menubar.innerHTML="Grammar: ";
- appendChildren(menubar,
- [menu,
- text(" From: "), empty_id("select","language_menu"),
- text(" To: "), empty_id("select","to_menu"),
- button("Clear","clear_all()"),
- button("⌫","delete_last()"),
- button("Random","generate_random()")]);
- select_grammar(grammars[0]);
+ var menubar=element("menubar");
+ menubar.innerHTML="";
+ if(grammars.length>1) {
+ var menu=empty("select");
+ for(var i=0;i<grammars.length;i++) {
+ var opt=empty("option");
+ opt.setAttribute("value",grammars[i]);
+ opt.innerHTML=grammars[i];
+ menu.appendChild(opt);
+ }
+ menu.setAttribute("onchange","new_grammar(this)");
+ menubar.innerHTML="Grammar: ";
+ menubar.appendChild(menu);
+ }
+ appendChildren(menubar,
+ [text(" From: "), empty_id("select","language_menu"),
+ text(" To: "), empty_id("select","to_menu"),
+ button(options.delete_button_text,"delete_last()"),
+ button("Clear","clear_all()"),
+ button("Random","generate_random()")]);
+ select_grammar(grammars[0]);
}
function new_grammar(menu) {
@@ -104,7 +118,7 @@ function select_grammar(grammar_name) {
}
function langpart(conc,abs) { // langpart("FoodsEng","Food") == "Eng"
- return conc.indexOf(abs)==0 ? conc.substring(abs.length) : conc;
+ return hasPrefix(conc,abs) ? conc.substr(abs.length) : conc;
}
function show_languages(grammar) {
@@ -116,7 +130,7 @@ function show_languages(grammar) {
menu.innerHTML="";
for(var i=0; i<lang.length; i++)
- if(lang[i].canParse)
+ if(lang[i].canParse && !hasPrefix(lang[i].name,"Disamb"))
menu.appendChild(option(langpart(lang[i].name,grammar.name),""+i));
var to=element("to_menu");
@@ -125,7 +139,8 @@ function show_languages(grammar) {
to.innerHMTL="";
to.appendChild(option("All","-1"));
for(var i=0; i<lang.length; i++)
- to.appendChild(option(langpart(lang[i].name,grammar.name),lang[i].name));
+ if(!hasPrefix(lang[i].name,"Disamb"))
+ to.appendChild(option(langpart(lang[i].name,grammar.name),lang[i].name));
new_language(menu);
}
@@ -270,7 +285,11 @@ function show_completions(completions) {
}
function get_translations(menu) {
- server.translate(menu.current.from,menu.current.input,"show_translations");
+ var c=menu.current;
+ if(options.show_grouped_translations)
+ server.translategroup(c.from,c.input,"show_groupedtranslations");
+ else
+ server.translate(c.from,c.input,"show_translations");
}
function tdt(tree_btn,txt) {
@@ -279,8 +298,7 @@ function tdt(tree_btn,txt) {
function show_translations(translations) {
var trans=element("translations");
- var menu=element("language_menu");
- var grammar=menu.grammar;
+ var grammar=element("language_menu").grammar;
var to_menu=element("to_menu");
var to=to_menu.options[to_menu.selectedIndex].value
var cnt=translations.length;
@@ -304,6 +322,29 @@ function show_translations(translations) {
}
}
+function show_groupedtranslations(translations) {
+ var trans=element("translations");
+ var grammar=element("language_menu").grammar;
+ var to_menu=element("to_menu");
+ var to=langpart(to_menu.options[to_menu.selectedIndex].value,grammar.name);
+ var cnt=translations.length;
+ trans.innerHTML="";
+ for(p=0;p<cnt;p++) {
+ var t=translations[p];
+ if(to=="-1" || t.to==to) {
+ var lin=t.linearizations;
+ var tbody=empty("tbody");
+ /*if(to=="-1")*/
+ tbody.appendChild(tr([th(text(t.to+":"))]));
+ for(var i=0;i<lin.length;i++) {
+ tbody.appendChild(tr([(text(lin[i].text))]));
+ if (lin.length > 1) tbody.appendChild(tr([(text(lin[i].tree))]));
+ }
+ trans.appendChild(wrap("table",tbody));
+ }
+ }
+}
+
function abstree_button(abs) {
var i=img(tree_icon);
i.setAttribute("onclick","toggle_img(this)");
diff --git a/src/runtime/javascript/minibar/phrasebook.html b/src/runtime/javascript/minibar/phrasebook.html
new file mode 100644
index 000000000..a331dc112
--- /dev/null
+++ b/src/runtime/javascript/minibar/phrasebook.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html> <head>
+<title>Phrasebook</title>
+<link rel=stylesheet type="text/css" href="minibar.css">
+<script type="text/JavaScript" src="support.js"></script>
+<script type="text/JavaScript" src="minibar.js"></script>
+<script type="text/JavaScript">
+var phrasebook_options={
+ server: "http://tournesol.cs.chalmers.se:41296",
+ grammar_list: ["Phrasebook.pgf"],
+ delete_button_text: "Del"
+}
+</script>
+</head>
+
+<body onload="start_minibar(phrasebook_options)">
+
+<div id=minibar>
+</div>
+<hr>
+
+<small>
+
+Based on
+<a href="http://www.cs.chalmers.se/~hallgren/minibar/minibar.html">minibar</a>,
+powered by
+<a href="http://www.grammaticalframework.org">GF</a>,
+see
+<a href="../phrasebook.html">doc</a>.
+
+
+</body>
+
+</html>
+
+
+
diff --git a/src/runtime/javascript/minibar/support.js b/src/runtime/javascript/minibar/support.js
index 2161ff650..e2240624c 100644
--- a/src/runtime/javascript/minibar/support.js
+++ b/src/runtime/javascript/minibar/support.js
@@ -117,7 +117,10 @@ function swap(a,i,j) { // Note: this doesn't work on strings.
return a;
}
-function sort(a) { // Note: this doesn't work on strings.
+function sort(a) {
+// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Global_Objects/Array/sort
+ return a.sort;
+ /* // Note: this doesn't work on strings.
for(var i=0;i<a.length-1;i++) {
var min=i;
for(var j=i+1;j<a.length;j++)
@@ -125,6 +128,7 @@ function sort(a) { // Note: this doesn't work on strings.
if(min!=i) swap(a,i,min);
}
return a;
+ */
}
function filter(p,xs) {
@@ -143,6 +147,9 @@ function implode(cs) { // array of strings to string
*/
return cs.join("");
}
+
+function hasPrefix(s,pre) { return s.substr(0,pre.length)==pre; }
+
/*
function all(p,xs) {
for(var i=0;i<xs.length;i++)
generated by cgit v1.2.3 (git 2.39.1) at 2026-05-20 06:29:41 +0000