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

More design changes

parent be7d0096
...@@ -77,21 +77,17 @@ ...@@ -77,21 +77,17 @@
</h:panelGroup> </h:panelGroup>
<h:panelGroup rendered="#{empty userIndexBean.userRegistryList}"> <h:panelGroup rendered="#{empty userIndexBean.userRegistryList}">
<ul> <h:outputText value="#{messages.no_registered_services}" styleClass="full"/>
<li>
<h:outputText value="#{messages.no_registered_services}"/>
</li>
</ul>
</h:panelGroup> </h:panelGroup>
<h:outputText value="#{messages.index_text2}" class="full" /> <h:outputText value="#{messages.index_text2}" class="full" />
<h:panelGroup rendered="#{not empty userIndexBean.pendingRegistryList}" style="margin-top: 12px;"> <h:panelGroup rendered="#{not empty userIndexBean.pendingRegistryList}">
<h:outputText value="#{messages.index_text5}" class="full"/> <h:outputText value="#{messages.index_text5}" styleClass="full"/>
<ui:repeat var="registry" value="#{userIndexBean.pendingRegistryList}"> <ui:repeat var="registry" value="#{userIndexBean.pendingRegistryList}">
<div class="third"> <div class="news-element third">
<h:outputText value="#{registry.service.name}" class="headline"/> <h:outputText value="#{registry.service.name}" class="headline"/>
<h:panelGroup rendered="#{registry.service.image != null}"> <h:panelGroup rendered="#{registry.service.image != null}">
<figure> <figure>
......
...@@ -41,6 +41,10 @@ ...@@ -41,6 +41,10 @@
border: none; border: none;
} }
.ui-helper-hidden {
display: none !important;
}
.col-width-1 { .col-width-1 {
width: 200px; width: 200px;
} }
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<ui:param name="title" value="#{messages.title}"/> <ui:param name="title" value="#{messages.title}"/>
<ui:define name="content"> <ui:define name="content">
<h:form id="form"> <h:form id="form" styleClass="form fancy full">
<h2><h:outputText value="#{messages.service}: #{serviceAdminDetailsBean.serviceEntity.name}"/></h2> <h2><h:outputText value="#{messages.service}: #{serviceAdminDetailsBean.serviceEntity.name}"/></h2>
......
...@@ -22,16 +22,16 @@ ...@@ -22,16 +22,16 @@
<ui:param name="title" value="#{messages.title}"/> <ui:param name="title" value="#{messages.title}"/>
<ui:define name="content"> <ui:define name="content">
<h:form id="form"> <h:form id="form" styleClass="form full fancy">
<h2><h:outputText value="#{messages.service}: #{serviceAdminUserListDeproBean.serviceEntity.name}"/></h2> <h2><h:outputText value="#{messages.service}: #{serviceAdminUserListDeproBean.serviceEntity.name}"/></h2>
<div id="panelInline"> <div id="panelInline">
<p:dataTable id="registeredTable1" var="registry" value="#{serviceAdminUserListDeproBean.deproList}" paginator="true" <p:dataTable id="registeredTable1" var="registry" value="#{serviceAdminUserListDeproBean.deproList}" paginator="true"
rows="15" tableStyle="width:auto;"> rows="15" tableStyle="width:auto; font-size: 1.2rem;">
<p:column sortBy="#{registry.id}" width="32"> <p:column sortBy="#{registry.id}">
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{messages.id}" /> <h:outputText value="#{messages.id}" />
</f:facet> </f:facet>
......
...@@ -22,16 +22,16 @@ ...@@ -22,16 +22,16 @@
<ui:param name="title" value="#{messages.title}"/> <ui:param name="title" value="#{messages.title}"/>
<ui:define name="content"> <ui:define name="content">
<h:form id="form"> <h:form id="form" styleClass="form full fancy">
<h2><h:outputText value="#{messages.service}: #{serviceAdminUserListBean.serviceEntity.name}"/></h2> <h2><h:outputText value="#{messages.service}: #{serviceAdminUserListBean.serviceEntity.name}"/></h2>
<div id="panelInline"> <div id="panelInline">
<p:tabView id="tabVw" dynamic="true" cache="false"> <p:tabView id="tabVw" dynamic="true" cache="false" >
<p:tab id="tab1" title="#{messages.active}"> <p:tab id="tab1" title="#{messages.active}">
<p:dataTable id="registeredTable1" var="registry" value="#{serviceAdminUserListBean.list}" paginator="true" <p:dataTable id="registeredTable1" var="registry" value="#{serviceAdminUserListBean.list}" paginator="true"
lazy="true" rows="15"> lazy="true" rows="15" style="width:auto; font-size: 1.2rem;">
<p:column sortBy="#{registry.id}"> <p:column sortBy="#{registry.id}">
<f:facet name="header"> <f:facet name="header">
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<p:tab id="tab2" title="#{messages.lost_access}"> <p:tab id="tab2" title="#{messages.lost_access}">
<p:dataTable id="registeredTable2" var="registry" value="#{serviceAdminUserListBean.lostAccessList}" paginator="true" <p:dataTable id="registeredTable2" var="registry" value="#{serviceAdminUserListBean.lostAccessList}" paginator="true"
lazy="true" rows="15"> lazy="true" rows="15" style="width:auto; font-size: 1.2rem;">
<p:column sortBy="#{registry.id}"> <p:column sortBy="#{registry.id}">
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{messages.id}" /> <h:outputText value="#{messages.id}" />
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
<p:tab id="tab3" title="#{messages.deregistered}"> <p:tab id="tab3" title="#{messages.deregistered}">
<p:dataTable id="registeredTable3" var="registry" value="#{serviceAdminUserListBean.deletedList}" paginator="true" <p:dataTable id="registeredTable3" var="registry" value="#{serviceAdminUserListBean.deletedList}" paginator="true"
lazy="true" rows="15"> lazy="true" rows="15" style="width:auto; font-size: 1.2rem;">
<p:column sortBy="#{registry.id}"> <p:column sortBy="#{registry.id}">
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{messages.id}" /> <h:outputText value="#{messages.id}" />
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
<p:tab id="tab4" title="#{messages.other}"> <p:tab id="tab4" title="#{messages.other}">
<p:dataTable id="registeredTable4" var="registry" value="#{serviceAdminUserListBean.otherList}" paginator="true" <p:dataTable id="registeredTable4" var="registry" value="#{serviceAdminUserListBean.otherList}" paginator="true"
lazy="true" rows="15"> lazy="true" rows="15" style="width:auto; font-size: 1.2rem;">
<p:column sortBy="#{registry.id}"> <p:column sortBy="#{registry.id}">
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{messages.id}" /> <h:outputText value="#{messages.id}" />
......
...@@ -22,27 +22,26 @@ ...@@ -22,27 +22,26 @@
<ui:param name="title" value="#{messages.title}"/> <ui:param name="title" value="#{messages.title}"/>
<ui:define name="content"> <ui:define name="content">
<h:form id="form"> <h:form id="form" styleClass="form full fancy">
<h2>#{messages.statistics}: #{serviceAdminStatsBean.serviceEntity.name}</h2> <h3>#{messages.statistics}: #{serviceAdminStatsBean.serviceEntity.name}</h3>
<div id="panelInline"> <!-- does not play well with new stylesheet -->
<p:chart type="pie" model="#{serviceAdminStatsBean.userPerIdpPie}" style="height:400px;" /> <!-- <p:chart type="pie" model="#{serviceAdminStatsBean.userPerIdpPie}" style="height:400px;" /> -->
<p:dataTable id="dataTable" var="o" value="#{serviceAdminStatsBean.userPerIdpList}"> <p:dataTable id="dataTable" var="o" value="#{serviceAdminStatsBean.userPerIdpList}">
<p:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{messages.users}" /> <h:outputText value="#{messages.users}" />
</f:facet> </f:facet>
<h:outputText value="#{o[0]}" /> <h:outputText value="#{o[0]}" />
</p:column> </p:column>
<p:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{messages.idp}" /> <h:outputText value="#{messages.idp}" />
</f:facet> </f:facet>
<h:outputText value="#{o[1].orgName}" /> <h:outputText value="#{o[1].orgName}" />
</p:column> </p:column>
</p:dataTable> </p:dataTable>
</div>
</h:form> </h:form>
</ui:define> </ui:define>
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<ui:param name="title" value="#{messages.title}"/> <ui:param name="title" value="#{messages.title}"/>
<ui:define name="content"> <ui:define name="content">
<h:form id="form"> <h:form id="form" styleClass="form full fancy">
<h2><h:outputText value="#{messages.registered}: #{serviceAdminUserDetailBean.entity.service.name}/ #{serviceAdminUserDetailBean.entity.user.eppn}"/></h2> <h2><h:outputText value="#{messages.registered}: #{serviceAdminUserDetailBean.entity.service.name}/ #{serviceAdminUserDetailBean.entity.user.eppn}"/></h2>
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<ui:param name="title" value="#{messages.title}"/> <ui:param name="title" value="#{messages.title}"/>
<ui:define name="content"> <ui:define name="content">
<h:form id="form"> <h:form id="form" styleClass="form fancy full">
<div id="panelInline"> <div id="panelInline">
<p:panel header="#{messages.approve}"> <p:panel header="#{messages.approve}">
......
...@@ -22,57 +22,46 @@ ...@@ -22,57 +22,46 @@
<ui:param name="title" value="#{messages.title}"/> <ui:param name="title" value="#{messages.title}"/>
<ui:define name="content"> <ui:define name="content">
<h:form id="form"> <h:form id="form" styleClass="form fancy full">
<h2><h:outputText value="#{messages.service}: #{approvalListBean.serviceEntity.name}"/></h2> <h3><h:outputText value="#{messages.service}: #{approvalListBean.serviceEntity.name}"/></h3>
<div id="panelInline"> <p:dataTable id="registeredTable" var="registry"
<p:panel header="#{messages.new_approvals}"> value="#{approvalListBean.list}" style="width:auto; font-size: 1.2rem;"
<p:dataTable id="registeredTable" var="registry" paginator="true" lazy="true" rows="15">
value="#{approvalListBean.list}" style="width:auto;" <p:column sortBy="#{registry.user.eppn}" filterBy="#{registry.user.eppn}">
paginator="true" lazy="true" rows="15"> <f:facet name="header">
<p:column sortBy="#{registry.id}" style="width: 48px;"> <h:outputText value="#{messages.eppn}" />
<f:facet name="header"> </f:facet>
<h:outputText value="#{messages.id}" /> <h:outputText value="#{registry.user.eppn}" />
</f:facet> </p:column>
<h:outputText value="#{registry.id}" /> <p:column sortBy="#{registry.user.surName}" filterBy="#{registry.user.surName}">
</p:column> <f:facet name="header">
<p:column sortBy="#{registry.user.eppn}" filterBy="#{registry.user.eppn}"> <h:outputText value="#{messages.sur_name}" />
<f:facet name="header"> </f:facet>
<h:outputText value="#{messages.eppn}" /> <h:outputText value="#{registry.user.surName}" />
</f:facet> </p:column>
<h:outputText value="#{registry.user.eppn}" /> <p:column sortBy="#{registry.user.givenName}" filterBy="#{registry.user.givenName}">
</p:column> <f:facet name="header">
<p:column sortBy="#{registry.user.surName}" filterBy="#{registry.user.surName}"> <h:outputText value="#{messages.given_name}" />
<f:facet name="header"> </f:facet>
<h:outputText value="#{messages.sur_name}" /> <h:outputText value="#{registry.user.givenName}" />
</f:facet> </p:column>
<h:outputText value="#{registry.user.surName}" /> <p:column sortBy="#{registry.agreedTime}">
</p:column> <f:facet name="header">
<p:column sortBy="#{registry.user.givenName}" filterBy="#{registry.user.givenName}"> <h:outputText value="#{messages.registered_time}" />
<f:facet name="header"> </f:facet>
<h:outputText value="#{messages.given_name}" /> <h:outputText value="#{of:formatDate(registry.agreedTime, 'dd.MM.yyyy HH:mm')}" />
</f:facet> </p:column>
<h:outputText value="#{registry.user.givenName}" /> <p:column style="width: 6em;">
</p:column> <f:facet name="header">
<p:column sortBy="#{registry.agreedTime}"> <h:outputText value="#{messages.action}" />
<f:facet name="header"> </f:facet>
<h:outputText value="#{messages.registered_time}" /> <h:link outcome="approve-user.xhtml" value="#{messages.edit}" >
</f:facet> <f:param name="id" value="#{registry.id}"/>
<h:outputText value="#{of:formatDate(registry.agreedTime, 'dd.MM.yyyy HH:mm')}" /> </h:link>
</p:column> </p:column>
<p:column style="width: 48px;"> </p:dataTable>
<f:facet name="header">
<h:outputText value="#{messages.action}" />
</f:facet>
<h:link outcome="approve-user.xhtml" value="#{messages.edit}" >
<f:param name="id" value="#{registry.id}"/>
</h:link>
</p:column>
</p:dataTable>
</p:panel>
</div>
</h:form> </h:form>
</ui:define> </ui:define>
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<ui:param name="title" value="#{messages.title}"/> <ui:param name="title" value="#{messages.title}"/>
<ui:define name="content"> <ui:define name="content">
<h:form id="form"> <h:form id="form" styleClass="full form fancy">
<h2><h:outputText value="#{messages.service}: #{sshPubKeyApprovalListBean.serviceEntity.name}"/></h2> <h2><h:outputText value="#{messages.service}: #{sshPubKeyApprovalListBean.serviceEntity.name}"/></h2>
......
...@@ -71,6 +71,71 @@ ...@@ -71,6 +71,71 @@
</li> </li>
<li class="flyout"><a href="#{request.contextPath}/index.xhtml">#{messages.services}</a> <li class="flyout"><a href="#{request.contextPath}/index.xhtml">#{messages.services}</a>
</li> </li>
<h:panelGroup rendered="#{authorizationBean.serviceApproverList.size() gt 0}">
<li class="flyout"><a href="#{request.contextPath}/index.xhtml">#{messages.approver}</a>
<div class="dropdown">
<ul class="navigation-l2">
<li class="has-submenu">
<a>#{messages.new_approvals}</a>
<ui:repeat var="service" value="#{authorizationBean.serviceApproverList}">
<div class="submenu">
<ul class="navigation-l3">
<li class="">
<h:link outcome="/service-approver/index.xhtml" value="#{service.name}">
<f:param name="serviceId" value="#{service.id}" />
</h:link>
</li>
</ul>
</div>
</ui:repeat>
</li>
</ul>
</div>
</li>
</h:panelGroup>
<h:panelGroup rendered="#{authorizationBean.serviceAdminList.size() gt 0}">
<li class="flyout"><a href="#{request.contextPath}/index.xhtml">Admin</a>
<div class="dropdown">
<ul class="navigation-l2">
<ui:repeat var="service" value="#{authorizationBean.serviceApproverList}">
<li class="has-submenu">
<a>#{service.name}</a>
<div class="submenu">
<ul class="navigation-l3">
<li class="">
<h:link outcome="/service-admin/index.xhtml" value="#{messages.service_props}">
<f:param name="serviceId" value="#{service.id}" />
</h:link>
</li>
</ul>
<ul class="navigation-l3">
<li class="">
<h:link outcome="/service-admin/list-service-users.xhtml" value="#{messages.service_users}">
<f:param name="serviceId" value="#{service.id}" />
</h:link>
</li>
</ul>
<ul class="navigation-l3">
<li class="">
<h:link outcome="/service-admin/list-service-users-for-depro.xhtml" value="#{messages.service_users_depro}">
<f:param name="serviceId" value="#{service.id}" />
</h:link>
</li>
</ul>
<ul class="navigation-l3">
<li class="">
<h:link outcome="/service-admin/service-stats.xhtml" value="#{messages.statistics}">
<f:param name="serviceId" value="#{service.id}" />
</h:link>
</li>
</ul>
</div>
</li>
</ui:repeat>
</ul>
</div>
</li>
</h:panelGroup>
<li class=""><a href="https://www.scc.kit.edu/" target="_blank">Das SCC</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=""><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> <li class="home"><a href="#{request.contextPath}/index.xhtml"><span>Startseite</span></a></li>
......
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