diff options
| author | Joonas Lehtinen <joonas.lehtinen@itmill.com> | 2007-11-01 11:31:47 +0000 |
|---|---|---|
| committer | Joonas Lehtinen <joonas.lehtinen@itmill.com> | 2007-11-01 11:31:47 +0000 |
| commit | ba505caf9ab05fe274400a6c214fbfce314e6536 (patch) | |
| tree | 2223bc5a450c624ef030cf640f5b32e4f4c44e28 | |
| parent | 282bf03546cb2afb44f33d2dba5b954e4f8c68e1 (diff) | |
| download | vaadin-framework-ba505caf9ab05fe274400a6c214fbfce314e6536.tar.gz vaadin-framework-ba505caf9ab05fe274400a6c214fbfce314e6536.zip | |
AjaxPageGeneration: Removed unnecessary relative-calculations, added loading of css from default-dir, ajax-window is set absolute and 100x100%
svn changeset:2652/svn branch:trunk
| -rw-r--r-- | src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java index c859d2a0b5..3ce669becf 100644 --- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java +++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java @@ -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(); |