February 2007 - portal-commits - Jboss List Archives

JBoss Portal SVN: r6466 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-02-28 11:16:20 -0500 (Wed, 28 Feb 2007) New Revision: 6466 Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml Log: applied missing styles 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 16:09:45 UTC (rev 6465) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml 2007-02-28 16:16:20 UTC (rev 6466) @@ -11,17 +11,17 @@ <ui:define name="content"> - <h:panelGrid id="federateddropdown"> - <h:form> - <h:selectOneMenu id="menu" value="#{portletmgr.selectedFederatedId}"> - <f:selectItems value="#{portletmgr.federatedIds}"/> - </h:selectOneMenu> - <h:commandButton value="Change portlet provider"/> - </h:form> - </h:panelGrid> - <h:form> + <h:outputLabel for="menu"> + <h:outputText value="Portlet provider: " styleClass="portlet-form-field-label"/> + </h:outputLabel> + <h:selectOneMenu id="menu" styleClass="portlet-form-field" value="#{portletmgr.selectedFederatedId}"> + <f:selectItems value="#{portletmgr.federatedIds}"/> + </h:selectOneMenu> + <h:commandButton value="Change" styleClass="portlet-form-button"/> + </h:form> + <h:form> <table width="100%" class="portlet-table-body"> <thead class="portlet-section-header"> <tr> @@ -61,7 +61,6 @@ </c:forEach> </tbody> </table> - </h:form> <c:if test="#{portletmgr.selectedPortlet != null}">

19 years, 1 month

1
0
0 / 0

JBoss Portal SVN: r6465 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-02-28 11:09:45 -0500 (Wed, 28 Feb 2007) New Revision: 6465 Removed: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/ Log: remove empty dirs

19 years, 1 month

1
0
0 / 0

JBoss Portal SVN: r6464 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-02-28 11:05:51 -0500 (Wed, 28 Feb 2007) New Revision: 6464 Added: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portletsTemplate.xhtml Removed: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/definitionsTemplate.xhtml Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml Log: cleanup unused stuff + some renames Deleted: 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 16:04:07 UTC (rev 6463) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/definitionsTemplate.xhtml 2007-02-28 16:05:51 UTC (rev 6464) @@ -1,15 +0,0 @@ -<div - xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:ui="http://java.sun.com/jsf/facelets" - class="admin-ui"> - - <h:form> - <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/> - - <ui:insert name="content">Content</ui:insert> - -</div> 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 16:04:07 UTC (rev 6463) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml 2007-02-28 16:05:51 UTC (rev 6464) @@ -7,7 +7,7 @@ xmlns:c="http://java.sun.com/jstl/core" xmlns:pfc="http://www.jboss.com/portal/facelet/common"> -<ui:composition template="/WEB-INF/jsp/management/definitionsTemplate.xhtml"> +<ui:composition template="/WEB-INF/jsp/management/portletsTemplate.xhtml"> <ui:define name="content"> Copied: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portletsTemplate.xhtml (from rev 6462, 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/portletsTemplate.xhtml (rev 0) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portletsTemplate.xhtml 2007-02-28 16:05:51 UTC (rev 6464) @@ -0,0 +1,15 @@ +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets" + class="admin-ui"> + + <h:form> + <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/> + + <ui:insert name="content">Content</ui:insert> + +</div>

19 years, 1 month

1
0
0 / 0

JBoss Portal SVN: r6463 - in trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management: plugins and 1 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-02-28 11:04:07 -0500 (Wed, 28 Feb 2007) New Revision: 6463 Added: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectNavigation.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/showPortletInfo.xhtml Removed: 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/plugins/manager.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/plugins/preferences.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/properties.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/security.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/theme.xhtml 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/pageNavigation.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 Log: cleanup unused stuff + some renames Deleted: 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 15:58:26 UTC (rev 6462) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -1,124 +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" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:pfc="http://www.jboss.com/portal/facelet/common" - xmlns:c="http://java.sun.com/jstl/core"> - - <h:form> - - <c:if test="#{not empty portalobjectmgr.portalNodes}"> - <table width="100%" class="portlet-table-body"> - <thead class="portlet-section-header"> - <tr> - <th>Portal</th> - <th>Actions</th> - </tr> - </thead> - <tbody> - <c:forEach items="#{portalobjectmgr.portalNodes}" var="object" varStatus="status"> - <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> - <td> - <h:commandLink action="#{portalobjectmgr.selectObject}"> - <h:outputText value="#{object.name}"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> - </td> - <td> - <h:commandLink action="editPortalPreferences" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Edit"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Security"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="editPortalTheme" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Theme"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="portals" actionListener="#{portalobjectmgr.destroyObject}"> - <h:outputText value="Destroy"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> - </td> - </tr> - </c:forEach> - </tbody> - </table> - </c:if> - - <c:if test="#{not empty portalobjectmgr.pageNodes}"> - <table width="100%" class="portlet-table-body"> - <thead class="portlet-section-header"> - <tr> - <th>Page</th> - <th>Actions</th> - </tr> - </thead> - <tbody> - <c:forEach items="#{portalobjectmgr.pageNodes}" var="object" varStatus="status"> - <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> - <td> - <h:commandLink action="#{portalobjectmgr.selectObject}"> - <h:outputText value="#{object.name}"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> - </td> - <td> - <h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Layout"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="editPageSecurity" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Security"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Theme"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="pages" actionListener="#{portalobjectmgr.destroyObject}"> - <h:outputText value="Destroy"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> - </td> - </tr> - </c:forEach> - </tbody> - </table> - </c:if> - - <c:if test="#{not empty portalobjectmgr.windowNodes}"> - <table width="100%" class="portlet-table-body"> - <thead class="portlet-section-header"> - <tr> - <th>Window</th> - <th>Actions</th> - </tr> - </thead> - <tbody> - <c:forEach items="#{portalobjectmgr.windowNodes}" var="object" varStatus="status"> - <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> - <td> - <h:commandLink action="#{portalobjectmgr.selectObject}"> - <h:outputText value="#{object.name}"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> - </td> - <td> - <h:commandLink action="editWindowPreferences" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Edit"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}"> - <h:outputText value="Theme"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> | <h:commandLink action="windows" actionListener="#{portalobjectmgr.destroyObject}"> - <h:outputText value="Destroy"/> - <f:param name="id" value="#{object.id}"/> - </h:commandLink> - </td> - </tr> - </c:forEach> - </tbody> - </table> - </c:if> - - </h:form> - -</div> Copied: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectNavigation.xhtml (from rev 6462, 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/objectNavigation.xhtml (rev 0) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectNavigation.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -0,0 +1,124 @@ +<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:pfc="http://www.jboss.com/portal/facelet/common" + xmlns:c="http://java.sun.com/jstl/core"> + + <h:form> + + <c:if test="#{not empty portalobjectmgr.portalNodes}"> + <table width="100%" class="portlet-table-body"> + <thead class="portlet-section-header"> + <tr> + <th>Portal</th> + <th>Actions</th> + </tr> + </thead> + <tbody> + <c:forEach items="#{portalobjectmgr.portalNodes}" var="object" varStatus="status"> + <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> + <td> + <h:commandLink action="#{portalobjectmgr.selectObject}"> + <h:outputText value="#{object.name}"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </td> + <td> + <h:commandLink action="editPortalPreferences" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Edit"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Security"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="editPortalTheme" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Theme"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="portals" actionListener="#{portalobjectmgr.destroyObject}"> + <h:outputText value="Destroy"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </td> + </tr> + </c:forEach> + </tbody> + </table> + </c:if> + + <c:if test="#{not empty portalobjectmgr.pageNodes}"> + <table width="100%" class="portlet-table-body"> + <thead class="portlet-section-header"> + <tr> + <th>Page</th> + <th>Actions</th> + </tr> + </thead> + <tbody> + <c:forEach items="#{portalobjectmgr.pageNodes}" var="object" varStatus="status"> + <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> + <td> + <h:commandLink action="#{portalobjectmgr.selectObject}"> + <h:outputText value="#{object.name}"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </td> + <td> + <h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Layout"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="editPageSecurity" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Security"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="editPageTheme" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Theme"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="pages" actionListener="#{portalobjectmgr.destroyObject}"> + <h:outputText value="Destroy"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </td> + </tr> + </c:forEach> + </tbody> + </table> + </c:if> + + <c:if test="#{not empty portalobjectmgr.windowNodes}"> + <table width="100%" class="portlet-table-body"> + <thead class="portlet-section-header"> + <tr> + <th>Window</th> + <th>Actions</th> + </tr> + </thead> + <tbody> + <c:forEach items="#{portalobjectmgr.windowNodes}" var="object" varStatus="status"> + <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> + <td> + <h:commandLink action="#{portalobjectmgr.selectObject}"> + <h:outputText value="#{object.name}"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </td> + <td> + <h:commandLink action="editWindowPreferences" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Edit"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}"> + <h:outputText value="Theme"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> | <h:commandLink action="windows" actionListener="#{portalobjectmgr.destroyObject}"> + <h:outputText value="Destroy"/> + <f:param name="id" value="#{object.id}"/> + </h:commandLink> + </td> + </tr> + </c:forEach> + </tbody> + </table> + </c:if> + + </h:form> + +</div> 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 15:58:26 UTC (rev 6462) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -10,9 +10,8 @@ <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/> -  + <hr/> <h:form> <c:forEach items="#{portalobjectmgr.selectedObjectPath}" var="node"> > 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 15:58:26 UTC (rev 6462) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -4,7 +4,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> - <ui:include src="nodeNavigation.xhtml"/> + <ui:include src="objectNavigation.xhtml"/>  Deleted: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/manager.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/manager.xhtml 2007-02-28 15:58:26 UTC (rev 6462) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/manager.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -1,75 +0,0 @@ -<div - xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:ct="http://www.julien.com"> -<br/> - - -<h:panelGroup - id="a" - rendered="#{portalobjectmgr.selectedObject.type==0}"> - <h:outputText style="font-weight:bold;" value="Type: "/> - <f:verbatim>CONTEXT<br/></f:verbatim> - <h:form id="portal_form"> - <h:outputLabel for="name"> - <h:outputText value="Portal Name: " style="font-weight:bold;"/> - </h:outputLabel> - <h:inputText id="name" value="#{portalAction.portalName}" - validator="#{portalAction.validatePortalName}" - required="true"/> - <h:messages style="color: red"/> - <br/> - <h:commandButton action="#{portalAction.addPortal}" value="Add portal"/> - </h:form> -</h:panelGroup> - - -<h:panelGroup - id="b" - rendered="#{portalobjectmgr.selectedObject.type==1}"> - <h:outputText style="font-weight:bold;" value="Name: "/> - <h:outputText value="#{portalobjectmgr.selectedObject.name}"/> - <f:verbatim><br/><br/></f:verbatim> - <h:outputText style="font-weight:bold;" value="Type: "/> - <f:verbatim>PORTAL<br/></f:verbatim> - <h:form id="portal_form_1"> - <h:outputLabel for="name"> - <h:outputText value="Defaut Page Name: " style="font-weight:bold;"/> - </h:outputLabel> - <h:selectOneMenu id="name" value="#{portalAction.defaultPageName}"> - <f:selectItems value="#{portalobjectmgr.portalPageItems}"/> - </h:selectOneMenu> - <br/> - <h:commandButton value="Update" styleClass="portlet-form-button"/> - <br/> - </h:form> - <h:form id="portal_form_2"> - <h:outputLabel for="name"> - <h:outputText value="New Page Name: " style="font-weight:bold;"/> - </h:outputLabel> - <h:inputText id="name" value="#{addPageAction.pageName}" - validator="#{addPageAction.validatePageName}" - required="true"/> - <h:messages errorClass="portlet-msg-error"/> - <br/> - <h:commandButton action="#{addPageAction.execute}" value="Add page" styleClass="portlet-form-button"/> - </h:form> -</h:panelGroup> - - -<h:panelGroup - id="d" - rendered="#{portalobjectmgr.selectedObject.type==3}"> - <h:form id="window_form"> - <ct:content - contentType="#{portalobjectmgr.selectedObject.type==3 ? portalobjectmgr.selectedObject.contentType : null}" - contentURI="#{portalobjectmgr.selectedObject.instanceRef}"/> - <br/> - <h:commandButton value="Change instance" styleClass="portlet-form-button"/> - </h:form> - - -</h:panelGroup> -</div> Deleted: 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 15:58:26 UTC (rev 6462) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -1,27 +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" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:c="http://java.sun.com/jstl/core"> - <br/> - -  - - <c:if test="#{portletmgr.selectedPortlet != null}"> - <ui:include src="/WEB-INF/jsp/management/common/showPortletDetails.xhtml"> - <ui:param name="portlet" value="#{portletmgr.selectedPortlet}"/> - </ui:include> - </c:if> - -  - - <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"> - </h:commandButton> - <h:message for="instanceId" errorClass="portlet-msg-error"/> - </h:form> - -</div> Deleted: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/preferences.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/preferences.xhtml 2007-02-28 15:58:26 UTC (rev 6462) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/preferences.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -1,78 +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" - xmlns:f="http://java.sun.com/jsf/core"> -<h:panelGroup - id="panel2" - rendered="#{preferences != null}"> - <h:form> - <h:dataTable - id="data__" - var="row" - value="#{preferences.model}" - rowClasses="portlet-section-body,portlet-section-alternate"> - <h:column> - <f:facet name="header"> - <h:outputText value="Key"/> - </f:facet> - <h:outputText value="#{row.key}"/> - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="Name"/> - </f:facet> - <h:outputText value="#{row.name}"/> - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="ReadOnly"/> - </f:facet> - <h:outputText value="#{row.readOnly}"/> - </h:column> - <h:column> - <f:facet name="header"> - <h:outputText value="Value"/> - </f:facet> - <h:commandLink - rendered="#{row.cell.value != null and preferences.model.mutable}" - action="#{action.selectRow}"> - <h:graphicImage - value="/images/management/edit.png" - alt="Edit" - style="vertical-align:middle;"/> - </h:commandLink> - <h:commandLink - rendered="#{row.cell.value != null and preferences.model.mutable}" - action="#{action.deleteCell}"> - <h:graphicImage - value="/images/management/delete.png" - alt="Delete" - style="vertical-align:middle;"/> - </h:commandLink> - <h:outputText value="#{row.value}"/> - </h:column> - </h:dataTable> - </h:form> -</h:panelGroup> -<h:panelGroup - id="panel3" - rendered="#{preferences.selectedPreference != null}"> - <h:form> - <h:dataTable - id="string_values" - var="row" - value="#{preferences.selectedPreference.valueIndices}"> - <h:column> - <h:inputText value="#{preferences.selectedPreference.value[row]}"/> - <h:commandButton action="#{action.deleteLine}" value="Delete"/> - </h:column> - </h:dataTable> - <h:commandButton action="#{action.updateCell}" value="Update"/> - </h:form> - <h:form> - <h:inputText value="#{action.appendedValue}"/> - <h:commandButton action="#{action.appendLine}" value="Append"/> - </h:form> -</h:panelGroup> -</div> Deleted: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/properties.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/properties.xhtml 2007-02-28 15:58:26 UTC (rev 6462) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/properties.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -1,91 +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" - xmlns:f="http://java.sun.com/jsf/core"> - <br/> - <h:outputText style="font-weight:bold;" value="Name: "/> - <h:outputText value="#{portalobjectmgr.selectedObject.name}"/> - <f:verbatim><br/><br/></f:verbatim> - - <h:panelGroup - rendered="#{portalobjectmgr.selectedObject.type==0}"> - <h:outputText style="font-weight:bold;" value="Type: "/> - <f:verbatim>CONTEXT<br/></f:verbatim> - </h:panelGroup> - <h:panelGroup - rendered="#{portalobjectmgr.selectedObject.type==1}"> - <h:outputText style="font-weight:bold;" value="Type: "/> - <f:verbatim>PORTAL<br/></f:verbatim> - </h:panelGroup> - <h:panelGroup - rendered="#{portalobjectmgr.selectedObject.type==2}"> - <h:outputText style="font-weight:bold;" value="Type: "/> - <f:verbatim>PAGE<br/></f:verbatim> - </h:panelGroup> - <h:panelGroup - rendered="#{portalobjectmgr.selectedObject.type==3}"> - <h:outputText style="font-weight:bold;" value="Type: "/> - <f:verbatim>WINDOW<br/></f:verbatim> - </h:panelGroup> - <br/><br/> - - <h:panelGroup - id="prop_a"> - <h:form id="properties_form"> - <h:dataTable - id="data" - var="p" - value="#{portalobjectmgr.selectedProperties}" - binding="#{propertyAction.propertyDataTable}" - rowClasses="portlet-section-body,portlet-section-alternate"> - <h:column> - <f:facet id="the_id_that_fixes_the_bug_1" name="header"> - <h:outputText id="the_id_that_fixes_the_bug_2" value="Operations"/> - </f:facet> - <h:commandLink - id="properties_form_link1" - action="#{propertyAction.selectProperty}"> - <h:graphicImage - value="/images/management/edit.png" - border="0" - alt="Edit" - style="vertical-align:middle;"/> - </h:commandLink> - <h:commandLink - id="properties_form_link2" - action="#{propertyAction.removeProperty}"> - <h:graphicImage - value="/images/management/delete.png" - border="0" - alt="Delete" - style="vertical-align:middle;"/> - </h:commandLink> - <h:outputText value="#{row.value}"/> - </h:column> - <h:column> - <f:facet id="the_id_that_fixes_the_bug_3" name="header"> - <h:outputText id="the_id_that_fixes_the_bug_4" value="Name"/> - </f:facet> - <h:outputText value="#{p[0]}"/> - </h:column> - <h:column> - <f:facet id="the_id_that_fixes_the_bug_5" name="header"> - <h:outputText id="the_id_that_fixes_the_bug_6" value="Value"/> - </f:facet> - <h:outputText value="#{p[1]}"/> - </h:column> - </h:dataTable> - <br/> - <h:messages style="color: red"/> - <h:outputText style="font-weight:bold;" value="Property Name: "/> - <h:inputText value="#{propertyAction.selectedProperty}" - validator="#{propertyAction.validatePropertyName}" /> - <br/> - <h:outputText style="font-weight:bold;" value="Property Value: "/> - <h:inputText value="#{propertyAction.propertyValue}"/> - <br/> - <h:commandButton action="#{propertyAction.updateProperty}" value="Update"/> - </h:form> - </h:panelGroup> -</div> Deleted: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/security.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/security.xhtml 2007-02-28 15:58:26 UTC (rev 6462) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/security.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -1,35 +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" - xmlns:f="http://java.sun.com/jsf/core"> - <br/> - <h:panelGroup - id="securitypg"> - <h:form - id="myform"> - <h:dataTable - id="dataconstraints" - var="role" - value="#{auth.roles}"> - <h:column - id="role_column"> - <f:facet name="header"> - <h:outputText value="Role"/> - </f:facet> - <h:outputText value="#{role == '__unchecked__' ? 'Unchecked' : (auth.roleDisplayNameMap[role] != null ? auth.roleDisplayNameMap[role] : role)}"/> - </h:column> - <h:column - id="actions_column"> - <f:facet name="header"> - <h:outputText value="Actions"/> - </f:facet> - <h:selectManyListbox value="#{auth.forRole[role]}"> - <f:selectItems value="#{auth.availableActions}"></f:selectItems> - </h:selectManyListbox> - </h:column> - </h:dataTable> - <h:commandButton value="Update"/> - </h:form> - </h:panelGroup> -</div> Deleted: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/theme.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/theme.xhtml 2007-02-28 15:58:26 UTC (rev 6462) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/theme.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -1,110 +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" - xmlns:f="http://java.sun.com/jsf/core"> -<br/> -<h:outputText style="font-weight:bold;" value="Name: "/> -<h:outputText value="#{portalobjectmgr.selectedObject.name}"/> -<f:verbatim><br/><br/></f:verbatim> - -<h:panelGroup - rendered="#{portalobjectmgr.selectedObject.type==0}"> - <h:outputText style="font-weight:bold;" value="Type: "/> - <f:verbatim>CONTEXT<br/></f:verbatim> -</h:panelGroup> -<h:panelGroup - rendered="#{portalobjectmgr.selectedObject.type==1}"> - <h:outputText style="font-weight:bold;" value="Type: "/> - <f:verbatim>PORTAL<br/></f:verbatim> -</h:panelGroup> -<h:panelGroup - rendered="#{portalobjectmgr.selectedObject.type==2}"> - <h:outputText style="font-weight:bold;" value="Type: "/> - <f:verbatim>PAGE<br/></f:verbatim> -</h:panelGroup> -<h:panelGroup - rendered="#{portalobjectmgr.selectedObject.type==3}"> - <h:outputText style="font-weight:bold;" value="Type: "/> - <f:verbatim>WINDOW<br/></f:verbatim> -</h:panelGroup> -<br/><br/> -<h:panelGroup styleClass="portlet-section-body" - id="themepg"> - <h:form - id="themeform"> - <table border="0" width="100%" cellpadding="2"> - <tr> - <td class="portlet-form-field-label"><label class="portlet-form-field-label">Layout:</label></td> - <td> - <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.layoutName}" - disabled="#{themes.window}"> - <f:selectItems value="#{themes.layoutNames}"/> - </h:selectOneMenu> - </td> - </tr> - <tr> - <td class="portlet-form-field-label"><label class="portlet-form-field-label">Theme:</label></td> - <td> - <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.themeName}" - disabled="#{themes.window}"> - <f:selectItems value="#{themes.themeNames}"/> - </h:selectOneMenu> - </td> - </tr> - <tr> - <td class="portlet-form-field-label"><label class="portlet-form-field-label">RenderSet:</label></td> - <td> - <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.renderSetName}" - disabled="#{themes.window}"> - <f:selectItems value="#{themes.renderSetNames}"/> - </h:selectOneMenu> - </td> - </tr> - <tr> - <td class="portlet-form-field-label"><label class="portlet-form-field-label">Layout Strategy:</label> - </td> - <td> - <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.strategyName}" - disabled="#{themes.window}"> - <f:selectItems value="#{themes.strategyNames}"/> - </h:selectOneMenu> - </td> - </tr> - - <tr> - <td class="portlet-form-field-label"><label class="portlet-form-field-label">Window Renderer:</label> - </td> - <td> - <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.windowRendererName}" - disabled="#{!themes.window}"> - <f:selectItems value="#{themes.renderSetNames}"/> - </h:selectOneMenu> - </td> - </tr> - <tr> - <td class="portlet-form-field-label"><label class="portlet-form-field-label">Decoration Renderer:</label> - </td> - <td> - <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.decorationRendererName}" - disabled="#{!themes.window}"> - <f:selectItems value="#{themes.renderSetNames}"/> - </h:selectOneMenu> - </td> - </tr> - <tr> - <td class="portlet-form-field-label"><label class="portlet-form-field-label">Portlet Renderer:</label> - </td> - <td> - <h:selectOneMenu styleClass="portlet-form-field" value="#{themePropertyAction.portletRendererName}" - disabled="#{!themes.window}"> - <f:selectItems value="#{themes.renderSetNames}"/> - </h:selectOneMenu> - </td> - </tr> - </table> - <h:commandButton styleClass="portlet-form-button" id="the_command" value="Update" - action="#{themePropertyAction.execute}"/> - </h:form> -</h:panelGroup> -</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 15:58:26 UTC (rev 6462) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -3,7 +3,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html"> - <ui:include src="nodeNavigation.xhtml"/> + <ui:include src="objectNavigation.xhtml"/> <hr/> <h:form id="portal_form"> 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 15:58:26 UTC (rev 6462) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -68,7 +68,7 @@ <c:if test="#{portletmgr.selectedPlugin == 'manager'}"> <hr/> <h3>Portlet details</h3> - <ui:include src="/WEB-INF/jsp/management/plugins/portlet/manager.xhtml"/> + <ui:include src="/WEB-INF/jsp/management/showPortletInfo.xhtml"/> </c:if> <c:if test="#{portletmgr.selectedPlugin == 'preferences'}"> <hr/> Copied: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/showPortletInfo.xhtml (from rev 6460, 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/showPortletInfo.xhtml (rev 0) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/showPortletInfo.xhtml 2007-02-28 16:04:07 UTC (rev 6463) @@ -0,0 +1,27 @@ +<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:c="http://java.sun.com/jstl/core"> + <br/> + +  + + <c:if test="#{portletmgr.selectedPortlet != null}"> + <ui:include src="/WEB-INF/jsp/management/common/showPortletDetails.xhtml"> + <ui:param name="portlet" value="#{portletmgr.selectedPortlet}"/> + </ui:include> + </c:if> + +  + + <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"> + </h:commandButton> + <h:message for="instanceId" errorClass="portlet-msg-error"/> + </h:form> + +</div> Property changes on: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/showPortletInfo.xhtml ___________________________________________________________________ Name: svn:executable + *

19 years, 1 month

1
0
0 / 0

JBoss Portal SVN: r6462 - in trunk/core-admin/src: main/org/jboss/portal/core/portlet/management and 4 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-02-28 10:58:26 -0500 (Wed, 28 Feb 2007) New Revision: 6462 Modified: trunk/core-admin/src/bin/portal-admin-war/images/management/management.css trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/editPreferences.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/instances.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/plugins/manager.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml Log: more work on portlet details editor 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 15:25:16 UTC (rev 6461) +++ trunk/core-admin/src/bin/portal-admin-war/images/management/management.css 2007-02-28 15:58:26 UTC (rev 6462) @@ -1,13 +1,22 @@ /* Redefine spacing for tables. */ .admin-ui .portlet-table-body { + border-collapse: separate; + border: 0px; border-spacing: 10px 4px; } -/* Align label on the left for the table headers. */ -.admin-ui .portlet-section-header { +.admin-ui .portlet-section-header th { text-align:left; + border-top: 0px; + border-bottom: 1px solid; + border-left: 0px; + border-right: 0px; } +.admin-ui .portlet-section-header td { + border: 0px; +} + /* Change dashed line to solid. */ .admin-ui hr { border-top-style: solid; Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java 2007-02-28 15:25:16 UTC (rev 6461) +++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java 2007-02-28 15:58:26 UTC (rev 6462) @@ -42,9 +42,13 @@ import org.jboss.portal.core.model.instance.Instance; import org.jboss.portal.core.model.instance.InstanceContainer; import org.jboss.portal.core.model.instance.NoSuchInstanceException; +import org.jboss.portal.core.model.instance.InstanceDefinition; import org.jboss.portal.faces.matrix.Cell; import org.jboss.portal.faces.matrix.Row; import org.jboss.portal.faces.matrix.RowSetModel; +import org.jboss.portal.faces.el.DelegatingPropertyResolver; +import org.jboss.portal.faces.el.decorator.SimpleBeanDecorator; +import org.jboss.portal.faces.el.decorator.AbstractPropertyDecorator; import org.jboss.portal.identity.RoleModule; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvokerException; @@ -443,4 +447,30 @@ }; } } + + static + { + SimpleBeanDecorator instanceDecorator = new SimpleBeanDecorator(); + + // If the portlet is not available we want to avoid the stack trace and rather return null + instanceDecorator.setProperty("portlet", new AbstractPropertyDecorator(Portlet.class) + { + public Object getValue(Object bean) + { + Instance instance = (Instance)bean; + try + { + return instance.getPortlet(); + } + catch (PortletInvokerException e) + { + return null; + } + } + }); + + // + DelegatingPropertyResolver.registerDecorator(InstanceDefinition.class, instanceDecorator); + } + } Modified: trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml 2007-02-28 15:25:16 UTC (rev 6461) +++ trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml 2007-02-28 15:58:26 UTC (rev 6462) @@ -12,6 +12,8 @@ styleClass="portlet-form-field"> <f:selectItems value="#{registry.editors.portlet.instanceItems}"/> </h:selectOneListbox> + <hr/> + <h:commandButton value="Show details" styleClass="portlet-form-button"/> <br/> <pfc:context> <ui:param name="instance" value="#{registry.editors.portlet.instanceMap[contentURI]}"/> @@ -19,14 +21,16 @@ <c:if test="#{instance != null}"> <div class="portlet-font"> <div><span class="portlet-form-field-label">Portlet instance:</span> #{instance.id}</div> - <c:if test="#{portlet != null}"> - <div><span class="portlet-form-field-label">Portlet name:</span> #{portlet.name}</div> - <div><span class="portlet-form-field-label">Portlet description:</span> #{portlet.description}</div> - </c:if> + <c:choose> + <c:when test="#{portlet != null}"> + <ui:include src="/WEB-INF/jsp/management/common/showPortletDetails.xhtml"> + <ui:param name="portlet" value="#{portlet}"/> + </ui:include> + </c:when> + <c:otherwise>The associated portlet is not available</c:otherwise> + </c:choose> </div> </c:if> </pfc:context> - <br/> - <h:commandButton value="Show details" styleClass="portlet-form-button"/> </div> \ No newline at end of file Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/editPreferences.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/editPreferences.xhtml 2007-02-28 15:25:16 UTC (rev 6461) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/editPreferences.xhtml 2007-02-28 15:58:26 UTC (rev 6462) @@ -6,7 +6,7 @@ xmlns:c="http://java.sun.com/jstl/core"> <h:form> - <table width="100%" border="0" cellspacing="0" class="portlet-table-body"> + <table width="100%" class="portlet-table-body"> <thead class="portlet-section-header" style="text-align:left;"> <tr> <th>Key</th> 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 15:25:16 UTC (rev 6461) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/definitionsTemplate.xhtml 2007-02-28 15:58:26 UTC (rev 6462) @@ -1,7 +1,8 @@ <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}"/> | <h:commandLink value="Porlet Instances" action="instances"/> | <b><h:commandLink value="Portlet Definitions" action="portlets"/></b> 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 15:25:16 UTC (rev 6461) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instances.xhtml 2007-02-28 15:58:26 UTC (rev 6462) @@ -12,7 +12,7 @@ <h:form> - <table id="instancesTable2" width="100%" border="0" cellspacing="0" class="portlet-table-body"> + <table id="instancesTable2" width="100%" class="portlet-table-body"> <thead class="portlet-section-header"> <tr> <th>Id</th> @@ -55,7 +55,27 @@ <hr/> <c:if test="#{instancemgr.selectedPlugin == 'info'}"> - Info + <c:choose> + <c:when test="#{instancemgr.selectedInstance.portlet != null}"> + <h3>Portlet details + </h3> + <h:form> + <h:commandLink + action="#{portletmgr.selectPortlet}"> + <f:param name="id" value="#{instancemgr.selectedInstance.portlet.context.id}"/> + <f:param name="plugin" value="manager"/> + Show + </h:commandLink> the associated portlet + </h:form> + <ui:include src="/WEB-INF/jsp/management/common/showPortletDetails.xhtml"> + <ui:param name="portlet" value="#{instancemgr.selectedInstance.portlet}"/> + </ui:include> + </c:when> + <c:otherwise> + <h3>Portlet details</h3> + The associated portlet is not available + </c:otherwise> + </c:choose> </c:if> <c:if test="#{instancemgr.selectedPlugin == 'preferences'}"> 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 15:25:16 UTC (rev 6461) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/nodeNavigation.xhtml 2007-02-28 15:58:26 UTC (rev 6462) @@ -9,7 +9,7 @@ <h:form> <c:if test="#{not empty portalobjectmgr.portalNodes}"> - <table width="100%" border="0" cellspacing="0" class="portlet-table-body"> + <table width="100%" class="portlet-table-body"> <thead class="portlet-section-header"> <tr> <th>Portal</th> @@ -47,7 +47,7 @@ </c:if> <c:if test="#{not empty portalobjectmgr.pageNodes}"> - <table width="100%" border="0" cellspacing="0" class="portlet-table-body"> + <table width="100%" class="portlet-table-body"> <thead class="portlet-section-header"> <tr> <th>Page</th> @@ -85,7 +85,7 @@ </c:if> <c:if test="#{not empty portalobjectmgr.windowNodes}"> - <table width="100%" border="0" cellspacing="0" class="portlet-table-body"> + <table width="100%" class="portlet-table-body"> <thead class="portlet-section-header"> <tr> <th>Window</th> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/manager.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/manager.xhtml 2007-02-28 15:25:16 UTC (rev 6461) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/manager.xhtml 2007-02-28 15:58:26 UTC (rev 6462) @@ -42,7 +42,7 @@ <f:selectItems value="#{portalobjectmgr.portalPageItems}"/> </h:selectOneMenu> <br/> - <h:commandButton value="Update" class="portlet-form-button"/> + <h:commandButton value="Update" styleClass="portlet-form-button"/> <br/> </h:form> <h:form id="portal_form_2"> @@ -52,9 +52,9 @@ <h:inputText id="name" value="#{addPageAction.pageName}" validator="#{addPageAction.validatePageName}" required="true"/> - <h:messages style="color: red"/> + <h:messages errorClass="portlet-msg-error"/> <br/> - <h:commandButton action="#{addPageAction.execute}" value="Add page" class="portlet-form-button"/> + <h:commandButton action="#{addPageAction.execute}" value="Add page" styleClass="portlet-form-button"/> </h:form> </h:panelGroup> @@ -67,7 +67,7 @@ contentType="#{portalobjectmgr.selectedObject.type==3 ? portalobjectmgr.selectedObject.contentType : null}" contentURI="#{portalobjectmgr.selectedObject.instanceRef}"/> <br/> - <h:commandButton value="Change instance" class="portlet-form-button"/> + <h:commandButton value="Change instance" styleClass="portlet-form-button"/> </h:form> 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 15:25:16 UTC (rev 6461) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml 2007-02-28 15:58:26 UTC (rev 6462) @@ -5,8 +5,7 @@ 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" - class="admin-ui"> + xmlns:pfc="http://www.jboss.com/portal/facelet/common"> <ui:composition template="/WEB-INF/jsp/management/definitionsTemplate.xhtml"> @@ -23,7 +22,7 @@ <h:form> - <table width="100%" border="0" cellspacing="0" class="portlet-table-body"> + <table width="100%" class="portlet-table-body"> <thead class="portlet-section-header"> <tr> <th>Id</th>

19 years, 1 month

1
0
0 / 0

JBoss Portal SVN: r6460 - in trunk: core-admin/src/main/org/jboss/portal/core/portlet/management and 5 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-02-28 09:58:59 -0500 (Wed, 28 Feb 2007) New Revision: 6460 Added: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/showPortletDetails.xhtml Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 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/portlets.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet.xml trunk/core/src/resources/portal-core-war/WEB-INF/portlet.xml Log: started to display more portlet meta info Modified: trunk/core/src/resources/portal-core-war/WEB-INF/portlet.xml =================================================================== --- trunk/core/src/resources/portal-core-war/WEB-INF/portlet.xml 2007-02-28 14:06:24 UTC (rev 6459) +++ trunk/core/src/resources/portal-core-war/WEB-INF/portlet.xml 2007-02-28 14:58:59 UTC (rev 6460) @@ -70,6 +70,7 @@ <resource-bundle>Resource</resource-bundle> <portlet-info> <title>User portlet</title> + <keywords>management,admin</keywords> </portlet-info> <security-role-ref> <role-name>Admin</role-name> @@ -90,6 +91,7 @@ <resource-bundle>Resource</resource-bundle> <portlet-info> <title>Role management</title> + <keywords>management,admin</keywords> </portlet-info> <security-role-ref> <role-name>Admin</role-name> @@ -109,24 +111,6 @@ </portlet-info> </portlet> <portlet> - <description>Administration portlet for portal pages administration</description> - <portlet-name>ManagementPortlet</portlet-name> - <display-name>Portal Management Portlet</display-name> - <portlet-class>org.apache.myfaces.portlet.MyFacesGenericPortlet</portlet-class> - <init-param> - <name>default-view</name> - <value>/WEB-INF/jsp/management/index.xhtml</value> - </init-param> - <expiration-cache>-1</expiration-cache> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>VIEW</portlet-mode> - </supports> - <portlet-info> - <title>Management Portlet</title> - </portlet-info> - </portlet> - <portlet> <description>Configurator portlet for personal dashboard</description> <portlet-name>ConfiguratorPortlet</portlet-name> <display-name>Dashboard Configurator Portlet</display-name> @@ -137,9 +121,9 @@ </supports> <portlet-info> <title>Dashboard Portlet</title> + <keywords>management,admin</keywords> </portlet-info> </portlet> - <user-attribute> <name>user.name.nickName</name> </user-attribute> Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-28 14:06:24 UTC (rev 6459) +++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-28 14:58:59 UTC (rev 6460) @@ -107,16 +107,26 @@ }); // + SimpleBeanDecorator localizedStringDecorator = new SimpleBeanDecorator(); + localizedStringDecorator.setProperty("value", new AbstractPropertyDecorator(String.class) + { + public Object getValue(Object bean) + { + LocalizedString string = (LocalizedString)bean; + FacesContext ctx = FacesContext.getCurrentInstance(); + Locale locale = ctx.getExternalContext().getRequestLocale(); + return string.getString(locale, true); + } + }); + + // SimpleBeanDecorator portletDecorator = new SimpleBeanDecorator(); portletDecorator.setProperty("name", new AbstractPropertyDecorator(String.class) { public Object getValue(Object bean) throws IllegalArgumentException { Portlet portlet = (Portlet)bean; - LocalizedString displayName = portlet.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME); - FacesContext ctx = FacesContext.getCurrentInstance(); - Locale locale = ctx.getExternalContext().getRequestLocale(); - return displayName.getString(locale, true); + return portlet.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME); } }); portletDecorator.setProperty("description", new AbstractPropertyDecorator(String.class) @@ -124,17 +134,25 @@ public Object getValue(Object bean) throws IllegalArgumentException { Portlet portlet = (Portlet)bean; - LocalizedString displayName = portlet.getInfo().getMeta().getMetaValue(MetaInfo.DESCRIPTION); - FacesContext ctx = FacesContext.getCurrentInstance(); - Locale locale = ctx.getExternalContext().getRequestLocale(); - String name = displayName.getString(locale, true); - if (name == null) - { - name = "-"; - } - return name; + return portlet.getInfo().getMeta().getMetaValue(MetaInfo.DESCRIPTION); } }); + portletDecorator.setProperty("keywords", new AbstractPropertyDecorator(String.class) + { + public Object getValue(Object bean) throws IllegalArgumentException + { + Portlet portlet = (Portlet)bean; + return portlet.getInfo().getMeta().getMetaValue(MetaInfo.KEYWORDS); + } + }); + portletDecorator.setProperty("title", new AbstractPropertyDecorator(String.class) + { + public Object getValue(Object bean) throws IllegalArgumentException + { + Portlet portlet = (Portlet)bean; + return portlet.getInfo().getMeta().getMetaValue(MetaInfo.TITLE); + } + }); portletDecorator.setProperty("remotable", new AbstractPropertyDecorator(String.class) { public Object getValue(Object bean) throws IllegalArgumentException @@ -144,10 +162,35 @@ return info.isRemotable(); } }); + portletDecorator.setProperty("modes", new AbstractPropertyDecorator(String.class) + { + public Object getValue(Object bean) throws IllegalArgumentException + { + Portlet portlet = (Portlet)bean; + return portlet.getInfo().getCapabilities().getModes("text/html"); + } + }); + portletDecorator.setProperty("windowStates", new AbstractPropertyDecorator(String.class) + { + public Object getValue(Object bean) throws IllegalArgumentException + { + Portlet portlet = (Portlet)bean; + return portlet.getInfo().getCapabilities().getWindowStates("text/html"); + } + }); + portletDecorator.setProperty("locales", new AbstractPropertyDecorator(String.class) + { + public Object getValue(Object bean) throws IllegalArgumentException + { + Portlet portlet = (Portlet)bean; + return new ArrayList(portlet.getInfo().getCapabilities().getAllLocales()); + } + }); // + DelegatingPropertyResolver.registerDecorator(LocalizedString.class, localizedStringDecorator); + DelegatingPropertyResolver.registerDecorator(RoleModule.class, roleModuleDecorator); DelegatingPropertyResolver.registerDecorator(Portlet.class, portletDecorator); - DelegatingPropertyResolver.registerDecorator(RoleModule.class, roleModuleDecorator); } /** . */ Added: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/showPortletDetails.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/showPortletDetails.xhtml (rev 0) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/showPortletDetails.xhtml 2007-02-28 14:58:59 UTC (rev 6460) @@ -0,0 +1,18 @@ +<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:c="http://java.sun.com/jstl/core"> + + <div><span class="portlet-form-field-label">Portlet name:</span> #{portlet.name.value}</div> + <div><span class="portlet-form-field-label">Portlet description:</span> #{portlet.description.value}</div> + <div><span class="portlet-form-field-label">Portlet title:</span> #{portlet.title.value}</div> + <div><span class="portlet-form-field-label">Portlet keywords:</span> #{portlet.keywords.value}</div> + <c:if test="#{not empty portlet.locales}"> + <div><span class="portlet-form-field-label">Portlet locales:</span> + <c:forEach items="#{portlet.locales}" var="locale"> #{locale} </c:forEach> + </div> + </c:if> + +</div> \ No newline at end of file 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 14:06:24 UTC (rev 6459) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml 2007-02-28 14:58:59 UTC (rev 6460) @@ -2,18 +2,18 @@ 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:f="http://java.sun.com/jsf/core" + xmlns:c="http://java.sun.com/jstl/core"> <br/> - <h:panelGrid - rendered="#{portletmgr.selectedPortlet != null}"> - <h:outputText value="Name: #{portletmgr.selectedPortlet.name}"/> - <h:outputText value="Description: #{portletmgr.selectedPortlet.description}"/> - <br/> +  + <c:if test="#{portletmgr.selectedPortlet != null}"> + <ui:include src="/WEB-INF/jsp/management/common/showPortletDetails.xhtml"> + <ui:param name="portlet" value="#{portletmgr.selectedPortlet}"/> + </ui:include> + </c:if> - </h:panelGrid> -  <hr/> 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 14:06:24 UTC (rev 6459) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml 2007-02-28 14:58:59 UTC (rev 6460) @@ -44,7 +44,7 @@ #{portlet.context.id} </h:commandLink> </td> - <td>#{portlet.name}</td> + <td>#{portlet.name.value}</td> <td><h:selectBooleanCheckbox disabled="true" value="#{portlet.remote}"/></td> <td><h:selectBooleanCheckbox disabled="true" value="#{portlet.remotable}"/></td> <td> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2007-02-28 14:06:24 UTC (rev 6459) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2007-02-28 14:58:59 UTC (rev 6460) @@ -43,6 +43,7 @@ </supports> <portlet-info> <title>Management Portlet</title> + <keywords>management,admin</keywords> </portlet-info> </portlet> </portlet-app> Modified: trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet.xml =================================================================== --- trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet.xml 2007-02-28 14:06:24 UTC (rev 6459) +++ trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet.xml 2007-02-28 14:58:59 UTC (rev 6460) @@ -38,10 +38,11 @@ </supports> <portlet-info> <title>Greetings!</title> + <keywords>sample,test</keywords> </portlet-info> </portlet> <portlet> - <description>Portlet to test modification of head content.</description> + <description>Portlet to test modification of head content</description> <portlet-name>HeaderContentPortlet</portlet-name> <display-name>Header Content Portlet</display-name> @@ -51,10 +52,11 @@ </supports> <portlet-info> <title>Header Content portlet</title> + <keywords>sample,test</keywords> </portlet-info> </portlet> <portlet> - <description>This is a test portlet</description> + <description>A test portlet</description> <description xml:lang="fr">C'est une portlet de test</description> <portlet-name>TestPortlet</portlet-name> <display-name>Test Portlet</display-name> @@ -67,6 +69,7 @@ </supports> <portlet-info> <title>Test portlet</title> + <keywords>sample,test</keywords> </portlet-info> <portlet-preferences> <preference> @@ -99,24 +102,22 @@ </security-role-ref> </portlet> <portlet> - <description>Portlet counting and displaying number of it's action/render calls - demonstrating session - behaviour</description> + <description>Portlet displaying the number of it's action/render calls</description> <portlet-name>CounterPortlet</portlet-name> <display-name>Counter Portlet</display-name> - <portlet-class>org.jboss.portal.core.portlet.test.CounterPortlet</portlet-class> <supports> <mime-type>text/html</mime-type> </supports> <portlet-info> <title>Counter portlet</title> + <keywords>sample,test</keywords> </portlet-info> </portlet> <portlet> <description>Counter Portlet with cache support</description> <portlet-name>CachedCounterPortlet</portlet-name> <display-name>Cached Counter Portlet</display-name> - <portlet-class>org.jboss.portal.core.portlet.test.CounterPortlet</portlet-class> <expiration-cache>60</expiration-cache> <supports> @@ -130,33 +131,32 @@ <description>Portlet for testing behaviour on exceptions</description> <portlet-name>ExceptionPortlet</portlet-name> <display-name>Exception Portlet</display-name> - <portlet-class>org.jboss.portal.core.portlet.test.ExceptionPortlet</portlet-class> <supports> <mime-type>text/html</mime-type> </supports> <portlet-info> <title>Exception portlet</title> + <keywords>sample,test</keywords> </portlet-info> </portlet> <portlet> - <description>Portlet using portlet session - demo purposes</description> + <description>Portlet using portlet session</description> <portlet-name>PortletSessionPortlet</portlet-name> <display-name>Porltet Session Portlet</display-name> - <portlet-class>org.jboss.portal.core.portlet.test.PortletSessionPortlet</portlet-class> <supports> <mime-type>text/html</mime-type> </supports> <portlet-info> <title>Portlet session portlet</title> + <keywords>sample,test</keywords> </portlet-info> </portlet> <portlet> <description>Portlet for demonstrating IPC</description> <portlet-name>PortletA</portlet-name> <display-name>Portlet A</display-name> - <portlet-class>org.jboss.portal.core.portlet.test.event.PortletA</portlet-class> <supports> <mime-type>text/html</mime-type> @@ -164,13 +164,13 @@ </supports> <portlet-info> <title>Test Event A</title> + <keywords>sample,test</keywords> </portlet-info> </portlet> <portlet> <description>Portlet for demonstrating IPC</description> <portlet-name>PortletB</portlet-name> <display-name>Portlet B</display-name> - <portlet-class>org.jboss.portal.core.portlet.test.event.PortletB</portlet-class> <supports> <mime-type>text/html</mime-type> @@ -178,6 +178,7 @@ </supports> <portlet-info> <title>Test Event B</title> + <keywords>sample,test</keywords> </portlet-info> </portlet> <portlet> @@ -192,13 +193,13 @@ </supports> <portlet-info> <title>Test charset</title> + <keywords>sample,test</keywords> </portlet-info> </portlet> <portlet> <description>Portlet for testing encoding</description> <portlet-name>EncodingPortlet</portlet-name> <display-name>Encoding Portlet</display-name> - <portlet-class>org.jboss.portal.core.portlet.test.EncodingPortlet</portlet-class> <supports> <mime-type>text/html</mime-type> @@ -206,13 +207,13 @@ </supports> <portlet-info> <title>Test charset</title> + <keywords>sample,test</keywords> </portlet-info> </portlet> <portlet> <description>Secured Test Portlet</description> <portlet-name>SecuredTestPortlet</portlet-name> <display-name>Secured Test Portlet</display-name> - <portlet-class>org.jboss.portal.core.portlet.test.TestPortlet</portlet-class> <supports> <mime-type>text/html</mime-type> @@ -222,13 +223,13 @@ </supports> <portlet-info> <title>Secured test portlet</title> + <keywords>sample,test</keywords> </portlet-info> </portlet> <portlet> <description>Portlet providing weather forecast</description> <portlet-name>WeatherPortlet</portlet-name> <display-name>Weather Portlet</display-name> - <portlet-class>org.jboss.samples.portlet.weather.WeatherPortlet</portlet-class> <init-param> <name>default_zipcode</name> @@ -250,6 +251,7 @@ </supports> <portlet-info> <title>Weather Portlet</title> + <keywords>sample,news</keywords> </portlet-info> <portlet-preferences> <preference> @@ -291,6 +293,7 @@ <resource-bundle>NewsResource</resource-bundle> <portlet-info> <title>News Feeds</title> + <keywords>sample,news</keywords> </portlet-info> <portlet-preferences> <preference> @@ -315,17 +318,20 @@ </supports> <portlet-info> <title>URL Portlet</title> + <keywords>sample,test</keywords> </portlet-info> </portlet> <portlet> <portlet-name>BasicPortlet</portlet-name> <portlet-class>org.jboss.portal.core.portlet.test.BasicPortlet</portlet-class> + <display-name>Basic Portlet</display-name> <supports> <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode> </supports> <portlet-info> <title>Basic Portlet</title> + <keywords>sample,test</keywords> </portlet-info> </portlet> <user-attribute>

19 years, 1 month

1
0
0 / 0

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

by portal-commits＠lists.jboss.org

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/>  <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 @@  - <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 @@  - <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>

19 years, 1 month

1
0
0 / 0

JBoss Portal SVN: r6458 - trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-02-28 08:40:55 -0500 (Wed, 28 Feb 2007) New Revision: 6458 Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/JackrabbitJCRService.java Log: Add Info for debugging... Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/JackrabbitJCRService.java =================================================================== --- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/JackrabbitJCRService.java 2007-02-28 13:38:32 UTC (rev 6457) +++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/JackrabbitJCRService.java 2007-02-28 13:40:55 UTC (rev 6458) @@ -97,6 +97,7 @@ public void start() throws Exception { + log.info("JackRabbit configuration: " + config); // Create repository StringReader reader = new StringReader(config); InputSource src = new InputSource(reader);

19 years, 1 month

1
0
0 / 0

JBoss Portal SVN: r6457 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-02-28 08:38:32 -0500 (Wed, 28 Feb 2007) New Revision: 6457 Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml Log: don't make the last object a link in the portal object path navigation 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:30:36 UTC (rev 6456) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml 2007-02-28 13:38:32 UTC (rev 6457) @@ -15,16 +15,19 @@ <h:form> <c:forEach items="#{portalobjectmgr.selectedObjectPath}" var="node"> > - <c:if test="#{node.type != '3'}"> - <h:commandLink action="#{portalobjectmgr.selectObject}"> - <f:param name="id" value="#{node.id}"/> - <c:if test="#{node.name == ''}">root</c:if> - <c:if test="#{node.name != ''}">#{node.name}</c:if> - </h:commandLink> - </c:if> - <c:if test="#{node.type == '3'}"> - #{node.name} - </c:if> + <c:choose> + <c:when test="#{node.id == portalobjectmgr.selectedObjectBean.id}"> + <c:if test="#{node.name == ''}">root</c:if> + <c:if test="#{node.name != ''}">#{node.name}</c:if> + </c:when> + <c:otherwise> + <h:commandLink action="#{portalobjectmgr.selectObject}"> + <f:param name="id" value="#{node.id}"/> + <c:if test="#{node.name == ''}">root</c:if> + <c:if test="#{node.name != ''}">#{node.name}</c:if> + </h:commandLink> + </c:otherwise> + </c:choose> </c:forEach> </h:form>

19 years, 1 month

1
0
0 / 0

JBoss Portal SVN: r6456 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-02-28 08:30:36 -0500 (Wed, 28 Feb 2007) New Revision: 6456 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/portalNavigation.xhtml Log: minor style corrections 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:28:17 UTC (rev 6455) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-28 13:30:36 UTC (rev 6456) @@ -10,11 +10,9 @@ <hr class="admin-ui"/> <h:form id="portal_form"> - <h:inputText id="name" value="#{addPageAction.pageName}" - validator="#{addPageAction.validatePageName}" - required="true"/> + <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"/> - <h:message for="name" style="color: red"/> + <h:message for="name" errorClass="portlet-msg-error"/> </h:form> </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 13:28:17 UTC (rev 6455) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml 2007-02-28 13:30:36 UTC (rev 6456) @@ -7,11 +7,9 @@ <hr class="admin-ui"/> <h:form id="portal_form"> - <h:inputText id="name" value="#{portalAction.portalName}" - validator="#{portalAction.validatePortalName}" - required="true"/> + <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"/> - <h:message for="name" style="color: red"/> + <h:message for="name" errorClass="portlet-msg-error"/> </h:form> </div>

19 years, 1 month

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits February 2007