Skip to content

GitLab

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

more pages in new design

parent 44051b47
Hide whitespace changes
Inline Side-by-side
bwreg-webapp/src/main/resources/msg/messages_de.properties
View file @ be7d0096
......@@ -458,7 +458,10 @@ twofa_elevated_since_recently=Mit 2FA eben
twofa_list=Liste zweiter Faktor
twofa_list_readonly=Ihre Token werden an dieser Stelle nur angezeigt. Um \u00C4nderungen vorzunehmen besuchen Sie bitte die folgende Webseite\:
twofa_login=Login mit zweiten Faktor
twofa_login_failed=Login fehlgeschlagen
twofa_login_failed_detail=Der Login mit den zweiten Faktor ist fehlgeschlagen.
twofa_login_text=Um die angeforderte Aktion durchzuf\u00FChren, muss ein zweiter Faktor eingegeben werden. Bitte geben Sie einen beliebigen zweiten Faktor aus der unten stehenden Liste ein um fortzufahren.
twofa_list_really_readonly=Ihre zweiten Faktoren werden an dieser Stelle nur gepr\u00FCft. Die Verwaltung Ihrer zweiten Faktoren finden Sie bei der folgenden Webadresse\:
twofa_mandatory=F\u00FCr diesen Dienst ist es notwendig einen zweiten Faktor einzurichten. Bitte richten Sie sich <a href\="../user/twofa.xhtml?retsid\=$service.id">hier</a> einen zweiten Faktor ein.
twofa_serial=Serial
twofa_token_not_init=Token ist nicht initialisiert worden
......
bwreg-webapp/src/main/resources/msg/messages_en.properties
View file @ be7d0096
......@@ -458,7 +458,10 @@ twofa_elevated_since_recently=With 2FA recently
twofa_list=List of second factors
twofa_list_readonly=Your tokens are only displayed here. To make changes please visit the following website\:
twofa_login=Login with second factor
twofa_login_failed=Login failed
twofa_login_failed_detail=Login with the second factor failed.
twofa_login_text=To perform the requested action, a second factor must be entered. Please enter any second factor from the list below to continue.
twofa_list_really_readonly=Your second factors are only checked at this point. The administration of your second factors can be found at the following web address\:
twofa_mandatory=For this service it is necessary to set up a second factor. Please set up a second factor <a href\="../user/twofa.xhtml?retsid\=$service.id">here</a>.
twofa_serial=Serial
twofa_token_not_init=Token has not been initialised
......
bwreg-webapp/src/main/webapp/user/deregister-service.xhtml
View file @ be7d0096
......@@ -22,36 +22,29 @@
<ui:param name="title" value="#{messages.title}"/>
<ui:define name="content">
<h:form id="form">
<h:form id="form" class="full fancy form">
<h2><h:outputText value="#{messages.deregister}: #{deregisterServiceBean.service.name}"/></h2>
<h3><h:outputText value="#{messages.deregister}: #{deregisterServiceBean.service.name}"/></h3>
<div class="panel">
<p:panel id="blockPanel">
<f:facet name="header">
<div style="color: red; font-weight: bold;">
<h:outputText value="#{messages.deregister}: #{deregisterServiceBean.service.name}" />
</div>
</f:facet>
<p:panel id="blockPanel">
<div>
<h:outputText value="#{messages.deregister_desc_long}"/>
</div>
<div>
<h:outputText value="#{deregisterServiceBean.deregisterTextBB}" escape="false"/>
</div>
<div>
<h:outputText value="#{messages.deregister_desc_long}"/>
</div>
<div>
<h:outputText value="#{deregisterServiceBean.deregisterTextBB}" escape="false"/>
</div>
<div style="margin-top: 16px;">
<p:commandButton id="save" action="#{deregisterServiceBean.deregisterUser}"
value="#{messages.deregister}" style="color: red;"/>
</div>
</p:panel>
<p:blockUI block="blockPanel" trigger="save">
<p:graphicImage value="#{resource['/img/ajax-loader.gif']}" alt="#{messages.loading}" />
</p:blockUI>
</div>
<div style="margin-top: 16px;">
<p:commandButton id="save" action="#{deregisterServiceBean.deregisterUser}"
value="#{messages.deregister}" style="color: red;"/>
</div>
</p:panel>
<p:blockUI block="blockPanel" trigger="save">
<p:graphicImage value="#{resource['/img/ajax-loader.gif']}" alt="#{messages.loading}" />
</p:blockUI>
</h:form>
</ui:define>
......
bwreg-webapp/src/main/webapp/user/register-service.xhtml
View file @ be7d0096
......@@ -24,7 +24,7 @@
<ui:define name="content">
<h:form id="form">
<h:form id="form" class="full fancy form">
<h2><h:outputText value="#{messages.register}: #{registerServiceBean.service.name}"/></h2>
<h:panelGroup rendered="#{registerServiceBean.errorState}">
......@@ -36,46 +36,39 @@
</h:panelGroup>
<h:panelGroup rendered="#{! registerServiceBean.errorState}">
<div class="panel">
<p:panel header="#{messages.requirements}">
<h:panelGroup rendered="#{registerServiceBean.accessAllowed}">
<h:outputText value="#{messages.requirements_met}" />
</h:panelGroup>
<h:panelGroup rendered="#{! registerServiceBean.accessAllowed}">
<h:outputText value="#{messages.requirements_unsatisfied}" />
<p:messages id="messageBoxReqs" for="reqs" showDetail="true" escape="false" />
</h:panelGroup>
</p:panel>
</div>
<div class="panel">
<p:panel id="blockPanel" header="#{messages.register}">
<p:outputPanel rendered="#{registerServiceBean.policyHolderList.size() gt 0}">
<h3>Um sich für den Dienst zu registrieren, müssen Sie den folgenden Nutzungsbedingungen
zustimmen.</h3>
</p:outputPanel>
<p:panel rendered="#{! registerServiceBean.accessAllowed}">
<h:outputText value="#{messages.requirements_unsatisfied}" />
<p:messages id="messageBoxReqs" for="reqs" showDetail="true" escape="false" />
</p:panel>
<p:panel id="blockPanel">
<p:outputPanel rendered="#{registerServiceBean.policyHolderList.size() gt 0}">
<b>Um sich für den Dienst zu registrieren, müssen Sie den folgenden Nutzungsbedingungen
zustimmen.</b>
</p:outputPanel>
<p:messages id="messageBox" for="need_check" showDetail="true" escape="false" />
<p:messages id="messageBox" for="need_check" showDetail="true" escape="false" />
<div style="margin: 1.5em 0.5em;">
<ui:repeat var="policyHolder" value="#{registerServiceBean.policyHolderList}">
<b><h:outputText value="#{policyHolder.policy.name} - #{policyHolder.policy.actualAgreement.name}" /></b>
<div style="margin-top: 1em;">
<h:outputText value="#{bbCodeConverter.convert(policyHolder.policy.actualAgreement.agreement)}" escape="false"/>
</div>
<div style="margin-top: 1em;">
<h:selectBooleanCheckbox value="#{policyHolder.checked}" />
<h:outputText value="#{messages.accept_tou}" />
</div>
</ui:repeat>
</div>
<div style="margin: 16px 0;">
<ui:repeat var="policyHolder" value="#{registerServiceBean.policyHolderList}">
<bw:contentBox header="#{policyHolder.policy.name} - #{policyHolder.policy.actualAgreement.name}">
<h:outputText value="#{bbCodeConverter.convert(policyHolder.policy.actualAgreement.agreement)}" escape="false"/>
<div>
<h:selectBooleanCheckbox value="#{policyHolder.checked}" />
<h:outputText value="#{messages.accept_tou}" />
</div>
</bw:contentBox>
</ui:repeat>
</div>
<p:commandButton id="save" action="#{registerServiceBean.registerUser}" value="#{messages.register}"
update="messageBox" disabled="#{! registerServiceBean.accessAllowed}" />
</p:panel>
<p:blockUI block="blockPanel" trigger="save">
<p:graphicImage value="#{resource['/img/ajax-loader.gif']}" alt="#{messages.loading}" />
</p:blockUI>
</div>
<p:commandButton id="save" action="#{registerServiceBean.registerUser}" value="#{messages.register}"
update="messageBox" disabled="#{! registerServiceBean.accessAllowed}" />
</p:panel>
<p:blockUI block="blockPanel" trigger="save">
<p:graphicImage value="#{resource['/img/ajax-loader.gif']}" alt="#{messages.loading}" />
</p:blockUI>
</h:panelGroup>
</h:form>
......
bwreg-webapp/src/main/webapp/user/ssh-keys.xhtml
View file @ be7d0096
......@@ -23,12 +23,14 @@
<ui:param name="title" value="#{messages.title}"/>
<ui:define name="content">
<h:form id="form">
<h:form id="form" class="form full fancy">
<h3>#{messages.ssh_pub_key_list}</h3>
<div><p:messages showDetail="true" /></div>
<p:dataGrid var="key" value="#{userSshKeyManagementBean.keyList.toArray()}" styleClass="whitefoot"
columns="2" layout="grid" style="margin-bottom: 16px;">
<f:facet name="header">#{messages.ssh_pub_key_list}</f:facet>
<p:panel styleClass="grayback" style="margin-bottom: 0px;">
<f:facet name="header">
<i class="fa fa-fw fa-key"></i>
......
bwreg-webapp/src/main/webapp/user/twofa-login.xhtml
View file @ be7d0096
......@@ -19,33 +19,32 @@
<ui:define name="content">
<h:form id="form" prependId="false">
<p:panel header="#{messages.twofa_login}">
<h:form id="form" prependId="false" class="full form fancy">
<h3>#{messages.twofa_login}</h3>
<p:outputPanel rendered="#{twoFaLoginBean.reallyReadOnly}">
<div><h:outputText value="#{messages.twofa_list_really_readonly}"/></div>
<div><a href="#{twoFaLoginBean.managementUrl}" target="_blank">#{twoFaLoginBean.managementUrl}</a></div>
</p:outputPanel>
<p:outputPanel rendered="#{twoFaLoginBean.reallyReadOnly}">
<div><h:outputText value="#{messages.twofa_list_really_readonly}"/></div>
<div class="full text"><a href="#{twoFaLoginBean.managementUrl}" target="_blank">#{twoFaLoginBean.managementUrl}</a></div>
</p:outputPanel>
<p:outputPanel rendered="#{twoFaLoginBean.readOnly and not twoFaLoginBean.reallyReadOnly}">
<div><h:outputText value="#{messages.twofa_list_readonly}"/></div>
<div><a href="#{twoFaLoginBean.managementUrl}" target="_blank">#{twoFaLoginBean.managementUrl}</a></div>
</p:outputPanel>
<div style="margin-top: 8px; margin-bottom: 16px;"><h:outputText value="#{messages.twofa_login_text}"/></div>
<div><p:messages showDetail="true" /></div>
<p:outputPanel rendered="#{twoFaLoginBean.readOnly and not twoFaLoginBean.reallyReadOnly}">
<div><h:outputText value="#{messages.twofa_list_readonly}"/></div>
<div class="full text"><a href="#{twoFaLoginBean.managementUrl}" target="_blank">#{twoFaLoginBean.managementUrl}</a></div>
</p:outputPanel>
<div style="margin-top: 1em; margin-bottom: 2em; font-size: 1.25em;"><h:outputText value="#{messages.twofa_login_text}"/></div>
<div><p:messages showDetail="true" /></div>
<p:focus conext="baseData" for="tokenText" />
<p:focus conext="baseData" for="tokenText" />
<h:panelGrid id="baseData" columns="2" style="margin-bottom: 16px;">
<p:outputLabel for="@next" value="#{messages.twofa_code}"/>
<p:inputText id="tokenText" autocomplete="false" value="#{twoFaLoginBean.tokenInput}"/>
</h:panelGrid>
<p:commandButton id="check" action="#{twoFaLoginBean.check}" value="#{messages.check}"
update=":form" />
<h:panelGrid id="baseData" columns="2" style="margin-bottom: 16px;">
<p:outputLabel for="@next" value="#{messages.twofa_code}"/>
<p:inputText id="tokenText" autocomplete="false" value="#{twoFaLoginBean.tokenInput}"/>
</h:panelGrid>
<p:commandButton id="check" action="#{twoFaLoginBean.check}" value="#{messages.check}"
update=":form" />
</p:panel>
<p:dataGrid var="token" value="#{twoFaLoginBean.tokenList}" rendered="#{not twoFaLoginBean.reallyReadOnly}"
columns="3" styleClass="whitefoot"
layout="grid" style="margin-top: 16px; margin-bottom: 16px;">
......
bwreg-webapp/src/main/webapp/user/twofa.xhtml
View file @ be7d0096
......@@ -24,18 +24,20 @@
<ui:param name="title" value="#{messages.title}"/>
<ui:define name="content">
<h:form id="form">
<h:form id="form" class="full fancy form">
<div><p:messages showDetail="true" /></div>
<p:panel header="#{messages.twofa_list}" rendered="#{twoFaUserBean.reallyReadOnly}">
<p:outputPanel rendered="#{twoFaUserBean.reallyReadOnly}">
<h3>#{messages.twofa_list}</h3>
<div><h:outputText value="#{messages.twofa_list_really_readonly}"/></div>
<div><a href="#{twoFaUserBean.managementUrl}" target="_blank">#{twoFaUserBean.managementUrl}</a></div>
</p:panel>
<div class="full text"><a href="#{twoFaUserBean.managementUrl}" target="_blank">#{twoFaUserBean.managementUrl}</a></div>
</p:outputPanel>
<p:panel header="#{messages.twofa_list}" rendered="#{twoFaUserBean.readOnly and not twoFaUserBean.reallyReadOnly}">
<p:outputPanel rendered="#{twoFaUserBean.readOnly and not twoFaUserBean.reallyReadOnly}">
<h3>#{messages.twofa_list}</h3>
<div><h:outputText value="#{messages.twofa_list_readonly}"/></div>
<div><a href="#{twoFaUserBean.managementUrl}" target="_blank">#{twoFaUserBean.managementUrl}</a></div>
<div class="full text"><a href="#{twoFaUserBean.managementUrl}" target="_blank">#{twoFaUserBean.managementUrl}</a></div>
<p:dataGrid var="token" value="#{twoFaUserBean.tokenList}" columns="2" styleClass="whitefoot"
layout="grid" style="margin-bottom: 16px; opacity: 0.5;">
......@@ -73,7 +75,7 @@
</p:panelGrid>
</p:panel>
</p:dataGrid>
</p:panel>
</p:outputPanel>
<p:dataGrid var="token" value="#{twoFaUserBean.tokenList}" columns="2" styleClass="whitefoot"
layout="grid" style="margin-bottom: 16px;" rendered="#{! twoFaUserBean.readOnly}">
......
bwreg-webapp/src/main/webapp/welcome/delete-all-personal-data-done.xhtml
View file @ be7d0096
......@@ -16,14 +16,8 @@
<ui:define name="content">
<h:form id="form" prependId="false">
<div class="panel">
<p:panel header="#{messages.my_data_deleted_header}">
<div class="panel"><h:outputText value="#{messages.my_data_deleted_text}"/></div>
</p:panel>
</div>
</h:form>
<h3 class="full">#{messages.my_data_deleted_header}</h3>
<div class="full"><h:outputText value="#{messages.my_data_deleted_text}"/></div>
</ui:define>
</ui:composition>
......
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