August 2007 - portal-commits - Jboss List Archives

JBoss Portal SVN: r8131 - trunk/core-admin/src/bin/portal-admin-war.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2007-08-31 17:41:00 -0400 (Fri, 31 Aug 2007) New Revision: 8131 Modified: trunk/core-admin/src/bin/portal-admin-war/style.css Log: - JBPORTAL-1670: Added style for object names outside of tables. Modified: trunk/core-admin/src/bin/portal-admin-war/style.css =================================================================== --- trunk/core-admin/src/bin/portal-admin-war/style.css 2007-08-31 21:38:16 UTC (rev 8130) +++ trunk/core-admin/src/bin/portal-admin-war/style.css 2007-08-31 21:41:00 UTC (rev 8131) @@ -238,3 +238,15 @@ display: block; padding: 1em 0 0 0; } + +.admin-ui .objectName:before { + content: "'"; +} + +.admin-ui .objectName:after { + content: "'"; +} + +.admin-ui .objectName { + font-style: italic; +} \ No newline at end of file

16 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8130 - branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2007-08-31 17:38:16 -0400 (Fri, 31 Aug 2007) New Revision: 8130 Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css Log: - JBPORTAL-1670: Added style for object names outside of tables. Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css 2007-08-31 21:31:11 UTC (rev 8129) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css 2007-08-31 21:38:16 UTC (rev 8130) @@ -238,3 +238,16 @@ display: block; padding: 1em 0 0 0; } + +.admin-ui .objectName:before { + content: "'"; +} + +.admin-ui .objectName:after { + content: "'"; +} + +.admin-ui .objectName { + font-style: italic; +} +

16 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8129 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2007-08-31 17:31:11 -0400 (Fri, 31 Aug 2007) New Revision: 8129 Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml Log: - Simplified navigation code. - Added styling of object names outside of tables. Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-08-31 21:24:29 UTC (rev 8128) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-08-31 21:31:11 UTC (rev 8129) @@ -13,7 +13,7 @@ Manage   <c:choose> <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}">portals</c:when> - <c:otherwise>#{portalobjectmgr.selectedObject.name} portal</c:otherwise> + <c:otherwise><span class="objectName">#{portalobjectmgr.selectedObject.name}</span> portal</c:otherwise> </c:choose> </h3> <h:form> @@ -27,7 +27,8 @@ Manage   <c:choose> <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}">sub-portals</c:when> - <c:otherwise>pages within #{portalobjectmgr.selectedObject.name} portal</c:otherwise> + <c:otherwise>pages within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + portal</c:otherwise> </c:choose> </h3>  Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-08-31 21:24:29 UTC (rev 8128) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-08-31 21:31:11 UTC (rev 8129) @@ -8,7 +8,7 @@ <ui:define name="content"> - <h3 class="sectionTitle">Manage #{portalobjectmgr.selectedObject.name} + <h3 class="sectionTitle">Manage <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{portalobjectmgr.selectedObject.typeName}</h3> <h:form> @@ -38,7 +38,7 @@ </h:commandLink> </h:form> - <h3 class="sectionTitle">Manage sub-pages within #{portalobjectmgr.selectedObject.name} + <h3 class="sectionTitle">Manage sub-pages within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{portalobjectmgr.selectedObject.typeName}</h3>  <h:form styleClass="createObjectForm"> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml 2007-08-31 21:24:29 UTC (rev 8128) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml 2007-08-31 21:31:11 UTC (rev 8129) @@ -5,8 +5,9 @@ <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="Security"/> <ui:define name="content"> - <h3>Please set the permissions for the window: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3> - <ui:include src="common/editSecurity.xhtml"/> + <h3>Please set the permissions for the <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + window</h3> + <ui:include src="common/editSecurity.xhtml"/> </ui:define> </ui:composition> </div> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-08-31 21:24:29 UTC (rev 8128) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-08-31 21:31:11 UTC (rev 8129) @@ -15,8 +15,7 @@ <f:facet name="header"> <h:outputText value="Portal"/> </f:facet> - <h:commandLink action="#{portalobjectmgr.selectObject}"> - <h:outputText value="#{object.name}"/> + <h:commandLink action="#{portalobjectmgr.selectObject}">#{object.name} <f:param name="id" value="#{object.id}"/> </h:commandLink> </h:column> @@ -61,8 +60,7 @@ <f:facet name="header"> <h:outputText value="Page"/> </f:facet> - <h:commandLink action="#{portalobjectmgr.selectObject}"> - <h:outputText value="#{object.name}"/> + <h:commandLink action="#{portalobjectmgr.selectObject}">#{object.name} <f:param name="id" value="#{object.id}"/> </h:commandLink> </h:column> @@ -101,14 +99,15 @@ </c:if> <c:if test="#{not empty portalobjectmgr.selectedObject.windows}"> + <h3 class="sectionTitle">Manage windows within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + #{portalobjectmgr.selectedObject.typeName}</h3> <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.windows}" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header"> <h:column> <f:facet name="header"> <h:outputText value="Window"/> </f:facet> - <h:commandLink action="#{portalobjectmgr.selectObject}"> - <h:outputText value="#{object.name}"/> + <h:commandLink action="#{portalobjectmgr.selectObject}">#{object.name} <f:param name="id" value="#{object.id}"/> </h:commandLink> </h:column> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-08-31 21:24:29 UTC (rev 8128) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-08-31 21:31:11 UTC (rev 8129) @@ -29,33 +29,16 @@ <li> > </li> - - <c:choose> - <c:when test="#{node.id == portalobjectmgr.selectedObject.id}"> - <li class="selected"> - <h:commandLink action="#{portalobjectmgr.selectObject}"> - <f:param name="id" value="#{node.id}"/> - <c:choose> - <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">Portals</c:when> - <c:otherwise>#{node.name} #{node.typeName}</c:otherwise> - </c:choose> - </h:commandLink> - <h:outputText value=" #{portalObjectScreen}" rendered="#{portalObjectScreen != null}"/> - - </li> - </c:when> - <c:otherwise> - <li> - <h:commandLink action="#{portalobjectmgr.selectObject}"> - <f:param name="id" value="#{node.id}"/> - <c:choose> - <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">Portals</c:when> - <c:otherwise>#{node.name} #{node.typeName}</c:otherwise> - </c:choose> - </h:commandLink> - </li> - </c:otherwise> - </c:choose> + <li class="#{node.id == portalobjectmgr.selectedObject.id ? 'selected' : ''}"> + <h:commandLink action="#{portalobjectmgr.selectObject}"> + <f:param name="id" value="#{node.id}"/> + <c:choose> + <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">Portals</c:when> + <c:otherwise><span class="objectName">#{node.name}</span> #{node.typeName}</c:otherwise> + </c:choose> + </h:commandLink> + <h:outputText value=" #{portalObjectScreen}" rendered="#{portalObjectScreen != null}"/> + </li> </c:forEach> </ul> </h:form> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml 2007-08-31 21:24:29 UTC (rev 8128) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml 2007-08-31 21:31:11 UTC (rev 8129) @@ -7,12 +7,13 @@ <ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="Rename"/> <ui:define name="content"> - <h3>Rename <h:outputText value="#{portalobjectmgr.selectedObjectType}"/></h3> + <h3>Rename #{portalobjectmgr.selectedObjectType}</h3> <h:form id="renameForm"> - <p>Rename the <h:outputText value=" #{portalobjectmgr.selectedObject.name} "/> - <h:outputText value="#{portalobjectmgr.selectedObjectType}"/> to: + <h:message for="newName"/> + + <p>Rename the <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + #{portalobjectmgr.selectedObjectType} to: <h:inputText id="newName" value="#{renameAction.newName}"/> - <h:message for="newName"/> <h:commandButton value="Rename" action="#{renameAction.execute}" styleClass="portlet-form-button"/> </p> </h:form>

16 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8128 - branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2007-08-31 17:24:29 -0400 (Fri, 31 Aug 2007) New Revision: 8128 Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml Log: - Simplified navigation code. - Added styling of object names outside of tables. Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-08-31 16:30:38 UTC (rev 8127) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-08-31 21:24:29 UTC (rev 8128) @@ -13,7 +13,7 @@ Manage   <c:choose> <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}">portals</c:when> - <c:otherwise>#{portalobjectmgr.selectedObject.name} portal</c:otherwise> + <c:otherwise><span class="objectName">#{portalobjectmgr.selectedObject.name}</span> portal</c:otherwise> </c:choose> </h3> <h:form> @@ -27,7 +27,8 @@ Manage   <c:choose> <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}">sub-portals</c:when> - <c:otherwise>pages within #{portalobjectmgr.selectedObject.name} portal</c:otherwise> + <c:otherwise>pages within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + portal</c:otherwise> </c:choose> </h3>  Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-08-31 16:30:38 UTC (rev 8127) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-08-31 21:24:29 UTC (rev 8128) @@ -8,7 +8,7 @@ <ui:define name="content"> - <h3 class="sectionTitle"> Manage #{portalobjectmgr.selectedObject.name} + <h3 class="sectionTitle">Manage <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{portalobjectmgr.selectedObject.typeName}</h3> <h:form> @@ -38,7 +38,7 @@ </h:commandLink> </h:form> - <h3 class="sectionTitle"> Manage sub-pages within #{portalobjectmgr.selectedObject.name} + <h3 class="sectionTitle">Manage sub-pages within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{portalobjectmgr.selectedObject.typeName}</h3>  <h:form styleClass="createObjectForm"> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml 2007-08-31 16:30:38 UTC (rev 8127) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml 2007-08-31 21:24:29 UTC (rev 8128) @@ -5,8 +5,9 @@ <ui:composition template="objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="Security"/> <ui:define name="content"> - <h3>Please set the permissions for the window: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3> - <ui:include src="common/editSecurity.xhtml"/> + <h3>Please set the permissions for the <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + window</h3> + <ui:include src="common/editSecurity.xhtml"/> </ui:define> </ui:composition> </div> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-08-31 16:30:38 UTC (rev 8127) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-08-31 21:24:29 UTC (rev 8128) @@ -15,8 +15,7 @@ <f:facet name="header"> <h:outputText value="Portal"/> </f:facet> - <h:commandLink action="#{portalobjectmgr.selectObject}"> - <h:outputText value="#{object.name}"/> + <h:commandLink action="#{portalobjectmgr.selectObject}">#{object.name} <f:param name="id" value="#{object.id}"/> </h:commandLink> </h:column> @@ -61,8 +60,7 @@ <f:facet name="header"> <h:outputText value="Page"/> </f:facet> - <h:commandLink action="#{portalobjectmgr.selectObject}"> - <h:outputText value="#{object.name}"/> + <h:commandLink action="#{portalobjectmgr.selectObject}">#{object.name} <f:param name="id" value="#{object.id}"/> </h:commandLink> </h:column> @@ -101,14 +99,15 @@ </c:if> <c:if test="#{not empty portalobjectmgr.selectedObject.windows}"> + <h3 class="sectionTitle">Manage windows within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + #{portalobjectmgr.selectedObject.typeName}</h3> <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.windows}" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header"> <h:column> <f:facet name="header"> <h:outputText value="Window"/> </f:facet> - <h:commandLink action="#{portalobjectmgr.selectObject}"> - <h:outputText value="#{object.name}"/> + <h:commandLink action="#{portalobjectmgr.selectObject}">#{object.name} <f:param name="id" value="#{object.id}"/> </h:commandLink> </h:column> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-08-31 16:30:38 UTC (rev 8127) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-08-31 21:24:29 UTC (rev 8128) @@ -29,33 +29,16 @@ <li> > </li> - - <c:choose> - <c:when test="#{node.id == portalobjectmgr.selectedObject.id}"> - <li class="selected"> - <h:commandLink action="#{portalobjectmgr.selectObject}"> - <f:param name="id" value="#{node.id}"/> - <c:choose> - <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">Portals</c:when> - <c:otherwise>#{node.name} #{node.typeName}</c:otherwise> - </c:choose> - </h:commandLink> - <h:outputText value=" #{portalObjectScreen}" rendered="#{portalObjectScreen != null}"/> - - </li> - </c:when> - <c:otherwise> - <li> - <h:commandLink action="#{portalobjectmgr.selectObject}"> - <f:param name="id" value="#{node.id}"/> - <c:choose> - <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">Portals</c:when> - <c:otherwise>#{node.name} #{node.typeName}</c:otherwise> - </c:choose> - </h:commandLink> - </li> - </c:otherwise> - </c:choose> + <li class="#{node.id == portalobjectmgr.selectedObject.id ? 'selected' : ''}"> + <h:commandLink action="#{portalobjectmgr.selectObject}"> + <f:param name="id" value="#{node.id}"/> + <c:choose> + <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">Portals</c:when> + <c:otherwise><span class="objectName">#{node.name}</span> #{node.typeName}</c:otherwise> + </c:choose> + </h:commandLink> + <h:outputText value=" #{portalObjectScreen}" rendered="#{portalObjectScreen != null}"/> + </li> </c:forEach> </ul> </h:form> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml 2007-08-31 16:30:38 UTC (rev 8127) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml 2007-08-31 21:24:29 UTC (rev 8128) @@ -7,11 +7,12 @@ <ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="Rename"/> <ui:define name="content"> - <h3>Rename <h:outputText value="#{portalobjectmgr.selectedObjectType}"/></h3> + <h3>Rename #{portalobjectmgr.selectedObjectType}</h3> <h:form id="renameForm"> <h:message for="newName"/> - <p>Rename the <h:outputText value=" #{portalobjectmgr.selectedObject.name} "/> - <h:outputText value="#{portalobjectmgr.selectedObjectType}"/> to: + + <p>Rename the <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + #{portalobjectmgr.selectedObjectType} to: <h:inputText id="newName" value="#{renameAction.newName}"/> <h:commandButton value="Rename" action="#{renameAction.execute}" styleClass="portlet-form-button"/> </p>

16 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8127 - in branches/JBoss_Portal_Branch_2_6/core-admin/src: resources/portal-admin-war/WEB-INF and 2 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-08-31 12:30:38 -0400 (Fri, 31 Aug 2007) New Revision: 8127 Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml Log: JBPORTAL-1311: Renaming a page should be possible in the dashboard and management portlet Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java 2007-08-31 16:02:18 UTC (rev 8126) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/RenameAction.java 2007-08-31 16:30:38 UTC (rev 8127) @@ -28,8 +28,11 @@ import javax.faces.context.FacesContext; import org.jboss.portal.core.admin.ui.PortalObjectManagerBean; +import org.jboss.portal.core.admin.ui.dashboard.DashboardBean; import org.jboss.portal.core.model.portal.DuplicatePortalObjectException; import org.jboss.portal.core.model.portal.NoSuchPortalObjectException; +import org.jboss.portal.core.model.portal.Page; +import org.jboss.portal.core.model.portal.PageContainer; import org.jboss.portal.core.model.portal.PortalObject; import org.jboss.portal.core.model.portal.PortalObjectId; import org.jboss.portal.core.model.portal.PortalObjectPath; @@ -43,10 +46,12 @@ { private String newName; - /** . */ - private PortalObjectManagerBean portalObjectManager; + /** The page container that will create the child. */ + public PageContainer pageContainer; private DomainConfigurator domainConfigurator; + + public Object bean; public void setNewName(String newName) { @@ -55,6 +60,10 @@ public String getNewName() { + if (newName == null) + { + newName = pageContainer.getName(); + } return newName; } @@ -68,39 +77,40 @@ { this.domainConfigurator = domainConfigurator; } - public PortalObjectManagerBean getPortalObjectManager() + + public PageContainer getPageContainer() { - return portalObjectManager; + return pageContainer; } - public void setPortalObjectManager(PortalObjectManagerBean portalObjectManager) + public void setPageContainer(PageContainer pageContainer) { - this.portalObjectManager = portalObjectManager; + this.pageContainer = pageContainer; } public String execute() { - PortalObject portalObject = (PortalObject)portalObjectManager.getSelectedObject(); - PortalObject parent = portalObject.getParent(); + PortalObject parent = pageContainer.getParent(); + PortalObject newObject = null; try { // TODO: Should be in a tx // Clone portal object - PortalObject newObject = portalObject.copy(parent, newName, true); + newObject = pageContainer.copy(parent, newName, true); // Copy security settings - Set set = domainConfigurator.getSecurityBindings(portalObject.getId().toString(PortalObjectPath.CANONICAL_FORMAT)); + Set set = domainConfigurator.getSecurityBindings(pageContainer.getId().toString(PortalObjectPath.CANONICAL_FORMAT)); domainConfigurator.setSecurityBindings(newObject.getId().toString(PortalObjectPath.CANONICAL_FORMAT), set); String defaultObject = (String)parent.getDeclaredProperties().get(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME); - if (portalObject.getName().equals(defaultObject)) + if (pageContainer.getName().equals(defaultObject)) { parent.setDeclaredProperty(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME, newName); } // Destroy previous object - parent.destroyChild(portalObject.getName()); + parent.destroyChild(pageContainer.getName()); } catch (IllegalArgumentException e) { @@ -116,8 +126,19 @@ { e.printStackTrace(); } - portalObjectManager.selectObject(parent); - return "objects"; + + // TODO: This is not clean + if (bean instanceof PortalObjectManagerBean) + { + ((PortalObjectManagerBean)bean).selectObject(parent); + return "objects"; + } + else if (bean instanceof DashboardBean) + { + ((DashboardBean)bean).selectedPageName = newObject.getName(); + } + + return null; } Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-08-31 16:02:18 UTC (rev 8126) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-08-31 16:30:38 UTC (rev 8127) @@ -288,15 +288,37 @@ <managed-bean-class>org.jboss.portal.core.admin.ui.actions.RenameAction</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> <managed-property> - <property-name>portalObjectManager</property-name> - <value>#{sessionScope.portalobjectmgr}</value> + <property-name>pageContainer</property-name> + <value>#{portalobjectmgr.selectedObject}</value> </managed-property> <managed-property> + <property-name>bean</property-name> + <value>#{portalobjectmgr}</value> + </managed-property> + <managed-property> <property-name>domainConfigurator</property-name> <value>#{applicationScope.AuthorizationDomainRegistry.portalobject.configurator}</value> </managed-property> </managed-bean> + <managed-bean> + <managed-bean-name>renameDashboardPageAction</managed-bean-name> + <managed-bean-class>org.jboss.portal.core.admin.ui.actions.RenameAction</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + <managed-property> + <property-name>pageContainer</property-name> + <value>#{dashboard.selectedPage}</value> + </managed-property> + <managed-property> + <property-name>bean</property-name> + <value>#{dashboard}</value> + </managed-property> + <managed-property> + <property-name>domainConfigurator</property-name> + <value>#{applicationScope.AuthorizationDomainRegistry.portalobject.configurator}</value> + </managed-property> + </managed-bean> +  <managed-bean> <managed-bean-name>PortalObject</managed-bean-name> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2007-08-31 16:02:18 UTC (rev 8126) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2007-08-31 16:30:38 UTC (rev 8127) @@ -12,7 +12,7 @@ <table width="100%"> <tr> - <th colspan="2" class="portlet-section-header" align="center">Personal Dashboard Editor</th> + <th class="portlet-section-header" align="center">Personal Dashboard Editor</th> </tr> <tr> <td class="portlet-section-body" align="center"> @@ -31,6 +31,18 @@ </h:form> </td> </tr> + <tr> + <td align="left" valign="top"><b>Rename this Page:</b><br/>New page name:  + <h:form id="renameForm" style="padding:0;margin:0"> + <h:message for="newName"/> + <h:inputText id="newName" value="#{renameDashboardPageAction.newName}" + styleClass="portlet-form-input-field"/> + <h:commandButton value="Rename" + action="#{renameDashboardPageAction.execute}" + styleClass="portlet-form-button"/> + </h:form> + </td> + </tr> </table> </td> <td align="left" valign="top"> @@ -38,28 +50,29 @@ You can control the page titles, column layouts, page themes, and add, order, or remove portlets. - </td> + </td> </tr> </table> </td> </tr> <tr> - <th colspan="2" class="portlet-section-header" align="center">Currently editing page #{dashboard.selectedPage.name}</th> + <td class="portlet-section-header" align="center">Currently editing page #{dashboard.selectedPage.name}</td> </tr> <tr> <td class="portlet-section-body" align="center"> <h:form id="page_selector_form" style="padding:0;margin:0"> Select: <h:selectOneMenu - id="pageNameSelector" - value="#{dashboard.selectedPageName}" - styleClass="portlet-form-field" - onchange="document.getElementById('page_selector_form').submit()"> - <f:selectItems value="#{dashboard.pageItems}"/> + id="pageNameSelector" + value="#{dashboard.selectedPageName}" + styleClass="portlet-form-field" + onchange="document.getElementById('page_selector_form').submit()"> + <f:selectItems value="#{dashboard.pageItems}"/> </h:selectOneMenu> </h:form> <br/> </td> </tr> + <tr> <td> <table width="100%"> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml 2007-08-31 16:02:18 UTC (rev 8126) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml 2007-08-31 16:30:38 UTC (rev 8127) @@ -7,12 +7,12 @@ <ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="Rename"/> <ui:define name="content"> - <h3>Rename <h:outputText value="#{portalobjectmgr.selectedObjectType}"/></h3> + <h3>Rename <h:outputText value="#{portalobjectmgr.selectedObjectType}"/></h3> <h:form id="renameForm"> + <h:message for="newName"/> <p>Rename the <h:outputText value=" #{portalobjectmgr.selectedObject.name} "/> <h:outputText value="#{portalobjectmgr.selectedObjectType}"/> to: <h:inputText id="newName" value="#{renameAction.newName}"/> - <h:message for="newName"/> <h:commandButton value="Rename" action="#{renameAction.execute}" styleClass="portlet-form-button"/> </p> </h:form>

16 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8126 - trunk/tools/lib.

by portal-commits＠lists.jboss.org

Author: prabhat.jha(a)jboss.com Date: 2007-08-31 12:02:18 -0400 (Fri, 31 Aug 2007) New Revision: 8126 Added: trunk/tools/lib/ant-trax.jar Removed: trunk/tools/lib/saxon.jar trunk/tools/lib/xalan.jar Log: adding ant-trax.jar and removing saxon and jaxon jars for build.bat reports to work Added: trunk/tools/lib/ant-trax.jar =================================================================== (Binary files differ) Property changes on: trunk/tools/lib/ant-trax.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/tools/lib/saxon.jar =================================================================== (Binary files differ) Deleted: trunk/tools/lib/xalan.jar =================================================================== (Binary files differ)

16 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8125 - in trunk/core/src/main/org/jboss/portal/core: model/instance and 1 other directory.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-08-31 08:49:58 -0400 (Fri, 31 Aug 2007) New Revision: 8125 Modified: trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceURLFactory.java Log: - RenderPortletInstanceCommand was left out from the InstanceURLFactory (problem enountered by Emanuel while trying to use it with non-logged in users) - JBPORTAL-1666: When redploying, removed preferences in portlet-instances.xml are not deleted Modified: trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java 2007-08-31 12:42:31 UTC (rev 8124) +++ trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java 2007-08-31 12:49:58 UTC (rev 8125) @@ -42,6 +42,7 @@ import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.impl.jsr168.metadata.PreferenceMetaData; import org.jboss.portal.portlet.state.PropertyChange; +import org.jboss.portal.portlet.state.PropertyMap; import org.jboss.portal.security.RoleSecurityBinding; import org.jboss.portal.security.SecurityConstants; import org.jboss.portal.security.metadata.SecurityConstraintsMetaData; @@ -396,22 +397,39 @@ private void configureInstance(Instance instance, InstanceMetaData metaData) throws PortletInvokerException, SecurityConfigurationException { + List changes = new ArrayList(); + + // Reset all preferences that are not overridden PreferencesMetaData preferencesMetaData = metaData.getPreferences(); - + PropertyMap propertyMap = instance.getProperties(); + if (propertyMap != null && propertyMap.size() > 0) + { + for (Iterator i = propertyMap.keySet().iterator(); i.hasNext();) + { + String key = (String)i.next(); + if (preferencesMetaData == null || preferencesMetaData.getPreference(key) == null) + { + changes.add(PropertyChange.newReset(key)); + } + } + } + // Configure preferences only if needed if (preferencesMetaData != null && preferencesMetaData.size() > 0) { - PropertyChange[] changes = new PropertyChange[preferencesMetaData.size()]; - int idx = 0; for (Iterator i = preferencesMetaData.iterator(); i.hasNext();) { PreferenceMetaData preference = (PreferenceMetaData)i.next(); Value value = new StringValue(preference.getValues()); - changes[idx++] = PropertyChange.newUpdate(preference.getName(), value); + changes.add(PropertyChange.newUpdate(preference.getName(), value)); } - instance.setProperties(changes); } + if (changes.size() > 0) + { + instance.setProperties((PropertyChange[])changes.toArray(new PropertyChange[changes.size()])); + } + // Configure security SecurityConstraintsMetaData securityConstraints = metaData.getSecurityConstraints(); if (securityConstraints == null) Modified: trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceURLFactory.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceURLFactory.java 2007-08-31 12:42:31 UTC (rev 8124) +++ trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceURLFactory.java 2007-08-31 12:49:58 UTC (rev 8125) @@ -27,11 +27,13 @@ import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.model.instance.command.action.InvokePortletInstanceRenderCommand; import org.jboss.portal.core.model.instance.command.action.InvokePortletInstanceActionCommand; +import org.jboss.portal.core.model.instance.command.render.RenderPortletInstanceCommand; import org.jboss.portal.core.model.instance.command.PortletInstanceCommand; import org.jboss.portal.server.ServerURL; import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.AbstractServerURL; import org.jboss.portal.portlet.impl.PortletRequestEncoder; +import org.jboss.util.NotImplementedException; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -45,7 +47,7 @@ /** . */ private String instanceId; - + public String getPath() { return path; @@ -87,12 +89,22 @@ PortletRequestEncoder encoder = new PortletRequestEncoder(url.getParameterMap()); encoder.encodeRender(iprc.getNavigationalState(), null, null); } - else + else if (cmd instanceof RenderPortletInstanceCommand) { + RenderPortletInstanceCommand rpic = (RenderPortletInstanceCommand)cmd; + PortletRequestEncoder encoder = new PortletRequestEncoder(url.getParameterMap()); + encoder.encodeRender(rpic.getNavigationalState(), null, null); + } + else if (cmd instanceof InvokePortletInstanceActionCommand) + { InvokePortletInstanceActionCommand iprc = (InvokePortletInstanceActionCommand)cmd; PortletRequestEncoder encoder = new PortletRequestEncoder(url.getParameterMap()); encoder.encodeAction(iprc.getNavigationalState(), iprc.getInteractionState(), null, null); } + else + { + throw new NotImplementedException(cmd + "is an unknown sub-class of PortletInstanceCommand"); + } return url; }

16 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8124 - branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-08-31 08:42:31 -0400 (Fri, 31 Aug 2007) New Revision: 8124 Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceURLFactory.java Log: RenderPortletInstanceCommand was left out from the InstanceURLFactory (problem enountered by Emanuel while trying to use it with non-logged in users) Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceURLFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceURLFactory.java 2007-08-31 12:30:35 UTC (rev 8123) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/instance/InstanceURLFactory.java 2007-08-31 12:42:31 UTC (rev 8124) @@ -27,11 +27,13 @@ import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.model.instance.command.action.InvokePortletInstanceRenderCommand; import org.jboss.portal.core.model.instance.command.action.InvokePortletInstanceActionCommand; +import org.jboss.portal.core.model.instance.command.render.RenderPortletInstanceCommand; import org.jboss.portal.core.model.instance.command.PortletInstanceCommand; import org.jboss.portal.server.ServerURL; import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.server.AbstractServerURL; import org.jboss.portal.portlet.impl.PortletRequestEncoder; +import org.jboss.util.NotImplementedException; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -45,7 +47,7 @@ /** . */ private String instanceId; - + public String getPath() { return path; @@ -87,12 +89,22 @@ PortletRequestEncoder encoder = new PortletRequestEncoder(url.getParameterMap()); encoder.encodeRender(iprc.getNavigationalState(), null, null); } - else + else if (cmd instanceof RenderPortletInstanceCommand) { + RenderPortletInstanceCommand rpic = (RenderPortletInstanceCommand)cmd; + PortletRequestEncoder encoder = new PortletRequestEncoder(url.getParameterMap()); + encoder.encodeRender(rpic.getNavigationalState(), null, null); + } + else if (cmd instanceof InvokePortletInstanceActionCommand) + { InvokePortletInstanceActionCommand iprc = (InvokePortletInstanceActionCommand)cmd; PortletRequestEncoder encoder = new PortletRequestEncoder(url.getParameterMap()); encoder.encodeAction(iprc.getNavigationalState(), iprc.getInteractionState(), null, null); } + else + { + throw new NotImplementedException(cmd + "is an unknown sub-class of PortletInstanceCommand"); + } return url; }

16 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8123 - modules/identity/trunk/identity/src/main/org/jboss/portal/test/identity/ldap.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2007-08-31 08:30:35 -0400 (Fri, 31 Aug 2007) New Revision: 8123 Modified: modules/identity/trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java Log: cleanup Modified: modules/identity/trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java 2007-08-31 11:39:00 UTC (rev 8122) +++ modules/identity/trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java 2007-08-31 12:30:35 UTC (rev 8123) @@ -105,7 +105,6 @@ // fix assert for OpenLDAP (\2C --> \,) names.add(user.getDn().replaceAll("\\\\2C", "\\\\,").toLowerCase()); } - System.out.println("#################### users: " + names); assertTrue(names.contains((prefix + "=jduke1,ou=People," + suffix).toLowerCase())); assertTrue(names.contains((prefix + "=jduke3,ou=People," + suffix).toLowerCase())); assertTrue(names.contains((prefix + "=jduke4\\, Duke,ou=People," + suffix).toLowerCase()));

16 years, 8 months

1
0
0 / 0

JBoss Portal SVN: r8122 - in modules/identity/trunk/identity: src/main/org/jboss/portal/test/identity/ldap and 1 other directory.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2007-08-31 07:39:00 -0400 (Fri, 31 Aug 2007) New Revision: 8122 Removed: modules/identity/trunk/identity/build.log Modified: modules/identity/trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java Log: fix assertions for OpenLDAP test case Deleted: modules/identity/trunk/identity/build.log =================================================================== --- modules/identity/trunk/identity/build.log 2007-08-31 10:35:31 UTC (rev 8121) +++ modules/identity/trunk/identity/build.log 2007-08-31 11:39:00 UTC (rev 8122) @@ -1,15 +0,0 @@ - -configure: - -configure-modules: - -configure-defaults: - -configure-tools: - -init: - -undeploy-ldap: - [delete] Deleting: /home/bdaw/Workshop/JBoss/server/jboss-4.2.1.GA/server/default/deploy/test-identity.sar - -BUILD SUCCESSFUL Modified: modules/identity/trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java 2007-08-31 10:35:31 UTC (rev 8121) +++ modules/identity/trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTestCase.java 2007-08-31 11:39:00 UTC (rev 8122) @@ -102,8 +102,10 @@ for (Iterator iterator = users.iterator(); iterator.hasNext();) { LDAPUserImpl user = (LDAPUserImpl)iterator.next(); - names.add(user.getDn().toLowerCase()); + // fix assert for OpenLDAP (\2C --> \,) + names.add(user.getDn().replaceAll("\\\\2C", "\\\\,").toLowerCase()); } + System.out.println("#################### users: " + names); assertTrue(names.contains((prefix + "=jduke1,ou=People," + suffix).toLowerCase())); assertTrue(names.contains((prefix + "=jduke3,ou=People," + suffix).toLowerCase())); assertTrue(names.contains((prefix + "=jduke4\\, Duke,ou=People," + suffix).toLowerCase())); @@ -160,7 +162,8 @@ for (Iterator iterator = users.iterator(); iterator.hasNext();) { LDAPUserImpl user = (LDAPUserImpl)iterator.next(); - names.add(user.getDn().toLowerCase()); + // fix assert for OpenLDAP (\2C --> \,) + names.add(user.getDn().replaceAll("\\\\2C", "\\\\,").toLowerCase()); } assertTrue(names.contains((prefix + "=jduke1,ou=People," + suffix).toLowerCase())); @@ -186,7 +189,8 @@ for (Iterator iterator = users.iterator(); iterator.hasNext();) { LDAPUserImpl user = (LDAPUserImpl)iterator.next(); - names.add(user.getDn().toLowerCase()); + // fix assert for OpenLDAP (\2C --> \,) + names.add(user.getDn().replaceAll("\\\\2C", "\\\\,").toLowerCase()); } assertTrue(names.contains((prefix + "=jduke3,ou=People," + suffix).toLowerCase()));

16 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits August 2007