aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-11-26 21:07:45 +0000
committerVaadin Code Review <review@vaadin.com>2012-11-26 21:07:45 +0000
commit57ad5b2fbe98af98b48f3f82ef19a2656cf5328e (patch)
tree5ae157edb47cb22e663b55ba4ce96e00fa7b85e3
parenta9931b76920992586f5aa0602fa019f124601b83 (diff)
parent65ce5934ab489849f8a81b708d74bf4b51f5ed0b (diff)
downloadvaadin-framework-57ad5b2fbe98af98b48f3f82ef19a2656cf5328e.tar.gz
vaadin-framework-57ad5b2fbe98af98b48f3f82ef19a2656cf5328e.zip
Merge "Add theme name as class name to LoginForm v-app (#10383)"
-rw-r--r--server/src/com/vaadin/ui/LoginForm.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/server/src/com/vaadin/ui/LoginForm.java b/server/src/com/vaadin/ui/LoginForm.java
index 15c917e454..c75326b99c 100644
--- a/server/src/com/vaadin/ui/LoginForm.java
+++ b/server/src/com/vaadin/ui/LoginForm.java
@@ -157,7 +157,9 @@ public class LoginForm extends CustomComponent {
+ "</head><body onload='setTarget();' style='margin:0;padding:0; background:transparent;' class=\""
+ ApplicationConstants.GENERATED_BODY_CLASSNAME
+ "\">"
- + "<div class='v-app v-app-loginpage' style=\"background:transparent;\">"
+ + "<div class='v-app v-app-loginpage "
+ + getUIThemeClassName()
+ + "' style=\"background:transparent;\">"
+ "<iframe name='logintarget' style='width:0;height:0;"
+ "border:0;margin:0;padding:0;display:block'></iframe>"
+ "<form id='loginf' target='logintarget' onkeypress=\"submitOnEnter(event)\" method=\"post\">"
@@ -174,6 +176,13 @@ public class LoginForm extends CustomComponent {
+ "</span></span></div></div></form></div>" + "</body></html>";
}
+ private String getUIThemeClassName() {
+ if (getUI() != null) {
+ return getUI().getTheme();
+ }
+ return "";
+ }
+
/**
* This event is sent when login form is submitted.
*/