Author: thomas.heute(a)jboss.com Date: 2007-05-21 07:41:17 -0400 (Mon, 21 May 2007) New Revision: 7291 Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml Log: JBPORTAL-1449: In the Portlet Instance Details that show up at the bottom of the portlet when a portlet instance ID is clicked, the field data should be left aligned in a column next to the labels. JBPORTAL-1450: The "Show the associated portlet" link should be removed Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml 2007-05-21 11:08:30 UTC (rev 7290) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml 2007-05-21 11:41:17 UTC (rev 7291) @@ -5,14 +5,35 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> - <div><span class="portlet-form-field-label">Portlet name:</span> #{portlet.name.value}</div> - <div><span class="portlet-form-field-label">Portlet description:</span> #{portlet.description.value}</div> - <div><span class="portlet-form-field-label">Portlet title:</span> #{portlet.title.value}</div> - <div><span class="portlet-form-field-label">Portlet keywords:</span> #{portlet.keywords.value}</div> - <c:if test="#{not empty portlet.locales}"> - <div><span class="portlet-form-field-label">Portlet locales:</span> - <c:forEach items="#{portlet.locales}" var="locale"> #{locale} </c:forEach> - </div> - </c:if> - + <table> + <tr> + <td class="portlet-form-field-label">Portlet name:</td> + <td><h:form><h:commandLink + action="#{portletmgr.selectPortlet}"> + <f:param name="id" value="#{portlet.context.id}"/> + <f:param name="plugin" value="manager"/> + #{portlet.name.value} + </h:commandLink></h:form></td> + </tr> + <tr> + <td class="portlet-form-field-label">Portlet description:</td> + <td>#{portlet.description.value}</td> + </tr> + <tr> + <td class="portlet-form-field-label">Portlet title:</td> + <td>#{portlet.title.value}</td> + </tr> + <tr> + <td class="portlet-form-field-label">Portlet keywords:</td> + <td>#{portlet.keywords.value}</td> + </tr> + <c:if test="#{not empty portlet.locales}"> + <tr> + <td class="portlet-form-field-label">Portlet locales:</td> + <td> + <c:forEach items="#{portlet.locales}" var="locale"> #{locale} </c:forEach> + </td> + </tr> + </c:if> + </table> </div> \ No newline at end of file Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-05-21 11:08:30 UTC (rev 7290) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-05-21 11:41:17 UTC (rev 7291) @@ -69,16 +69,9 @@ <c:when test="#{instancemgr.selectedInstance.portlet != null}"> <h3>Portlet details </h3> - <h:form> - <h:commandLink - action="#{portletmgr.selectPortlet}"> - <f:param name="id" value="#{instancemgr.selectedInstance.portlet.context.id}"/> - <f:param name="plugin" value="manager"/> - Show - </h:commandLink> the associated portlet - </h:form> <ui:include src="common/showPortletDetails.xhtml"> <ui:param name="portlet" value="#{instancemgr.selectedInstance.portlet}"/> + <ui:param name="portletmgr" value="#{portletmgr}"/> </ui:include> </c:when> <c:otherwise>