Author: wesleyhales Date: 2008-10-16 21:05:49 -0400 (Thu, 16 Oct 2008) New Revision: 12079 Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/window_param.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/resources/portal-admin-war/jsf/editCoordination.xhtml Log: JBPORTAL-1919 alias and parameter binding 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-16 22:29:50 UTC (rev 12078) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/basestyles.css 2008-10-17 01:05:49 UTC (rev 12079) @@ -55,6 +55,16 @@ width: 65.9%; } +.auto-width { + width: auto; + padding: 0 7px 0 0; +} + +.ten-percent-width { + width: 10%; +} + + .third-width-pad5 { width: 32.5%; padding: 5px; 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-16 22:29:50 UTC (rev 12078) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-10-17 01:05:49 UTC (rev 12079) @@ -723,6 +723,12 @@ padding: 0 0 0 10px; } +.paramBinding-step2 { + border-left: 2px solid #ececec; + padding: 0 0 0 10px; +} + + ul.coord-nav { padding: 0; margin: 0; @@ -739,6 +745,29 @@ font-weight: bold; } +ul.paramList { + margin: 0; + padding: 0; +} + +ul.paramList li { + list-style-image: url( "../img/jbp-icon-set/window_param.gif" ); + list-style-type: none; + list-style-position: inside; + padding: 3px 0 0 5px; +} + +div.paramList-header { + font-weight: bold; + font-size: 1em; + border-bottom: 1px solid #ececec; + background-image: url("../img/jbp-icon-set/window.gif"); + background-repeat: no-repeat; + background-position: top left; + padding: 0 0 0 22px; + margin: 4px 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/window_param.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/jbp-icon-set/window_param.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream 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-16 22:29:50 UTC (rev 12078) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-10-17 01:05:49 UTC (rev 12079) @@ -72,9 +72,9 @@ <h:form rendered="#{!empty aliasManager.displayAliasBindings}"> <div class="float-left full-width"> <h:dataTable var="binding" value="#{aliasManager.displayAliasBindings}" - rendered="true" styleClass="objectList datatable" + rendered="true" styleClass="objectList datatable full-width" rowClasses="portlet-section-body,portlet-section-alternate-blue" - columnClasses="objectNameColumn" + columnClasses="half-width" headerClass="portlet-section-header"> <h:column> <f:facet name="header">#{bundle.COORDINATION_ALIAS_EXISTING_NAME}</f:facet> @@ -130,8 +130,8 @@ <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_PARAMETER_CREATE}</h3> <h:outputText value="#{bundle.COORDINATION_PARAMETER_CREATE_NO_PAIRS}" rendered="#{empty parameterManager.availableParameterWindowPairs}"/> <h:form rendered="#{!empty parameterManager.availableParameterWindowPairs}"> - <div class="float-left quarter-width"> - #{bundle.COORDINATION_PARAMETER_CREATE_STEP1} + <div class="float-left tenpx-right"> + <h4>#{bundle.COORDINATION_PARAMETER_CREATE_STEP1}</h4> <h:selectManyListbox id="parameterWindowPair" size="5" value="#{parameterManager.selectedParameterWindowPairs}" immediate="true" onchange="this.form.submit()"> <f:selectItems value="#{parameterManager.availableParameterWindowPairs}"/> @@ -139,13 +139,17 @@ </div> <h:panelGroup rendered="#{!empty parameterManager.selectedParameterWindowPairs}"> - <div class="float-left quarter-width"> - #{bundle.COORDINATION_PARAMETER_CREATE_STEP2} - <h:inputText id="bindingName" value="#{parameterManager.windowBindingName}"/> - <h:commandButton value="#{bundle.COORDINATION_PARAMETER_CREATE_CREATE}" - action="#{parameterManager.create}" styleClass="portlet-form-button"/> - <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{parameterManager.cancel}" - styleClass="portlet-form-button"/> + <div class="float-left paramBinding-step2"> + <h4>#{bundle.COORDINATION_PARAMETER_CREATE_STEP2}</h4> + <div class="full-width"> + <span><h:inputText id="bindingName" value="#{parameterManager.windowBindingName}"/></span> + <span> + <h:commandButton value="#{bundle.COORDINATION_PARAMETER_CREATE_CREATE}" + action="#{parameterManager.create}" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{parameterManager.cancel}" + styleClass="portlet-form-button"/> + </span> + </div> </div> </h:panelGroup> @@ -158,27 +162,36 @@ <h:outputText value="#{bundle.COORDINATION_PARAMETER_EXISTING_NONE}" rendered="#{empty parameterManager.displayParameterBindings}"/> <h:form rendered="#{!empty parameterManager.displayParameterBindings}"> <h:dataTable var="binding" value="#{parameterManager.displayParameterBindings}" - rendered="true" styleClass="objectList datatable" + rendered="true" styleClass="objectList datatable full-width" rowClasses="portlet-section-body,portlet-section-alternate-blue" - columnClasses="objectNameColumn" + columnClasses="ten-percent-width,half-width,quarter-width" headerClass="portlet-section-header"> <h:column> <f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_NAME}</f:facet> - #{binding.name} + <h4>#{binding.name}</h4> </h:column> <h:column> <f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_PAIRS}</f:facet> - <ul> + <div class="full-width"> <ui:repeat var="pair" value="#{binding.parameterWindowPairs}"> - <li> - #{pair.name}#{pair.separator} - <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName"> - <f:param name="id" value="#{pair.window.id}"/> - #{pair.window.name} - </h:commandLink> - </li> + <div class="float-left pad5"> + <div class="paramList-header">#{pair.window.name}</div> + <ul class="paramList"> + <c:set var="pairname" value="#{fn:split(pair.name, ';')}" /> + <ui:repeat var="name" value="#{pairname}"> + <li>#{name}</li> + </ui:repeat> + </ul> + <ui:remove> + <!--<h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName">--> + <!--<f:param name="id" value="#{pair.window.id}"/>--> + <!--#{pair.window.name}--> + <!--</h:commandLink>--> + </ui:remove> + </div> </ui:repeat> - </ul> + </div> + </h:column> <h:column> <f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_ACTIONS}</f:facet> @@ -219,7 +232,7 @@ <h:outputText value="#{bundle.COORDINATION_EVENT_CREATE_NO_EVENTS}" rendered="#{empty eventManager.sourceEvents}"/> <h:form rendered="#{!empty eventManager.sourceEvents}"> <h:panelGroup> - #{bundle.COORDINATION_EVENT_CREATE_STEP1} + <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}"/> @@ -227,7 +240,7 @@ </h:panelGroup> <h:panelGroup rendered="#{!empty eventManager.selectedSourceEvent}"> - #{eventManager.step2Message} <!-- this uses bundle.COORDINATION_EVENT_CREATE_STEP2 --> + <h4>#{eventManager.step2Message}</h4> <!-- this uses bundle.COORDINATION_EVENT_CREATE_STEP2 --> <h:selectManyListbox id="sourceWindows" size="5" value="#{eventManager.selectedSourceWindows}" immediate="true" onchange="this.form.submit()"> <f:selectItems value="#{eventManager.sourceWindows}"/> @@ -235,7 +248,7 @@ </h:panelGroup> <h:panelGroup rendered="#{!empty eventManager.selectedSourceWindows}"> - #{bundle.COORDINATION_EVENT_CREATE_STEP3} + <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}"/> @@ -243,7 +256,7 @@ </h:panelGroup> <h:panelGroup rendered="#{!empty eventManager.selectedDestinationEvent}"> - #{eventManager.step4Message} <!-- this uses bundle.COORDINATION_EVENT_CREATE_STEP4 --> + <h4>#{eventManager.step4Message}</h4> <!-- this uses bundle.COORDINATION_EVENT_CREATE_STEP4 --> <h:selectManyListbox id="destWindows" size="5" value="#{eventManager.selectedDestinationWindows}" immediate="true" onchange="this.form.submit()"> <f:selectItems value="#{eventManager.destinationWindows}"/> @@ -251,7 +264,7 @@ </h:panelGroup> <h:panelGroup rendered="#{!empty eventManager.selectedDestinationWindows}"> - #{bundle.COORDINATION_EVENT_CREATE_STEP5} + <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"/>