updated demo page and summer school

2 files changed, 31 insertions, 20 deletions

diff --git a/demos/index.html b/demos/index.html
index 2a10c15aa..e84e36eed 100644
--- a/demos/index.html
+++ b/demos/index.html
@@ -9,15 +9,28 @@
 </FONT></CENTER>
 
 <P>
-<A HREF="http://www.cs.chalmers.se/~markus/gramlets/letter-applet.html">Letter editor</A>: compose
-a letter in a language you don't know.
+<B>NEW</B> <A HREF="http://tournesol.cs.chalmers.se:41296/gwt/www/se.chalmers.cs.gf.gwt.FridgeApp/Fridge.html">Fridge poetry</A>
+</P>
+<P>
+<B>NEW</B> <A HREF="http://tournesol.cs.chalmers.se:41296/gwt/www/se.chalmers.cs.gf.gwt.TranslateApp/Translate.html">Word-completing translator</A>
+</P>
+<P>
+<B>NEW</B> <A HREF="http://www.youtube.com/watch?v=1bfaYHWS6zU">Tramdemo on YouTube</A>: 
+find your way in Gothenburg public transport system, in six languages (film).
+</P>
+<P>
+<B>NEW</B> <A HREF="http://csmisc14.cs.chalmers.se/~meza/restWiki/wiki.cgi">Multilingual Wiki</A>.
+</P>
+<P>
+<A HREF="index-numbers.html">Numeral translator for the iPhone</A>: number words in 15 languages.
 </P>
 <P>
-<A HREF="http://www.cs.chalmers.se/~bringert/gf/translate/">Numeral translator</A>: see 
+<A HREF="http://www.cs.chalmers.se/~bringert/gf/translate/">Numeral translator</A>:
 number words in 88 languages.
 </P>
 <P>
-<B>NEW</B> <A HREF="index-numbers.html">Numeral translator for the iPhone</A>.
+<A HREF="http://www.cs.chalmers.se/~markus/gramlets/letter-applet.html">Letter editor</A>: compose
+a letter in a language you don't know.
 </P>
 <P>
 <A HREF="http://www.cs.chalmers.se/~bringert/xv/pizza/">Pizza</A>: order a pizza by speaking
@@ -28,14 +41,10 @@ to your web browser.
 create mathematical exercises in six languages simultaneously (film).
 </P>
 <P>
-<B>NEW</B> <A HREF="http://www.jem-thematic.net/en/node/846#comment-209">WebALT Math translator</A>:
+<A HREF="http://www.jem-thematic.net/en/node/846#comment-209">WebALT Math translator</A>:
 translate mathematical exercises in a web service using incremental parsing.
 </P>
 <P>
-<A HREF="http://www.cs.chalmers.se/~bringert/demos/gotgodis/">Tramdemo</A>: find your way in
-Gothenburg public transport system, in six languages (film).
-</P>
-<P>
 <A HREF="http://csmisc14.cs.chalmers.se/~bjorn/langtrain.cgi">GF Language Trainer</A>:
 translation quizzes in Arabic, English, Russian, Swedish.
 </P>
diff --git a/demos/index.txt b/demos/index.txt
index cbf1ed807..cc80d5ec6 100644
--- a/demos/index.txt
+++ b/demos/index.txt
@@ -2,30 +2,32 @@ Grammatical Framework Demos
 
 
 
+**NEW** [Fridge poetry http://tournesol.cs.chalmers.se:41296/gwt/www/se.chalmers.cs.gf.gwt.FridgeApp/Fridge.html]
 
-[Letter editor http://www.cs.chalmers.se/~markus/gramlets/letter-applet.html]: compose
-a letter in a language you don't know.
+**NEW** [Word-completing translator http://tournesol.cs.chalmers.se:41296/gwt/www/se.chalmers.cs.gf.gwt.TranslateApp/Translate.html]
+
+**NEW** [Tramdemo on YouTube http://www.youtube.com/watch?v=1bfaYHWS6zU]: 
+find your way in Gothenburg public transport system, in six languages (film).
+
+**NEW** [Multilingual Wiki http://csmisc14.cs.chalmers.se/~meza/restWiki/wiki.cgi].
+
+[Numeral translator for the iPhone index-numbers.html]: number words in 15 languages.
 
-[Numeral translator http://www.cs.chalmers.se/~bringert/gf/translate/]: see 
+[Numeral translator http://www.cs.chalmers.se/~bringert/gf/translate/]:
 number words in 88 languages.
 
-**NEW** [Numeral translator for the iPhone index-numbers.html].
+[Letter editor http://www.cs.chalmers.se/~markus/gramlets/letter-applet.html]: compose
+a letter in a language you don't know.
 
 [Pizza http://www.cs.chalmers.se/~bringert/xv/pizza/]: order a pizza by speaking
 to your web browser.
 
-%[Restauranggajden http://www.restauranggajden.se/tomas/]: write and read
-%restaurant reviews in a multilingual Wiki.
-
 [WebALT Math Editor  http://webalt.math.helsinki.fi/PublicFiles/CD/Screencast/TextMathEditor%20Demo.swf]:
 create mathematical exercises in six languages simultaneously (film).
 
-**NEW** [WebALT Math translator http://www.jem-thematic.net/en/node/846#comment-209]:
+[WebALT Math translator http://www.jem-thematic.net/en/node/846#comment-209]:
 translate mathematical exercises in a web service using incremental parsing.
 
-[Tramdemo http://www.cs.chalmers.se/~bringert/demos/gotgodis/]: find your way in
-Gothenburg public transport system, in six languages (film).
-
 [GF Language Trainer http://csmisc14.cs.chalmers.se/~bjorn/langtrain.cgi]:
 translation quizzes in Arabic, English, Russian, Swedish.