fixes #759, #758

author Matti Tahvonen <matti.tahvonen@itmill.com>

Tue, 5 Jun 2007 05:56:07 +0000 (05:56 +0000)

committer Matti Tahvonen <matti.tahvonen@itmill.com>

Tue, 5 Jun 2007 05:56:07 +0000 (05:56 +0000)
author Matti Tahvonen <matti.tahvonen@itmill.com>
Tue, 5 Jun 2007 05:56:07 +0000 (05:56 +0000)
committer Matti Tahvonen <matti.tahvonen@itmill.com>
Tue, 5 Jun 2007 05:56:07 +0000 (05:56 +0000)
diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java

index 38e25ba7e1e3c1f6ae82b6444931f0a32baee1c0..625684244ebac33600b1673184dc45692ef01871 100644 (file)
--- a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
@@ -884,8 +884,6 @@ 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");
                 Theme t = theme;
                 Vector themes = new Vector();
                 themes.add(t);
@@ -923,11 +921,16 @@ public class ApplicationServlet extends HttpServlet implements
  
                 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&amp;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 language=\"JavaScript\" type=\"text/javascript\">\n");
  
                 String[] urlParts = getApplicationUrl(request).toString().split("\\/");
                 String appUrl = "";
author	Matti Tahvonen <matti.tahvonen@itmill.com>
	Tue, 5 Jun 2007 05:56:07 +0000 (05:56 +0000)
committer	Matti Tahvonen <matti.tahvonen@itmill.com>
	Tue, 5 Jun 2007 05:56:07 +0000 (05:56 +0000)