5:45 p.m.
Author: wesleyhales
Date: 2007-11-28 11:45:37 -0500 (Wed, 28 Nov 2007)
New Revision: 9171
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/tabContainer.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml
Log:
JBPORTAL-1805 Let a user define multiple display-name for a portal object in the admin
portlet
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/tabContainer.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/tabContainer.xhtml 2007-11-28
16:35:27 UTC (rev 9170)
+++
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/tabContainer.xhtml 2007-11-28
16:45:37 UTC (rev 9171)
@@ -5,6 +5,7 @@
<div class="tab-container">
<ui:insert name="tab-container-content"/>
+ <br class="clear"/>
</div>
</ui:composition>
\ No newline at end of file
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml 2007-11-28
16:35:27 UTC (rev 9170)
+++
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml 2007-11-28
16:45:37 UTC (rev 9171)
@@ -1,62 +1,79 @@
<div
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:c="http://java.sun.com/jstl/core">
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core">
<ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml">
- <ui:param name="portalObjectScreen" value="Rename"/>
-
+ <ui:param name="portalObjectScreen" value="Display
Names"/>
+
<ui:define name="content">
<h3 class="zero pad10 clear">Add Display Name</h3>
+
<div class="float-left third-width-pad5">
<h:form id="displayNameForm">
- <p class="portlet-area-header">Add Display Names</p>
- <div class="portlet-area-body">
- <h:inputText id="newName"
value="#{addDisplayNameAction.newText}" required="true"/>
- <h:selectOneMenu id="locales"
value="#{addDisplayNameAction.newLocale}">
- <f:selectItems
value="#{addDisplayNameAction.locales}"/>
- </h:selectOneMenu>
- <h:commandButton value="Add Name"
action="#{addDisplayNameAction.addDisplayName}"
styleClass="portlet-form-button"/>
- </div>
+ <p class="portlet-area-header">Add Display
Names</p>
+
+ <div class="portlet-area-body">
+ <h:inputText id="newName"
value="#{addDisplayNameAction.newText}" required="true"/>
+ <h:selectOneMenu id="locales"
value="#{addDisplayNameAction.newLocale}">
+ <f:selectItems
value="#{addDisplayNameAction.locales}"/>
+ </h:selectOneMenu>
+ <h:commandButton value="#{addDisplayNameAction.newText ne null
? 'Modify' : 'Add'} Name"
action="#{addDisplayNameAction.addDisplayName}"
+ styleClass="portlet-form-button"/>
+ </div>
</h:form>
</div>
<div class="float-left two-third-width-pad5">
<h:form>
- <p class="portlet-area-header">Current Display
Names</p>
- <div class="portlet-area-body">
+ <p class="portlet-area-header">Current Display
Names</p>
- <table class="full-width">
- <tr>
- <th>Locale</th>
- <th>Display Name</th>
- <th>Delete</th>
- <th>Rename</th>
- </tr>
+ <div class="portlet-area-body">
- <c:forEach items="#{addDisplayNameAction.currentLocales}"
var="value">
- <tr>
+ <h:dataTable var="value"
value="#{addDisplayNameAction.currentLocales}"
styleClass="objectList"
+
rowClasses="portlet-section-body,portlet-section-alternate"
+ columnClasses="objectNameColumn,
objectActionColumn"
+ headerClass="portlet-section-header">
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Locale"/>
+ </f:facet>
+ #{value.localeDisplayName}
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Display Name"/>
+ </f:facet>
+ #{value.text}
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Delete"/>
+ </f:facet>
- <td>#{value.localeDisplayName}</td>
- <td>#{value.text}</td>
- <td>
- <h:commandLink
action="#{addDisplayNameAction.editDisplayName}">
- <h:outputText styleClass="actionDelete"
value="Delete"/>
- <f:param name="locale"
value="#{value.locale}"/>
- <f:param name="editAction"
value="delete"/>
- </h:commandLink>
- </td>
- <td><h:commandLink
action="#{addDisplayNameAction.editDisplayName}">
- <h:outputText styleClass="actionRename"
value="Rename"/>
- <f:param name="locale"
value="#{value.locale}"/>
- <f:param name="editAction"
value="rename"/>
- </h:commandLink></td>
- </tr>
- </c:forEach>
- </table>
- </div>
+ <div style="width:150px"><h:commandLink
action="#{addDisplayNameAction.editDisplayName}">
+ <h:outputText styleClass="actionDelete"
value="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="Rename"/>
+ </f:facet>
+
+ <div style="width:150px"><h:commandLink
action="#{addDisplayNameAction.editDisplayName}">
+ <h:outputText styleClass="actionRename"
value="Rename"/>
+ <f:param name="locale"
value="#{value.locale}"/>
+ <f:param name="editAction"
value="rename"/>
+ </h:commandLink></div>
+ </h:column>
+ </h:dataTable>
+
+ </div>
</h:form>
+
</div>