Author: julien(a)jboss.com
Date: 2007-02-28 18:00:07 -0500 (Wed, 28 Feb 2007)
New Revision: 6473
Removed:
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/windowNavigation.xhtml
Modified:
trunk/core-admin/src/bin/portal-admin-war/images/management/management.css
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instancesTemplate.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/pages.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portals.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portletsTemplate.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/tabTemplate.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml
Log:
simplified the various file inclusions
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
22:10:14 UTC (rev 6472)
+++ trunk/core-admin/src/bin/portal-admin-war/images/management/management.css 2007-02-28
23:00:07 UTC (rev 6473)
@@ -41,6 +41,17 @@
text-decoration: none;
}
+.admin-ui ul.topnav {
+ margin: 0;
+ padding: 4px 0px 3px 0px;
+}
+
+.admin-ui ul.topnav li {
+ list-style-type: none;
+ display: inline;
+ margin-right: 10px;
+}
+
/* Change dashed line to solid. */
.admin-ui hr {
border-top-style: solid;
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
22:10:14 UTC (rev 6472)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instancesTemplate.xhtml 2007-02-28
23:00:07 UTC (rev 6473)
@@ -4,9 +4,7 @@
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>
+ <ui:include src="tabTemplate.xhtml"/>
<hr/>
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
22:10:14 UTC (rev 6472)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/objectTemplate.xhtml 2007-02-28
23:00:07 UTC (rev 6473)
@@ -6,9 +6,8 @@
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>
+ <!-- Common nav -->
+ <ui:include src="tabTemplate.xhtml"/>
<!-- Path nav -->
<hr/>
@@ -31,6 +30,10 @@
</c:forEach>
</h:form>
+ <!-- Navigation -->
+ <ui:include src="objectNavigation.xhtml"/>
+
+ <!-- Content -->
<ui:insert name="content">Content</ui:insert>
</div>
Deleted:
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
22:10:14 UTC (rev 6472)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pageNavigation.xhtml 2007-02-28
23:00:07 UTC (rev 6473)
@@ -1,18 +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">
-
- <ui:include src="objectNavigation.xhtml"/>
-
- <!-- Sub page addition -->
-
- <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"/>
- <h:message for="name" errorClass="portlet-msg-error"/>
- </h:form>
-
-</div>
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pages.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pages.xhtml 2007-02-28
22:10:14 UTC (rev 6472)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/pages.xhtml 2007-02-28
23:00:07 UTC (rev 6473)
@@ -2,14 +2,21 @@
xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html">
+
<ui:composition
template="/WEB-INF/jsp/management/objectTemplate.xhtml">
<ui:define name="content">
- <h3>You are editing the pages of: <h:outputText
value="#{portalobjectmgr.selectedObject.name}"/></h3>
+
<h:message id="status" for="status"/>
- <ui:include
src="/WEB-INF/jsp/management/pageNavigation.xhtml"/>
+
+ <!-- Sub page addition -->
+ <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"/>
+ <h:message for="name"
errorClass="portlet-msg-error"/>
+ </h:form>
+
</ui:define>
</ui:composition>
+
</div>
-
-
-
Deleted:
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
22:10:14 UTC (rev 6472)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portalNavigation.xhtml 2007-02-28
23:00:07 UTC (rev 6473)
@@ -1,15 +0,0 @@
-<div
-
xmlns="http://www.w3.org/1999/xhtml"
-
xmlns:ui="http://java.sun.com/jsf/facelets"
-
xmlns:h="http://java.sun.com/jsf/html">
-
- <ui:include src="objectNavigation.xhtml"/>
-
- <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"/>
- <h:message for="name" errorClass="portlet-msg-error"/>
- </h:form>
-
-</div>
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portals.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portals.xhtml 2007-02-28
22:10:14 UTC (rev 6472)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portals.xhtml 2007-02-28
23:00:07 UTC (rev 6473)
@@ -2,13 +2,20 @@
xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html">
+
<ui:composition
template="/WEB-INF/jsp/management/objectTemplate.xhtml">
<ui:define name="content">
+
<h:message id="status" for="status"/>
- <ui:include
src="/WEB-INF/jsp/management/portalNavigation.xhtml"/>
+
+ <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"/>
+ <h:message for="name"
errorClass="portlet-msg-error"/>
+ </h:form>
+
</ui:define>
</ui:composition>
+
</div>
-
-
-
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portletsTemplate.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portletsTemplate.xhtml 2007-02-28
22:10:14 UTC (rev 6472)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portletsTemplate.xhtml 2007-02-28
23:00:07 UTC (rev 6473)
@@ -4,9 +4,7 @@
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>
+ <ui:include src="tabTemplate.xhtml"/>
<hr/>
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/tabTemplate.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/tabTemplate.xhtml 2007-02-28
22:10:14 UTC (rev 6472)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/tabTemplate.xhtml 2007-02-28
23:00:07 UTC (rev 6473)
@@ -2,27 +2,18 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:ui="http://java.sun.com/jsf/facelets">
-<h:form>
-<div id="navigation">
- <ul id="tabsHeader">
- <li id="current"
onmouseover="this.className='hoverOn'"
onmouseout="this.className='hoverOff'">
- <h:commandLink value="Portal Objects"
action="portalobjects"/>
- </li>
- <li onmouseover="this.className='hoverOn'"
onmouseout="this.className='hoverOff'">
- <h:commandLink value="Porlet Instances"
action="instances"/>
- </li>
- <li onmouseover="this.className='hoverOn'"
onmouseout="this.className='hoverOff'">
- <h:commandLink value="Portlet Definitions"
action="portlets"/>
- </li>
- </ul>
-</div>
+ <h:form>
+ <ul class="topnav">
+ <li>
+ <h:commandLink value="Portal Objects" action="portals"
actionListener="#{portalobjectmgr.selectRootObject}"/>
+ </li>
+ <li>
+ <h:commandLink value="Portlet Instances"
action="instances"/>
+ </li>
+ <li>
+ <h:commandLink value="Portlet Definitions"
action="portlets"/>
+ </li>
+ </ul>
+ </h:form>
-<div>
-<h:commandLink value="Portal Objects" action="portals"/> |
<h:commandLink value="Porlet Instances" action="instances"/> |
<h:commandLink value="Portlet Definitions" action="portlets"/>
</div>
-
-</h:form>
-
-<ui:insert name="content">Content</ui:insert>
-
-</div>
Deleted:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml 2007-02-28
22:10:14 UTC (rev 6472)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windowNavigation.xhtml 2007-02-28
23:00:07 UTC (rev 6473)
@@ -1,5 +0,0 @@
-<div
-
xmlns="http://www.w3.org/1999/xhtml"
-
xmlns:ui="http://java.sun.com/jsf/facelets">
- <ui:include src="/WEB-INF/jsp/management/nodeNavigation.xhtml"/>
-</div>
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml 2007-02-28
22:10:14 UTC (rev 6472)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/windows.xhtml 2007-02-28
23:00:07 UTC (rev 6473)
@@ -1,17 +1,24 @@
<div
xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:ct="http://www.julien.com"
xmlns:h="http://java.sun.com/jsf/html">
+
<ui:composition
template="/WEB-INF/jsp/management/objectTemplate.xhtml">
<ui:define name="content">
- <h3>You are editing the windows of: <h:outputText
value="#{portalobjectmgr.selectedObject.name}"/></h3>
+
<h:message id="status" for="status"/>
- <ui:include
src="/WEB-INF/jsp/management/windowNavigation.xhtml"/>
+
<hr/>
- <ui:include
src="/WEB-INF/jsp/management/plugins/manager.xhtml"/>
+ <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>
+
</ui:define>
</ui:composition>
+
</div>
-
-
-