]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 56c914e)
Fixes #1074 and enables loading of CSS also for default theme
authorJoonas Lehtinen <joonas.lehtinen@itmill.com>
Fri, 2 Nov 2007 13:49:30 +0000 (13:49 +0000)
committerJoonas Lehtinen <joonas.lehtinen@itmill.com>
Fri, 2 Nov 2007 13:49:30 +0000 (13:49 +0000)
svn changeset:2690/svn branch:trunk

src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java patch | blob | history

diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
index 4972b6b6f6fe2f9636313dbf47be9e3ffb49da9a..5a3e2c343ecf5df2fc38c1840b2f73ca6c48bc9d 100644 (file)
--- 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"
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework