Skip to content

GitLab

Commit bf273df3 authored by ls1947's avatar ls1947
Browse files

optics and texts

parent 020f7379
Hide whitespace changes
Inline Side-by-side
bwreg-webapp/src/main/resources/msg/messages_de.properties
View file @ bf273df3
......@@ -32,8 +32,14 @@ accept_tou=Ich habe die Nutzungsbedingungen gelesen und bin einverstanden.
set_ssh_pub_key=SSH Key setzen
key_blacklisted=Dieser SSH Key wurde bereits im System verwendet. Er kann nicht wieder verwendet werden.
add_ssh_pub_key=SSH Key hochladen
ssh_pub_key_active=Aktiv
ssh_pub_key_pending=In Pr\u00FCfung
ssh_pub_key_denied=Abgelehnt
ssh_pub_key_registry_confirm=<div>Sind Sie sicher, dass Sie die Verkn\u00FCpfung vom SSH Pub Key zum Dienst l\u00F6sen m\u00F6chten?</div>\n<div>Bei einer Verkn\u00FCpfung mit Kommando muss diese erneut durch einen Administrator freigeschaltet werden, wenn sie wieder eingetragen wird.</div>
ssh_key_type=Schl\u00FCssel Typ
ssh_pub_key_command=Kommando
command=Kommando
interactive=Interaktiv
comment=Kommentar
ssh_pub_key_from=Von (Netzwerkadresse)
ssh_pub_key_interactiv=SSH Key f\u00FCr eine interaktive Shell
ssh_pub_key_list=List der SSH Keys
......
bwreg-webapp/src/main/resources/msg/messages_en.properties
View file @ bf273df3
......@@ -36,13 +36,19 @@ add_ssh_pub_key_desc=<div>You can create an SSH Pub Key here. This is the public
never=Never
ssh-pub-key-missing=You have not yet created an SSH Pub Key
add_ssh_pub_key=Add SSH Key
ssh_pub_key_active=Active
ssh_pub_key_pending=Pending
ssh_pub_key_denied=Abgelehnt
ssh_pub_key_registry_confirm=<div>Are you sure you want to remove the link from the ssh key to the service?</div>\n<div>For a link with a command, it must be released by an administrator when it is added again.</div>
ssh_pub_key_comment=Comment (visible for administrators)
ssh_key_type=Key type
service_ssh_pub_key_help=Link one of your SSH keys to the service where you want to use the key. You can define the type of the link.
service_ssh_pub_key_help_modal=Select the type of link for this SSH key.
accept_tou=I have read and accepted the terms of use.
access_check=Check access
ssh_pub_key_command=Command
command=Command
interactive=Interactive
comment=Comment
ssh_pub_key_from=From (network address)
ssh_pub_key_interactiv=SSH Key for an interactive shell
set_ssh_pub_key_for=Enable SSH Key for
......
bwreg-webapp/src/main/webapp/service/set-sshkey.xhtml
View file @ bf273df3
......@@ -38,37 +38,51 @@
</p:panelGrid>
<p:dataTable var="regKey" value="#{setServiceSshPubKeyBean.sshPubKeyRegistryList.toArray()}">
<p:column width="5%">
<p:column width="12%">
<f:facet name="header"><h:outputText value="#{messages.status}"/></f:facet>
<h:panelGroup id="deniedKey" rendered="#{regKey.keyStatus == 'DENIED'}">
<i class="fa fa-fw fa-close"></i>
<i class="fa fa-fw fa-close"></i><span><h:outputText value="#{messages.ssh_pub_key_denied}" /></span>
</h:panelGroup>
<p:tooltip id="toolTipDeniedKey" for="deniedKey" value="#{messages.ssh_pub_key_denied}" position="top"/>
<h:panelGroup id="pendingKey" rendered="#{regKey.keyStatus == 'PENDING'}">
<i class="fa fa-fw fa-exclamation-triangle"></i>
<i class="fa fa-fw fa-exclamation-triangle"></i><span><h:outputText value="#{messages.ssh_pub_key_pending}" /></span>
</h:panelGroup>
<p:tooltip id="toolTipPendingKey" for="pendingKey" value="#{messages.ssh_pub_key_pending}" position="top"/>
<h:panelGroup id="activeKey" rendered="#{regKey.keyStatus == 'ACTIVE'}">
<i class="fa fa-fw fa-check"></i>
<i class="fa fa-fw fa-check"></i><span><h:outputText value="#{messages.ssh_pub_key_active}" /></span>
</h:panelGroup>
<p:tooltip id="toolTipActiveKey" for="activeKey" value="#{messages.ssh_pub_key_active}" position="top"/>
</p:column>
<p:column width="5%">
<p:column width="12%">
<f:facet name="header"><h:outputText value="#{messages.ssh_pub_key_usage_type}"/></f:facet>
<h:panelGroup id="interactiveId" rendered="#{regKey.usageType == 'INTERACTIVE'}"><i class="fa fa-fw fa-user"></i></h:panelGroup>
<p:tooltip for="interactiveId" value="#{messages.ssh_pub_key_interactiv}" position="top"/>
<h:panelGroup id="commandId" rendered="#{regKey.usageType == 'COMMAND'}"><i class="fa fa-fw fa-database"></i></h:panelGroup>
<p:tooltip for="commandId" value="#{messages.ssh_pub_key_command}" position="top"/>
<h:panelGroup id="interactiveId" rendered="#{regKey.usageType == 'INTERACTIVE'}">
<i class="fa fa-fw fa-user"></i><span><h:outputText value="#{messages.interactive}" /></span>
</h:panelGroup>
<p:tooltip for="interactiveId" value="#{messages.interactive}" position="top"/>
<h:panelGroup id="commandId" rendered="#{regKey.usageType == 'COMMAND'}">
<i class="fa fa-fw fa-database"></i><span><h:outputText value="#{messages.command}" /></span>
</h:panelGroup>
<p:tooltip for="commandId" value="#{messages.command}" position="top"/>
</p:column>
<p:column>
<f:facet name="header"><h:outputText value="#{messages.ssh_key_name}:"/></f:facet>
<h:outputText value="#{regKey.sshPubKey.name}"/>
<p:panelGrid columns="2" style="margin-bottom: 0px;">
<h:outputText value="#{regKey.sshPubKey.name}"/>
<p:outputPanel>
<h:outputText value="#{messages.comment}: #{regKey.comment}" rendered="#{not empty regKey.comment}" />
<p:outputPanel rendered="#{regKey.usageType == 'COMMAND'}">
<div><h:outputText value="#{messages.command}: #{regKey.command}" /></div>
<div><h:outputText value="#{messages.from}: #{regKey.from}" /></div>
</p:outputPanel>
</p:outputPanel>
</p:panelGrid>
</p:column>
<p:column>
<p:commandLink action="#{setServiceSshPubKeyBean.delete(regKey)}" immediate="true" update="@form">
<h:panelGroup styleClass="ui-icon ui-icon-trash" />
<p:confirm header="#{messages.confirm_header}" message="#{messages.confirm}" />
</p:commandLink>
<p:column width="12%">
<p:commandButton action="#{setServiceSshPubKeyBean.delete(regKey)}" immediate="true" update="@form"
value="#{messages.delete}">
<p:confirm header="#{messages.confirm_header}" escape="false"
message="#{messages.ssh_pub_key_registry_confirm}" />
</p:commandButton>
</p:column>
</p:dataTable>
</p:panel>
......@@ -84,10 +98,10 @@
<h:outputText value="#{of:formatDate(key.expiresAt, 'dd.MM.yyyy HH:mm')}"/>
</p:column>
<p:column>
<p:commandLink oncomplete="PF('addKeyDlg').show();" update=":form:addKeyDlgId">
<h:panelGroup styleClass="ui-icon ui-icon-plus" />
<p:commandButton oncomplete="PF('addKeyDlg').show();" update=":form:addKeyDlgId"
value="#{messages.add}">
<f:setPropertyActionListener value="#{key}" target="#{setServiceSshPubKeyBean.selectedKey}" />
</p:commandLink>
</p:commandButton>
</p:column>
</p:dataTable>
......@@ -123,7 +137,7 @@
<h:outputText value="#{messages.ssh_pub_key_usage_command_help}" />
</div>
<p:panelGrid columns="2">
<p:outputLabel for="@next" value="#{messages.ssh_pub_key_command}" />
<p:outputLabel for="@next" value="#{messages.command}" />
<p:inputText value="#{setServiceSshPubKeyBean.newCommand}" />
<p:outputLabel for="@next" value="#{messages.ssh_pub_key_from}" />
......@@ -144,9 +158,10 @@
</h:panelGroup>
</p:dialog>
<p:confirmDialog global="true" showEffect="fade" hideEffect="fade" closable="false" closeOnEscape="true">
<p:commandButton value="#{messages.yes}" type="button" styleClass="ui-confirmdialog-yes" />
<p:commandButton value="#{messages.no}" type="button" styleClass="ui-confirmdialog-no" />
<p:confirmDialog global="true" showEffect="fade" hideEffect="fade" closable="false"
closeOnEscape="true" width="250">
<p:commandButton value="#{messages.yes}" type="button" styleClass="ui-confirmdialog-yes"/>
<p:commandButton value="#{messages.no}" type="button" styleClass="ui-confirmdialog-no"/>
</p:confirmDialog>
</p:panel>
......
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