Author: chris.laprun(a)jboss.com Date: 2009-02-24 06:12:12 -0500 (Tue, 24 Feb 2009) New Revision: 12877 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml Log: - JBPORTAL-2317: Better target for messages. Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java 2009-02-24 10:26:55 UTC (rev 12876) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/DisplayNameAction.java 2009-02-24 11:12:12 UTC (rev 12877) @@ -102,7 +102,7 @@ public void addDisplayName() throws ConversionException { - newText = checkNameValidity(newText, null); + newText = checkNameValidity(newText, "display-names-view:add-display-name-form:newName"); if (newText != null) { HasDisplayName hasDisplayName = getTarget(); Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml 2009-02-24 10:26:55 UTC (rev 12876) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml 2009-02-24 11:12:12 UTC (rev 12877) @@ -123,69 +123,68 @@ <div class="half-width float-right details-right-col"> -<f:subview rendered="#{showDisplayNameEditor}"> +<f:subview rendered="#{showDisplayNameEditor}" id="display-names-view"> <div class="whiteWithLtGreyHeader meta-box"> <h3 class="blue">#{bundle.COMMON_ADD_INSTANCE_DISPLAY_NAMES}</h3> <div class="pad5"> - <h:form id="add-display-name-form" style="background-color:transparent;width:100%;margin:0;padding:0;display:inline;"> - <h:inputText id="newName" value="#{instanceDisplayNameAction.newText}" required="true"/> - <h:selectOneMenu id="locales" value="#{instanceDisplayNameAction.newLocale}"> - <f:selectItems value="#{instanceDisplayNameAction.locales}"/> - </h:selectOneMenu> - <h:commandButton id="addDisplay" value="#{instanceDisplayNameAction.newText ne null ? 'Modify' : 'Add'} Name" - action="#{instanceDisplayNameAction.addDisplayName}" - styleClass="portlet-form-button"/> - </h:form> + <h:form id="add-display-name-form" style="background-color:transparent;width:100%;margin:0;padding:0;display:inline;"> + <h:inputText id="newName" value="#{instanceDisplayNameAction.newText}" required="true"/> + <h:message for="newName" errorClass="portlet-msg-error"/> + <h:selectOneMenu id="locales" value="#{instanceDisplayNameAction.newLocale}"> + <f:selectItems value="#{instanceDisplayNameAction.locales}"/> + </h:selectOneMenu> + <h:commandButton id="addDisplay" value="#{instanceDisplayNameAction.newText ne null ? 'Modify' : 'Add'} Name" + action="#{instanceDisplayNameAction.addDisplayName}" styleClass="portlet-form-button"/> + </h:form> </div> <br/> <h3 class="blue">#{bundle.COMMON_CURRENT_INSTANCE_DISPLAY_NAMES}</h3> <div class="pad5"> + <h:form id="instance-display-form" style="display:inline;width:100%;"> + <h:dataTable id="locale-datatable" var="value" value="#{instanceDisplayNameAction.currentLocales}" + styleClass="objectList datatable" + rowClasses="portlet-section-body,portlet-section-alternate-blue" + columnClasses="objectNameColumn, objectActionColumn" + headerClass="portlet-section-header"> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.COMMON_LOCALE}"/> + </f:facet> + #{value.localeDisplayName} + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.COMMON_DISPLAY_NAME}"/> + </f:facet> + #{value.text} + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.COMMON_DELETE}"/> + </f:facet> - <h:form id="instance-display-form" style="display:inline;width:100%;"> - <h:dataTable id="locale-datatable" var="value" value="#{instanceDisplayNameAction.currentLocales}" - styleClass="objectList datatable" - rowClasses="portlet-section-body,portlet-section-alternate-blue" - columnClasses="objectNameColumn, objectActionColumn" - headerClass="portlet-section-header"> - <h:column> - <f:facet name="header"> - <h:outputText value="#{bundle.COMMON_LOCALE}"/> - </f:facet> - #{value.localeDisplayName} - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{bundle.COMMON_DISPLAY_NAME}"/> - </f:facet> - #{value.text} - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{bundle.COMMON_DELETE}"/> - </f:facet> + <div><h:commandLink id="delete-link" action="#{instanceDisplayNameAction.editDisplayName}"> + <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> + <f:param name="locale" value="#{value.locale}"/> + <f:param name="editAction" value="delete"/> + </h:commandLink></div> + </h:column> + <h:column> + <f:facet name="header"> + <h:outputText value="#{bundle.RENAME}"/> + </f:facet> - <div><h:commandLink id="delete-link" action="#{instanceDisplayNameAction.editDisplayName}"> - <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> - <f:param name="locale" value="#{value.locale}"/> - <f:param name="editAction" value="delete"/> - </h:commandLink></div> - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="#{bundle.RENAME}"/> - </f:facet> - - <div style="width:150px"> - <h:commandLink id="edit-link" action="#{instanceDisplayNameAction.editDisplayName}"> - <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> - <f:param name="locale" value="#{value.locale}"/> - <f:param name="editAction" value="rename"/> - </h:commandLink></div> - </h:column> - </h:dataTable> - </h:form> + <div style="width:150px"> + <h:commandLink id="edit-link" action="#{instanceDisplayNameAction.editDisplayName}"> + <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> + <f:param name="locale" value="#{value.locale}"/> + <f:param name="editAction" value="rename"/> + </h:commandLink></div> + </h:column> + </h:dataTable> + </h:form> </div> </div> @@ -207,7 +206,7 @@ </c:forEach> </dl> </portal:box> - <portal:box class="whiteWithLtGreyHeader meta-box"> +<portal:box class="whiteWithLtGreyHeader meta-box"> <h3>#{bundle.COMMON_CONSUMED_EVENTS}</h3> <dl> <c:forEach var="consumedEvent" items="#{portlet.consumedEvents}">