[portal-commits] JBoss Portal SVN: r6459 - in trunk/core-admin/src: resources/portal-admin-war/WEB-INF/jsp/management and 1 other directories.

Author: julien(a)jboss.com Date: 2007-02-28 09:06:24 -0500 (Wed, 28 Feb 2007) New Revision: 6459 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/definitionsTemplate.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPagePreferences.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalPreferences.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/plugins/portlet/manager.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/portlets.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml Log: css cleanup and improvements 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 13:40:55 UTC (rev 6458) +++ trunk/core-admin/src/bin/portal-admin-war/images/management/management.css 2007-02-28 14:06:24 UTC (rev 6459) @@ -1,43 +1,14 @@ -.vertTop { - vertical-align: top; +/* Redefine spacing for tables. */ +.admin-ui .portlet-table-body { + border-spacing: 10px 4px; } -.tableList { - border-spacing: 20px 7px; +/* Align label on the left for the table headers. */ +.admin-ui .portlet-section-header { + text-align:left; } -.menu { - background-color: #e6e6fa; - border-style: dashed; - border-color: black; - border-width: 1px; -} - -.content { - /* background-color: #f0f8ff; */ - border-style: solid; - border-color: black; - border-width: 0px 0px 0px 1px; - padding: 4px; -} - -.tooltip { - -} - -.helpblock { - background-color: #FFFF99; - border-style: dashed; - border-color: black; - border-width: 1px; - padding: 4px; - margin: 2px; -} - -img.scroller { - border:thin solid black; -} - -hr.admin-ui { +/* Change dashed line to solid. */ +.admin-ui hr { border-top-style: solid; -} \ 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 13:40:55 UTC (rev 6458) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/definitionsTemplate.xhtml 2007-02-28 14:06:24 UTC (rev 6459) @@ -7,7 +7,7 @@ <h:commandLink value="Portal Objects" action="portals" actionListener="#{portalobjectmgr.selectRootObject}"/> | <h:commandLink value="Porlet Instances" action="instances"/> | <b><h:commandLink value="Portlet Definitions" action="portlets"/></b> </h:form> - <hr class="admin-ui"/> + <hr/> <ui:insert name="content">Content</ui:insert> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPagePreferences.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPagePreferences.xhtml 2007-02-28 13:40:55 UTC (rev 6458) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPagePreferences.xhtml 2007-02-28 14:06:24 UTC (rev 6459) @@ -7,18 +7,14 @@ <ui:define name="content"> - <h3>You are editing the page: <h:outputText - value="#{portalobjectmgr.selectedObject.name}" /></h3> + <h3>You are editing the page: <h:outputText value="#{portalobjectmgr.selectedObject.name}" /></h3> + <h:form> + <h:inputText id="name" value="#{addPageAction.pageName}" styleClass="portlet-form-input-field" required="true"/> + <h:commandButton action="#{addPageAction.execute}" value="Add Portal sub-Page" styleClass="portlet-form-button"/> + <h:message for="name" errorClass="portlet-msg-error"/> + </h:form> - <h:form> - <h:inputText id="name" value="#{addPageAction.pageName}" - validator="#{addPageAction.validatePageName}" - required="true"/> - <h:commandButton action="#{addPageAction.execute}" value="Add Portal sub-Page" class="portlet-form-button"/> - <h:message for="name" style="color: red"/> - </h:form> - </ui:define> </ui:composition> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalPreferences.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalPreferences.xhtml 2007-02-28 13:40:55 UTC (rev 6458) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/editPortalPreferences.xhtml 2007-02-28 14:06:24 UTC (rev 6459) @@ -13,12 +13,12 @@ <h:form> <h:outputLabel for="name"> - <h:outputText value="Default Page: " /> + <h:outputText styleClass="portlet-form-field-label" value="Default Page:"/> </h:outputLabel> - <h:selectOneMenu value="#{portalAction.defaultPageName}"> + <h:selectOneMenu id="name" styleClass="portlet-form-field" value="#{portalAction.defaultPageName}"> <f:selectItems value="#{portalobjectmgr.portalPageItems}" /> </h:selectOneMenu> - <h:commandButton class="portlet-form-button" value="Update" action="portals" actionListener="#{portalobjectmgr.selectParentObject}"/> + <h:commandButton styleClass="portlet-form-button" value="Update" action="portals" actionListener="#{portalobjectmgr.selectParentObject}"/> </h:form> 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 13:40:55 UTC (rev 6458) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instances.xhtml 2007-02-28 14:06:24 UTC (rev 6459) @@ -13,7 +13,7 @@ <h:form> <table id="instancesTable2" width="100%" border="0" cellspacing="0" class="portlet-table-body"> - <thead class="portlet-section-header" style="text-align:left;"> + <thead class="portlet-section-header"> <tr> <th>Id</th> <th>Actions</th> @@ -52,7 +52,7 @@ <c:if test="#{instancemgr.selectedPlugin != null}"> - <hr class="admin-ui"/> + <hr/> <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 13:40:55 UTC (rev 6458) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instancesTemplate.xhtml 2007-02-28 14:06:24 UTC (rev 6459) @@ -1,13 +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"> + xmlns:ui="http://java.sun.com/jsf/facelets" + class="admin-ui"> <h:form> <h:commandLink value="Portal Objects" action="portals" actionListener="#{portalobjectmgr.selectRootObject}"/> | <b><h:commandLink value="Porlet Instances" action="instances"/></b> | <h:commandLink value="Portlet Definitions" action="portlets"/> </h:form> - <hr class="admin-ui"/> + <hr/> <ui:insert name="content">Content</ui:insert> 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 13:40:55 UTC (rev 6458) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml 2007-02-28 14:06:24 UTC (rev 6459) @@ -10,7 +10,7 @@ <c:if test="#{not empty portalobjectmgr.portalNodes}"> <table width="100%" border="0" cellspacing="0" class="portlet-table-body"> - <thead class="portlet-section-header" style="text-align:left;"> + <thead class="portlet-section-header"> <tr> <th>Portal</th> <th>Actions</th> @@ -48,7 +48,7 @@ <c:if test="#{not empty portalobjectmgr.pageNodes}"> <table width="100%" border="0" cellspacing="0" class="portlet-table-body"> - <thead class="portlet-section-header" style="text-align:left;"> + <thead class="portlet-section-header"> <tr> <th>Page</th> <th>Actions</th> @@ -86,7 +86,7 @@ <c:if test="#{not empty portalobjectmgr.windowNodes}"> <table width="100%" border="0" cellspacing="0" class="portlet-table-body"> - <thead class="portlet-section-header" style="text-align:left;"> + <thead class="portlet-section-header"> <tr> <th>Window</th> <th>Actions</th> 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 13:40:55 UTC (rev 6458) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml 2007-02-28 14:06:24 UTC (rev 6459) @@ -3,13 +3,14 @@ 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"> + xmlns:c="http://java.sun.com/jstl/core" + class="admin-ui"> <h:form> <b><h:commandLink value="Portal Objects" action="portals" actionListener="#{portalobjectmgr.selectRootObject}"/></b> | <h:commandLink value="Porlet Instances" action="instances"/> | <h:commandLink value="Portlet Definitions" action="portlets"/> </h:form> - <hr class="admin-ui"/> + <hr/> <!-- Path nav --> <h:form> 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 13:40:55 UTC (rev 6458) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-28 14:06:24 UTC (rev 6459) @@ -8,7 +8,7 @@ <!-- Sub page addition --> - <hr class="admin-ui"/> + <hr/> <h:form id="portal_form"> <h:inputText id="name" value="#{addPageAction.pageName}" styleClass="portlet-form-input-field" required="true"/> <h:commandButton action="#{addPageAction.execute}" value="Add page" styleClass="portlet-form-button"/> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml 2007-02-28 13:40:55 UTC (rev 6458) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml 2007-02-28 14:06:24 UTC (rev 6459) @@ -16,7 +16,7 @@ <!-- Instance creation --> - <hr class="admin-ui"/> + <hr/> <h:form id="add_instance_form"> <h:inputText id="instanceId" value="#{createInstanceAction.instanceId}" styleClass="portlet-form-input-field" required="true"/> <h:commandButton action="#{createInstanceAction.execute}" value="Create instance" styleClass="portlet-form-button"> 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 13:40:55 UTC (rev 6458) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml 2007-02-28 14:06:24 UTC (rev 6459) @@ -5,7 +5,7 @@ <ui:include src="nodeNavigation.xhtml"/> - <hr class="admin-ui"/> + <hr/> <h:form id="portal_form"> <h:inputText id="name" value="#{portalAction.portalName}" styleClass="portlet-form-input-field" required="true"/> <h:commandButton action="#{portalAction.addPortal}" value="Add portal" styleClass="portlet-form-button"/> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml 2007-02-28 13:40:55 UTC (rev 6458) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml 2007-02-28 14:06:24 UTC (rev 6459) @@ -5,7 +5,8 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:jbp="http://www.jboss.com/portal" xmlns:c="http://java.sun.com/jstl/core" - xmlns:pfc="http://www.jboss.com/portal/facelet/common"> + xmlns:pfc="http://www.jboss.com/portal/facelet/common" + class="admin-ui"> <ui:composition template="/WEB-INF/jsp/management/definitionsTemplate.xhtml"> @@ -23,7 +24,7 @@ <h:form> <table width="100%" border="0" cellspacing="0" class="portlet-table-body"> - <thead class="portlet-section-header" style="text-align:left;"> + <thead class="portlet-section-header"> <tr> <th>Id</th> <th>Name</th> @@ -66,12 +67,12 @@ <c:if test="#{portletmgr.selectedPortlet != null}"> <c:if test="#{portletmgr.selectedPlugin == 'manager'}"> - <hr class="admin-ui"/> + <hr/> <h3>Portlet details</h3> <ui:include src="/WEB-INF/jsp/management/plugins/portlet/manager.xhtml"/> </c:if> <c:if test="#{portletmgr.selectedPlugin == 'preferences'}"> - <hr class="admin-ui"/> + <hr/> <h3>Portlet preferences</h3> <ui:include src="/WEB-INF/jsp/management/common/editPreferences.xhtml"> <ui:param name="preferences" value="#{portletmgr.selectedPreferences}"/> 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 13:40:55 UTC (rev 6458) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml 2007-02-28 14:06:24 UTC (rev 6459) @@ -7,7 +7,7 @@ <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"/> + <hr/> <ui:include src="/WEB-INF/jsp/management/plugins/manager.xhtml"/> </ui:define> </ui:composition>