Author: julien(a)jboss.com
Date: 2007-03-15 10:13:44 -0400 (Thu, 15 Mar 2007)
New Revision: 6688
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/ThemePropertyAction.java
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml
Log:
simplified theme code in admin UI
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java
===================================================================
---
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2007-03-15
13:50:51 UTC (rev 6687)
+++
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2007-03-15
14:13:44 UTC (rev 6688)
@@ -31,6 +31,7 @@
import org.jboss.portal.identity.IdentityException;
import org.jboss.portal.common.util.LocalizedString;
import org.jboss.portal.common.util.IteratorStatus;
+import org.jboss.portal.common.MediaType;
import org.jboss.portal.portlet.Portlet;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.info.MetaInfo;
@@ -46,6 +47,8 @@
import org.jboss.portal.theme.PortalLayout;
import org.jboss.portal.theme.ThemeService;
import org.jboss.portal.theme.PortalTheme;
+import org.jboss.portal.theme.ServerRegistrationID;
+import org.jboss.portal.theme.render.PortalRenderSet;
import javax.faces.context.FacesContext;
import javax.faces.model.SelectItem;
@@ -55,6 +58,9 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Collection;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Iterator;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -285,7 +291,7 @@
{
LayoutService layoutService = (LayoutService)bean;
Collection layouts = layoutService.getLayouts();
- SelectItem[] items = new SelectItem[layouts.size()];
+ SelectItem[] items = new SelectItem[layouts.size() + 1];
for (IteratorStatus i = new IteratorStatus(layouts.iterator());i.hasNext();)
{
PortalLayout layout = (PortalLayout)i.next();
@@ -295,9 +301,36 @@
item.setLabel(layoutName);
items[i.getElementIndex()] = item;
}
+ items[items.length - 1] = new SelectItem("", "default");
return items;
}
});
+ layoutServiceDecorator.setProperty("renderSetItems", new
AbstractPropertyDecorator(SelectItem[].class)
+ {
+ public Object getValue(Object bean) throws IllegalArgumentException
+ {
+ LayoutService layoutService = (LayoutService)bean;
+ Collection renderSets = layoutService.getRenderSets();
+ Map names = new HashMap();
+ for (Iterator i = renderSets.iterator(); i.hasNext();)
+ {
+ ServerRegistrationID renderSetId = (ServerRegistrationID)i.next();
+ PortalRenderSet renderSet = layoutService.getRenderSet(renderSetId,
MediaType.HTML);
+ if (renderSet != null)
+ {
+ names.put(renderSet.getName(), renderSet.getName());
+ }
+ }
+ SelectItem[] items = new SelectItem[names.size() + 1];
+ for (IteratorStatus i = new IteratorStatus(names.keySet().iterator());
i.hasNext();)
+ {
+ String key = (String)i.next();
+ items[i.getElementIndex()] = new SelectItem(key, (String)names.get(key));
+ }
+ items[items.length - 1] = new SelectItem("", "default");
+ return items;
+ }
+ });
registerDecorator(LayoutService.class, layoutServiceDecorator);
//
@@ -308,7 +341,7 @@
{
ThemeService layoutService = (ThemeService)bean;
Collection themes = layoutService.getThemes();
- SelectItem[] items = new SelectItem[themes.size()];
+ SelectItem[] items = new SelectItem[themes.size() + 1];
for (IteratorStatus i = new IteratorStatus(themes.iterator());i.hasNext();)
{
PortalTheme name = (PortalTheme)i.next();
@@ -318,6 +351,7 @@
item.setLabel(themeName);
items[i.getElementIndex()] = item;
}
+ items[items.length - 1] = new SelectItem("", "default");
return items;
}
});
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-15
13:50:51 UTC (rev 6687)
+++
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-03-15
14:13:44 UTC (rev 6688)
@@ -38,7 +38,6 @@
import javax.faces.event.ActionEvent;
import javax.faces.model.SelectItem;
-import org.jboss.portal.common.MediaType;
import org.jboss.portal.core.model.instance.Instance;
import org.jboss.portal.core.model.instance.InstanceContainer;
import org.jboss.portal.core.model.portal.PortalObject;
@@ -55,19 +54,11 @@
import org.jboss.portal.core.impl.model.content.ContentEditorRegistry;
import org.jboss.portal.faces.component.portlet.PortletActionEvent;
import org.jboss.portal.identity.RoleModule;
-import org.jboss.portal.security.AuthorizationDomainRegistry;
import org.jboss.portal.security.RoleSecurityBinding;
import org.jboss.portal.security.SecurityConstants;
-import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
import org.jboss.portal.security.spi.provider.DomainConfigurator;
import org.jboss.portal.theme.LayoutService;
-import org.jboss.portal.theme.PortalLayout;
-import org.jboss.portal.theme.PortalTheme;
-import org.jboss.portal.theme.ServerRegistrationID;
-import org.jboss.portal.theme.ThemeConstants;
import org.jboss.portal.theme.ThemeService;
-import org.jboss.portal.theme.render.PortalRenderSet;
-import org.jboss.portal.theme.strategy.LayoutStrategy;
import org.jboss.portal.portlet.PortletInvoker;
/** The portal object manager bean. */
@@ -120,9 +111,6 @@
// Runtime state
/** . */
- private final ThemeBean themes = new ThemeBean();
-
- /** . */
private final AbstractAuthorizationBean auth = new PortalObjectAuthorizationBean();
/** . */
@@ -306,11 +294,6 @@
return auth;
}
- public ThemeBean getThemes()
- {
- return themes;
- }
-
public SelectItem[] getInstanceItems()
{
return instanceItems;
@@ -631,150 +614,6 @@
}
}
- public final class ThemeBean
- {
- public String getLayoutName()
- {
- return getDeclaredProperty(ThemeConstants.PORTAL_PROP_LAYOUT);
- }
-
- public String getThemeName()
- {
- return getDeclaredProperty(ThemeConstants.PORTAL_PROP_THEME);
- }
-
- public String getRenderSetName()
- {
- return getDeclaredProperty(ThemeConstants.PORTAL_PROP_RENDERSET);
- }
-
- public String getStrategyName()
- {
- return getDeclaredProperty(ThemeConstants.PORTAL_PROP_STRATEGY);
- }
-
- public String getWindowRenderer()
- {
- return getDeclaredProperty(ThemeConstants.PORTAL_PROP_WINDOW_RENDERER);
- }
-
- public String getDecorationRenderer()
- {
- return getDeclaredProperty(ThemeConstants.PORTAL_PROP_DECORATION_RENDERER);
- }
-
- public String getPortletRenderer()
- {
- return getDeclaredProperty(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER);
- }
-
- /**
- * Get the list of available layouts
- *
- * @return an array of the available layout names to pick a layout from
- */
- public SelectItem[] getLayoutNames()
- {
- Collection layouts = layoutService.getLayouts();
- SelectItem[] names = new SelectItem[layouts.size() + 1];
- int p = 0;
- for (Iterator i = layouts.iterator(); i.hasNext();)
- {
- PortalLayout layout = (PortalLayout)i.next();
- names[p++] = new SelectItem(layout.getLayoutInfo().getName(),
layout.getLayoutInfo().getName());
- }
- names[p] = new SelectItem("", "default");
- return names;
- }
-
- /**
- * Get the list of available themes
- *
- * @return an array of the available theme names to pick a theme from
- */
- public SelectItem[] getThemeNames()
- {
- Collection themes = themeService.getThemes();
- SelectItem[] themeNames = new SelectItem[themes.size() + 1];
-
- int p = 0;
- for (Iterator i = themes.iterator(); i.hasNext();)
- {
- PortalTheme theme = (PortalTheme)i.next();
- themeNames[p++] = new SelectItem(theme.getThemeInfo().getName(),
theme.getThemeInfo().getName());
- }
- themeNames[p] = new SelectItem("", "default");
-
- return themeNames;
- }
-
- /**
- * Get a list of available render sets
- *
- * @return and array of all available render set names to pick a render set from
- */
- public SelectItem[] getRenderSetNames()
- {
- Collection renderSets = layoutService.getRenderSets();
- Map names = new HashMap();
- for (Iterator i = renderSets.iterator(); i.hasNext();)
- {
- ServerRegistrationID renderSetId = (ServerRegistrationID)i.next();
- PortalRenderSet renderSet = layoutService.getRenderSet(renderSetId,
MediaType.HTML);
- if (renderSet != null)
- {
- names.put(renderSet.getName(), renderSet.getName());
- }
- }
- SelectItem[] renderSetNames = new SelectItem[names.size() + 1];
- int i = 0;
- for (Iterator it = names.keySet().iterator(); it.hasNext();)
- {
- String key = (String)it.next();
- renderSetNames[i++] = new SelectItem(key, (String)names.get(key));
- }
- renderSetNames[i] = new SelectItem("", "default");
- return renderSetNames;
- }
-
- public SelectItem[] getStrategyNames()
- {
- Collection strategies = layoutService.getStrategies();
- Map names = new HashMap();
- for (Iterator i = strategies.iterator(); i.hasNext();)
- {
- ServerRegistrationID id = (ServerRegistrationID)i.next();
- LayoutStrategy strategy = layoutService.getStrategy(id, MediaType.HTML);
- if (strategy != null)
- {
- names.put(strategy.getName(), strategy.getName());
- }
- }
- SelectItem[] strategyNames = new SelectItem[names.size() + 1];
-
- int i = 0;
- for (Iterator it = names.keySet().iterator(); it.hasNext();)
- {
- String key = (String)it.next();
- strategyNames[i++] = new SelectItem(key, (String)names.get(key));
- }
- strategyNames[i] = new SelectItem("", "Default");
- return strategyNames;
- }
-
- private String getDeclaredProperty(String key)
- {
- String value = null;
- PortalObject po = getSelectedObject();
- if (po != null)
- {
- value = po.getDeclaredProperty(key);
- }
-
- return value;
- }
- }
-
public String getPreviewURL()
{
// try
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/ThemePropertyAction.java
===================================================================
---
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/ThemePropertyAction.java 2007-03-15
13:50:51 UTC (rev 6687)
+++
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/ThemePropertyAction.java 2007-03-15
14:13:44 UTC (rev 6688)
@@ -26,7 +26,6 @@
import javax.faces.context.FacesContext;
import org.jboss.portal.core.model.portal.PortalObject;
-import org.jboss.portal.core.admin.ui.PortalObjectManagerBean;
import org.jboss.portal.theme.ThemeConstants;
/**
@@ -37,7 +36,7 @@
{
/** . */
- private PortalObjectManagerBean pomgr;
+ private PortalObject portalObject;
/** . */
private String layoutName;
@@ -49,9 +48,6 @@
private String renderSetName;
/** . */
- private String strategyName;
-
- /** . */
private String windowRendererName;
/** . */
@@ -60,22 +56,21 @@
/** . */
private String portletRendererName;
- public PortalObjectManagerBean getPortalObjectManager()
+
+ public PortalObject getPortalObject()
{
- return pomgr;
+ return portalObject;
}
- public void setPortalObjectManager(PortalObjectManagerBean portalObjectManager)
+ public void setPortalObject(PortalObject portalObject)
{
- this.pomgr = portalObjectManager;
-
- layoutName = pomgr.getThemes().getLayoutName();
- themeName = pomgr.getThemes().getThemeName();
- renderSetName = pomgr.getThemes().getRenderSetName();
- strategyName = pomgr.getThemes().getStrategyName();
- windowRendererName = pomgr.getThemes().getWindowRenderer();
- decorationRendererName = pomgr.getThemes().getDecorationRenderer();
- portletRendererName = pomgr.getThemes().getPortletRenderer();
+ this.portalObject = portalObject;
+ this.layoutName =
portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_LAYOUT);
+ this.themeName =
portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_THEME);
+ this.renderSetName =
portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_RENDERSET);
+ this.windowRendererName =
portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_WINDOW_RENDERER);
+ this.decorationRendererName =
portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_DECORATION_RENDERER);
+ this.portletRendererName =
portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER);
}
public String getLayoutName()
@@ -83,157 +78,144 @@
return layoutName;
}
- public void setLayoutName(String layoutName)
- {
- this.layoutName = ("".equals(layoutName) ? null : layoutName);
- }
-
public String getThemeName()
{
return themeName;
}
- public void setThemeName(String themeName)
- {
- this.themeName = ("".equals(themeName) ? null : themeName);
- }
-
public String getRenderSetName()
{
return renderSetName;
}
- public void setRenderSetName(String renderSetName)
+ public String getWindowRendererName()
{
- this.renderSetName = ("".equals(renderSetName) ? null : renderSetName);
+ return windowRendererName;
}
- public String getStrategyName()
+ public String getDecorationRendererName()
{
- return strategyName;
+ return decorationRendererName;
}
- public void setStrategyName(String strategyName)
+ public String getPortletRendererName()
{
- this.strategyName = ("".equals(strategyName) ? null : strategyName);
+ return portletRendererName;
}
- public String getWindowRendererName()
+ public void setLayoutName(String layoutName)
{
- return windowRendererName;
+ this.layoutName = "".equals(layoutName) ? null : layoutName;
}
- public void setWindowRendererName(String windowRendererName)
+ public void setThemeName(String themeName)
{
- this.windowRendererName = ("".equals(windowRendererName) ? null :
windowRendererName);
+ this.themeName = "".equals(themeName) ? null : themeName;
}
- public String getDecorationRendererName()
+ public void setRenderSetName(String renderSetName)
{
- return decorationRendererName;
+ this.renderSetName = "".equals(renderSetName) ? null : renderSetName;
}
- public void setDecorationRendererName(String decorationRendererName)
+ public void setWindowRendererName(String windowRendererName)
{
- this.decorationRendererName = ("".equals(decorationRendererName) ? null :
decorationRendererName);
+ this.windowRendererName = "".equals(windowRendererName) ? null :
windowRendererName;
}
- public String getPortletRendererName()
+ public void setDecorationRendererName(String decorationRendererName)
{
- return portletRendererName;
+ this.decorationRendererName = "".equals(decorationRendererName) ? null :
decorationRendererName;
}
public void setPortletRendererName(String portletRendererName)
{
- this.portletRendererName = ("".equals(portletRendererName) ? null :
portletRendererName);
+ this.portletRendererName = "".equals(portletRendererName) ? null :
portletRendererName;
}
public String execute()
{
- PortalObject po = pomgr.getSelectedObject();
-
boolean successful = true;
-
- if (po.getType() == PortalObject.TYPE_PORTAL || po.getType() ==
PortalObject.TYPE_PAGE)
+
+ // Get actual values
+ String layoutName =
portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_LAYOUT);
+ String themeName =
portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_THEME);
+ String renderSetName =
portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_RENDERSET);
+ String windowRendererName =
portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_WINDOW_RENDERER);
+ String decorationRendererName =
portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_DECORATION_RENDERER);
+ String portletRendererName =
portalObject.getDeclaredProperty(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER);
+
+ //
+ switch(portalObject.getType())
{
- if (layoutName == null ||
!layoutName.equals(pomgr.getThemes().getLayoutName()))
- {
-// log.info("set layout to '" + layoutName + "' for
" + po.getName());
- po.setDeclaredProperty(ThemeConstants.PORTAL_PROP_LAYOUT, layoutName);
- }
- if (themeName == null || !themeName.equals(pomgr.getThemes().getThemeName()))
- {
- if ("".equals(themeName))
+ case PortalObject.TYPE_PORTAL:
+ case PortalObject.TYPE_PAGE:
+ if (this.layoutName == null || !this.layoutName.equals(layoutName))
{
+ this.portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_LAYOUT,
this.layoutName);
}
-// log.info("set theme to '" + themeName + "' for
" + po.getName());
- po.setDeclaredProperty(ThemeConstants.PORTAL_PROP_THEME, themeName);
- }
- if (renderSetName == null ||
!renderSetName.equals(pomgr.getThemes().getRenderSetName()))
- {
-// log.info("set renderSet to '" + renderSetName + "'
for " + po.getName());
- po.setDeclaredProperty(ThemeConstants.PORTAL_PROP_RENDERSET, renderSetName);
- }
- if (strategyName == null ||
!strategyName.equals(pomgr.getThemes().getStrategyName()))
- {
-// log.info("set strategy to '" + strategyName + "' for
" + po.getName());
- po.setDeclaredProperty(ThemeConstants.PORTAL_PROP_STRATEGY, strategyName);
- }
+ if (this.themeName == null || !this.themeName.equals(themeName))
+ {
+ this.portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_THEME,
this.themeName);
+ }
+ if (this.renderSetName == null || !this.renderSetName.equals(renderSetName))
+ {
+
this.portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_RENDERSET,
this.renderSetName);
+ }
+ if (this.windowRendererName == null ||
!this.windowRendererName.equals(windowRendererName))
+ {
+ this.portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_STRATEGY,
this.windowRendererName);
+ }
+ break;
+ case PortalObject.TYPE_WINDOW:
+ if (this.windowRendererName == null ||
!this.windowRendererName.equals(windowRendererName))
+ {
+
this.portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_WINDOW_RENDERER,
this.windowRendererName);
+ }
+ if (this.decorationRendererName == null ||
!this.decorationRendererName.equals(decorationRendererName))
+ {
+
this.portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_DECORATION_RENDERER,
this.decorationRendererName);
+ }
+ if (this.portletRendererName == null ||
!this.portletRendererName.equals(portletRendererName))
+ {
+
this.portalObject.setDeclaredProperty(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER,
this.portletRendererName);
+ }
+ break;
+ default:
+ successful = false;
}
- else if (po.getType() == PortalObject.TYPE_WINDOW)
+
+ //
+ if (successful)
{
- if (windowRendererName == null ||
!windowRendererName.equals(pomgr.getThemes().getWindowRenderer()))
+ String stringMessage = null;
+ switch(this.portalObject.getType())
{
-// log.info("set window renderer to '" + windowRendererName +
"' for " + po.getName());
- po.setDeclaredProperty(ThemeConstants.PORTAL_PROP_WINDOW_RENDERER,
windowRendererName);
+ case PortalObject.TYPE_PORTAL:
+ stringMessage = "Theme has been correctly updated on the portal
named: " + portalObject.getName();
+ break;
+ case PortalObject.TYPE_PAGE:
+ stringMessage = "Theme has been correctly updated on the page named:
" + portalObject.getName();
+ break;
+ case PortalObject.TYPE_WINDOW:
+ stringMessage = "Theme has been correctly updated on the window
named: " + portalObject.getName();
+ break;
}
- if (decorationRendererName == null ||
!decorationRendererName.equals(pomgr.getThemes().getDecorationRenderer()))
+
+ //
+ if (stringMessage != null)
{
-// log.info("set decoration renderer to '" +
decorationRendererName + "' for " + po.getName());
- po.setDeclaredProperty(ThemeConstants.PORTAL_PROP_DECORATION_RENDERER,
decorationRendererName);
+ FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO,
stringMessage, stringMessage);
+ FacesContext.getCurrentInstance().addMessage("status", message);
}
- if (portletRendererName == null ||
!portletRendererName.equals(pomgr.getThemes().getPortletRenderer()))
- {
-// log.info("set portlet renderer to '" + portletRendererName +
"' for " + po.getName());
- po.setDeclaredProperty(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER,
portletRendererName);
- }
}
else
{
String stringMessage = "Unknown object type, please file a Jira issue:
http://jira.jboss.org";
FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR,
stringMessage, stringMessage);
FacesContext.getCurrentInstance().addMessage("error", message);
- successful = false;
}
- if (po.getType() == PortalObject.TYPE_PORTAL)
- {
- if (successful)
- {
- String stringMessage = "Theme has been correctly updated on the portal
named: " + po.getName();
- FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO,
stringMessage, stringMessage);
- FacesContext.getCurrentInstance().addMessage("status", message);
- }
- }
- else if (po.getType() == PortalObject.TYPE_PAGE)
- {
- if (successful)
- {
- String stringMessage = "Theme has been correctly updated on the page
named: " + po.getName();
- FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO,
stringMessage, stringMessage);
- FacesContext.getCurrentInstance().addMessage("status", message);
- }
- }
- else if (po.getType() == PortalObject.TYPE_WINDOW)
- {
- if (successful)
- {
- String stringMessage = "Theme has been correctly updated on the window
named: " + po.getName();
- FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO,
stringMessage, stringMessage);
- FacesContext.getCurrentInstance().addMessage("status", message);
- }
- }
-
return "objects";
}
}
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-03-15
13:50:51 UTC (rev 6687)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-03-15
14:13:44 UTC (rev 6688)
@@ -103,8 +103,8 @@
<managed-bean-class>org.jboss.portal.core.admin.ui.actions.ThemePropertyAction</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
<managed-property>
- <property-name>portalObjectManager</property-name>
- <value>#{sessionScope.portalobjectmgr}</value>
+ <property-name>portalObject</property-name>
+ <value>#{sessionScope.portalobjectmgr.selectedObject}</value>
</managed-property>
</managed-bean>
<managed-bean>
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2007-03-15
13:50:51 UTC (rev 6687)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2007-03-15
14:13:44 UTC (rev 6688)
@@ -16,7 +16,7 @@
</td>
<td>
<h:selectOneMenu id="layout"
styleClass="portlet-form-field"
value="#{themePropertyAction.layoutName}">
- <f:selectItems
value="#{portalobjectmgr.themes.layoutNames}"/>
+ <f:selectItems
value="#{applicationScope.LayoutService.layoutItems}"/>
</h:selectOneMenu>
</td>
</tr>
@@ -26,7 +26,7 @@
</td>
<td>
<h:selectOneMenu id="theme"
styleClass="portlet-form-field"
value="#{themePropertyAction.themeName}">
- <f:selectItems
value="#{portalobjectmgr.themes.themeNames}"/>
+ <f:selectItems
value="#{applicationScope.ThemeService.themeItems}"/>
</h:selectOneMenu>
</td>
</tr>
@@ -36,7 +36,7 @@
</td>
<td>
<h:selectOneMenu id="renderSet"
styleClass="portlet-form-field"
value="#{themePropertyAction.renderSetName}">
- <f:selectItems
value="#{portalobjectmgr.themes.renderSetNames}"/>
+ <f:selectItems
value="#{applicationScope.LayoutService.renderSetItems}"/>
</h:selectOneMenu>
</td>
</tr>
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml
===================================================================
---
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml 2007-03-15
13:50:51 UTC (rev 6687)
+++
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml 2007-03-15
14:13:44 UTC (rev 6688)
@@ -15,7 +15,7 @@
</td>
<td>
<h:selectOneMenu styleClass="portlet-form-field"
value="#{themePropertyAction.windowRendererName}">
- <f:selectItems
value="#{portalobjectmgr.themes.renderSetNames}"/>
+ <f:selectItems
value="#{applicationScope.LayoutService.renderSetItems}"/>
</h:selectOneMenu>
</td>
</tr>
@@ -24,7 +24,7 @@
</td>
<td>
<h:selectOneMenu styleClass="portlet-form-field"
value="#{themePropertyAction.decorationRendererName}">
- <f:selectItems
value="#{portalobjectmgr.themes.renderSetNames}"/>
+ <f:selectItems
value="#{applicationScope.LayoutService.renderSetItems}"/>
</h:selectOneMenu>
</td>
</tr>
@@ -33,7 +33,7 @@
</td>
<td>
<h:selectOneMenu styleClass="portlet-form-field"
value="#{themePropertyAction.portletRendererName}">
- <f:selectItems
value="#{portalobjectmgr.themes.renderSetNames}"/>
+ <f:selectItems
value="#{applicationScope.LayoutService.renderSetItems}"/>
</h:selectOneMenu>
</td>
</tr>