Author: wesleyhales Date: 2008-10-17 21:53:52 -0400 (Fri, 17 Oct 2008) New Revision: 12085 Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/event_dest.gif branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/event_dest_window.gif branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/event_source.gif branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/event_source_window.gif Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/basestyles.css branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 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 event wiring ui Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/basestyles.css =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/basestyles.css 2008-10-17 21:48:54 UTC (rev 12084) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/basestyles.css 2008-10-18 01:53:52 UTC (rev 12085) @@ -99,6 +99,10 @@ padding: 10px } +.margin10 { + margin: 10px; +} + .grey-border { border: 1px solid #B3C0C7; } Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-10-17 21:48:54 UTC (rev 12084) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-10-18 01:53:52 UTC (rev 12085) @@ -768,6 +768,61 @@ margin: 4px 0 0 0; } +ul.sourceWindowList, +ul.sourceEventList, +ul.destEventList, +ul.destWindowList { + margin: 0; + padding: 0; +} + +ul.sourceWindowList li { + list-style-image: url( "../img/jbp-icon-set/event_source_window.gif" ); + list-style-type: none; + list-style-position: inside; + padding: 3px 0 0 5px; +} + +ul.sourceEventList li { + list-style-image: url( "../img/jbp-icon-set/event_source.gif" ); + list-style-type: none; + list-style-position: inside; + padding: 3px 0 0 5px; +} + +ul.destEventList li { + list-style-image: url( "../img/jbp-icon-set/event_dest.gif" ); + list-style-type: none; + list-style-position: inside; + padding: 3px 0 0 5px; +} + +ul.destWindowList li { + list-style-image: url( "../img/jbp-icon-set/event_dest_window.gif" ); + list-style-type: none; + list-style-position: inside; + padding: 3px 0 0 5px; +} + +div.event-wiring-preview { + text-align: left; + padding: 15px 0 0 10px; + border-left: 1px solid #ececec; +} + +div.event-wiring-preview p.source-event-text { + background-image: url( "../img/jbp-icon-set/event_source.gif" ); + padding: 0 0 0 23px; + background-repeat: no-repeat; +} + +div.event-wiring-preview div.createwiring-box { + background-color: #fff3c4; + border: 2px solid #e1d39c; + padding: 0; + margin: 15px 0 0 0; +} + /*--------------------------- Coordination admin end */ h3.blue { padding: 2px 2px 2px 5px; Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/event_dest.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/event_dest.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/event_dest_window.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/event_dest_window.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/event_source.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/event_source.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/event_source_window.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/event_source_window.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2008-10-17 21:48:54 UTC (rev 12084) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2008-10-18 01:53:52 UTC (rev 12085) @@ -272,7 +272,7 @@ private QName name; public static final int PARAM_NAME = 0; public static final int WINDOW_NAME = 1; - private static final String SEP = " <-> "; + private static final String SEP = " &hArr; "; public ParameterWindowPair(ParameterInfo info, Window window) { 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-17 21:48:54 UTC (rev 12084) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-10-18 01:53:52 UTC (rev 12085) @@ -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 <-> parameter pairs +COORDINATION_PARAMETER_EXISTING_PAIRS=Window &hArr; 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. @@ -309,9 +309,9 @@ COORDINATION_EVENT_CREATE=Create new event wiring: COORDINATION_EVENT_CREATE_NO_EVENTS=No available events. Cannot create new event wirings. COORDINATION_EVENT_CREATE_STEP1=1. Select source event: -COORDINATION_EVENT_CREATE_STEP2=2. Select source windows producing event ''{0}'': +COORDINATION_EVENT_CREATE_STEP2=2. Select source windows producing event: COORDINATION_EVENT_CREATE_STEP3=3. Select destination event: -COORDINATION_EVENT_CREATE_STEP4=4. Select destination windows consuming event ''{0}'': +COORDINATION_EVENT_CREATE_STEP4=4. Select destination windows consuming event: COORDINATION_EVENT_CREATE_STEP5=5. Name wiring: COORDINATION_EVENT_CREATE_CREATE=Create wiring 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-17 21:48:54 UTC (rev 12084) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-10-18 01:53:52 UTC (rev 12085) @@ -19,13 +19,12 @@ else e.style.display = ''; } + //--> </script> <br/> - <ul class="clear coord-nav"> - <li><a href="javascript:toggle_visibility('aliasBindings');toggle_visibility('parameterBindings');toggle_visibility('eventWirings');void(0);">Expand/Collapse All</a></li> - </ul> + <div class="tenpx-top-bottom"> <h2 class="portlet-area-header" onclick="toggle_visibility('aliasBindings');" style="cursor: pointer"><a name="#{bundle.COORDINATION_ALIAS_BINDINGS}"/>#{bundle.COORDINATION_ALIAS_BINDINGS}</h2> @@ -231,49 +230,105 @@ <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}"> - <h:panelGroup> + <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> - </h:panelGroup> + </div> - <h:panelGroup rendered="#{!empty eventManager.selectedSourceEvent}"> - <h4>#{eventManager.step2Message}</h4> <!-- this uses bundle.COORDINATION_EVENT_CREATE_STEP2 --> + <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> - </h:panelGroup> + </div> + </f:subview> - <h:panelGroup rendered="#{!empty eventManager.selectedSourceWindows}"> + <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> - </h:panelGroup> + </div> + </f:subview> - <h:panelGroup rendered="#{!empty eventManager.selectedDestinationEvent}"> - <h4>#{eventManager.step4Message}</h4> <!-- this uses bundle.COORDINATION_EVENT_CREATE_STEP4 --> + <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> - </h:panelGroup> + </div> + </f:subview> - <h:panelGroup rendered="#{!empty eventManager.selectedDestinationWindows}"> - <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP5}</h4> + + <br class="clear"/> + </div> + + <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"/> - </h:panelGroup> + </div> + </div> + </f:subview> + + <br class="clear"/> + + </div> + </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}"/> @@ -281,20 +336,20 @@ <h:dataTable var="wiring" value="#{eventManager.displayEventWirings}" styleClass="objectList datatable" rowClasses="portlet-section-body,portlet-section-alternate-blue" - columnClasses="objectNameColumn, objectActionColumn" + columnClasses="ten-percent-width,quarter-width,quarter-width,ten-percent-width" headerClass="portlet-section-header"> <h:column> <f:facet name="header"> - <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_NAME}"/> + <h4>#{bundle.COORDINATION_EVENT_EXISTING_NAME}</h4> </f:facet> #{wiring.name} </h:column> <h:column> <f:facet name="header"> - <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_SOURCE_WINDOWS}"/> + #{bundle.COORDINATION_EVENT_EXISTING_SOURCE_WINDOWS} / #{bundle.COORDINATION_EVENT_EXISTING_SOURCE_EVENTS} </f:facet> - <ul> + <ul class="sourceWindowList"> <ui:repeat var="window" value="#{wiring.sourceWindows}"> <li> <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName"> @@ -304,35 +359,31 @@ </li> </ui:repeat> </ul> - </h:column> - - <h:column> - <f:facet name="header"> - <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_SOURCE_EVENTS}"/> - </f:facet> - <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"> - <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_EVENTS}"/> + #{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS} / #{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_EVENTS} </f:facet> - <ul> - <ui:repeat var="event" value="#{wiring.destinationEvents}"> - <li>#{event}</li> - </ui:repeat> - </ul> - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS}"/> - </f:facet> - <ul> + <ul class="destWindowList"> <ui:repeat var="window" value="#{wiring.destinationWindows}"> <li> <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName"> @@ -342,11 +393,35 @@ </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}" + #{bundle.COORDINATION_EVENT_EXISTING_ACTIONS} </f:facet> <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0"> <h:commandLink action="renameCoordination" actionListener="#{coordinationManager.select}">