Author: wesleyhales Date: 2008-10-15 14:32:23 -0400 (Wed, 15 Oct 2008) New Revision: 12074 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 branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/RepeatRefreshPortlet.java branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jsp/ajax/repeatrefresh.jsp Log: JBPORTAL-1919 and cleanup some on refreshRepeat demo 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-15 18:07:27 UTC (rev 12073) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/basestyles.css 2008-10-15 18:32:23 UTC (rev 12074) @@ -69,6 +69,14 @@ margin: 10px 0 10px 0; } +.tenpx-right { + margin: 0 10px 0 0; +} + +.tenpx-left { + margin: 0 0 0 10px; +} + .clear { clear: both; } 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-15 18:07:27 UTC (rev 12073) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/style.css 2008-10-15 18:32:23 UTC (rev 12074) @@ -692,10 +692,36 @@ .details-body { padding: 15px 0 0 0; } +/*--------------------------- Instance Meta Data end*/ +/*--------------------------- Coordination admin */ + +ul.bindingList { + margin: 0; + padding: 0; +} + +ul.bindingList li { + list-style-image: url( "/portal-admin/img/binding-arrow.gif" ); + list-style-type: none; + list-style-position: inside; +} + +.aliasBinding-step2 { + border-left: 2px solid #ececec; + padding: 0 0 0 10px; +} + +/*--------------------------- Coordination admin end */ h3.blue { padding: 2px 2px 2px 5px; margin: 0 0 3px 0; color: #003399; } + +h4 { + padding-top: 0 +} + + 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-15 18:07:27 UTC (rev 12073) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-10-15 18:32:23 UTC (rev 12074) @@ -5,7 +5,9 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:pfc="http://www.jboss.com/portal/facelet/common" - xmlns:c="http://java.sun.com/jstl/core"> + xmlns:c="http://java.sun.com/jstl/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> <ui:param name="portalObjectScreen" value="#{bundle.COORDINATION_COORDINATION}"/> <ui:define name="content"> @@ -16,25 +18,35 @@ <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_ALIAS_CREATE}</h3> <h:outputText value="#{bundle.COORDINATION_ALIAS_CREATE_NO_PARAMS}" rendered="#{empty aliasManager.availableRenderParameters}"/> <h:form rendered="#{!empty aliasManager.availableRenderParameters}"> - <div class="float-left quarter-width"> - #{bundle.COORDINATION_ALIAS_CREATE_STEP1} + <div class="float-left tenpx-right"> + <h4>#{bundle.COORDINATION_ALIAS_CREATE_STEP1}</h4> <h:selectManyListbox id="alias" size="5" value="#{aliasManager.originalQNames}" immediate="true" onchange="this.form.submit()"> <f:selectItems value="#{aliasManager.availableRenderParameters}"/> </h:selectManyListbox> </div> + <div class="float-left aliasBinding-step2"> + <h:panelGroup rendered="#{!empty aliasManager.originalQNames}"> + <h4>#{bundle.COORDINATION_ALIAS_CREATE_STEP2}</h4> + <div style="full-width"> + <span><h:inputText id="aliasName" value="#{aliasManager.aliasName}"/></span> + <span> + <h:commandButton value="#{bundle.COORDINATION_ALIAS_CREATE_CREATE}" + action="#{aliasManager.create}" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{aliasManager.cancel}" + styleClass="portlet-form-button"/> + </span> + </div> + <div> + <ul class="bindingList"> + <ui:repeat var="selectedQNames" value="#{aliasManager.originalQNames}"> + <li>#{selectedQNames}</li> + </ui:repeat> + </ul> + </div> - <h:panelGroup rendered="#{!empty aliasManager.originalQNames}"> - <div class="float-left quarter-width"> - #{bundle.COORDINATION_ALIAS_CREATE_STEP2} - <h:inputText id="aliasName" value="#{aliasManager.aliasName}"/> - <h:commandButton value="#{bundle.COORDINATION_ALIAS_CREATE_CREATE}" - action="#{aliasManager.create}" styleClass="portlet-form-button"/> - <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{aliasManager.cancel}" - styleClass="portlet-form-button"/> - </div> </h:panelGroup> - + </div> <br class="clear"/> </h:form> Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/RepeatRefreshPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/RepeatRefreshPortlet.java 2008-10-15 18:07:27 UTC (rev 12073) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/RepeatRefreshPortlet.java 2008-10-15 18:32:23 UTC (rev 12074) @@ -50,22 +50,18 @@ public void processAction(ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException { - String repeatText = req.getParameter("repeat"); + //String repeatText = req.getParameter("repeat"); // set the text from form input - if (repeatText != null){ - resp.setRenderParameter("repeat", repeatText); - } + //if (repeatText != null){ + //resp.setRenderParameter("repeat", repeatText); + //} // request view - resp.setPortletMode(PortletMode.VIEW); + //resp.setPortletMode(PortletMode.VIEW); } public void render(RenderRequest renderRequest, RenderResponse renderResponse) throws PortletException, IOException { - //ResourceURL resourceURL = renderResponse.createResourceURL(); - //PortletURL actionURL = renderResponse.createActionURL(); - PortletContext context = getPortletContext(); - //renderResponse.setContentType("text/html"); PortletRequestDispatcher rd = context.getRequestDispatcher(JSP_PATH + "/repeatrefresh.jsp"); rd.include(renderRequest, renderResponse); } Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jsp/ajax/repeatrefresh.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jsp/ajax/repeatrefresh.jsp 2008-10-15 18:07:27 UTC (rev 12073) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jsp/ajax/repeatrefresh.jsp 2008-10-15 18:32:23 UTC (rev 12074) @@ -1,7 +1,7 @@ -<%@ page import="javax.portlet.PortletURL" %> <%@ page import="javax.portlet.ResourceURL" %> <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<!--This tag establishes three objects; renderRequest, renderResponse and portletConfig for use in this JSP page.--> <portlet:defineObjects/> <% ResourceURL resourceURL = renderResponse.createResourceURL(); @@ -23,7 +23,9 @@ <h4>Partial Refresh Repeater Demo</h4> <div class='half-width float-left'> - <form method='post' id="testrepeatform" name="testrepeatform" action="<portlet:actionURL/>" + + <!--Simple ajax repeater via a form, note that the action does not matter--> + <form method='post' id="testrepeatform" name="testrepeatform" action="" onsubmit="ajaxRequest('<%=resourceURL%>','repeat-div',Form.serialize(this),true); return false;"> <font class='portlet-font'>Repeat Demo:</font><br/> <input class='portlet-form-input-field' type='text' value='' size='12' name="repeat" id="repeat" @@ -43,10 +45,14 @@ <div class='full-width'> <div class='float-left third-width'> + <!--Parameters set on a resource URL are not render parameters but--> + <!--parameters for serving this resource and will last only for the current serveResource request. --> + <!--Example 1--> <!--Here we set the parameters on the URL via the ajax request--> <a href="javascript: ajaxRequest('<%=resourceURL%>','output-div','prodId=1',true);">Product1</a><br/> + <!--Example 2--> <!--For the next 2, we use the resourceURL to set the params--> <%resourceURL.setParameter("prodId","2");%> <a href="javascript: ajaxRequest('<%=resourceURL%>','output-div','',true);">Product2</a><br/>