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

change rest layout xhtml of index page

parent ed156edb
...@@ -17,157 +17,149 @@ ...@@ -17,157 +17,149 @@
<ui:define name="content"> <ui:define name="content">
<p:panel header="#{messages.index_motd_header}" rendered="#{messages.index_motd_header != '???index_motd_header???'}" <p:panel header="#{messages.index_motd_header}" rendered="#{messages.index_motd_header != '???index_motd_header???'}"
style="margin-bottom: 8px;" styleClass="full"> style="margin-bottom: 8px;" styleClass="full">
<h:outputText value="#{messages.index_motd_text1}" escape="false" /> <h:outputText value="#{messages.index_motd_text1}" escape="false" />
</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">
<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>
<picture> <picture>
<p:graphicImage value="#{request.contextPath}/rest/image/icon/#{registry.service.image.id}" /> <p:graphicImage value="#{request.contextPath}/rest/image/icon/#{registry.service.image.id}" />
</picture> </picture>
</figure> </figure>
</h:panelGroup> </h:panelGroup>
<p><h:outputText value="#{registry.service.shortDescription}" /></p> <p><h:outputText value="#{registry.service.shortDescription}" /></p>
<h:panelGroup rendered="#{not empty userIndexBean.getServiceAccessStatus(registry.service)}"> <h:panelGroup rendered="#{not empty userIndexBean.getServiceAccessStatus(registry.service)}">
<div class="serviceBlockProblem"> <div class="serviceBlockProblem">
<h:outputText value="#{messages.access_rule_problem} " /> <h:outputText value="#{messages.access_rule_problem} " />
<h:link outcome="/user/check-access.xhtml" value="#{messages.access_check}"> <h:link outcome="/user/check-access.xhtml" value="#{messages.access_check}">
<f:param name="regId" value="#{registry.id}" />
</h:link>
</div>
</h:panelGroup>
<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>
<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}" /> <f:param name="regId" value="#{registry.id}" />
</h:link> </h:link>
</div> </div>
</h:panelGroup> <div>
<div> <h:panelGroup rendered="#{authorizationBean.isPasswordCapable(registry.service)}">
<span class="ui-icon ui-icon-script" style="display:inline-block; vertical-align: bottom;" /> <span class="ui-icon ui-icon-locked" style="display:inline-block; vertical-align: bottom;" />
<h:link outcome="/service/index.xhtml" value="#{messages.service_desc}"> <h:link outcome="/service/set-password.xhtml" value="#{messages.set_password}">
<f:param name="serviceId" value="#{registry.service.id}" /> <f:param name="registryId" value="#{registry.id}" />
</h:link> </h:link>
</div> </h:panelGroup>
<div> </div>
<span class="ui-icon ui-icon-link" style="display:inline-block; vertical-align: bottom;" /> <div>
<h:link outcome="/service/registry-detail.xhtml" value="#{messages.registry_details}"> <h:panelGroup rendered="#{authorizationBean.isSshPubKeyCapable(registry.service)}">
<f:param name="regId" value="#{registry.id}" /> <span class="ui-icon ui-icon-locked" style="display:inline-block; vertical-align: bottom;" />
</h:link> <h:link outcome="/service/set-sshkey.xhtml" value="#{messages.set_ssh_pub_key}">
<f:param name="registryId" value="#{registry.id}" />
</h:link>
</h:panelGroup>
</div>
</div> </div>
<div> </ui:repeat>
<h:panelGroup rendered="#{authorizationBean.isPasswordCapable(registry.service)}"> </h:panelGroup>
<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}"> <h:panelGroup rendered="#{empty userIndexBean.userRegistryList}">
<f:param name="registryId" value="#{registry.id}" /> <ul>
</h:link> <li>
<h:outputText value="#{messages.no_registered_services}"/>
</li>
</ul>
</h:panelGroup>
<h:outputText value="#{messages.index_text2}" class="full" />
<h:panelGroup rendered="#{not empty userIndexBean.pendingRegistryList}" style="margin-top: 12px;">
<h:outputText value="#{messages.index_text5}" class="full"/>
<ui:repeat var="registry" value="#{userIndexBean.pendingRegistryList}">
<div class="third">
<h:outputText value="#{registry.service.name}" class="headline"/>
<h:panelGroup rendered="#{registry.service.image != null}">
<figure>
<picture>
<p:graphicImage value="#{request.contextPath}/rest/image/icon/#{registry.service.image.id}" />
</picture>
</figure>
</h:panelGroup> </h:panelGroup>
</div> <p><h:outputText value="#{registry.service.shortDescription}" /></p>
<div> <h:panelGroup rendered="#{not empty userIndexBean.getServiceAccessStatus(registry.service)}">
<h:panelGroup rendered="#{authorizationBean.isSshPubKeyCapable(registry.service)}"> <div class="serviceBlockProblem">
<span class="ui-icon ui-icon-locked" style="display:inline-block; vertical-align: bottom;" /> <h:outputText value="#{messages.access_rule_problem} " />
<h:link outcome="/service/set-sshkey.xhtml" value="#{messages.set_ssh_pub_key}"> <h:link outcome="/user/check-access.xhtml" value="#{messages.access_check}">
<f:param name="registryId" value="#{registry.id}" /> <f:param name="regId" value="#{registry.id}" />
</h:link> </h:link>
</div>
</h:panelGroup> </h:panelGroup>
<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>
<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> </div>
</div> </ui:repeat>
</ui:repeat> </h:panelGroup>
</h:panelGroup>
<h:outputText value="#{messages.index_text3}" class="full" />
<h:panelGroup rendered="#{empty userIndexBean.userRegistryList}">
<ul>
<li>
<h:outputText value="#{messages.no_registered_services}"/>
</li>
</ul>
</h:panelGroup>
<h:outputText value="#{messages.index_text2}" class="full" />
<h:panelGroup rendered="#{not empty userIndexBean.pendingRegistryList}" style="margin-top: 12px;">
<h:outputText value="#{messages.index_text5}" class="full"/>
<ui:repeat var="registry" value="#{userIndexBean.pendingRegistryList}"> <ui:repeat var="service" value="#{authorizationBean.unregisteredServiceList}">
<div class="third"> <div class="news-element third">
<h:outputText value="#{registry.service.name}" class="headline"/> <h:outputText value="#{service.name}" class="headline"/>
<h:panelGroup rendered="#{registry.service.image != null}"> <h:panelGroup rendered="#{service.image != null}">
<figure> <figure>
<picture> <picture>
<p:graphicImage value="#{request.contextPath}/rest/image/icon/#{registry.service.image.id}" /> <p:graphicImage value="#{request.contextPath}/rest/image/icon/#{registry.service.image.id}" />
</picture> </picture>
</figure> </figure>
</h:panelGroup> </h:panelGroup>
<p><h:outputText value="#{registry.service.shortDescription}" /></p> <p>
<h:panelGroup rendered="#{not empty userIndexBean.getServiceAccessStatus(registry.service)}"> <h:outputText value="#{service.shortDescription}" />
<div class="serviceBlockProblem"> <br />
<h:outputText value="#{messages.access_rule_problem} " /> <h:outputText value="#{userIndexBean.getServiceAccessStatus(registry.service)}" />
<h:link outcome="/user/check-access.xhtml" value="#{messages.access_check}"> </p>
<f:param name="regId" value="#{registry.id}" />
</h:link>
</div>
</h:panelGroup>
<div> <div>
<span class="ui-icon ui-icon-script" style="display:inline-block; vertical-align: bottom;" /> <span class="ui-icon ui-icon-script" style="display:inline-block; vertical-align: bottom;" />
<h:link outcome="/service/index.xhtml" value="#{messages.service_desc}"> <h:link outcome="/service/index.xhtml" value="#{messages.service_desc}">
<f:param name="serviceId" value="#{registry.service.id}" /> <f:param name="serviceId" value="#{service.id}" />
</h:link> </h:link>
</div> </div>
<div> <div>
<span class="ui-icon ui-icon-link" style="display:inline-block; vertical-align: bottom;" /> <span class="ui-icon ui-icon-carat-1-e" style="display:inline-block; vertical-align: bottom;" />
<h:link outcome="/service/registry-detail.xhtml" value="#{messages.registry_details}"> <h:link outcome="/user/register-service.xhtml" value="#{messages.register}">
<f:param name="regId" value="#{registry.id}" /> <f:param name="serviceId" value="#{service.id}" />
</h:link> </h:link>
</div> </div>
</div> </div>
</ui:repeat> </ui:repeat>
</h:panelGroup>
<h:outputText value="#{messages.index_text4}" class="full" />
<p:panel style="margin-top: 12px;">
<div style="margin-top: 4px;">
<h:outputText value="#{messages.index_text3}" />
</div>
<div>
<ui:repeat var="service" value="#{authorizationBean.unregisteredServiceList}">
<div class="serviceBlock">
<div class="serviceBlockHeader">
<h:outputText value="#{service.name}" />
</div>
<h:panelGroup rendered="#{service.image != null}">
<div class="serviceBlockImage">
<p:graphicImage
value="#{request.contextPath}/rest/image/icon/#{service.image.id}" />
</div>
</h:panelGroup>
<div class="serviceBlockDesc">
<h:outputText value="#{service.shortDescription}" />
<br />
<h:outputText value="#{userIndexBean.getServiceAccessStatus(registry.service)}" />
</div>
<div class="serviceBlockLink">
<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="#{service.id}" />
</h:link>
</div>
<div class="serviceBlockLink">
<span class="ui-icon ui-icon-carat-1-e" style="display:inline-block; vertical-align: bottom;" />
<h:link outcome="/user/register-service.xhtml" value="#{messages.register}">
<f:param name="serviceId" value="#{service.id}" />
</h:link>
</div>
</div>
</ui:repeat>
</div>
<div style="margin-top: 8px;">
<h:outputText value="#{messages.index_text4}" />
</div>
</p:panel>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
</body> </body>
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
} }
.col-width-1 { .col-width-1 {
width: 150px; width: 200px;
} }
.col-width-2 { .col-width-2 {
......
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