Author: julien(a)jboss.com Date: 2007-02-27 19:58:21 -0500 (Tue, 27 Feb 2007) New Revision: 6448 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/editPageSecurity.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalSecurity.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pages.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portals.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml Log: - more visual tweaks (too many horizontal lines) - improve markup formatting a bit 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-28 00:48:44 UTC (rev 6447) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml 2007-02-28 00:58:21 UTC (rev 6448) @@ -10,7 +10,6 @@ <ui:define name="content"> - <hr class="admin-ui"/> <h3>You are editing the page layout</h3> <h:form id="layoutForm"> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageSecurity.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageSecurity.xhtml 2007-02-28 00:48:44 UTC (rev 6447) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageSecurity.xhtml 2007-02-28 00:58:21 UTC (rev 6448) @@ -2,20 +2,12 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html"> - -<ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml"> - - <ui:define name="content"> - - <hr class="admin-ui"/> - <h3>Please set the page permissions</h3> - - <ui:include src="/WEB-INF/jsp/management/common/editSecurity.xhtml"> - <ui:param name="auth" value="#{portalobjectmgr.auth}"/> - </ui:include> - - </ui:define> - -</ui:composition> - + <ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml"> + <ui:define name="content"> + <h3>Please set the page permissions</h3> + <ui:include src="/WEB-INF/jsp/management/common/editSecurity.xhtml"> + <ui:param name="auth" value="#{portalobjectmgr.auth}"/> + </ui:include> + </ui:define> + </ui:composition> </div> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalSecurity.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalSecurity.xhtml 2007-02-28 00:48:44 UTC (rev 6447) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalSecurity.xhtml 2007-02-28 00:58:21 UTC (rev 6448) @@ -7,7 +7,6 @@ <ui:define name="content"> - <hr class="admin-ui"/> <h3>Please set the portal permissions</h3> <ui:include src="/WEB-INF/jsp/management/common/editSecurity.xhtml"> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-28 00:48:44 UTC (rev 6447) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-28 00:58:21 UTC (rev 6448) @@ -9,14 +9,13 @@ <!-- Sub page addition --> <hr class="admin-ui"/> - - <h:form id="portal_form"> - <h:inputText id="name" value="#{addPageAction.pageName}" + <h:form id="portal_form"> + <h:inputText id="name" value="#{addPageAction.pageName}" validator="#{addPageAction.validatePageName}" required="true"/> - <h:commandButton action="#{addPageAction.execute}" value="Add portal page" styleClass="portlet-form-button"/> - <h:message for="name" style="color: red"/> - </h:form> + <h:commandButton action="#{addPageAction.execute}" value="Add portal page" styleClass="portlet-form-button"/> + <h:message for="name" style="color: red"/> + </h:form> <h:outputLink value="#{portalobjectmgr.previewURL}" title="Preview link" target="_blank">Preview link</h:outputLink> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pages.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pages.xhtml 2007-02-28 00:48:44 UTC (rev 6447) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pages.xhtml 2007-02-28 00:58:21 UTC (rev 6448) @@ -2,21 +2,13 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html"> - -<ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml"> - - <ui:define name="content"> - - <h3>You are editing the pages of: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3> - - <h:message id="status" for="status"/> - - <ui:include src="/WEB-INF/jsp/management/pageNavigation.xhtml"/> - - </ui:define> - -</ui:composition> - + <ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml"> + <ui:define name="content"> + <h3>You are editing the pages of: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3> + <h:message id="status" for="status"/> + <ui:include src="/WEB-INF/jsp/management/pageNavigation.xhtml"/> + </ui:define> + </ui:composition> </div> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml 2007-02-28 00:48:44 UTC (rev 6447) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml 2007-02-28 00:58:21 UTC (rev 6448) @@ -5,12 +5,13 @@ <ui:include src="nodeNavigation.xhtml"/> - <h:form id="portal_form"> - <h:inputText id="name" value="#{portalAction.portalName}" + <hr class="admin-ui"/> + <h:form id="portal_form"> + <h:inputText id="name" value="#{portalAction.portalName}" validator="#{portalAction.validatePortalName}" required="true"/> - <h:commandButton action="#{portalAction.addPortal}" value="Add portal" styleClass="portlet-form-button"/> - <h:message for="name" style="color: red"/> - </h:form> + <h:commandButton action="#{portalAction.addPortal}" value="Add portal" styleClass="portlet-form-button"/> + <h:message for="name" style="color: red"/> + </h:form> </div> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portals.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portals.xhtml 2007-02-28 00:48:44 UTC (rev 6447) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portals.xhtml 2007-02-28 00:58:21 UTC (rev 6448) @@ -2,19 +2,12 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html"> - -<ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml"> - - <ui:define name="content"> - - <h:message id="status" for="status"/> - - <ui:include src="/WEB-INF/jsp/management/portalNavigation.xhtml"/> - - </ui:define> - -</ui:composition> - + <ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml"> + <ui:define name="content"> + <h:message id="status" for="status"/> + <ui:include src="/WEB-INF/jsp/management/portalNavigation.xhtml"/> + </ui:define> + </ui:composition> </div> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml 2007-02-28 00:48:44 UTC (rev 6447) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml 2007-02-28 00:58:21 UTC (rev 6448) @@ -1,7 +1,5 @@ <div - xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets"> - + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets"> <ui:include src="/WEB-INF/jsp/management/nodeNavigation.xhtml"/> - </div> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml 2007-02-28 00:48:44 UTC (rev 6447) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml 2007-02-28 00:58:21 UTC (rev 6448) @@ -2,26 +2,15 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html"> - - <ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml"> - <ui:define name="content"> - <h3>You are editing the windows of: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3> - <h:message id="status" for="status"/> - <ui:include src="/WEB-INF/jsp/management/windowNavigation.xhtml"/> - <hr class="admin-ui"/> - <ui:include src="/WEB-INF/jsp/management/plugins/manager.xhtml"/> - </ui:define> - </ui:composition> - </div>