Commit a61ec15a authored by michael.simon's avatar michael.simon
Browse files

add changes to new layout

parent d5b7cf78
......@@ -16,9 +16,9 @@
<ui:define name="content">
<h3><h:outputText value="#{messages.error_msg}"/></h3>
<h3 class="full"><h:outputText value="#{messages.error_msg}"/></h3>
<div id="panelInline">
<div class="full">
<p:panel header="#{messages.error_detail}">
<div style="font-weight: bold;">
#{requestScope['javax.servlet.error.message']}
......
......@@ -16,9 +16,9 @@
<ui:define name="content">
<h3><h:outputText value="#{messages.error_msg}"/></h3>
<h3 class="full"><h:outputText value="#{messages.error_msg}"/></h3>
<div id="panelInline">
<div class="full">
<p:panel header="#{messages.error_detail}">
<div style="font-weight: bold;">
#{requestScope['javax.servlet.error.message']}
......
......@@ -17,33 +17,25 @@
<ui:define name="content">
<div>
<p:panel header="#{messages.index_motd_header}" rendered="#{messages.index_motd_header != '???index_motd_header???'}"
style="margin-bottom: 8px;">
<div class="panel">
style="margin-bottom: 8px;" styleClass="full">
<h:outputText value="#{messages.index_motd_text1}" escape="false" />
</div>
</p:panel>
<p:panel>
<div>
<h:outputText value="#{messages.index_text1}" />
</div>
<h:outputText value="#{messages.index_text1}" styleClass="full" />
<h:panelGroup rendered="#{not empty userIndexBean.userRegistryList}">
<div>
<ui:repeat var="registry" value="#{userIndexBean.userRegistryList}">
<div class="serviceBlock">
<div class="serviceBlockHeader">
<h:outputText value="#{registry.service.name}" />
</div>
<div class="news-element third">
<h:outputText value="#{registry.service.name}" class="headline"/>
<h:panelGroup rendered="#{registry.service.image != null}">
<div class="serviceBlockImage">
<p:graphicImage
value="#{request.contextPath}/rest/image/icon/#{registry.service.image.id}" />
</div>
<figure>
<picture>
<p:graphicImage value="#{request.contextPath}/rest/image/icon/#{registry.service.image.id}" />
</picture>
</figure>
</h:panelGroup>
<div class="serviceBlockDesc">
<h:outputText value="#{registry.service.shortDescription}" />
</div>
<p><h:outputText value="#{registry.service.shortDescription}" /></p>
<h:panelGroup rendered="#{not empty userIndexBean.getServiceAccessStatus(registry.service)}">
<div class="serviceBlockProblem">
<h:outputText value="#{messages.access_rule_problem} " />
......@@ -52,19 +44,19 @@
</h:link>
</div>
</h:panelGroup>
<div class="serviceBlockLink">
<div>
<span class="ui-icon ui-icon-script" style="display:inline-block; vertical-align: bottom;" />
<h:link outcome="/service/index.xhtml" value="#{messages.service_desc}">
<f:param name="serviceId" value="#{registry.service.id}" />
</h:link>
</div>
<div class="serviceBlockLink">
<div>
<span class="ui-icon ui-icon-link" style="display:inline-block; vertical-align: bottom;" />
<h:link outcome="/service/registry-detail.xhtml" value="#{messages.registry_details}">
<f:param name="regId" value="#{registry.id}" />
</h:link>
</div>
<div class="serviceBlockLink">
<div>
<h:panelGroup rendered="#{authorizationBean.isPasswordCapable(registry.service)}">
<span class="ui-icon ui-icon-locked" style="display:inline-block; vertical-align: bottom;" />
<h:link outcome="/service/set-password.xhtml" value="#{messages.set_password}">
......@@ -72,7 +64,7 @@
</h:link>
</h:panelGroup>
</div>
<div class="serviceBlockLink">
<div>
<h:panelGroup rendered="#{authorizationBean.isSshPubKeyCapable(registry.service)}">
<span class="ui-icon ui-icon-locked" style="display:inline-block; vertical-align: bottom;" />
<h:link outcome="/service/set-sshkey.xhtml" value="#{messages.set_ssh_pub_key}">
......@@ -82,7 +74,6 @@
</div>
</div>
</ui:repeat>
</div>
</h:panelGroup>
<h:panelGroup rendered="#{empty userIndexBean.userRegistryList}">
......@@ -93,20 +84,14 @@
</ul>
</h:panelGroup>
<div style="margin-top: 8px;">
<h:outputText value="#{messages.index_text2}" />
</div>
</p:panel>
<h:outputText value="#{messages.index_text2}" class="full" />
<p:panel rendered="#{not empty userIndexBean.pendingRegistryList}" style="margin-top: 12px;">
<div style="margin-top: 4px;">
<h:outputText value="#{messages.index_text5}" />
</div>
<h:panelGroup rendered="#{not empty userIndexBean.pendingRegistryList}" style="margin-top: 12px;">
<h:outputText value="#{messages.index_text5}" class="full"/>
<h:panelGroup >
<div>
<ui:repeat var="registry" value="#{userIndexBean.pendingRegistryList}">
<div class="serviceBlock">
<div class="third">
<div class="serviceBlockHeader">
<h:outputText value="#{registry.service.name}" />
</div>
......@@ -141,9 +126,7 @@
</div>
</div>
</ui:repeat>
</div>
</h:panelGroup>
</p:panel>
<p:panel style="margin-top: 12px;">
<div style="margin-top: 4px;">
......@@ -186,7 +169,6 @@
<h:outputText value="#{messages.index_text4}" />
</div>
</p:panel>
</div>
</ui:define>
</ui:composition>
......
......@@ -27,6 +27,28 @@
font-style: normal;
font-display:block}
.ui-widget {
font-family: "Roboto", sans-serif;
font-size: 1.25rem;
font-weight: 300;
}
.ui-widget .ui-widget {
font-size: 1.25rem;
}
.ui-panel {
border: none;
}
.col-width-1 {
width: 150px;
}
.col-width-2 {
width: auto;
}
.form .input-option.checkbox label span:before,.mediathek-teaser .teaser-element picture:after,.navigation-search .search-form button,.news-slider .swiper-button-next:before,.news-slider .swiper-button-prev:before,.page-footer .button.icon:after,.search-form-container .search-form button,.sidebar-contact .phone:before,.sidebar-media picture:after,.slider-small .swiper-button-next:before,.slider-small .swiper-button-prev:before,.social a:after,.stage-slider-tile p:after,.stage-slider .swiper-button-next:before,.stage-slider .swiper-button-prev:before,.to-top-button {
font-family: "kit-icons"!important;
speak: none;
......
......@@ -39,9 +39,9 @@
<section class="content-wrap">
<div class="content">
<div class="ui-widget text form full fancy">
<!-- <div class="ui-widget text form full fancy"> -->
<ui:insert name="content">Default content</ui:insert>
</div>
<!-- </div> -->
</div>
</section>
</main>
......
......@@ -16,6 +16,21 @@
<ul class="navigation-l1">
<h:panelGroup rendered="#{sessionManager.isLoggedIn()}">
<li class="flyout"><a href="#{request.contextPath}/index.xhtml">#{messages.index}</a>
<div class="dropdown">
<ul class="navigation-l2">
<li class="has-submenu">
<h:link outcome="#{request.contextPath}/user/index.xhtml" value="#{messages.my_data}" />
</li>
<li class="has-submenu">
<h:link outcome="#{request.contextPath}/user/ssh-keys.xhtml" value="#{messages.my_ssh_keys}" />
</li>
<li class="has-submenu">
<h:link outcome="#{request.contextPath}/user/twofa.xhtml" value="#{messages.my_twofa}" />
</li>
</ul>
</div>
</li>
<li class="flyout"><a href="#{request.contextPath}/index.xhtml">#{messages.registered_services}</a>
<div class="dropdown">
<ul class="navigation-l2">
<ui:repeat var="registry" value="#{authorizationBean.userRegistryList}">
......@@ -31,12 +46,31 @@
</h:link>
</li>
</ul>
</div>
<ul class="navigation-l3">
<h:panelGroup rendered="#{registry.registryStatus == 'ACTIVE' and authorizationBean.isPasswordCapable(registry.service)}">
<li class="">
<h:link outcome="/service/set-password.xhtml" value="#{messages.set_password}">
<f:param name="registryId" value="#{registry.id}" />
</h:link>
</li>
</h:panelGroup>
</ul>
<ul class="navigation-l3">
<h:panelGroup rendered="#{registry.registryStatus == 'ACTIVE' and authorizationBean.isSshPubKeyCapable(registry.service)}">
<li class="">
<h:link outcome="/service/set-sshkey.xhtml" value="#{messages.set_ssh_pub_key}">
<f:param name="registryId" value="#{registry.id}" />
</h:link>
</li>
</h:panelGroup>
</ul>
</div></li>
</ui:repeat>
</ul>
</div>
</li>
<li class="flyout"><a href="#{request.contextPath}/index.xhtml">#{messages.services}</a>
</li>
<li class=""><a href="https://www.scc.kit.edu/" target="_blank">Das SCC</a></li>
<li class=""><a href="https://www.scc.kit.edu/stellen/index.php" target="_blank">Stellenangebote</a></li>
<li class="home"><a href="#{request.contextPath}/index.xhtml"><span>Startseite</span></a></li>
......
......@@ -23,8 +23,9 @@
<ui:define name="content">
<h:form id="form" prependId="false">
<p:panel header="#{messages.welcome}" styleClass="full">
<h:form id="form" prependId="false" class="full form">
<h3><h:outputText value="#{messages.welcome}"/></h3>
<p:panel>
<p:outputPanel rendered="#{empty discoveryLoginBean.spMetadata and empty discoveryLoginBean.clientConfig}" style="margin-top: 8px;">
<h:outputText value="#{messages.welcome_disco}"/>
</p:outputPanel>
......@@ -49,7 +50,7 @@
<p:focus conext="baseData" for="filterText" />
<h:panelGrid id="baseData" columns="2" style="margin-top: 8px;">
<h:panelGrid id="baseData" columns="2" style="margin-top: 8px;" columnClasses="col-width-1,col-width-2">
<p:outputLabel value="#{messages.federation}:" for="selectFed" />
<p:selectOneMenu id="selectFed" value="#{discoveryLoginBean.selectedFederation}"
......@@ -66,7 +67,7 @@
</p:inputText>
<p:outputLabel value="#{messages.home_org}:" for="idpBox" />
<p:selectOneListbox id="idpBox" value="#{discoveryLoginBean.selectedIdp}" scrollHeight="360" style="width:300px;"
<p:selectOneListbox id="idpBox" value="#{discoveryLoginBean.selectedIdp}" scrollHeight="360" style="width:auto;"
converter="#{samlIdpMetadataConverter}">
<f:selectItems value="#{discoveryLoginBean.idpList}"
var="idp" itemLabel="#{idp.displayName == null ? idp.orgName : idp.displayName}" itemValue="#{idp}"/>
......@@ -79,7 +80,7 @@
update=":form" />
</p:panel>
<p:panel header="OIDC Test" rendered="#{'true'.equalsIgnoreCase(discoveryLoginBean.appConfig.getConfigValue('show_oidc_login'))}">
<p:panel header="OIDC Test" rendered="#{'true'.equalsIgnoreCase(discoveryLoginBean.appConfig.getConfigValue('show_oidc_login'))}" styleClass="full">
<h:panelGrid id="oidcBaseData" columns="2" style="margin-top: 8px;">
<p:outputLabel value="#{messages.home_org}:" for="idpBox" />
<p:selectOneListbox id="oidcBox" value="#{discoveryLoginBean.selectedOidcRp}" scrollHeight="120" style="width:300px;"
......
Supports Markdown
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