diff --git a/bwreg-webapp/src/main/webapp/user/connect-account.xhtml b/bwreg-webapp/src/main/webapp/user/connect-account.xhtml
index d4ee0a1f69fa81c138ee2f1699f7289f3d631b91..48cbd3e9eea0e2e5f6d582daa9fa23645c131d42 100644
--- a/bwreg-webapp/src/main/webapp/user/connect-account.xhtml
+++ b/bwreg-webapp/src/main/webapp/user/connect-account.xhtml
@@ -54,13 +54,10 @@
</ui:repeat>
</ul>
</div>
-
- <p:dataList var="user" value="#{connectAccountBean.userList}" type="unordered">
- </p:dataList>
- <div class="grid">
- <div style="margin-top: 1em;" class="col-12 md:col-6 lg:col-6 xl:col-6">
- <p:outputPanel rendered="#{connectAccountBean.largeList}">
+ <div class="grid" style="margin-top: 1em;">
+ <div class="col-12 xs:col-12 sm:col-12 md:col-6 lg:col-6 xl:col-6">
+ <h:panelGroup rendered="#{connectAccountBean.largeList}">
<p:focus conext="baseData" for="searchAutocompl" />
<span class="ui-float-label">
<p:autoComplete id="searchAutocompl" multiple="false" value="#{connectAccountBean.selected}" converter="#{userProvisionerCachedEntryConverter}"
@@ -73,54 +70,54 @@
</p:autoComplete>
<p:outputLabel for="@previous" value="#{messages['search_filter']}" />
</span>
- </p:outputPanel>
- <p:outputPanel rendered="#{not connectAccountBean.largeList}">
+ </h:panelGroup>
+ <h:panelGroup rendered="#{not connectAccountBean.largeList}">
<p:focus conext="baseData" for="selectBox" />
<p:selectOneListbox id="selectBox" style="width: 100%;" value="#{connectAccountBean.selected}" converter="#{userProvisionerCachedEntryConverter}"
filter="true" filterMatchMode="contains" filterNormalize="true">
<f:selectItems value="#{connectAccountBean.allList}" var="idp" itemLabel="#{idp.displayName}" itemValue="#{idp}"/>
<p:ajax update=":form:infoPnl,:form:btnPanel" />
</p:selectOneListbox>
- </p:outputPanel>
-
- <h:panelGroup id="btnPanel" style="block" styleClass="form">
- <p:commandButton id="login" action="#{connectAccountBean.startConnect()}" value="#{messages.proceed}" disabled="#{empty connectAccountBean.selected}"
- update=":form" />
</h:panelGroup>
-
</div>
- <div style="margin-top: 0.5em;" class="col-12 md:col-6 lg:col-6 xl:col-6">
- <p:outputPanel id="infoPnl">
- <p:panel style="margin:0.5em; border: 1px solid #eeeeee;" rendered="#{not empty connectAccountBean.selected}">
+ <div style="margin-top: 0em;" class="col-12 xs:col-12 sm:col-12 md:col-6 lg:col-6 xl:col-6">
+ </div>
+ <div style="margin-top: 0em;" class="col-12 xs:col-6 sm:col-6 md:col-3 lg:col-3 xl:col-3">
+ <h:panelGroup id="btnPanel" layout="block" styleClass="form">
+ <p:commandButton id="login" style="width:100%;" action="#{connectAccountBean.startConnect()}" value="#{messages.proceed}" disabled="#{empty connectAccountBean.selected}"
+ update=":form" />
+ </h:panelGroup>
+ </div>
+ <div style="margin-top: 0em;" class="col-12 xs:col-6 sm:col-6 md:col-3 lg:col-3 xl:col-3">
+ <h:panelGroup id="infoPnl">
+ <p:panel style="margin:0.5em;" rendered="#{not empty connectAccountBean.selected}">
<p:commandLink action="#{connectAccountBean.login(connectAccountBean.selected.id)}">
<div style="text-align: left;">
- <p:graphicImage style="max-width: 320px; max-height: 160px;" value="#{request.contextPath}/rest/icon-cache/sync/small/#{connectAccountBean.selected.iconLargeId}" />
+ <p:graphicImage style="max-width: 320px; max-height: 3em;" value="#{request.contextPath}/rest/icon-cache/sync/small/#{connectAccountBean.selected.iconLargeId}" />
</div>
- <div>
- <h:outputText value="#{connectAccountBean.selected.displayName}" />
- </div>
</p:commandLink>
</p:panel>
- </p:outputPanel>
+ </h:panelGroup>
</div>
+
</div>
- <p:outputPanel rendered="#{connectAccountBean.extraList.size() > 0}">
+ <h:panelGroup rendered="#{connectAccountBean.extraList.size() > 0}">
<div style="margin-top: 2em;"><h:outputText value="#{messages['discovery.alternatives']}:" /></div>
<div style="margin-top: 0.5em;" class="grid">
<ui:repeat var="extra" value="#{connectAccountBean.extraList}">
<div class="col-12 md:col-6 lg:col-3 xl:col-2" style="text-align:center; margin: 0.5em; border: 1px solid #eeeeee;">
- <p:commandLink action="#{connectAccountBean.login(extra.id)}">
+ <p:commandLink action="#{discoveryLoginBean.login(extra.id)}">
<div>
- <p:graphicImage style="max-width: 160px; max-height: 60px;" value="#{request.contextPath}/rest/icon-cache/sync/small/#{extra.iconLargeId}" />
+ <p:graphicImage style="max-width: 160px; max-height: 36px;" value="#{request.contextPath}/rest/icon-cache/sync/small/#{extra.iconLargeId}" />
</div>
<div>#{extra.displayName}</div>
</p:commandLink>
</div>
</ui:repeat>
</div>
- </p:outputPanel>
+ </h:panelGroup>
</h:form>
</ui:define>
diff --git a/bwreg-webapp/src/main/webapp/welcome/index.xhtml b/bwreg-webapp/src/main/webapp/welcome/index.xhtml
index c55b9c7f5777aba1e7afb5d293f125f83f22114d..f1606be33f90c0d1cec867706c161612cf236181 100644
--- a/bwreg-webapp/src/main/webapp/welcome/index.xhtml
+++ b/bwreg-webapp/src/main/webapp/welcome/index.xhtml
@@ -26,101 +26,96 @@
<h:form id="form" prependId="false" class="full">
<h3><h:outputText value="#{messages.welcome}"/></h3>
- <div>
- <p:panel rendered="#{sessionManager.originalRequestPath != null and sessionManager.originalRequestPath.startsWith('/idp-debug-login/')}">
- <span class="text-danger">Login debugging is on. You will see a full log of your login process.</span>
- </p:panel>
-
- <h:panelGroup rendered="#{empty discoveryLoginBean.spMetadata and empty discoveryLoginBean.clientConfig}">
- <h:outputText value="#{messages.welcome_disco}" escape="false"/>
- </h:panelGroup>
-
- <h:panelGroup rendered="#{not empty discoveryLoginBean.spMetadata}">
- <h:outputText value="#{messages.welcome_redirected}" /><br/>
- <b>
- <h:outputText value="#{discoveryLoginBean.spMetadata.displayName}" rendered="#{not empty discoveryLoginBean.spMetadata.displayName}" />
- <h:outputText value="#{discoveryLoginBean.spMetadata.entityId}" rendered="#{empty discoveryLoginBean.spMetadata.displayName}" />
- </b>
- </h:panelGroup>
-
- <h:panelGroup rendered="#{not empty discoveryLoginBean.clientConfig}">
- <h:outputText value="#{messages.welcome_redirected}" /><br/>
- <b>
- <h:outputText value="#{discoveryLoginBean.clientConfig.displayName}" rendered="#{not empty discoveryLoginBean.clientConfig.displayName}" />
- <h:outputText value="#{discoveryLoginBean.clientConfig.name}" rendered="#{empty discoveryLoginBean.clientConfig.displayName}" />
- </b>
- </h:panelGroup>
- </div>
+ <h:panelGroup layout="block" styleClass="text-danger text" rendered="#{sessionManager.originalRequestPath != null and sessionManager.originalRequestPath.startsWith('/idp-debug-login/')}">
+ Login debugging is on. You will see a full log of your login process.
+ </h:panelGroup>
+
+ <h:panelGroup layout="block" styleClass="text" rendered="#{empty discoveryLoginBean.spMetadata and empty discoveryLoginBean.clientConfig}">
+ <h:outputText value="#{messages.welcome_disco}" escape="false"/>
+ </h:panelGroup>
+ <h:panelGroup layout="block" rendered="#{not empty discoveryLoginBean.spMetadata}">
+ <h:outputText value="#{messages.welcome_redirected}" /><br/>
+ <b>
+ <h:outputText value="#{discoveryLoginBean.spMetadata.displayName}" rendered="#{not empty discoveryLoginBean.spMetadata.displayName}" />
+ <h:outputText value="#{discoveryLoginBean.spMetadata.entityId}" rendered="#{empty discoveryLoginBean.spMetadata.displayName}" />
+ </b>
+ </h:panelGroup>
- <div><p:messages showDetail="true" /></div>
+ <h:panelGroup layout="block" rendered="#{not empty discoveryLoginBean.clientConfig}">
+ <h:outputText value="#{messages.welcome_redirected}" /><br/>
+ <b>
+ <h:outputText value="#{discoveryLoginBean.clientConfig.displayName}" rendered="#{not empty discoveryLoginBean.clientConfig.displayName}" />
+ <h:outputText value="#{discoveryLoginBean.clientConfig.name}" rendered="#{empty discoveryLoginBean.clientConfig.displayName}" />
+ </b>
+ </h:panelGroup>
+ <div><p:messages showDetail="true" /></div>
- <div class="grid">
- <div style="margin-top: 1em;" class="col-12 xs:col-12 sm:col-12 md:col-6 lg:col-6 xl:col-6">
- <h:panelGroup rendered="#{discoveryLoginBean.largeList}">
- <p:focus conext="baseData" for="searchAutocompl" />
- <span class="ui-float-label">
- <p:autoComplete id="searchAutocompl" multiple="false" value="#{discoveryLoginBean.selected}" converter="#{userProvisionerCachedEntryConverter}"
- var="idp" itemLabel="#{idp.displayName}" itemValue="#{idp}" cache="true" minQueryLength="2"
- completeMethod="#{discoveryLoginBean.search}" maxResults="10"
- forceSelection="true" style="width: 100%;" onfocus="this.select();">
- <p:column><p:graphicImage style="max-width: 48px; max-height: 32px;" value="#{request.contextPath}/rest/icon-cache/async/small/#{idp.iconId}" rendered="#{not empty idp.iconId}" /></p:column>
- <p:column>#{idp.displayName}</p:column>
- <p:ajax update=":form" />
- </p:autoComplete>
- <p:outputLabel for="@previous" value="#{messages['search_filter']}" />
- </span>
- </h:panelGroup>
- <h:panelGroup rendered="#{not discoveryLoginBean.largeList}">
- <p:focus conext="baseData" for="selectBox" />
- <p:selectOneListbox id="selectBox" style="width: 100%;" value="#{discoveryLoginBean.selected}" converter="#{userProvisionerCachedEntryConverter}"
- filter="true" filterMatchMode="contains" filterNormalize="true">
- <f:selectItems value="#{discoveryLoginBean.allList}" var="idp" itemLabel="#{idp.displayName}" itemValue="#{idp}"/>
- <p:ajax update=":form:infoPnl,:form:btnPanel" />
- </p:selectOneListbox>
- </h:panelGroup>
- <h:panelGroup style="margin-top: 1em;">
- <p:selectBooleanCheckbox value="#{discoveryLoginBean.storeIdpSelection}" itemLabel="#{messages.store_idp_selection}" />
- </h:panelGroup>
- </div>
- <div style="margin-top: 0em;" class="col-12 xs:col-12 sm:col-12 md:col-6 lg:col-6 xl:col-6">
- </div>
- <div style="margin-top: 0em;" class="col-12 xs:col-6 sm:col-6 md:col-3 lg:col-3 xl:col-3">
- <h:panelGroup id="btnPanel" style="block" styleClass="form">
- <p:commandButton id="login" style="width:100%;" action="#{discoveryLoginBean.login}" value="#{messages.proceed}" disabled="#{empty discoveryLoginBean.selected}"
- update=":form" />
- </h:panelGroup>
-
- </div>
- <div style="margin-top: 0em;" class="col-12 xs:col-6 sm:col-6 md:col-3 lg:col-3 xl:col-3">
- <h:panelGroup id="infoPnl">
- <p:panel style="margin:0.5em;" rendered="#{not empty discoveryLoginBean.selected}">
- <p:commandLink action="#{discoveryLoginBean.login(discoveryLoginBean.selected.id)}">
- <div style="text-align: left;">
- <p:graphicImage style="max-width: 320px; max-height: 3em;" value="#{request.contextPath}/rest/icon-cache/sync/small/#{discoveryLoginBean.selected.iconLargeId}" />
- </div>
- </p:commandLink>
- </p:panel>
- </h:panelGroup>
- </div>
+ <div class="grid" style="margin-top: 1em;">
+ <div class="col-12 xs:col-12 sm:col-12 md:col-6 lg:col-6 xl:col-6">
+ <h:panelGroup rendered="#{discoveryLoginBean.largeList}">
+ <p:focus conext="baseData" for="searchAutocompl" />
+ <span class="ui-float-label">
+ <p:autoComplete id="searchAutocompl" multiple="false" value="#{discoveryLoginBean.selected}" converter="#{userProvisionerCachedEntryConverter}"
+ var="idp" itemLabel="#{idp.displayName}" itemValue="#{idp}" cache="true" minQueryLength="2"
+ completeMethod="#{discoveryLoginBean.search}" maxResults="10"
+ forceSelection="true" style="width: 100%;" onfocus="this.select();">
+ <p:column><p:graphicImage style="max-width: 48px; max-height: 32px;" value="#{request.contextPath}/rest/icon-cache/async/small/#{idp.iconId}" rendered="#{not empty idp.iconId}" /></p:column>
+ <p:column>#{idp.displayName}</p:column>
+ <p:ajax update=":form" />
+ </p:autoComplete>
+ <p:outputLabel for="@previous" value="#{messages['search_filter']}" />
+ </span>
+ </h:panelGroup>
+ <h:panelGroup rendered="#{not discoveryLoginBean.largeList}">
+ <p:focus conext="baseData" for="selectBox" />
+ <p:selectOneListbox id="selectBox" style="width: 100%;" value="#{discoveryLoginBean.selected}" converter="#{userProvisionerCachedEntryConverter}"
+ filter="true" filterMatchMode="contains" filterNormalize="true">
+ <f:selectItems value="#{discoveryLoginBean.allList}" var="idp" itemLabel="#{idp.displayName}" itemValue="#{idp}"/>
+ <p:ajax update=":form:infoPnl,:form:btnPanel" />
+ </p:selectOneListbox>
+ </h:panelGroup>
+ <h:panelGroup layout="block">
+ <p:selectBooleanCheckbox style="margin-top: 1em; font-size:0.9em;" value="#{discoveryLoginBean.storeIdpSelection}" itemLabel="#{messages.store_idp_selection}" />
+ </h:panelGroup>
+ </div>
+ <div style="margin-top: 0em;" class="col-12 xs:col-12 sm:col-12 md:col-6 lg:col-6 xl:col-6">
+ </div>
+ <div style="margin-top: 0em;" class="col-12 xs:col-6 sm:col-6 md:col-3 lg:col-3 xl:col-3">
+ <h:panelGroup id="btnPanel" layout="block" styleClass="form">
+ <p:commandButton id="login" style="width:100%;" action="#{discoveryLoginBean.login}" value="#{messages.proceed}" disabled="#{empty discoveryLoginBean.selected}"
+ update=":form" />
+ </h:panelGroup>
+ </div>
+ <div style="margin-top: 0em;" class="col-12 xs:col-6 sm:col-6 md:col-3 lg:col-3 xl:col-3">
+ <h:panelGroup id="infoPnl">
+ <p:panel style="margin:0.5em;" rendered="#{not empty discoveryLoginBean.selected}">
+ <p:commandLink action="#{discoveryLoginBean.login(discoveryLoginBean.selected.id)}">
+ <div style="text-align: left;">
+ <p:graphicImage style="max-width: 320px; max-height: 3em;" value="#{request.contextPath}/rest/icon-cache/sync/small/#{discoveryLoginBean.selected.iconLargeId}" />
+ </div>
+ </p:commandLink>
+ </p:panel>
+ </h:panelGroup>
+ </div>
+ </div>
+ <h:panelGroup rendered="#{discoveryLoginBean.extraList.size() > 0}">
+ <div style="margin-top: 2em;"><h:outputText value="#{messages['discovery.alternatives']}:" /></div>
+ <div style="margin-top: 0.5em;" class="grid">
+ <ui:repeat var="extra" value="#{discoveryLoginBean.extraList}">
+ <div class="col-12 md:col-6 lg:col-3 xl:col-2" style="text-align:center; margin: 0.5em; border: 1px solid #eeeeee;">
+ <p:commandLink action="#{discoveryLoginBean.login(extra.id)}">
+ <div>
+ <p:graphicImage style="max-width: 160px; max-height: 36px;" value="#{request.contextPath}/rest/icon-cache/sync/small/#{extra.iconLargeId}" />
+ </div>
+ <div>#{extra.displayName}</div>
+ </p:commandLink>
+ </div>
+ </ui:repeat>
</div>
- <h:panelGroup rendered="#{discoveryLoginBean.extraList.size() > 0}">
- <div style="margin-top: 2em;"><h:outputText value="#{messages['discovery.alternatives']}:" /></div>
- <div style="margin-top: 0.5em;" class="grid">
- <ui:repeat var="extra" value="#{discoveryLoginBean.extraList}">
- <div class="col-12 md:col-6 lg:col-3 xl:col-2" style="text-align:center; margin: 0.5em; border: 1px solid #eeeeee;">
- <p:commandLink action="#{discoveryLoginBean.login(extra.id)}">
- <div>
- <p:graphicImage style="max-width: 160px; max-height: 36px;" value="#{request.contextPath}/rest/icon-cache/sync/small/#{extra.iconLargeId}" />
- </div>
- <div>#{extra.displayName}</div>
- </p:commandLink>
- </div>
- </ui:repeat>
- </div>
- </h:panelGroup>
+ </h:panelGroup>
</h:form>
</ui:define>