Additional fix for issue 3903. Adds noscript tags to additional samples
and updates the noscript contents from r5852.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@6026 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/dev/shell/GWTShellServlet.java b/dev/core/src/com/google/gwt/dev/shell/GWTShellServlet.java
index f8a08e7..3a11993 100644
--- a/dev/core/src/com/google/gwt/dev/shell/GWTShellServlet.java
+++ b/dev/core/src/com/google/gwt/dev/shell/GWTShellServlet.java
@@ -382,9 +382,10 @@
writer.println("<iframe src=\"javascript:''\" id='__gwt_historyFrame' "
+ "style='position:absolute;width:0;height:0;border:0'></iframe>");
writer.println("<noscript>");
- writer.println(" <b style=\"color: red; border: 1px solid red; padding: 4px;\">");
- writer.println(" Your web browser must have JavaScript enabled in order for this application to display correctly");
- writer.println(" </b>");
+ writer.println(" <div style=\"width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; border: 1px solid red; padding: 4px; font-family: sans-serif\">");
+ writer.println(" Your web browser must have JavaScript enabled");
+ writer.println(" in order for this application to display correctly.");
+ writer.println(" </div>");
writer.println("</noscript>");
writer.println("</body></html>");
diff --git a/eclipse/reference/code-museum/war/DefaultMuseum.html b/eclipse/reference/code-museum/war/DefaultMuseum.html
index b8a5257..d936866 100644
--- a/eclipse/reference/code-museum/war/DefaultMuseum.html
+++ b/eclipse/reference/code-museum/war/DefaultMuseum.html
@@ -1,11 +1,17 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
- <head>
- <title>Museum</title>
- <script language='javascript' src='defaultmuseum/defaultmuseum.nocache.js'></script>
- </head>
+ <head>
+ <title>Museum</title>
+ <script language='javascript' src='defaultmuseum/defaultmuseum.nocache.js'></script>
+ </head>
- <body>
- <iframe src="javascript:''" id="__gwt_historyFrame" style="position:absolute;width:0;height:0;border:0"></iframe>
- </body>
+ <body>
+ <iframe src="javascript:''" id="__gwt_historyFrame" style="position:absolute;width:0;height:0;border:0"></iframe>
+ <noscript>
+ <div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; border: 1px solid red; padding: 4px; font-family: sans-serif">
+ Your web browser must have JavaScript enabled
+ in order for this application to display correctly.
+ </div>
+ </noscript>
+ </body>
</html>
diff --git a/eclipse/reference/code-museum/war/SingleIssue.html b/eclipse/reference/code-museum/war/SingleIssue.html
index eeccf6a..1c481b0 100644
--- a/eclipse/reference/code-museum/war/SingleIssue.html
+++ b/eclipse/reference/code-museum/war/SingleIssue.html
@@ -7,5 +7,11 @@
<body>
<iframe src="javascript:''" id="__gwt_historyFrame" style="position:absolute;width:0;height:0;border:0"></iframe>
+ <noscript>
+ <div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; border: 1px solid red; padding: 4px; font-family: sans-serif">
+ Your web browser must have JavaScript enabled
+ in order for this application to display correctly.
+ </div>
+ </noscript>
</body>
</html>
diff --git a/samples/dynatable/war/DynaTable.html b/samples/dynatable/war/DynaTable.html
index 8ede80d..68b801d 100644
--- a/samples/dynatable/war/DynaTable.html
+++ b/samples/dynatable/war/DynaTable.html
@@ -17,11 +17,18 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<link type="text/css" rel="stylesheet" href="DynaTable.css">
- <title></title>
+ <title>DynaTable Example</title>
+ <script type="text/javascript" language='javascript' src='dynatable/dynatable.nocache.js'></script>
</head>
<body>
- <iframe src="javascript:''" id='__gwt_historyFrame' tabIndex='-1' style='width:0;height:0;border:0'></iframe>
- <script type="text/javascript" language='javascript' src='dynatable/dynatable.nocache.js'></script>
+ <iframe src="javascript:''" id='__gwt_historyFrame' tabIndex='-1' style='width:0;height:0;border:0'></iframe>
+ <noscript>
+ <div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; border: 1px solid red; padding: 4px; font-family: sans-serif">
+ Your web browser must have JavaScript enabled
+ in order for this application to display correctly.
+ </div>
+ </noscript>
+
<h1>School Schedule for Professors and Students</h1>
<table width="100%" border="0" summary="School Schedule for Professors and Students">
<tr valign="top">
diff --git a/samples/hello/war/Hello.html b/samples/hello/war/Hello.html
index ba2d093..50a9735 100644
--- a/samples/hello/war/Hello.html
+++ b/samples/hello/war/Hello.html
@@ -17,8 +17,14 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<title>Hello</title>
+ <script type="text/javascript" language="javascript" src="hello/hello.nocache.js"></script>
</head>
<body bgcolor="white">
- <script type="text/javascript" language="javascript" src="hello/hello.nocache.js"></script>
+ <noscript>
+ <div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; border: 1px solid red; padding: 4px; font-family: sans-serif">
+ Your web browser must have JavaScript enabled
+ in order for this application to display correctly.
+ </div>
+ </noscript>
</body>
</html>
diff --git a/samples/i18n/war/I18N.html b/samples/i18n/war/I18N.html
index 93435c3..24ba7d5 100644
--- a/samples/i18n/war/I18N.html
+++ b/samples/i18n/war/I18N.html
@@ -64,6 +64,12 @@
</div>
</div>
+ <noscript>
+ <div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; border: 1px solid red; padding: 4px; font-family: sans-serif">
+ Your web browser must have JavaScript enabled
+ in order for this application to display correctly.
+ </div>
+ </noscript>
<div class="examples">
diff --git a/samples/json/war/JSON.html b/samples/json/war/JSON.html
index fd38344..c1a4a55 100644
--- a/samples/json/war/JSON.html
+++ b/samples/json/war/JSON.html
@@ -14,44 +14,50 @@
<!-- limitations under the License. -->
<html>
- <head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8">
- <link type="text/css" rel='stylesheet' href='JSON.css'>
- <title>JSON Interoperability Example</title>
- </head>
- <body>
- <script type="text/javascript" language='javascript' src='json/json.nocache.js'></script>
-
- <h1>JSON Interop Using JSNI</h1>
-
- <div class="intro">
- This example application demonstrates a simple approach to
- interoperating with services that return their output in JSON format.
- It uses GWT's JavaScript Native Interface (JSNI) to analyze a JSON
- response and create Java-accessible objects. The JSON classes in this sample
- are general-purpose and can be reused in other projects if you find
- them useful.
-
- <p>
- When you click the "Search" button below, you can browse the cached
- results of a Yahoo JSON image search for "potato." The response is
- parsed into Java objects which are used to populate a tree view below.
- </p>
+ <head>
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+ <link type="text/css" rel='stylesheet' href='JSON.css'>
+ <title>JSON Interoperability Example</title>
+ <script type="text/javascript" language='javascript' src='json/json.nocache.js'></script>
+ </head>
+ <body>
+ <noscript>
+ <div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; border: 1px solid red; padding: 4px; font-family: sans-serif">
+ Your web browser must have JavaScript enabled
+ in order for this application to display correctly.
+ </div>
+ </noscript>
+
+ <h1>JSON Interop Using JSNI</h1>
+
+ <div class="intro">
+ This example application demonstrates a simple approach to
+ interoperating with services that return their output in JSON format.
+ It uses GWT's JavaScript Native Interface (JSNI) to analyze a JSON
+ response and create Java-accessible objects. The JSON classes in this sample
+ are general-purpose and can be reused in other projects if you find
+ them useful.
+
+ <p>
+ When you click the "Search" button below, you can browse the cached
+ results of a Yahoo JSON image search for "potato." The response is
+ parsed into Java objects which are used to populate a tree view below.
+ </p>
- <ul>
- <li>For more details on how the JSON response is parsed into a set
- of Java objects, see the JSONParser class.
- <li>The search URL used in this example was
- <a href='http://api.search.yahoo.com/ImageSearchService/V1/imageSearch?appid=YahooDemo&query=potato&results=2&output=json'>http://api.search.yahoo.com/ImageSearchService/V1/imageSearch?appid=YahooDemo&query=potato&results=2&output=json</a>.
- </ul>
-
- <div id="search">
- </div>
- </div>
+ <ul>
+ <li>For more details on how the JSON response is parsed into a set
+ of Java objects, see the JSONParser class.
+ <li>The search URL used in this example was
+ <a href='http://api.search.yahoo.com/ImageSearchService/V1/imageSearch?appid=YahooDemo&query=potato&results=2&output=json'>http://api.search.yahoo.com/ImageSearchService/V1/imageSearch?appid=YahooDemo&query=potato&results=2&output=json</a>.
+ </ul>
+
+ <div id="search">
+ </div>
+ </div>
- <table align="center" width="80%" style="margin-top: 1em">
- <tr><th style="text-align: center; margin: 1em">JSON Response Tree View</th></tr>
- <tr><td id="tree"></td></tr>
- </table>
- </body>
+ <table align="center" width="80%" style="margin-top: 1em">
+ <tr><th style="text-align: center; margin: 1em">JSON Response Tree View</th></tr>
+ <tr><td id="tree"></td></tr>
+ </table>
+ </body>
</html>
diff --git a/samples/mail/war/Mail.html b/samples/mail/war/Mail.html
index 8f34e6e..40c3dca 100644
--- a/samples/mail/war/Mail.html
+++ b/samples/mail/war/Mail.html
@@ -17,8 +17,14 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<link type="text/css" rel='stylesheet' href='Mail.css'>
<title>Mail App</title>
+ <script type="text/javascript" language='javascript' src='mail/mail.nocache.js'></script>
</head>
<body>
- <script type="text/javascript" language='javascript' src='mail/mail.nocache.js'></script>
+ <noscript>
+ <div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; border: 1px solid red; padding: 4px; font-family: sans-serif">
+ Your web browser must have JavaScript enabled
+ in order for this application to display correctly.
+ </div>
+ </noscript>
</body>
</html>
diff --git a/samples/showcase/war/Showcase.html b/samples/showcase/war/Showcase.html
index 33c7752..86f9963 100644
--- a/samples/showcase/war/Showcase.html
+++ b/samples/showcase/war/Showcase.html
@@ -3,7 +3,7 @@
<title>Showcase of GWT Features</title>
<script language='javascript'>
// Used in the Dictionary Example
- var userInfo = {
+ var userInfo = {
name: "Amelie Crutcher",
timeZone: "EST",
userID: "123",
@@ -14,5 +14,11 @@
</head>
<body>
<iframe src="javascript:''" id="__gwt_historyFrame" style="position:absolute;width:0;height:0;border:0"></iframe>
+ <noscript>
+ <div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; border: 1px solid red; padding: 4px; font-family: sans-serif">
+ Your web browser must have JavaScript enabled
+ in order for this application to display correctly.
+ </div>
+ </noscript>
</body>
</html>
diff --git a/samples/simplerpc/war/SimpleRPC.html b/samples/simplerpc/war/SimpleRPC.html
index 2b9f758..09888a7 100644
--- a/samples/simplerpc/war/SimpleRPC.html
+++ b/samples/simplerpc/war/SimpleRPC.html
@@ -14,17 +14,23 @@
<!-- limitations under the License. -->
<html>
- <head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8">
- <link type="text/css" rel="stylesheet" href="SimpleRPC.css">
- <title>SimpleRPC</title>
- </head>
- <body>
- <iframe src="javascript:''" id='__gwt_historyFrame' tabIndex='-1' style='width:0;height:0;border:0'></iframe>
- <script type="text/javascript" language='javascript' src='simplerpc/simplerpc.nocache.js'></script>
- <h1> Simple RPC</h1>
- <p>
- Simple example of RPC, check out the DynaTable sample if you want to see real RPC coolness.
- </p>
- </body>
+ <head>
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+ <link type="text/css" rel="stylesheet" href="SimpleRPC.css">
+ <title>SimpleRPC</title>
+ <script type="text/javascript" language='javascript' src='simplerpc/simplerpc.nocache.js'></script>
+ </head>
+ <body>
+ <iframe src="javascript:''" id='__gwt_historyFrame' tabIndex='-1' style='width:0;height:0;border:0'></iframe>
+ <noscript>
+ <div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; border: 1px solid red; padding: 4px; font-family: sans-serif">
+ Your web browser must have JavaScript enabled
+ in order for this application to display correctly.
+ </div>
+ </noscript>
+ <h1> Simple RPC</h1>
+ <p>
+ Simple example of RPC, check out the DynaTable sample if you want to see real RPC coolness.
+ </p>
+ </body>
</html>
diff --git a/samples/simplexml/war/SimpleXML.html b/samples/simplexml/war/SimpleXML.html
index c134c61..b32ce85 100644
--- a/samples/simplexml/war/SimpleXML.html
+++ b/samples/simplexml/war/SimpleXML.html
@@ -16,14 +16,20 @@
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
- <title>Simple XML Example</title>
- <link rel="stylesheet" type="text/css" href="SimpleXML.css">
- </head>
- <body bgcolor="white">
- <script type="text/javascript" language="javascript" src="simplexml/simplexml.nocache.js"></script>
- <h1> Simple XML Example</h1>
- <p>
- Simple example of loading an XML file from the server and parsing it.
- </p>
- </body>
+ <title>Simple XML Example</title>
+ <link rel="stylesheet" type="text/css" href="SimpleXML.css">
+ <script type="text/javascript" language="javascript" src="simplexml/simplexml.nocache.js"></script>
+ </head>
+ <body bgcolor="white">
+ <noscript>
+ <div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; border: 1px solid red; padding: 4px; font-family: sans-serif">
+ Your web browser must have JavaScript enabled
+ in order for this application to display correctly.
+ </div>
+ </noscript>
+ <h1> Simple XML Example</h1>
+ <p>
+ Simple example of loading an XML file from the server and parsing it.
+ </p>
+ </body>
</html>
diff --git a/user/src/com/google/gwt/junit/public/junit.html b/user/src/com/google/gwt/junit/public/junit.html
index 7f80fc5..99faef8 100644
--- a/user/src/com/google/gwt/junit/public/junit.html
+++ b/user/src/com/google/gwt/junit/public/junit.html
@@ -57,9 +57,10 @@
</script>
<iframe src="javascript:''" id='__gwt_historyFrame' style='position:absolute;width:0;height:0;border:0'></iframe>
<noscript>
- <b style="color: red; border: 1px solid red; padding: 4px;">
- Your web browser must have JavaScript enabled in order for this application to display correctly
- </b>
+ <div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; border: 1px solid red; padding: 4px; font-family: sans-serif">
+ Your web browser must have JavaScript enabled
+ in order for this application to display correctly.
+ </div>
</noscript>
</body>
</html>
diff --git a/user/src/com/google/gwt/user/tools/AppHtml.htmlsrc b/user/src/com/google/gwt/user/tools/AppHtml.htmlsrc
index c284086..bf59447 100644
--- a/user/src/com/google/gwt/user/tools/AppHtml.htmlsrc
+++ b/user/src/com/google/gwt/user/tools/AppHtml.htmlsrc
@@ -40,9 +40,10 @@
<!-- RECOMMENDED if your web app will not function without JavaScript enabled -->
<noscript>
- <b style="color: red; border: 1px solid red; padding: 4px;">
- Your web browser must have JavaScript enabled in order for this application to display correctly
- </b>
+ <div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; border: 1px solid red; padding: 4px; font-family: sans-serif">
+ Your web browser must have JavaScript enabled
+ in order for this application to display correctly.
+ </div>
</noscript>
<h1>Web Application Starter Project</h1>
diff --git a/user/test/com/google/gwt/i18n/public_es_AR/junit.html b/user/test/com/google/gwt/i18n/public_es_AR/junit.html
index edf5fc0..3820854 100644
--- a/user/test/com/google/gwt/i18n/public_es_AR/junit.html
+++ b/user/test/com/google/gwt/i18n/public_es_AR/junit.html
@@ -64,9 +64,10 @@
</script>
<iframe src="javascript:''" id='__gwt_historyFrame' style='position:absolute;width:0;height:0;border:0'></iframe>
<noscript>
- <b style="color: red; border: 1px solid red; padding: 4px;">
- Your web browser must have JavaScript enabled in order for this application to display correctly
- </b>
+ <div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; border: 1px solid red; padding: 4px; font-family: sans-serif">
+ Your web browser must have JavaScript enabled
+ in order for this application to display correctly.
+ </div>
</noscript>
</body>
</html>
diff --git a/user/test/com/google/gwt/i18n/public_es_MX/junit.html b/user/test/com/google/gwt/i18n/public_es_MX/junit.html
index f694694..7b43179 100644
--- a/user/test/com/google/gwt/i18n/public_es_MX/junit.html
+++ b/user/test/com/google/gwt/i18n/public_es_MX/junit.html
@@ -64,9 +64,10 @@
</script>
<iframe src="javascript:''" id='__gwt_historyFrame' style='position:absolute;width:0;height:0;border:0'></iframe>
<noscript>
- <b style="color: red; border: 1px solid red; padding: 4px;">
- Your web browser must have JavaScript enabled in order for this application to display correctly
- </b>
+ <div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; border: 1px solid red; padding: 4px; font-family: sans-serif">
+ Your web browser must have JavaScript enabled
+ in order for this application to display correctly.
+ </div>
</noscript>
</body>
</html>
