Author: julien(a)jboss.com
Date: 2007-03-03 20:09:21 -0500 (Sat, 03 Mar 2007)
New Revision: 6518
Modified:
trunk/core-admin/src/bin/portal-admin-war/style.css
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
Log:
fix window content selection
Modified: trunk/core-admin/src/bin/portal-admin-war/style.css
===================================================================
--- trunk/core-admin/src/bin/portal-admin-war/style.css 2007-03-04 00:45:46 UTC (rev
6517)
+++ trunk/core-admin/src/bin/portal-admin-war/style.css 2007-03-04 01:09:21 UTC (rev
6518)
@@ -88,6 +88,8 @@
width:11em;
}
+/* Style a table for form layout */
+
.admin-ui table.form {
border-spacing: 10px 4px;
margin-left: -10px;
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
===================================================================
---
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-03-04
00:45:46 UTC (rev 6517)
+++
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-03-04
01:09:21 UTC (rev 6518)
@@ -460,16 +460,6 @@
selectedId = new PortalObjectId();
}
selectedObject = getObjectFromId(selectedId);
- if (selectedObject instanceof Window)
- {
- Window window = (Window)selectedObject;
- selectedContentType = window.getContentType();
- Content content = window.getContent();
- if (content != null)
- {
- selectedContentURI = content.getURI();
- }
- }
}
return selectedObject;
}
@@ -556,6 +546,13 @@
case PortalObject.TYPE_PAGE:
break;
case PortalObject.TYPE_WINDOW:
+ Window window = (Window)object;
+ selectedContentType = window.getContentType();
+ Content content = window.getContent();
+ if (content != null)
+ {
+ selectedContentURI = content.getURI();
+ }
break;
}
}
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-03-04
00:45:46 UTC (rev 6517)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-03-04
01:09:21 UTC (rev 6518)
@@ -7,12 +7,17 @@
<ui:define name="content">
- <!-- -->
- <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>
+ <!-- Sub page addition -->
+ <div style="padding:1em 0 0 0">
+ <div class="portlet-font">Create a portal:</div>
+ <div style="padding:1em 0 1em 0">
+ <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>
+ </div>
<!-- Separation -->
<hr/>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-03-04
00:45:46 UTC (rev 6517)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-03-04
01:09:21 UTC (rev 6518)
@@ -25,9 +25,6 @@
<div class="portlet-font">Default page:</div>
<div style="padding:1em 0 1em 0">
<h:form>
- <h:outputLabel for="name">
- <h:outputText styleClass="portlet-form-field-label"
value="Default Page:"/>
- </h:outputLabel>
<h:selectOneMenu id="name"
styleClass="portlet-form-field"
value="#{portalAction.defaultPageName}">
<f:selectItems
value="#{portalobjectmgr.portalPageItems}" />
</h:selectOneMenu>