]> 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: a42ca8a)
Load theme-specific CSS in servlet
authorJoonas Lehtinen <joonas.lehtinen@itmill.com>
Fri, 15 Jun 2007 11:23:37 +0000 (11:23 +0000)
committerJoonas Lehtinen <joonas.lehtinen@itmill.com>
Fri, 15 Jun 2007 11:23:37 +0000 (11:23 +0000)
svn changeset:1744/svn branch:trunk

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

diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
index 64a1dfb5693a7c4f21e2506af5a289c09a4bb500..525d9f91b691f7be0f4ac34ee3dc21cca807f922 100644 (file)
--- a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
@@ -184,7 +184,7 @@ public class ApplicationServlet extends HttpServlet implements
 
        private static final String AJAX_UIDL_URI = "/UIDL/";
 
-       private static final String THEME_DIRECTORY_PATH = "/WEB-INF/lib/themes/";
+       private static final String THEME_DIRECTORY_PATH = "/theme/";
 
        private static final String THEME_LISTING_FILE = THEME_DIRECTORY_PATH
                        + "themes.txt";
@@ -902,7 +902,8 @@ public class ApplicationServlet extends HttpServlet implements
                
                page.write("'\n};\n" +
                                "</script>\n" +
-                               "<body>\n<script language=\"javascript\" src=\"/tk/com.itmill.toolkit.terminal.gwt.Client/gwt.js\"></script>\n" +
+                               "<link REL=\"stylesheet\" TYPE=\"text/css\" HREF=\""+request.getContextPath() + "/theme/"+theme.getName()+"/style.css\">" + 
+                               "</head>\n<body>\n<script language=\"javascript\" src=\"/tk/com.itmill.toolkit.terminal.gwt.Client/gwt.js\"></script>\n" +
                                "       <iframe id=\"__gwt_historyFrame\" style=\"width:0;height:0;border:0\"></iframe>\n" +
                                "       <div id=\"itmtk-ajax-window\"></div>" +
                                "       <div id=\"itmtk-loki\" style=\"width: 100%; position: absolute; left: 0px; bottom: 0; height: 0px; border-top: 1px solid gray; background-color: #f6f6f6; overflow: scroll; font-size: x-small;color:red !important;\"" +
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework