Mentions légales du service

Skip to content
Snippets Groups Projects
Commit c105bf1c authored by Anne-Gaëlle BERGE's avatar Anne-Gaëlle BERGE
Browse files

update proxy layout

git-svn-id: https://scm.gforge.inria.fr/authscm/ycadoret/svn/gazelle/Maven/gazelle-proxy/trunk@36385 356b4b1a-1d2b-0410-8bf1-ffa24008f01e
parent d9954fbf
No related branches found
No related tags found
No related merge requests found
Showing
with 29 additions and 16 deletions
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
xmlns:a4j="http://richfaces.org/a4j" xmlns:a4j="http://richfaces.org/a4j"
xmlns:h="http://java.sun.com/jsf/html" xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"> xmlns:rich="http://richfaces.org/rich">
<h:form id="resultlink"> <h:form id="resultlink">
<s:token allowMultiplePosts="true"/>
<s:div id="linkDiv" <s:div id="linkDiv"
rendered="#{messageBean.message.getResultOid()!=null and !(messageBean.message.getResultOid().isEmpty())}" rendered="#{messageBean.message.getResultOid()!=null and !(messageBean.message.getResultOid().isEmpty())}"
style="width:50%"> style="width:50%">
......
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
<h1>#{messages['net.ihe.gazelle.proxy.DICOMMessage']}</h1> <h1>#{messages['net.ihe.gazelle.proxy.DICOMMessage']}</h1>
#{messageBean.retrieveMessage("DICOM")} #{messageBean.retrieveMessage("DICOM")}
#{messageBean.intResult()} #{messageBean.intResult()}
<h:form> <h:form >
<s:token allowMultiplePosts="true"/>
<h:panelGrid columns="1" style="width:50%"> <h:panelGrid columns="1" style="width:50%">
<ui:include src="commonProperties.xhtml" /> <ui:include src="commonProperties.xhtml" />
......
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
<h1>#{messages['net.ihe.gazelle.proxy.HL7Message']}</h1> <h1>#{messages['net.ihe.gazelle.proxy.HL7Message']}</h1>
#{messageBean.retrieveMessage("HL7")} #{messageBean.retrieveMessage("HL7")}
#{messageBean.intResult()} #{messageBean.intResult()}
<h:form> <h:form >
<s:token allowMultiplePosts="true"/>
<h:panelGrid columns="1"> <h:panelGrid columns="1">
<ui:include src="commonProperties.xhtml" /> <ui:include src="commonProperties.xhtml" />
</h:panelGrid> </h:panelGrid>
......
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
<h1>#{messages['net.ihe.gazelle.proxy.HTTPMessage']}</h1> <h1>#{messages['net.ihe.gazelle.proxy.HTTPMessage']}</h1>
#{messageBean.retrieveMessage("HTTP")} #{messageBean.retrieveMessage("HTTP")}
#{messageBean.intResult()} #{messageBean.intResult()}
<h:form> <h:form >
<s:token allowMultiplePosts="true"/>
<h:panelGrid columns="1"> <h:panelGrid columns="1">
<ui:include src="commonProperties.xhtml" /> <ui:include src="commonProperties.xhtml" />
......
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
<h1>#{messages['net.ihe.gazelle.proxy.RawMessage']}</h1> <h1>#{messages['net.ihe.gazelle.proxy.RawMessage']}</h1>
#{messageBean.retrieveMessage("RAW")} #{messageBean.retrieveMessage("RAW")}
#{messageBean.intResult()} #{messageBean.intResult()}
<h:form> <h:form >
<s:token allowMultiplePosts="true"/>
<h:panelGrid columns="1"> <h:panelGrid columns="1">
<ui:include src="commonProperties.xhtml" /> <ui:include src="commonProperties.xhtml" />
</h:panelGrid> </h:panelGrid>
......
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
<h1>#{messages['net.ihe.gazelle.proxy.SyslogMessage']}</h1> <h1>#{messages['net.ihe.gazelle.proxy.SyslogMessage']}</h1>
#{messageBean.retrieveMessage("SYSLOG")} #{messageBean.retrieveMessage("SYSLOG")}
#{messageBean.intResult()} #{messageBean.intResult()}
<h:form> <h:form >
<s:token allowMultiplePosts="true"/>
<h:panelGrid columns="1"> <h:panelGrid columns="1">
<ui:include src="commonProperties.xhtml" /> <ui:include src="commonProperties.xhtml" />
......
...@@ -168,7 +168,7 @@ public class ChannelManagerBean implements Serializable { ...@@ -168,7 +168,7 @@ public class ChannelManagerBean implements Serializable {
} }
public String goHome() { public String goHome() {
return "/channels.seam"; return "/home.seam";
} }
} }
...@@ -34,5 +34,6 @@ ...@@ -34,5 +34,6 @@
<mapping class="net.ihe.gazelle.proxy.model.tm.TestInstance" /> <mapping class="net.ihe.gazelle.proxy.model.tm.TestInstance" />
<mapping class="net.ihe.gazelle.proxy.model.tm.Configuration" /> <mapping class="net.ihe.gazelle.proxy.model.tm.Configuration" />
<mapping class="net.ihe.gazelle.proxy.model.tm.Step" /> <mapping class="net.ihe.gazelle.proxy.model.tm.Step" />
<mapping class="net.ihe.gazelle.proxy.admin.model.ApplicationConfiguration" />
</session-factory> </session-factory>
</hibernate-configuration> </hibernate-configuration>
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
xmlns:rich="http://richfaces.org/rich" xmlns:rich="http://richfaces.org/rich"
template="//layout/template.xhtml"> template="//layout/template.xhtml">
<ui:define name="body"> <ui:define name="body">
<h:form> <h:form >
<s:token allowMultiplePosts="true"/>
<s:div id="globalDiv"> <s:div id="globalDiv">
<h1>Application Preferences</h1> <h1>Application Preferences</h1>
<rich:panel <rich:panel
......
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
xmlns:rich="http://richfaces.org/rich" xmlns:rich="http://richfaces.org/rich"
xmlns:a4j="http://richfaces.org/a4j" template="layout/template.xhtml"> xmlns:a4j="http://richfaces.org/a4j" template="layout/template.xhtml">
<ui:define name="body"> <ui:define name="body">
<h:form id="listOfChannelsForm"> <h:form id="listOfChannelsForm">
<s:token allowMultiplePosts="true"/>
<h1>Channels management</h1> <h1>Channels management</h1>
<s:div> <s:div>
<h:panelGrid columns="4"> <h:panelGrid columns="4">
...@@ -112,7 +113,8 @@ ...@@ -112,7 +113,8 @@
value="#{messages['net.ihe.gazelle.proxy.StopChannel']}" /> value="#{messages['net.ihe.gazelle.proxy.StopChannel']}" />
</h:panelGroup> </h:panelGroup>
</f:facet> </f:facet>
<h:form id="stopForm"> <h:form id="stopForm">
<s:token allowMultiplePosts="true"/>
<h:panelGrid columns="2"> <h:panelGrid columns="2">
<a4j:htmlCommandLink <a4j:htmlCommandLink
......
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
xmlns:a4j="http://richfaces.org/a4j" template="layout/template.xhtml"> xmlns:a4j="http://richfaces.org/a4j" template="layout/template.xhtml">
<ui:define name="body"> <ui:define name="body">
<h:form id="globalForm"> <h:form id="globalForm">
<s:token allowMultiplePosts="true"/>
#{homeManagerBean.initializeHome()} #{homeManagerBean.initializeHome()}
<s:div id="title" <s:div id="title"
rendered="#{not applicationConfigurationManager.worksWithoutCas and (not identity.loggedIn or not s:hasRole('admin_role'))}"> rendered="#{not applicationConfigurationManager.worksWithoutCas and (not identity.loggedIn or not s:hasRole('admin_role'))}">
......
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
<ui:param name="pageNameUrl" value="testInstance.seam" /> <ui:param name="pageNameUrl" value="testInstance.seam" />
<ui:define name="body"> <ui:define name="body">
<h:form> <h:form >
<s:token allowMultiplePosts="true"/>
#{messagesBean.redirectToMessageFromURL()} #{messagesBean.redirectToMessageFromURL()}
</h:form> </h:form>
</ui:define> </ui:define>
......
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
xmlns:t="http://myfaces.apache.org/tomahawk" xmlns:t="http://myfaces.apache.org/tomahawk"
template="layout/template.xhtml"> template="layout/template.xhtml">
<ui:define name="body"> <ui:define name="body">
<h:form id="newChannel" enctype="multipart/form-data"> <h:form id="newChannel">
<s:token allowMultiplePosts="true"/>
<h1>Channels management</h1> <h1>Channels management</h1>
<rich:panel id="search"> <rich:panel id="search">
<f:facet name="header">New channel configuration</f:facet> <f:facet name="header">New channel configuration</f:facet>
...@@ -33,7 +34,7 @@ ...@@ -33,7 +34,7 @@
<ui:define name="label">#{messages['net.ihe.gazelle.proxy.RespondersIP']}</ui:define> <ui:define name="label">#{messages['net.ihe.gazelle.proxy.RespondersIP']}</ui:define>
<h:inputText id="responderIP" <h:inputText id="responderIP"
value="#{channelManagerBean.responderIP}" required="true" value="#{channelManagerBean.responderIP}" required="true"
requiredMessage="Responder&apos; IP address is mandatory"> requiredMessage="Responder&apos;s IP address is mandatory">
<a4j:support event="onblur" reRender="responderIPDeco"/> <a4j:support event="onblur" reRender="responderIPDeco"/>
</h:inputText> </h:inputText>
</s:decorate> </s:decorate>
...@@ -42,7 +43,7 @@ ...@@ -42,7 +43,7 @@
<ui:define name="label">#{messages['net.ihe.gazelle.proxy.RespondersPort']}</ui:define> <ui:define name="label">#{messages['net.ihe.gazelle.proxy.RespondersPort']}</ui:define>
<h:inputText id="responderPort" <h:inputText id="responderPort"
value="#{channelManagerBean.responderPort}" required="true" value="#{channelManagerBean.responderPort}" required="true"
requiredMessage="Responder&apos; port is mandatory"> requiredMessage="Responder&apos;s port is mandatory">
<a4j:support event="onblur" reRender="responderPortDeco"/> <a4j:support event="onblur" reRender="responderPortDeco"/>
</h:inputText> </h:inputText>
</s:decorate> </s:decorate>
...@@ -50,7 +51,7 @@ ...@@ -50,7 +51,7 @@
</h:panelGrid> </h:panelGrid>
<h:panelGrid columns="1"> <h:panelGrid columns="1">
<a4j:commandButton value="#{messages['net.ihe.gazelle.proxy.Start']}" <h:commandButton value="#{messages['net.ihe.gazelle.proxy.Start']}"
action="#{channelManagerBean.startChannel()}" /> action="#{channelManagerBean.startChannel()}" />
</h:panelGrid> </h:panelGrid>
</rich:panel> </rich:panel>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment