diff options
| author | John Ahlroos <john@vaadin.com> | 2012-09-24 14:49:22 +0300 |
|---|---|---|
| committer | John Ahlroos <john@vaadin.com> | 2012-09-24 14:49:22 +0300 |
| commit | 8c11021ab84fec373f0c27e3a9b87b4d7e5b049e (patch) | |
| tree | 5632998156ecee5a0c1ed50ae66d8190e33c31f8 /server | |
| parent | 0985dac7be6384d05c91d8ce91b41cdcf33226ab (diff) | |
| parent | 410a4787830a6b58507217219cd20f8965aa2eff (diff) | |
| download | vaadin-framework-8c11021ab84fec373f0c27e3a9b87b4d7e5b049e.tar.gz vaadin-framework-8c11021ab84fec373f0c27e3a9b87b4d7e5b049e.zip | |
Merge branch 'html5-doctype'
Diffstat (limited to 'server')
| -rw-r--r-- | server/src/com/vaadin/server/BootstrapHandler.java | 5 | ||||
| -rw-r--r-- | server/src/com/vaadin/ui/LoginForm.java | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/server/src/com/vaadin/server/BootstrapHandler.java b/server/src/com/vaadin/server/BootstrapHandler.java index 8721550a41..d6c6d0e59b 100644 --- a/server/src/com/vaadin/server/BootstrapHandler.java +++ b/server/src/com/vaadin/server/BootstrapHandler.java @@ -229,12 +229,9 @@ public abstract class BootstrapHandler implements RequestHandler { Document document = response.getDocument(); - DocumentType doctype = new DocumentType("html", - "-//W3C//DTD XHTML 1.0 Transitional//EN", - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", + DocumentType doctype = new DocumentType("html", "", "", document.baseUri()); document.child(0).before(doctype); - document.body().parent().attr("xmlns", "http://www.w3.org/1999/xhtml"); Element head = document.head(); head.appendElement("meta").attr("http-equiv", "Content-Type") diff --git a/server/src/com/vaadin/ui/LoginForm.java b/server/src/com/vaadin/ui/LoginForm.java index 661c24bf56..b65d1cfa06 100644 --- a/server/src/com/vaadin/ui/LoginForm.java +++ b/server/src/com/vaadin/ui/LoginForm.java @@ -161,7 +161,7 @@ public class LoginForm extends CustomComponent { + "\">" + "<div class='v-app v-app-loginpage' style=\"background:transparent;\">" + "<iframe name='logintarget' style='width:0;height:0;" - + "border:0;margin:0;padding:0;'></iframe>" + + "border:0;margin:0;padding:0;display:block'></iframe>" + "<form id='loginf' target='logintarget' onkeypress=\"submitOnEnter(event)\" method=\"post\">" + "<div>" + usernameCaption |