]> source.dussan.org Git - vaadin-framework.git/commitdiff
AjaxPageGeneration: Removed unnecessary relative-calculations, added loading of css...
authorJoonas Lehtinen <joonas.lehtinen@itmill.com>
Thu, 1 Nov 2007 11:31:47 +0000 (11:31 +0000)
committerJoonas Lehtinen <joonas.lehtinen@itmill.com>
Thu, 1 Nov 2007 11:31:47 +0000 (11:31 +0000)
svn changeset:2652/svn branch:trunk

src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java

index c859d2a0b567c0f02ae199e017439fa5ba4e1573..3ce669becfb38cc1cdb52757cc6b00e566566d41 100644 (file)
@@ -472,17 +472,8 @@ public class ApplicationServlet extends HttpServlet {
                response.setContentType("text/html");
                BufferedWriter page = new BufferedWriter(new OutputStreamWriter(
                                response.getOutputStream()));
-
-               String relative = "";
-
                String pathInfo = request.getPathInfo() == null ? "/" : request
                                .getPathInfo();
-               String t = pathInfo.substring(1);
-               while (t.indexOf('/') >= 0) {
-                       t = t.substring(t.indexOf('/') + 1);
-                       relative += "../";
-               }
-
                page
                                .write("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" "
                                                + "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n");
@@ -509,6 +500,8 @@ public class ApplicationServlet extends HttpServlet {
                if (widgetset == null) {
                        widgetset = DEFAULT_WIDGETSET;
                }
+               
+               if (themeName == null) themeName = "default";
 
                page
                                .write("', pathInfo: '"
@@ -531,7 +524,7 @@ public class ApplicationServlet extends HttpServlet {
                                                + "/styles.css\">\n"
                                                + "</head>\n<body style=\"width:100%;height:100%;border:0;margin:0\">\n"
                                                + "     <iframe id=\"__gwt_historyFrame\" style=\"width:0;height:0;border:0;overflow:hidden\"></iframe>\n"
-                                               + "     <div id=\"itmill-ajax-window\"></div>"
+                                               + "     <div id=\"itmill-ajax-window\" style=\"position: absolute;top:0;left:0;width:100%;height:100%;border:0;margin:0\"></div>"
                                                + "     </body>\n" + "</html>\n");
 
                page.close();