Skip to content
Snippets Groups Projects
Commit d53a438b authored by Mohammed Sayed's avatar Mohammed Sayed Committed by Michael Simon
Browse files

ISSUE-208 better accessibility, no idp is selected if the input is empty and fix layout.

parent 845f2c2f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 32 additions and 21 deletions
bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/HeadBarBean.java
+ 2
− 2
View file @ d53a438b
......@@ -86,7 +86,7 @@ public class HeadBarBean {
public String getHomeLink() {
return getApplicationBase() + getOrDefault(request.getServerName() + "_home_link",
"<a href=\"http://www.kit.edu\" target=\"_blank\"><span class=\"svg-icon\"><img src=\"/resources/img/kitlogo_nano.svg\" width=\"10px\"/></span><span>KIT</span></a>");
"<a href=\"http://www.kit.edu\" target=\"_blank\"><span class=\"svg-icon\"><img src=\"/resources/img/kitlogo_nano.svg\" alt=\"KIT link\" width=\"10px\"/></span><span>KIT</span></a>");
}
public String getApplicationBase() {
......@@ -130,7 +130,7 @@ public class HeadBarBean {
}
public String getBurgerIcon() {
return "<button class=\"burger\"><svg class=\"burger-icon\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\" viewBox=\"0 0 300 274.5\" width=\"300px\" height=\"274.5px\">\n"
return "<button class=\"burger\" aria-label=\"Burger button\"><svg class=\"burger-icon\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\" viewBox=\"0 0 300 274.5\" width=\"300px\" height=\"274.5px\">\n"
+ " <rect class=\"burger-top\" y=\"214.4\" width=\"300\" height=\"60.1\"/>\n"
+ " <rect class=\"burger-middle\" y=\"107.2\" width=\"300\" height=\"60.1\"/>\n"
+ " <rect class=\"burger-bottom\" y=\"0\" width=\"300\" height=\"60.1\"/>\n" + "</svg></button>";
......
bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/disco/DiscoveryLoginBean.java
+ 5
− 0
View file @ d53a438b
......@@ -355,4 +355,9 @@ public class DiscoveryLoginBean implements Serializable {
public Boolean getLargeList() {
return largeList;
}
public void clearPanel() {
this.selected = null;
}
}
bwreg-webapp/src/main/resources/META-INF/resources/primefaces-kit-theme/theme.css
+ 1
− 1
View file @ d53a438b
Source diff could not be displayed: it is too large. Options to address this: view the blob.
bwreg-webapp/src/main/webapp/resources/css/std-ext.css
+ 4
− 0
View file @ d53a438b
......@@ -74,3 +74,7 @@ body .ui-selectonelistbox .ui-selectlistbox-listcontainer .ui-selectlistbox-list
body .ui-selectonelistbox .ui-selectlistbox-listcontainer .ui-selectlistbox-item::before {
border-left: 12px solid grey;
}
body .ui-commandlink {
color: var(--primaryDarkColor);
}
bwreg-webapp/src/main/webapp/template/head-bar.xhtml
+ 1
− 1
View file @ d53a438b
......@@ -17,7 +17,7 @@
<div class="logo">
<a href="#{headBarBean.headerLink}" title="#{headBarBean.headerTitle}">
<img src="#{headBarBean.headerImage}" />
<img src="#{headBarBean.headerImage}" alt="logo" />
</a>
</div>
......
bwreg-webapp/src/main/webapp/user/connect-account.xhtml
+ 2
− 2
View file @ d53a438b
......@@ -94,7 +94,7 @@
<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: 3em;" 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}" alt="Organization logo"/>
</div>
</p:commandLink>
</p:panel>
......@@ -110,7 +110,7 @@
<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}" />
<p:graphicImage style="max-width: 160px; max-height: 36px;" value="#{request.contextPath}/rest/icon-cache/sync/small/#{extra.iconLargeId}" alt="Organization logo"/>
</div>
<div>#{extra.displayName}</div>
</p:commandLink>
......
bwreg-webapp/src/main/webapp/welcome/index.xhtml
+ 17
− 15
View file @ d53a438b
......@@ -59,24 +59,27 @@
<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%; min-width: 100%; box-sizing: border-box;" onfocus="this.select();">
forceSelection="true" style="width: 100%; min-width: 100%; box-sizing: border-box;" onfocus="this.select();" update="infoPnl">
<p:column style="background-color: white; padding: 0.5rem 0.5rem; text-align: center; vertical-align: middle; width: 4rem">
<p:graphicImage style="max-width: 48px; max-height: 32px; transform: scale(1.4)"
value="#{request.contextPath}/rest/icon-cache/async/small/#{idp.iconId}" rendered="#{not empty idp.iconId}"
onerror="this.style.display='none'" />
</p:column>
<p:graphicImage style="max-width: 48px; max-height: 32px; transform: scale(1.4)"
value="#{request.contextPath}/rest/icon-cache/async/small/#{idp.iconId}" rendered="#{not empty idp.iconId}"
onerror="this.style.display='none'" />
</p:column>
<p:column style="font-size: 1.2rem; color: black;">#{idp.displayName}</p:column>
<p:ajax update=":form" oncomplete="updateClearButtonVisibility();" />
<p:ajax event="itemSelect" update="login" oncomplete="updateClearButtonVisibility();" />
<p:ajax event="clear" update="login" oncomplete="updateClearButtonVisibility();" />
<p:ajax event="itemSelect" update="infoPnl login" oncomplete="updateClearButtonVisibility();" />
<p:ajax event="clear" update="infoPnl login" oncomplete="updateClearButtonVisibility();" />
<p:ajax event="change" update="infoPnl" oncomplete="updateClearButtonVisibility();" />
<p:ajax event="blur" oncomplete="updateClearButtonVisibility();" />
</p:autoComplete>
<button type="button"
class="autocomplete-clear-button"
onclick="clearAutocomplete()">&#10006;</button>
onclick="clearAutocomplete(); clearPanelAction()"
>&#10006;</button>
<p:remoteCommand name="clearPanelAction" action="#{discoveryLoginBean.clearPanel}" update="infoPnl" />
<h:outputScript target="body">
window.clearAutocomplete = function() {
var autoCompleteInput = document.getElementById('searchAutocompl_input');
......@@ -115,7 +118,7 @@
loginButton.disabled = true;
}
}
}
}
}
document.addEventListener('DOMContentLoaded', function() {
......@@ -152,7 +155,6 @@
<p:commandButton id="login" style="margin-top: 0em; width:100%;" action="#{discoveryLoginBean.login}"
value="#{messages.proceed}" disabled="#{empty discoveryLoginBean.selected}"
update=":form" />
</h:panelGroup>
</div>
......@@ -162,7 +164,7 @@
<p:commandLink action="#{discoveryLoginBean.login(discoveryLoginBean.selected.id)}">
<div style="text-align: left;">
<p:graphicImage style="max-width: 320px; max-height: 2.8em;"
value="#{request.contextPath}/rest/icon-cache/sync/small/#{discoveryLoginBean.selected.iconLargeId}" />
value="#{request.contextPath}/rest/icon-cache/sync/small/#{discoveryLoginBean.selected.iconLargeId}" alt="Organization logo"/>
</div>
</p:commandLink>
</p:panel>
......@@ -172,13 +174,13 @@
</div>
<h:panelGroup rendered="#{discoveryLoginBean.extraList.size() > 0}">
<div style="margin-top: 2em;"><h:outputText value="#{messages['discovery.alternatives']}:" /></div>
<div style="margin-top: 3.5em;"><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;">
<div class="col-12 md:col-6 lg:col-2 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}" />
<p:graphicImage style="max-width: 160px; max-height: 24px;" value="#{request.contextPath}/rest/icon-cache/sync/small/#{extra.iconLargeId}" alt="Organization logo"/>
</div>
<div>#{extra.displayName}</div>
</p:commandLink>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Help | Imprint | Privacy policy | Accessibility | Contact