[portal-commits] JBoss Portal SVN: r12118 - in branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war: jsf and 1 other directory.

Author: chris.laprun(a)jboss.com Date: 2008-10-21 14:30:26 -0400 (Tue, 21 Oct 2008) New Revision: 12118 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml Log: - JBPORTAL-1919: Localization and improvements of wording and formatting. Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-10-21 15:24:10 UTC (rev 12117) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-10-21 18:30:26 UTC (rev 12118) @@ -274,7 +274,7 @@ COORDINATION_PARAMETER_MANAGE_EXISTING=Manage existing parameter bindings: COORDINATION_PARAMETER_EXISTING_NONE=No existing parameter bindings. COORDINATION_PARAMETER_EXISTING_NAME=Name -COORDINATION_PARAMETER_EXISTING_PAIRS=Window &hArr; parameter pairs +COORDINATION_PARAMETER_EXISTING_PAIRS=Window / parameter pairs COORDINATION_PARAMETER_EXISTING_ACTIONS=Actions COORDINATION_PARAMETER_CREATE=Create new parameter binding: COORDINATION_PARAMETER_CREATE_NO_PAIRS=No available public render parameters. Cannot create new parameter bindings. @@ -314,7 +314,14 @@ COORDINATION_EVENT_CREATE_STEP4=4. Select destination windows consuming event: COORDINATION_EVENT_CREATE_STEP5=5. Name wiring: COORDINATION_EVENT_CREATE_CREATE=Create wiring +COORDINATION_EVENT_CREATE_PREVIEW=New event wiring preview: +COORDINATION_EVENT_CREATE_PREVIEW_STEP1=You have selected the following source event: +COORDINATION_EVENT_CREATE_PREVIEW_STEP2=triggered by the following source windows: +COORDINATION_EVENT_CREATE_PREVIEW_STEP3=The produced window events will be wired to the following destination event: +COORDINATION_EVENT_CREATE_PREVIEW_STEP4=for the following destination windows: + + COORDINATION_WIRING=event wiring COORDINATION_PARAMETER=parameter binding COORDINATION_ALIAS=alias binding Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-10-21 15:24:10 UTC (rev 12117) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-10-21 18:30:26 UTC (rev 12118) @@ -219,226 +219,223 @@ <h2 class="portlet-area-header" onclick="toggle_visibility('eventWirings');" style="cursor: pointer"><a name="#{bundle.COORDINATION_EVENT_WIRINGS}"/>#{bundle.COORDINATION_EVENT_WIRINGS}</h2> <div id="eventWirings"> - <h:form> - <h:selectBooleanCheckbox id="useExplicitEvents" value="#{coordinationManager.explicitEventsUsed}" - onchange="this.form.submit()" immediate="true"/>#{bundle.COORDINATION_EVENT_EXPLICIT_MODE} - </h:form> + <h:form> + <h:selectBooleanCheckbox id="useExplicitEvents" value="#{coordinationManager.explicitEventsUsed}" + onchange="this.form.submit()" immediate="true"/>#{bundle.COORDINATION_EVENT_EXPLICIT_MODE} + </h:form> - <h:panelGroup rendered="#{coordinationManager.explicitEventsUsed}"> - <hr/> - <!-- Create new event wiring --> - <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_CREATE}</h3> - <h:outputText value="#{bundle.COORDINATION_EVENT_CREATE_NO_EVENTS}" rendered="#{empty eventManager.sourceEvents}"/> - <h:form rendered="#{!empty eventManager.sourceEvents}"> - <div class="half-width float-left"> - <div class="full-width pad5"> - <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP1}</h4> - <h:selectOneListbox id="sourceEvent" size="5" value="#{eventManager.selectedSourceEvent}" immediate="true" - onchange="this.form.submit()"> - <f:selectItems value="#{eventManager.sourceEvents}"/> - </h:selectOneListbox> - </div> + <h:panelGroup rendered="#{coordinationManager.explicitEventsUsed}"> + <hr/> + <!-- Create new event wiring --> + <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_CREATE}</h3> + <h:outputText value="#{bundle.COORDINATION_EVENT_CREATE_NO_EVENTS}" rendered="#{empty eventManager.sourceEvents}"/> + <h:form rendered="#{!empty eventManager.sourceEvents}"> + <div class="half-width float-left"> + <div class="full-width pad5"> + <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP1}</h4> + <h:selectOneListbox id="sourceEvent" size="5" value="#{eventManager.selectedSourceEvent}" immediate="true" + onchange="this.form.submit()"> + <f:selectItems value="#{eventManager.sourceEvents}"/> + </h:selectOneListbox> + </div> - <f:subview id="COORDINATION_EVENT_CREATE_STEP2" rendered="#{!empty eventManager.selectedSourceEvent}"> - <div class="full-width pad5"> - <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP2}</h4> - <div class="pad5"><h:graphicImage url="/img/jbp-icon-set/event_source.gif"/> #{eventManager.selectedSourceEvent}</div> - <h:selectManyListbox id="sourceWindows" size="5" value="#{eventManager.selectedSourceWindows}" immediate="true" - onchange="this.form.submit()"> - <f:selectItems value="#{eventManager.sourceWindows}"/> - </h:selectManyListbox> - </div> - </f:subview> + <f:subview id="COORDINATION_EVENT_CREATE_STEP2" rendered="#{!empty eventManager.selectedSourceEvent}"> + <div class="full-width pad5"> + <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP2}</h4> + <div class="pad5"><h:graphicImage url="/img/jbp-icon-set/event_source.gif"/> #{eventManager.selectedSourceEvent}</div> + <h:selectManyListbox id="sourceWindows" size="5" value="#{eventManager.selectedSourceWindows}" immediate="true" + onchange="this.form.submit()"> + <f:selectItems value="#{eventManager.sourceWindows}"/> + </h:selectManyListbox> + </div> + </f:subview> - <f:subview id="COORDINATION_EVENT_CREATE_STEP3" rendered="#{!empty eventManager.selectedSourceWindows}"> - <div class="full-width pad5"> - <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP3}</h4> - <h:selectOneListbox id="destEvent" size="5" value="#{eventManager.selectedDestinationEvent}" immediate="true" - onchange="this.form.submit()"> - <f:selectItems value="#{eventManager.destinationEvents}"/> - </h:selectOneListbox> - </div> - </f:subview> + <f:subview id="COORDINATION_EVENT_CREATE_STEP3" rendered="#{!empty eventManager.selectedSourceWindows}"> + <div class="full-width pad5"> + <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP3}</h4> + <h:selectOneListbox id="destEvent" size="5" value="#{eventManager.selectedDestinationEvent}" immediate="true" + onchange="this.form.submit()"> + <f:selectItems value="#{eventManager.destinationEvents}"/> + </h:selectOneListbox> + </div> + </f:subview> - <f:subview id="COORDINATION_EVENT_CREATE_STEP4" rendered="#{!empty eventManager.selectedDestinationEvent}"> - <div class="full-width pad5"> - <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP4}</h4> - <div class="pad5"><h:graphicImage url="/img/jbp-icon-set/event_dest.gif"/>#{eventManager.selectedDestinationEvent}</div> - <h:selectManyListbox id="destWindows" size="5" value="#{eventManager.selectedDestinationWindows}" immediate="true" - onchange="this.form.submit()"> - <f:selectItems value="#{eventManager.destinationWindows}"/> - </h:selectManyListbox> + <f:subview id="COORDINATION_EVENT_CREATE_STEP4" rendered="#{!empty eventManager.selectedDestinationEvent}"> + <div class="full-width pad5"> + <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP4}</h4> + <div class="pad5"><h:graphicImage url="/img/jbp-icon-set/event_dest.gif"/>#{eventManager.selectedDestinationEvent}</div> + <h:selectManyListbox id="destWindows" size="5" value="#{eventManager.selectedDestinationWindows}" immediate="true" + onchange="this.form.submit()"> + <f:selectItems value="#{eventManager.destinationWindows}"/> + </h:selectManyListbox> + </div> + </f:subview> + + <br class="clear"/> </div> - </f:subview> + <div class="half-width float-left event-wiring-preview"> + <f:subview id="sourceEventUI" rendered="#{!empty eventManager.selectedSourceEvent}"> + <h4>#{bundle.COORDINATION_EVENT_CREATE_PREVIEW}</h4> + <p>#{bundle.COORDINATION_EVENT_CREATE_PREVIEW_STEP1}</p> + <ul class="sourceEventList"> + <li>#{eventManager.selectedSourceEvent}</li> + </ul> + </f:subview> + <f:subview id="sourceWindowUI" rendered="#{!empty eventManager.selectedSourceWindows}" > + <p>#{bundle.COORDINATION_EVENT_CREATE_PREVIEW_STEP2}</p> + <ul class="sourceWindowList"> + <ui:repeat var="window" value="#{eventManager.selectedSourceWindows}"> + <li>#{window}</li> + </ui:repeat> + </ul> + </f:subview> + <f:subview id="destEventUI" rendered="#{!empty eventManager.selectedDestinationEvent}"> + <hr/> + <p>#{bundle.COORDINATION_EVENT_CREATE_PREVIEW_STEP3}</p> + <ul class="destEventList"> + <li>#{eventManager.selectedDestinationEvent}</li> + </ul> + </f:subview> + <f:subview id="destWindowUI" rendered="#{!empty eventManager.selectedDestinationWindows}"> + <p>#{bundle.COORDINATION_EVENT_CREATE_PREVIEW_STEP4}</p> + <ul class="destWindowList"> + <ui:repeat var="window" value="#{eventManager.selectedDestinationWindows}"> + <li>#{window}</li> + </ui:repeat> + </ul> + </f:subview> - <br class="clear"/> - </div> + <f:subview id="COORDINATION_EVENT_CREATE_STEP5" rendered="#{!empty eventManager.selectedDestinationWindows}"> + <div class="full-width createwiring-box"> + <div class="margin10"> + <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP5}</h4> + <h:inputText id="wiringName" value="#{eventManager.wiringName}"/> + <h:commandButton value="#{bundle.COORDINATION_EVENT_CREATE_CREATE}" action="#{eventManager.create}" + styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{eventManager.cancel}" + styleClass="portlet-form-button"/> + </div> + </div> + </f:subview> - <div class="half-width float-left event-wiring-preview"> - <h4>New Event Wiring Preview:</h4> - <f:subview id="sourceEventUI" rendered="#{!empty eventManager.selectedSourceEvent}"> - <p class="source-event-text"><b>#{eventManager.selectedSourceEvent}</b> is the selected source event.</p> - </f:subview> - <f:subview id="sourceWindowUI" rendered="#{!empty eventManager.selectedSourceWindows}" > - <p>The following windows will produce the <b>#{eventManager.selectedSourceEvent}</b> event.</p> - <ul class="sourceWindowList"> - <ui:repeat var="window" value="#{eventManager.selectedSourceWindows}"> - <li> - #{window} - </li> - </ui:repeat> - </ul> - </f:subview> - <f:subview id="destEventUI" rendered="#{!empty eventManager.selectedDestinationEvent}"> - <p>The producing Window Events will be wired to the following destination events.</p> - <ul class="destEventList"> - <ui:repeat var="event" value="#{eventManager.selectedDestinationEvent}"> - <li>#{event}</li> - </ui:repeat> - </ul> - </f:subview> - <f:subview id="destWindowUI" rendered="#{!empty eventManager.selectedDestinationWindows}"> - <p>And the following windows will consume the above listed destination events.</p> - <ul class="destWindowList"> - <ui:repeat var="window" value="#{eventManager.selectedDestinationWindows}"> - <li> - #{window} - </li> - </ui:repeat> - </ul> - </f:subview> - - <f:subview id="COORDINATION_EVENT_CREATE_STEP5" rendered="#{!empty eventManager.selectedDestinationWindows}"> - <div class="full-width createwiring-box"> - <div class="margin10"> - <h4>5. Name and create this wiring:</h4> - <h:inputText id="wiringName" value="#{eventManager.wiringName}"/> - <h:commandButton value="#{bundle.COORDINATION_EVENT_CREATE_CREATE}" action="#{eventManager.create}" - styleClass="portlet-form-button"/> - <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{eventManager.cancel}" - styleClass="portlet-form-button"/> + <br class="clear"/> </div> - </div> - </f:subview> - <br class="clear"/> + </h:form> - </div> + <br class="clear"/> - </h:form> - <hr/> - <br class="clear"/> - <!-- Manage existing wirings --> - <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_MANAGE_EXISTING}</h3> - <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_NONE}" rendered="#{empty eventManager.displayEventWirings}"/> - <h:form rendered="#{!empty eventManager.displayEventWirings}"> - <h:dataTable var="wiring" value="#{eventManager.displayEventWirings}" - styleClass="objectList datatable" - rowClasses="portlet-section-body,portlet-section-alternate-blue" - columnClasses="ten-percent-width,quarter-width,quarter-width,ten-percent-width" - headerClass="portlet-section-header"> - <h:column> - <f:facet name="header"> - <h4>#{bundle.COORDINATION_EVENT_EXISTING_NAME}</h4> - </f:facet> - #{wiring.name} - </h:column> + <!-- Manage existing wirings --> + <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_MANAGE_EXISTING}</h3> + <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_NONE}" rendered="#{empty eventManager.displayEventWirings}"/> + <h:form rendered="#{!empty eventManager.displayEventWirings}"> + <h:dataTable var="wiring" value="#{eventManager.displayEventWirings}" + styleClass="objectList datatable" + rowClasses="portlet-section-body,portlet-section-alternate-blue" + columnClasses="ten-percent-width,quarter-width,quarter-width,ten-percent-width" + headerClass="portlet-section-header"> + <h:column> + <f:facet name="header"> + <h4>#{bundle.COORDINATION_EVENT_EXISTING_NAME}</h4> + </f:facet> + #{wiring.name} + </h:column> - <h:column> - <f:facet name="header"> - #{bundle.COORDINATION_EVENT_EXISTING_SOURCE_WINDOWS} / #{bundle.COORDINATION_EVENT_EXISTING_SOURCE_EVENTS} - </f:facet> - <ul class="sourceWindowList"> - <ui:repeat var="window" value="#{wiring.sourceWindows}"> - <li> - <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName"> - <f:param name="id" value="#{window.id}"/> - #{window.name} - </h:commandLink> - </li> - </ui:repeat> - </ul> - <hr/> - <ul class="sourceEventList"> - <ui:repeat var="event" value="#{wiring.sourceEvents}"> - <li>#{event}</li> - </ui:repeat> - </ul> - </h:column> - <ui:remove> - <!--<h:column>--> - <!--<f:facet name="header">--> - <!--<h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_SOURCE_EVENTS}"/>--> - <!--</f:facet>--> - <!--<ul class="sourceEventList">--> - <!--<ui:repeat var="event" value="#{wiring.sourceEvents}">--> - <!--<li>#{event}</li>--> - <!--</ui:repeat>--> - <!--</ul>--> - <!--</h:column>--> - </ui:remove> - <h:column> - <f:facet name="header"> - #{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS} / #{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_EVENTS} - </f:facet> + <h:column> + <f:facet name="header"> + #{bundle.COORDINATION_EVENT_EXISTING_SOURCE_WINDOWS} / #{bundle.COORDINATION_EVENT_EXISTING_SOURCE_EVENTS} + </f:facet> + <ul class="sourceWindowList"> + <ui:repeat var="window" value="#{wiring.sourceWindows}"> + <li> + <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName"> + <f:param name="id" value="#{window.id}"/> + #{window.name} + </h:commandLink> + </li> + </ui:repeat> + </ul> + <hr/> + <ul class="sourceEventList"> + <ui:repeat var="event" value="#{wiring.sourceEvents}"> + <li>#{event}</li> + </ui:repeat> + </ul> + </h:column> + <ui:remove> + <!--<h:column>--> + <!--<f:facet name="header">--> + <!--<h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_SOURCE_EVENTS}"/>--> + <!--</f:facet>--> + <!--<ul class="sourceEventList">--> + <!--<ui:repeat var="event" value="#{wiring.sourceEvents}">--> + <!--<li>#{event}</li>--> + <!--</ui:repeat>--> + <!--</ul>--> + <!--</h:column>--> + </ui:remove> + <h:column> + <f:facet name="header"> + #{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS} / #{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_EVENTS} + </f:facet> - <ul class="destWindowList"> - <ui:repeat var="window" value="#{wiring.destinationWindows}"> - <li> - <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName"> - <f:param name="id" value="#{window.id}"/> - #{window.name} - </h:commandLink> - </li> - </ui:repeat> - </ul> - <hr/> - <ul class="destEventList"> - <ui:repeat var="event" value="#{wiring.destinationEvents}"> - <li>#{event}</li> - </ui:repeat> - </ul> + <ul class="destWindowList"> + <ui:repeat var="window" value="#{wiring.destinationWindows}"> + <li> + <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName"> + <f:param name="id" value="#{window.id}"/> + #{window.name} + </h:commandLink> + </li> + </ui:repeat> + </ul> + <hr/> + <ul class="destEventList"> + <ui:repeat var="event" value="#{wiring.destinationEvents}"> + <li>#{event}</li> + </ui:repeat> + </ul> - </h:column> - <ui:remove> - <!--<h:column>--> - <!--<f:facet name="header">--> - <!--<h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS}"/>--> - <!--</f:facet>--> - <!--<ul class="destEventList">--> - <!--<ui:repeat var="window" value="#{wiring.destinationWindows}">--> - <!--<li>--> - <!--<h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName">--> - <!--<f:param name="id" value="#{window.id}"/>--> - <!--#{window.name}--> - <!--</h:commandLink>--> - <!--</li>--> - <!--</ui:repeat>--> - <!--</ul>--> - <!--</h:column>--> - </ui:remove> - <h:column> - <f:facet name="header"> - #{bundle.COORDINATION_EVENT_EXISTING_ACTIONS} - </f:facet> - <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0"> - <h:commandLink action="renameCoordination" actionListener="#{coordinationManager.select}"> - <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> - <f:param name="name" value="#{wiring.name}"/> - <f:param name="type" value="wiring"/> - </h:commandLink> - <h:commandLink action="confirmCoordinationDeletion" actionListener="#{coordinationManager.select}"> - <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> - <f:param name="name" value="#{wiring.name}"/> - <f:param name="type" value="wiring"/> - </h:commandLink> - </h:panelGrid> - </h:column> - </h:dataTable> - </h:form> - </h:panelGroup> + </h:column> + <ui:remove> + <!--<h:column>--> + <!--<f:facet name="header">--> + <!--<h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS}"/>--> + <!--</f:facet>--> + <!--<ul class="destEventList">--> + <!--<ui:repeat var="window" value="#{wiring.destinationWindows}">--> + <!--<li>--> + <!--<h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName">--> + <!--<f:param name="id" value="#{window.id}"/>--> + <!--#{window.name}--> + <!--</h:commandLink>--> + <!--</li>--> + <!--</ui:repeat>--> + <!--</ul>--> + <!--</h:column>--> + </ui:remove> + <h:column> + <f:facet name="header"> + #{bundle.COORDINATION_EVENT_EXISTING_ACTIONS} + </f:facet> + <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0"> + <h:commandLink action="renameCoordination" actionListener="#{coordinationManager.select}"> + <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> + <f:param name="name" value="#{wiring.name}"/> + <f:param name="type" value="wiring"/> + </h:commandLink> + <h:commandLink action="confirmCoordinationDeletion" actionListener="#{coordinationManager.select}"> + <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> + <f:param name="name" value="#{wiring.name}"/> + <f:param name="type" value="wiring"/> + </h:commandLink> + </h:panelGrid> + </h:column> + </h:dataTable> + </h:form> + </h:panelGroup> </div> </ui:define>