Author: chris.laprun(a)jboss.com Date: 2007-08-27 16:44:47 -0400 (Mon, 27 Aug 2007) New Revision: 8055 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/objectNavigation.xhtml Log: - JBPORTAL-1644: + Removed drop down action. + Mistakenly added Make Default to windows list. 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-27 20:38:05 UTC (rev 8054) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-08-27 20:44:47 UTC (rev 8055) @@ -1,8 +1,8 @@ <div - xmlns="http://www.w3.org/1999/xhtml" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html"> + xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html"> <ui:composition template="objectTemplate.xhtml"> @@ -21,27 +21,13 @@ <tr> <h:form id="portal_form"> <td><span class="portlet-font">Create a portal:</span></td> - <td><h:inputText id="name" value="#{portalAction.portalName}" styleClass="portlet-form-input-field" required="true"/></td> - <td><h:commandButton action="#{portalAction.addPortal}" value="Add portal" styleClass="portlet-form-button"/></td> + <td><h:inputText id="name" value="#{portalAction.portalName}" styleClass="portlet-form-input-field" + required="true"/></td> + <td><h:commandButton action="#{portalAction.addPortal}" value="Add portal" + styleClass="portlet-form-button"/></td> <td><h:message for="name" errorClass="portlet-msg-error"/></td> </h:form> </tr> - <!-- Default portal --> - <tr> - <h:form> - <td> - <span class="portlet-font">Default portal:</span> - </td> - <td> - <h:selectOneMenu id="name" styleClass="portlet-form-field" value="#{portalAction.defaultObjectName}"> - <f:selectItems value="#{portalobjectmgr.portalItems}" /> - </h:selectOneMenu> - </td> - <td colspan="2"> - <h:commandButton styleClass="portlet-form-button" value="Update" action="objects"/> - </td> - </h:form> - </tr> </table> </div> 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-27 20:38:05 UTC (rev 8054) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-08-27 20:44:47 UTC (rev 8055) @@ -56,25 +56,6 @@ </td> </h:form> </tr> - <!-- Default page --> - <h:panelGroup rendered="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL}"> - <tr> - <h:form> - <td> - <span class="portlet-font">Default page:</span> - </td> - <td> - <h:selectOneMenu id="name" styleClass="portlet-form-field" - value="#{portalAction.defaultObjectName}"> - <f:selectItems value="#{portalobjectmgr.portalPageItems}"/> - </h:selectOneMenu> - </td> - <td colspan="2"> - <h:commandButton styleClass="portlet-form-button" value="Update" action="objects"/> - </td> - </h:form> - </tr> - </h:panelGroup> </table> </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-27 20:38:05 UTC (rev 8054) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-08-27 20:44:47 UTC (rev 8055) @@ -146,15 +146,6 @@ <h:outputText value="Delete"/> <f:param name="id" value="#{object.id}"/> </h:commandLink> - <c:choose> - <c:when test="#{not object.default}"> | <h:commandLink action="#{portalobjectmgr.makeObjectDefault}"> - <h:outputText value="Make Default"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> - </c:when> - <c:otherwise> | <h:outputText value="Default"/> - </c:otherwise> - </c:choose> </td> </tr> </c:forEach>