[portal-commits] JBoss Portal SVN: r6438 - in trunk/core-admin/src/resources: portal-admin-war/WEB-INF/jsp/management and 1 other directory.
Author: julien(a)jboss.com
Date: 2007-02-27 17:22:41 -0500 (Tue, 27 Feb 2007)
New Revision: 6438
Modified:
trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml
Log:
- use portlet css style for error message
- use css styles in portlet plugin editor for portlet description
Modified: trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml 2007-02-27
22:12:53 UTC (rev 6437)
+++ trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml 2007-02-27
22:22:41 UTC (rev 6438)
@@ -4,7 +4,8 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ct="http://www.julien.com"
- xmlns:pfc="http://www.jboss.com/portal/facelet/common">
+ xmlns:pfc="http://www.jboss.com/portal/facelet/common"
+ xmlns:c="http://java.sun.com/jstl/core">
<h:selectOneListbox
value="#{contentURI}"
@@ -15,15 +16,15 @@
<pfc:context>
<ui:param name="instance"
value="#{registry.editors.portlet.instanceMap[contentURI]}"/>
<ui:param name="portlet" value="#{instance.portlet}"/>
- <h:panelGroup rendered="#{instance != null}">
- <h:outputText value="#{instance.id}"
styleClass="portlet-font"/>
- <br />
- <h:panelGroup rendered="#{portlet != null}">
- <h:outputText
- styleClass="portlet-font"
- value="Portlet #{portlet.name} - #{portlet.description}"/>
- </h:panelGroup>
- </h:panelGroup>
+ <c:if test="#{instance != null}">
+ <div class="portlet-font">
+ <div><span class="portlet-form-field-label">Portlet
instance:</span> #{instance.id}</div>
+ <c:if test="#{portlet != null}">
+ <div><span class="portlet-form-field-label">Portlet
name:</span> #{portlet.name}</div>
+ <div><span class="portlet-form-field-label">Portlet
description:</span> #{portlet.description}</div>
+ </c:if>
+ </div>
+ </c:if>
</pfc:context>
<br/>
<h:commandButton value="Show details"
styleClass="portlet-form-button"/>
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml 2007-02-27
22:12:53 UTC (rev 6437)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml 2007-02-27
22:22:41 UTC (rev 6438)
@@ -31,7 +31,7 @@
<f:selectItems
value="#{registry.availableTypes}"/>
</h:selectOneMenu>
<h:commandButton value="Change content type"
styleClass="portlet-form-button"/>
- <br/><h:message for="instanceId"
errorStyle="color:red;"/>
+ <br/><h:message for="instanceId"
errorClass="portlet-msg-error"/>
</td>
</tr>
<tr>
@@ -47,7 +47,7 @@
<h:outputText value="Window Name: "
styleClass="portlet-form-field-label"/>
</h:outputLabel>
<h:inputText id="windowName"
value="#{assignWindowsAction.windowName}"
styleClass="portlet-form-input-field"/>
- <br/><h:message for="windowName"
errorStyle="color:red;"/>
+ <br/><h:message for="windowName"
errorClass="portlet-msg-error"/>
</td>
</tr>
</table>