From: Joonas Lehtinen Date: Thu, 1 Nov 2007 11:31:47 +0000 (+0000) Subject: AjaxPageGeneration: Removed unnecessary relative-calculations, added loading of css... X-Git-Tag: 6.7.0.beta1~5726 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ba505caf9ab05fe274400a6c214fbfce314e6536;p=vaadin-framework.git 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 --- 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("\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" + "\n\n" + " \n" - + "

" + + "

" + " \n" + "\n"); page.close();