Author: julien(a)jboss.com Date: 2007-04-27 10:25:24 -0400 (Fri, 27 Apr 2007) New Revision: 7108 Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml 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/dashboard/dashboard.xhtml trunk/core/src/main/org/jboss/portal/core/model/instance/command/render/RenderPortletInstanceCommand.java Log: - improved page layout editor layout - use right stylesheet for the dashboard part that uses the page layout editor Modified: trunk/core/src/main/org/jboss/portal/core/model/instance/command/render/RenderPortletInstanceCommand.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/instance/command/render/RenderPortletInstanceCommand.java 2007-04-27 14:03:28 UTC (rev 7107) +++ trunk/core/src/main/org/jboss/portal/core/model/instance/command/render/RenderPortletInstanceCommand.java 2007-04-27 14:25:24 UTC (rev 7108) @@ -81,9 +81,12 @@ // For now let the controller handle non fragment response String content; + String header = ""; if (response instanceof FragmentResponse) { - content = ((FragmentResponse)response).getContent(); + FragmentResponse fragment = (FragmentResponse)response; + content = fragment.getContent(); + header = fragment.getHeader(); } else if (response instanceof ErrorResponse) { @@ -110,7 +113,7 @@ windowProps.put(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER, "emptyRenderer"); // - WindowResult res = new WindowResult("", content, Collections.EMPTY_MAP, windowProps, null, WindowState.MAXIMIZED, Mode.VIEW); + WindowResult res = new WindowResult("", content, Collections.EMPTY_MAP, windowProps, header, WindowState.MAXIMIZED, Mode.VIEW); WindowContext blah = new WindowContext("BILTO", "maximized", 0, res); result.addWindowContext(blah); Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml 2007-04-27 14:03:28 UTC (rev 7107) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml 2007-04-27 14:25:24 UTC (rev 7108) @@ -40,6 +40,9 @@ <transaction> <trans-attribute>Required</trans-attribute> </transaction> + <header-content> + <link rel="stylesheet" type="text/css" href="/style.css" title="" media="screen"/> + </header-content> </portlet> <!-- Service injected in the portlet context. --> 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-04-27 14:03:28 UTC (rev 7107) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-04-27 14:25:24 UTC (rev 7108) @@ -11,24 +11,10 @@ <table> <c:forEach items="#{pageManager.regionNames}" var="regionName" varStatus="status"> <tbody> - <c:choose> - <c:when test="#{status.index > 0}"> - <tr> - <td colspan="2" class="portlet-form-field-label" - style="border-width:0px;border-top:1px dashed #d5d5d5">#{regionName} - Region - </td> - </tr> - </c:when> - <c:otherwise> - <tr> - <td colspan="2" class="portlet-form-field-label">#{regionName} - Region - </td> - </tr> - </c:otherwise> - </c:choose> <tr> + <td colspan="2" class="portlet-form-field-label"><hr/> #{regionName} Region </td> + </tr> + <tr> <td> <div> <h:commandButton Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2007-04-27 14:03:28 UTC (rev 7107) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2007-04-27 14:25:24 UTC (rev 7108) @@ -114,9 +114,11 @@ <table> <tr> <td> - <ui:include src="/WEB-INF/jsf/common/editPageLayout.xhtml"> - <ui:param name="pageManager" value="#{dashboard.pageManager}"/> - </ui:include> + <div class="admin-ui"> + <ui:include src="/WEB-INF/jsf/common/editPageLayout.xhtml"> + <ui:param name="pageManager" value="#{dashboard.pageManager}"/> + </ui:include> + </div> </td> </tr> </table>