Renamed saas login theme to default login theme

sdk-html/src/main/java/org/keycloak/sdk/LoginBean.java

@@ -36,7 +36,7 @@ public class LoginBean {
 
     private List<SocialProvider> providers;
 
-    private String theme = "saas";
+    private String theme;
 
     private String themeUrl;
 
@@ -66,7 +66,7 @@ public class LoginBean {
         addSocialProviders();
 
         // TODO Get theme name from realm
-        theme = "saas";
+        theme = "default";
         themeUrl = FacesContext.getCurrentInstance().getExternalContext().getRequestContextPath() + "/sdk/theme/" + theme;
 
         themeConfig = new HashMap<String, Object>();

sdk-html/src/main/resources/META-INF/resources/sdk/theme/default/login.xhtml

@@ -1,36 +1,36 @@
-<ui:composition xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:ui="http://java.sun.com/jsf/facelets">
-	<div id="keycloak-login-container">
-		<div id="keycloak-login-standard">
-			<h1>Login to #{login.name}</h1>
+<ui:composition xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:c="http://java.sun.com/jstl/core" template="template.xhtml">
 
-			<form action="#{login.loginAction}">
-				<label for="username">Username</label>
-				<h:inputText name="username" value="#{login.username}" />
+	<ui:define name="header">Log in to <strong>#{login.name}</strong></ui:define>
 	
-				<label for="password">Password</label>
-				<h:inputSecret name="password" />
-
-				<h:inputHidden name="client_id" value="#{login.clientId}" />
-				<h:inputHidden name="scope" value="#{login.scope}" disabled="#{empty login.scope}" />
-				<h:inputHidden name="state" value="#{login.state}" disabled="#{empty login.state}" />
-				<h:inputHidden name="redirect_uri" value="#{login.redirectUri}" disabled="#{empty login.redirectUri}" />
+	<ui:define name="form">
+		<form action="#{login.loginAction}" method="post">
+			<div>
+				<label for="username">Username</label> <input id="username" name="username" value="#{login.username}" type="text" />
+			</div>
 
+			<ui:repeat var="c" value="#{login.requiredCredentials}">
 				<div>
-					<button class="btn btn-primary" id="keycloak-login-submit" type="submit">Login</button>
-				</div>
-			</form>
-		</div>
-
-		<div id="keycloak-login-social">
-			<h3>Login with</h3>
-
-			<ui:repeat var="p" value="#{login.providers}">
-				<div>
-					<a href="#{p.loginUrl}"> <img src="#{p.iconUrl}" /> Login with #{p.name}</a>
+					<label for="#{c.name}">#{c.label}</label> <input id="#{c.name}" name="#{c.name}" type="#{c.inputType}" />
 				</div>
 			</ui:repeat>
-		</div>
 
-	</div>
+			<ui:repeat var="p" value="#{login.hiddenProperties}">
+				<input name="#{p.name}" value="#{p.value}" type="hidden" />
+			</ui:repeat>
+
+			<div class="aside-btn">
+				<input type="checkbox" id="remember" /><label for="remember">Remember Username</label>
+				<p>Forgot <a href="#">Username</a> or <a href="#">Password</a>?</p>
+			</div>
+
+			<input type="submit" value="Log In" />
+		</form>
+	</ui:define>
+	
+	<ui:define name="info">
+		<h:panelGroup rendered="#{login.registrationAllowed}">
+			<p>No account? <a href="saas-register.html">Register</a>.</p>
+		</h:panelGroup>	
+	</ui:define>
 </ui:composition>

sdk-html/src/main/resources/META-INF/resources/sdk/theme/default/styles.css

@@ -1,19 +1,6 @@
-@IMPORT url("bootstrap.css");
-
-body {
-	margin: 50px;
-}
-
-div#keycloak-login-container,div#keycloak-register-container {
-	
-}
-
-div#keycloak-login-standard,div#keycloak-register-standard {
-	width: 50%;
-	float: left;
-}
-
-div#keycloak-login-social,div#keycloak-register-social {
-	width: 50%;
-	float: left;
-}
+@IMPORT url("css/reset.css");
+@IMPORT url("css/base.css");
+@IMPORT url("css/forms.css");
+@IMPORT url("css/zocial/zocial.css");
+@IMPORT url("css/login-screen.css");
+@IMPORT url("http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic");

sdk-html/src/main/resources/META-INF/resources/sdk/theme/saas/login.xhtml

@@ -1,36 +0,0 @@
-<ui:composition xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:c="http://java.sun.com/jstl/core" template="template.xhtml">
-
-	<ui:define name="header">Log in to <strong>#{login.name}</strong></ui:define>
-	
-	<ui:define name="form">
-		<form action="#{login.loginAction}" method="post">
-			<div>
-				<label for="username">Username</label> <input id="username" name="username" value="#{login.username}" type="text" />
-			</div>
-
-			<ui:repeat var="c" value="#{login.requiredCredentials}">
-				<div>
-					<label for="#{c.name}">#{c.label}</label> <input id="#{c.name}" name="#{c.name}" type="#{c.inputType}" />
-				</div>
-			</ui:repeat>
-
-			<ui:repeat var="p" value="#{login.hiddenProperties}">
-				<input name="#{p.name}" value="#{p.value}" type="hidden" />
-			</ui:repeat>
-
-			<div class="aside-btn">
-				<input type="checkbox" id="remember" /><label for="remember">Remember Username</label>
-				<p>Forgot <a href="#">Username</a> or <a href="#">Password</a>?</p>
-			</div>
-
-			<input type="submit" value="Log In" />
-		</form>
-	</ui:define>
-	
-	<ui:define name="info">
-		<h:panelGroup rendered="#{login.registrationAllowed}">
-			<p>No account? <a href="saas-register.html">Register</a>.</p>
-		</h:panelGroup>	
-	</ui:define>
-</ui:composition>

sdk-html/src/main/resources/META-INF/resources/sdk/theme/saas/styles.css

@@ -1,6 +0,0 @@
-@IMPORT url("css/reset.css");
-@IMPORT url("css/base.css");
-@IMPORT url("css/forms.css");
-@IMPORT url("css/zocial/zocial.css");
-@IMPORT url("css/login-screen.css");
-@IMPORT url("http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic");