removed hardcoded appUri

svn changeset:1634/svn branch:trunk

diff --git a/WebContent/com.itmill.toolkit.terminal.gwt.Client/index.html b/WebContent/com.itmill.toolkit.terminal.gwt.Client/index.html
index 8deac9d9e7bcc781283529c772085979559cba9e..80250bb4046f0bd50c520247b91301685283edad 100755 (executable)
--- a/WebContent/com.itmill.toolkit.terminal.gwt.Client/index.html
+++ b/WebContent/com.itmill.toolkit.terminal.gwt.Client/index.html
@@ -15,6 +15,9 @@
                        a:link,.w,.w a:link{color:#0000cc}
                        a:visited{color:#551a8b}
                        a:active{color:#ff0000}
+                       
+                       .itmtk-loki .gwt-Tree { 
+                       }
                </style>
 
                <!--                                           -->
@@ -22,6 +25,12 @@
                <!-- between html and your Web Toolkit module  -->              
                <!--                                           -->
                <meta name='gwt:module' content='com.itmill.toolkit.terminal.gwt.Client'>
+               
+               <script type="text/javascript">
+                       var itmtk = {
+                               appUri: "http://127.0.0.1:8080/tk/Calc"
+                       };
+               </script>
 
        <!--                                           -->
        <!-- The body can have arbitrary html, or      -->
@@ -42,7 +51,7 @@
 
                <div id="itmtk-ajax-window"></div>
 
-               <div id="itmtk-loki" style="position: absolute; width: 100%; margin: 0; left: 0; height: 150px; bottom: 0; border-top: 1px solid gray; background-color: #f6f6f6; overflow: scroll; font-size: x-small;color:red !important;"></div>
+               <div id="itmtk-loki" style="position: absolute; width: 100%; margin: 0; left: 0; height: 300px; bottom: 0; border-top: 1px solid gray; background-color: #f6f6f6; overflow: scroll; font-size: x-small;color:red !important;"></div>
                <div style="position: absolute; right: 25px; height: 145px; bottom: 0; color: gray; "><b>console</b></div>
                <div style="position: absolute; right: 5px; top: 5; color: gray;"><b>IT Mill Toolkit 5 Prototype</b></div>
        </body>

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/Client.java b/src/com/itmill/toolkit/terminal/gwt/client/Client.java
index f9c0179f0226f11007e0e8d92870783fd35b498a..0068b67e5799201df0849d2520fc482828e65b4d 100755 (executable)
--- a/src/com/itmill/toolkit/terminal/gwt/client/Client.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/Client.java
@@ -24,7 +24,7 @@ import com.google.gwt.user.client.ui.Widget;
  */
 public class Client implements EntryPoint {
 
-       private String appUri = "http://127.0.0.1:8080/tk/Calc";
+       private String appUri;
 
        // TODO remove repaintAll until things start to pile up
        private RequestBuilder rb = new RequestBuilder(RequestBuilder.POST, appUri
@@ -44,6 +44,8 @@ public class Client implements EntryPoint {
         * This is the entry point method.
         */
        public void onModuleLoad() {
+               
+               appUri = getAppUri();
 
                console = new Console(RootPanel.get("itmtk-loki"));
 
@@ -70,6 +72,10 @@ public class Client implements EntryPoint {
                }
 
        }
+       
+       private native String getAppUri()/*-{
+               return $wnd.itmtk.appUri;
+       }-*/;
 
        private void makeUidlRequest(String requestData) {
                console.log("Making UIDL Request");