From e50731c5111cc4a4addbdb157de2d73001976c2d Mon Sep 17 00:00:00 2001
From: hallgren <hallgren@chalmers.se>
Date: Mon, 8 Aug 2011 14:08:55 +0000
Subject: [PATCH] minibar: resolve conflict

---
 src/runtime/javascript/minibar/minibar.html | 29 +++------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/src/runtime/javascript/minibar/minibar.html b/src/runtime/javascript/minibar/minibar.html
index 61fc49791..a6bc8f085 100644
--- a/src/runtime/javascript/minibar/minibar.html
+++ b/src/runtime/javascript/minibar/minibar.html
@@ -29,31 +29,10 @@ HTML <!-- hhmts start --> Last modified: Wed Aug  3 15:09:58 CEST 2011 <!-- hhmt
 <a href="http://www.cse.chalmers.se/~hallgren/">TH</a>
 <img src="http://www.altocumulus.org/~hallgren/online.cgi?icon" alt=""></address>
 
-<script type="text/javascript">
-
-var online_options={
-//grammars_url: "http://www.grammaticalframework.org/grammars/",
-//grammars_url: "http://tournesol.cs.chalmers.se:41296/grammars/",
-//grammars_url: "http://localhost:41296/grammars/",
-//grammar_list: ["Foods.pgf"], // leave undefined to get list from server
-}
-
-
-if(/^\?\/tmp\//.test(location.search)) {
-  online_options.grammars_url=location.search.substr(1);
-}
-
-var server=pgf_online(online_options);
-
-var minibar_options= {
-  show_abstract: true,
-  show_trees: true,
-  show_grouped_translations: false,
-  default_source_language: "Eng",
-//feedback_url: "feedback.html",
-  try_google: true
-}
-var minibar=new Minibar(server,minibar_options,"minibar");
+<script type="text/JavaScript" src="support.js"></script>
+<script type="text/JavaScript" src="minibar.js"></script>
+<script type="text/JavaScript" src="pgf_online.js"></script>
+<script type="text/javascript" src="minibar_online.js"></script>
 
 </body>
 </html>