diff options
| author | Joonas Lehtinen <joonas.lehtinen@itmill.com> | 2007-11-02 13:49:30 +0000 |
|---|---|---|
| committer | Joonas Lehtinen <joonas.lehtinen@itmill.com> | 2007-11-02 13:49:30 +0000 |
| commit | 7cd41d97393a93d5870a83b0593cda75817e5691 (patch) | |
| tree | 5e220e69291157f573aec86cd8ee4e24d8bebcc8 /src/com/itmill | |
| parent | 56c914ebd911e57d31ad7f2c9d4dc3332192dd46 (diff) | |
| download | vaadin-framework-7cd41d97393a93d5870a83b0593cda75817e5691.tar.gz vaadin-framework-7cd41d97393a93d5870a83b0593cda75817e5691.zip | |
Fixes #1074 and enables loading of CSS also for default theme
svn changeset:2690/svn branch:trunk
Diffstat (limited to 'src/com/itmill')
| -rw-r--r-- | src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java index 4972b6b6f6..5a3e2c343e 100644 --- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java +++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java @@ -504,14 +504,15 @@ public class ApplicationServlet extends HttpServlet { if (themeName == null) themeName = "default"; + String contextPath = request.getContextPath(); + page.write("', pathInfo: '" + pathInfo + "'\n};\n" + "</script>\n" - + "<script language='javascript' src='" + appUrl + "/" + + "<script language='javascript' src='" + contextPath + "/" + WIDGETSET_DIRECTORY_PATH + widgetset + "/" + widgetset + ".nocache.js'></script>\n"); - if (!themeName.equals("default")) - page.write("<link REL=\"stylesheet\" TYPE=\"text/css\" HREF=\"" - + appUrl + "/" // TODO relative url as above? - + THEME_DIRECTORY_PATH + themeName + "/styles.css\">\n"); + page.write("<link REL=\"stylesheet\" TYPE=\"text/css\" HREF=\"" + + contextPath + "/" + THEME_DIRECTORY_PATH + themeName + + "/styles.css\">\n"); page .write("</head>\n<body style=\"width:100%;height:100%;border:0;margin:0;overflow:auto;\">\n" + " <iframe id=\"__gwt_historyFrame\" style=\"width:0;height:0;border:0;overflow:hidden\"></iframe>\n" |