Author: chris.laprun(a)jboss.com Date: 2007-09-07 12:19:21 -0400 (Fri, 07 Sep 2007) New Revision: 8200 Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml trunk/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp Log: - Cleaned-up markup a little. Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp =================================================================== --- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2007-09-07 16:18:57 UTC (rev 8199) +++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2007-09-07 16:19:21 UTC (rev 8200) @@ -10,23 +10,9 @@ <% Collection instances = (Collection)request.getAttribute("INSTANCES"); Instance selectedInstance = (Instance)request.getAttribute("SELECTED_INSTANCE"); - boolean newContent = Boolean.TRUE == request.getAttribute("NEW_CONTENT"); %> -<% - if (newContent) - { -%> <span class="portlet-font">Portlet instance associated to this window:</span> -<% -} -else -{ -%> -<span class="portlet-font">Portlet instance associated to this window:</span> -<% - } -%> <div style="height:300px; width:300px; overflow: auto; overflow-x: hidden; border: 1px solid #333;"> <table style="width:100%;" cellspacing="0" cellpadding="0"> @@ -37,8 +23,8 @@ String rowClass = instance == selectedInstance ? "portlet-section-selected" : (i.getIndex() % 2 == 0 ? "portlet-section-body" : "portlet-section-alternate"); %> <portlet:actionURL var="url"> - <portlet:param name="content.action.select" value="true"/> - <portlet:param name="content.uri" value="<%= instance.getId() %>"/> + <portlet:param name="content.action.select" value="true"/> + <portlet:param name="content.uri" value="<%= instance.getId() %>"/> </portlet:actionURL> <tr class="<%= rowClass %>"> <td><a href="<%= url %>"><%= instance.getId() %> @@ -62,6 +48,7 @@ + Portlet portlet = null; try { @@ -78,6 +65,7 @@ + %> <div><span class="portlet-form-field-label">Portlet name:</span><%= metaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString() %> @@ -96,10 +84,12 @@ + } } + %> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-09-07 16:18:57 UTC (rev 8199) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-09-07 16:19:21 UTC (rev 8200) @@ -63,18 +63,16 @@ </tr> <tr> <td colspan="2" valign="top"> - <div> - <jbp:portlet - portletId="#{pageManager.selectedEditorPortletId}" - portletInvoker="#{pageManager.portletInvoker}" - actionListener="#{pageManager.assignWindow}" - supportedModes="edit_content" - supportedWindowStates="normal" - initialMode="edit_content" - initialWindowState="normal" - renderParameters="#{pageManager.selectedRenderParameters}" - onClick="url.setParameter('windowName', document.getElementById('windowForm:windowName').value);"/> - </div> + <jbp:portlet + portletId="#{pageManager.selectedEditorPortletId}" + portletInvoker="#{pageManager.portletInvoker}" + actionListener="#{pageManager.assignWindow}" + supportedModes="edit_content" + supportedWindowStates="normal" + initialMode="edit_content" + initialWindowState="normal" + renderParameters="#{pageManager.selectedRenderParameters}" + onClick="url.setParameter('windowName', document.getElementById('windowForm:windowName').value);"/> </td> </tr> </table> @@ -92,8 +90,8 @@ <h:message for="layoutForm" errorClass="portlet-msg-error"/> <input id="blah" type="hidden" name="blah" value=""/> <table width="100%"> - <c:forEach items="#{pageManager.regionNames}" var="regionName" varStatus="status"> - <tbody> + <tbody> + <c:forEach items="#{pageManager.regionNames}" var="regionName" varStatus="status"> <tr> <td colspan="3" class="portlet-form-field-label"> <hr/> @@ -132,8 +130,8 @@ styleClass="portlet-form-button layout-button"/> </td> </tr> - </tbody> - </c:forEach> + </c:forEach> + </tbody> <c:if test="#{!(empty pageManager.assignedWindows['unknown'])}"> <tbody> <tr>