diff options
| author | Matti Tahvonen <matti.tahvonen@itmill.com> | 2007-05-30 13:21:11 +0000 |
|---|---|---|
| committer | Matti Tahvonen <matti.tahvonen@itmill.com> | 2007-05-30 13:21:11 +0000 |
| commit | 79ed0e32b1baa93f3a291c8c606fae70f4259c90 (patch) | |
| tree | 7ce7a8d2f82542f3efafe16cf76ca656f5ac81a4 /src | |
| parent | 615cae3800434ba4bab12f7732f3a357d47b8e78 (diff) | |
| download | vaadin-framework-79ed0e32b1baa93f3a291c8c606fae70f4259c90.tar.gz vaadin-framework-79ed0e32b1baa93f3a291c8c606fae70f4259c90.zip | |
fixes #758, #759
svn changeset:1532/svn branch:trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/itmill/toolkit/terminal/web/ApplicationServlet.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java index 8aa0960ace..542b138193 100644 --- a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java +++ b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java @@ -885,19 +885,20 @@ public class ApplicationServlet extends HttpServlet implements page .write("<html><head>\n<title>" + window.getCaption() + "</title>\n"); - page - .write("<NOSCRIPT><META http-equiv=\"refresh\" content=\"0; url=?WA_NOSCRIPT=1\" /></NOSCRIPT>\n"); - page.write("<link rel=\"stylesheet\" href=\"" + resourcePath + theme.getName() + "/css/compiledstyle.css\" type=\"text/css\" />\n"); - page.write("<script type=\"text/javascript\" src=\"" + resourcePath + theme.getName() + "/script/compiledjavascript.js\"></script>"); + page.write("<link rel=\"stylesheet\" href=\"" + resourcePath + theme.getName() + + "/css/compiledstyle.css\" type=\"text/css\" />\n"); + page.write("<script type=\"text/javascript\" src=\"" + resourcePath + theme.getName() + + "/script/compiledjavascript.js\"></script>"); page.write("</head><body class=\"itmtk\">\n"); - + page.write("<noscript>Your browser claims to have a Javascript engine, but for some reason it is turned off. Eithter turn it on or use <a href=\"?renderingMode=detect&WA_NOSCRIPT=1\">degraded mode</a>.</noscript>\n"); + page.write("<div id=\"ajax-wait\">Loading...</div>\n"); page.write("<div id=\"ajax-window\"></div>\n"); - page.write("<script language=\"JavaScript\">\n"); + page.write("<script type=\"text/javascript\">\n"); String[] urlParts = getApplicationUrl(request).toString().split("\\/"); String appUrl = ""; |