Commit 406bb8d1 authored by michael.simon's avatar michael.simon
Browse files

more structed display

add Back link to subpages
parent 98fcdaa0
...@@ -67,6 +67,7 @@ audit_detail=Audit-Detail ...@@ -67,6 +67,7 @@ audit_detail=Audit-Detail
audit_entry=Audit-Eintrag audit_entry=Audit-Eintrag
audit_status=Audit-Status audit_status=Audit-Status
available_services=Verf\u00FCgbare Dienste available_services=Verf\u00FCgbare Dienste
back=Zur\u00FCck
bcc=BCC bcc=BCC
body=Body body=Body
bulk_import=Massenimport bulk_import=Massenimport
......
...@@ -67,6 +67,7 @@ audit_detail=Audit detail ...@@ -67,6 +67,7 @@ audit_detail=Audit detail
audit_entry=Audit entry audit_entry=Audit entry
audit_status=Audit state audit_status=Audit state
available_services=Available services available_services=Available services
back=Back
bcc=BCC bcc=BCC
body=Body body=Body
bulk_import=Bulk import bulk_import=Bulk import
......
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
</p:panel> </p:panel>
<h:outputText value="#{messages.index_text1}" styleClass="full" /> <h:outputText value="#{messages.index_text1}" styleClass="full" />
<h:panelGroup rendered="#{not empty userIndexBean.userRegistryList}"> <h:panelGroup rendered="#{not empty userIndexBean.userRegistryList}">
<ui:repeat var="registry" value="#{userIndexBean.userRegistryList}"> <ui:repeat var="registry" value="#{userIndexBean.userRegistryList}">
<div class="news-element third"> <div class="news-element third" style="border: #cccccc 1px solid; padding: 0.4em;">
<h:outputText value="#{registry.service.name}" class="headline"/> <h:outputText value="#{registry.service.name}" styleClass="headline"/>
<h:panelGroup rendered="#{registry.service.image != null}"> <h:panelGroup rendered="#{registry.service.image != null}">
<figure> <figure>
<picture> <picture>
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<h:outputText value="#{messages.index_text5}" styleClass="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="news-element third"> <div class="news-element third" style="border: #cccccc 1px solid; padding: 0.4em;">
<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>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
<h:outputText value="#{messages.index_text3}" class="full" /> <h:outputText value="#{messages.index_text3}" class="full" />
<ui:repeat var="service" value="#{authorizationBean.unregisteredServiceList}"> <ui:repeat var="service" value="#{authorizationBean.unregisteredServiceList}">
<div class="news-element third"> <div class="news-element third" style="border: #cccccc 1px solid; padding: 0.4em;">
<h:outputText value="#{service.name}" class="headline"/> <h:outputText value="#{service.name}" class="headline"/>
<h:panelGroup rendered="#{service.image != null}"> <h:panelGroup rendered="#{service.image != null}">
<figure> <figure>
......
...@@ -38,6 +38,10 @@ ...@@ -38,6 +38,10 @@
</h:link> </h:link>
</div> </div>
</h:panelGroup> </h:panelGroup>
<div class="text full">
<a href="../index.xhtml"><h:outputText value="#{messages.back}"/></a>
</div>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
......
...@@ -84,6 +84,9 @@ ...@@ -84,6 +84,9 @@
</div> </div>
</h:panelGroup> </h:panelGroup>
<div class="text full" style="margin-top: 2em;">
<a href="../index.xhtml"><h:outputText value="#{messages.back}"/></a>
</div>
</h:form> </h:form>
</ui:define> </ui:define>
......
...@@ -61,6 +61,11 @@ ...@@ -61,6 +61,11 @@
update="messageBox,baseData" /> update="messageBox,baseData" />
</div> </div>
</p:panel> </p:panel>
<div class="text full" style="margin-top: 2em;">
<a href="../index.xhtml"><h:outputText value="#{messages.back}"/></a>
</div>
</h:form> </h:form>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
......
...@@ -168,8 +168,13 @@ ...@@ -168,8 +168,13 @@
</p:confirmDialog> </p:confirmDialog>
</p:panel> </p:panel>
<div class="text full" style="margin-top: 2em;">
<a href="../index.xhtml"><h:outputText value="#{messages.back}"/></a>
</div>
</h:form> </h:form>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
</f:view> </f:view>
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
<ui:define name="content"> <ui:define name="content">
<h:form id="form" prependId="false" class="full form"> <h:form id="form" prependId="false" class="full form">
<div class="panel">
<p:panel rendered="#{userPropertiesBean.userList.size() gt 1}"> <p:panel rendered="#{userPropertiesBean.userList.size() gt 1}">
<p:outputLabel for="@next" value="Choose account: " /> <p:outputLabel for="@next" value="Choose account: " />
<p:selectOneMenu id="userSelect" value="#{userPropertiesBean.user}" converter="#{userConverter}"> <p:selectOneMenu id="userSelect" value="#{userPropertiesBean.user}" converter="#{userConverter}">
...@@ -48,10 +47,10 @@ ...@@ -48,10 +47,10 @@
rendered="#{not empty userPropertiesBean.idpEntity and not empty userPropertiesBean.idpEntity.displayName}"/> rendered="#{not empty userPropertiesBean.idpEntity and not empty userPropertiesBean.idpEntity.displayName}"/>
</p:panelGrid> </p:panelGrid>
<div class="panel">#{messages.my_data_delete_all} <div style="margin-top: 0.8em;">#{messages.my_data_delete_all}
</div> </div>
<div class="panel"> <div style="margin-top: 0.8em;" class="text">
<h:link outcome="/user/delete-all-personal-data.xhtml" value="#{messages.my_data_delete_all_link}"> <h:link outcome="/user/delete-all-personal-data.xhtml" value="#{messages.my_data_delete_all_link}" styleClass="link">
</h:link> </h:link>
</div> </div>
</p:tab> </p:tab>
...@@ -96,7 +95,11 @@ ...@@ -96,7 +95,11 @@
</p:tab> </p:tab>
</p:tabView> </p:tabView>
</div>
<div class="text full" style="margin-top: 0.4em;">
<a href="../index.xhtml"><h:outputText value="#{messages.back}"/></a>
</div>
</h:form> </h:form>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
......
...@@ -113,6 +113,11 @@ ...@@ -113,6 +113,11 @@
<p:commandButton value="#{messages.yes}" type="button" styleClass="ui-confirmdialog-yes" /> <p:commandButton value="#{messages.yes}" type="button" styleClass="ui-confirmdialog-yes" />
<p:commandButton value="#{messages.no}" type="button" styleClass="ui-confirmdialog-no" /> <p:commandButton value="#{messages.no}" type="button" styleClass="ui-confirmdialog-no" />
</p:confirmDialog> </p:confirmDialog>
<div class="text full" style="margin-top: 0.4em;">
<a href="../index.xhtml"><h:outputText value="#{messages.back}"/></a>
</div>
</h:form> </h:form>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
......
...@@ -245,6 +245,10 @@ ...@@ -245,6 +245,10 @@
<p:defaultCommand target="yubicoStartButton" scope="addYubicoDlgId"/> <p:defaultCommand target="yubicoStartButton" scope="addYubicoDlgId"/>
<p:defaultCommand target="checkTotpButton" scope="addTotpDlgId"/> <p:defaultCommand target="checkTotpButton" scope="addTotpDlgId"/>
<div class="text full" style="margin-top: 0.4em;">
<a href="../index.xhtml"><h:outputText value="#{messages.back}"/></a>
</div>
</h:form> </h:form>
</ui:define> </ui:define>
......
Markdown is supported
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