Author: julien(a)jboss.com Date: 2007-02-27 19:48:44 -0500 (Tue, 27 Feb 2007) New Revision: 6447 Removed: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowTheme.xhtml Modified: trunk/core-admin/src/bin/portal-admin-war/images/management/management.css trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/editSecurity.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/definitionsTemplate.xhtml 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/instances.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instancesTemplate.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.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/windows.xhtml Log: visual tweaks Modified: trunk/core-admin/src/bin/portal-admin-war/images/management/management.css =================================================================== --- trunk/core-admin/src/bin/portal-admin-war/images/management/management.css 2007-02-28 00:18:59 UTC (rev 6446) +++ trunk/core-admin/src/bin/portal-admin-war/images/management/management.css 2007-02-28 00:48:44 UTC (rev 6447) @@ -36,4 +36,8 @@ img.scroller { border:thin solid black; +} + +hr.admin-ui { + border-top-style: solid; } \ No newline at end of file Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/editSecurity.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/editSecurity.xhtml 2007-02-28 00:18:59 UTC (rev 6446) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/editSecurity.xhtml 2007-02-28 00:48:44 UTC (rev 6447) @@ -1,26 +1,24 @@ <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"> - <h:panelGroup> - <h:form> - <h:dataTable - var="role" - value="#{auth.roles}"> - <h:column> - <b><h:outputText value="#{role == '__unchecked__' ? 'Unchecked' : (auth.roleDisplayNameMap[role] != null ? auth.roleDisplayNameMap[role] : role)}"/></b> - </h:column> - <h:column> - <h:selectManyCheckbox id="cars" - value="#{auth.forRole[role]}"> - <f:selectItems value="#{auth.availableActions}"/> - </h:selectManyCheckbox> - </h:column> - </h:dataTable> + 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"> - <h:commandButton action="#{auth.execute}" value="Update" styleClass="portlet-form-button"/> + <h:form> + <h:dataTable + var="role" + value="#{auth.roles}"> + <h:column> + <b><h:outputText value="#{role == '__unchecked__' ? 'Unchecked' : (auth.roleDisplayNameMap[role] != null ? auth.roleDisplayNameMap[role] : role)}"/></b> + </h:column> + <h:column> + <h:selectManyCheckbox id="cars" + value="#{auth.forRole[role]}"> + <f:selectItems value="#{auth.availableActions}"/> + </h:selectManyCheckbox> + </h:column> + </h:dataTable> + <h:commandButton action="#{auth.execute}" value="Update" styleClass="portlet-form-button"/> + </h:form> - </h:form> - </h:panelGroup> </div> \ No newline at end of file Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/definitionsTemplate.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/definitionsTemplate.xhtml 2007-02-28 00:18:59 UTC (rev 6446) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/definitionsTemplate.xhtml 2007-02-28 00:48:44 UTC (rev 6447) @@ -1,29 +1,14 @@ -<div xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:ui="http://java.sun.com/jsf/facelets"> - -<!-- h:form> -<div id="navigation"> - <ul id="tabsHeader"> - <li id="current" onmouseover="this.className='hoverOn'" onmouseout="this.className='hoverOff'"> - <h:commandLink value="Portal Objects" action="portals"/> - </li> - <li onmouseover="this.className='hoverOn'" onmouseout="this.className='hoverOff'"> - <h:commandLink value="Porlet Instances" action="instances"/> - </li> - <li onmouseover="this.className='hoverOn'" onmouseout="this.className='hoverOff'"> - <h:commandLink value="Portlet Definitions" action="portlets"/> - </li> - </ul> -</div> -</h:form--> -<div> -<h:form> -<h:commandLink value="Portal Objects" action="portals"/> | <h:commandLink value="Porlet Instances" action="instances"/> | <b><h:commandLink value="Portlet Definitions" action="portlets"/></b> -</h:form> -</div> +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets"> -<br/> -<ui:insert name="content">Content</ui:insert> + <h:form> + <h:commandLink value="Portal Objects" action="portals"/> | <h:commandLink value="Porlet Instances" action="instances"/> | <b><h:commandLink value="Portlet Definitions" action="portlets"/></b> + </h:form> + + <hr class="admin-ui"/> + + <ui:insert name="content">Content</ui:insert> </div> 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:18:59 UTC (rev 6446) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageLayout.xhtml 2007-02-28 00:48:44 UTC (rev 6447) @@ -10,12 +10,9 @@ <ui:define name="content"> - <h3>You are editing the layout of the page #{portalobjectmgr.selectedObject.name}</h3> + <hr class="admin-ui"/> + <h3>You are editing the page layout</h3> - <!-- --> - - <hr /> - <h:form id="layoutForm"> <h:panelGroup> <table> 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:18:59 UTC (rev 6446) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPageSecurity.xhtml 2007-02-28 00:48:44 UTC (rev 6447) @@ -7,9 +7,12 @@ <ui:define name="content"> - <h3>Please set the permissions for the page: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3> + <hr class="admin-ui"/> + <h3>Please set the page permissions</h3> - <ui:include src="/WEB-INF/jsp/management/common/editSecurity.xhtml"/> + <ui:include src="/WEB-INF/jsp/management/common/editSecurity.xhtml"> + <ui:param name="auth" value="#{portalobjectmgr.auth}"/> + </ui:include> </ui:define> 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:18:59 UTC (rev 6446) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalSecurity.xhtml 2007-02-28 00:48:44 UTC (rev 6447) @@ -7,7 +7,8 @@ <ui:define name="content"> - <h3>Please set the permissions for the portal: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3> + <hr class="admin-ui"/> + <h3>Please set the portal permissions</h3> <ui:include src="/WEB-INF/jsp/management/common/editSecurity.xhtml"> <ui:param name="auth" value="#{portalobjectmgr.auth}"/> Deleted: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowTheme.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowTheme.xhtml 2007-02-28 00:18:59 UTC (rev 6446) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editWindowTheme.xhtml 2007-02-28 00:48:44 UTC (rev 6447) @@ -1,19 +0,0 @@ -<div - 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>Please set the display options for the window: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3> - <br/> - <ui:include src="/WEB-INF/jsp/management/common/editTheme.xhtml"/> - - </ui:define> - -</ui:composition> - -</div> - Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instances.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instances.xhtml 2007-02-28 00:18:59 UTC (rev 6446) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instances.xhtml 2007-02-28 00:48:44 UTC (rev 6447) @@ -1,10 +1,10 @@ <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:jbp="http://www.jboss.com/portal" - 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:jbp="http://www.jboss.com/portal" + xmlns:c="http://java.sun.com/jstl/core"> <ui:composition template="/WEB-INF/jsp/management/instancesTemplate.xhtml"> @@ -43,7 +43,7 @@ <c:if test="#{instancemgr.selectedPlugin != null}"> - <hr/> + <hr class="admin-ui"/> <c:if test="#{instancemgr.selectedPlugin == 'info'}"> Info Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instancesTemplate.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instancesTemplate.xhtml 2007-02-28 00:18:59 UTC (rev 6446) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instancesTemplate.xhtml 2007-02-28 00:48:44 UTC (rev 6447) @@ -1,30 +1,14 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<div xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:ui="http://java.sun.com/jsf/facelets"> +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets"> -<!-- h:form> -<div id="navigation"> - <ul id="tabsHeader"> - <li id="current" onmouseover="this.className='hoverOn'" onmouseout="this.className='hoverOff'"> - <h:commandLink value="Portal Objects" action="portals"/> - </li> - <li onmouseover="this.className='hoverOn'" onmouseout="this.className='hoverOff'"> - <h:commandLink value="Porlet Instances" action="instances"/> - </li> - <li onmouseover="this.className='hoverOn'" onmouseout="this.className='hoverOff'"> - <h:commandLink value="Portlet Definitions" action="portlets"/> - </li> - </ul> -</div> -</h:form--> -<div> -<h:form> -<h:commandLink value="Portal Objects" action="portals"/> | <b><h:commandLink value="Porlet Instances" action="instances"/></b> | <h:commandLink value="Portlet Definitions" action="portlets"/> -</h:form> -</div> + <h:form> + <h:commandLink value="Portal Objects" action="portals"/> | <b><h:commandLink value="Porlet Instances" action="instances"/></b> | <h:commandLink value="Portlet Definitions" action="portlets"/> + </h:form> -<br/> -<ui:insert name="content">Content</ui:insert> + <hr class="admin-ui"/> + + <ui:insert name="content">Content</ui:insert> </div> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml 2007-02-28 00:18:59 UTC (rev 6446) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml 2007-02-28 00:48:44 UTC (rev 6447) @@ -67,9 +67,6 @@ <h:commandLink action="editWindowPreferences" actionListener="#{portalobjectmgr.selectObject}"> <h:outputText value="Edit"/> <f:param name="id" value="#{window.id}"/> - </h:commandLink> | <h:commandLink action="editWindowSecurity" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Security"/> - <f:param name="id" value="#{window.id}"/> </h:commandLink> | <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}"> <h:outputText value="Theme"/> <f:param name="id" value="#{window.id}"/> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml 2007-02-28 00:18:59 UTC (rev 6446) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml 2007-02-28 00:48:44 UTC (rev 6447) @@ -1,31 +1,16 @@ -<div xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:c="http://java.sun.com/jstl/core"> - -<!-- h:form> -<div id="navigation"> - <ul id="tabsHeader"> - <li id="current" onmouseover="this.className='hoverOn'" onmouseout="this.className='hoverOff'"> - <h:commandLink value="Portal Objects" action="portals"/> - </li> - <li onmouseover="this.className='hoverOn'" onmouseout="this.className='hoverOff'"> - <h:commandLink value="Porlet Instances" action="instances"/> - </li> - <li onmouseover="this.className='hoverOn'" onmouseout="this.className='hoverOff'"> - <h:commandLink value="Portlet Definitions" action="portlets"/> - </li> - </ul> -</div> -</h:form--> -<div> -<h:form> -<b><h:commandLink value="Portal Objects" action="portals"/></b> | <h:commandLink value="Porlet Instances" action="instances"/> | <h:commandLink value="Portlet Definitions" action="portlets"/> -</h:form> -</div> -<hr /> +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:c="http://java.sun.com/jstl/core"> + <h:form> + <b><h:commandLink value="Portal Objects" action="portals"/></b> | <h:commandLink value="Porlet Instances" action="instances"/> | <h:commandLink value="Portlet Definitions" action="portlets"/> + </h:form> + + <hr class="admin-ui"/> + <!-- Path nav --> <h:form> <c:forEach items="#{portalobjectmgr.selectedObjectPath}" var="node"> @@ -43,7 +28,6 @@ </c:forEach> </h:form> -<br/> -<ui:insert name="content">Content</ui:insert> + <ui:insert name="content">Content</ui:insert> </div> 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:18:59 UTC (rev 6446) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-28 00:48:44 UTC (rev 6447) @@ -8,7 +8,7 @@ <!-- Sub page addition --> - <hr /> + <hr class="admin-ui"/> <h:form id="portal_form"> <h:inputText id="name" value="#{addPageAction.pageName}" 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:18:59 UTC (rev 6446) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml 2007-02-28 00:48:44 UTC (rev 6447) @@ -4,24 +4,24 @@ xmlns:h="http://java.sun.com/jsf/html"> -<ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml"> + <ui:composition template="/WEB-INF/jsp/management/objectTemplate.xhtml"> - <ui:define name="content"> + <ui:define name="content"> - <h3>You are editing the windows of: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3> + <h3>You are editing the windows of: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3> - <h:message id="status" for="status"/> + <h:message id="status" for="status"/> - <ui:include src="/WEB-INF/jsp/management/windowNavigation.xhtml"/> - - <hr /> - - <ui:include src="/WEB-INF/jsp/management/plugins/manager.xhtml"/> - - </ui:define> + <ui:include src="/WEB-INF/jsp/management/windowNavigation.xhtml"/> -</ui:composition> + <hr class="admin-ui"/> + <ui:include src="/WEB-INF/jsp/management/plugins/manager.xhtml"/> + + </ui:define> + + </ui:composition> + </div>