[jboss-svn-commits] JBoss Portal SVN: r5406 - trunk/core/src/main/org/jboss/portal/core/aspects/controller
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Oct 10 14:51:03 EDT 2006
Author: roy.russo at jboss.com
Date: 2006-10-10 14:51:03 -0400 (Tue, 10 Oct 2006)
New Revision: 5406
Modified:
trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java
Log:
- scoped navigation links
Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2006-10-10 18:50:42 UTC (rev 5405)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2006-10-10 18:51:03 UTC (rev 5406)
@@ -60,7 +60,9 @@
public class PageCustomizerInterceptor extends ControllerInterceptor
{
- /** . */
+ /**
+ * .
+ */
private static final String RESOURCE_PREFIX = "PAGENAME_";
private PortalAuthorizationManagerFactory portalAuthorizationManagerFactory;
@@ -94,7 +96,7 @@
windowProps.put(ThemeConstants.PORTAL_PROP_WINDOW_RENDERER, "emptyRenderer");
windowProps.put(ThemeConstants.PORTAL_PROP_DECORATION_RENDERER, "emptyRenderer");
windowProps.put(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER, "emptyRenderer");
- WindowResult res = new ModifiableWindowResult("", tabbedNav.toString(), Collections.EMPTY_MAP, windowProps, null, null, WindowState.NORMAL, Mode.VIEW);
+ WindowResult res = new ModifiableWindowResult("", tabbedNav.toString(), Collections.EMPTY_MAP, windowProps, null, null, WindowState.NORMAL, Mode.VIEW);
WindowContext blah = new WindowContext("BLAH", "BLAH", "navigation", 0);
rendition.getPageResult().addWindowContext(blah);
rendition.getPageResult().addWindowResult("BLAH", res);
@@ -111,7 +113,7 @@
windowProps.put(ThemeConstants.PORTAL_PROP_WINDOW_RENDERER, "emptyRenderer");
windowProps.put(ThemeConstants.PORTAL_PROP_DECORATION_RENDERER, "emptyRenderer");
windowProps.put(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER, "emptyRenderer");
- WindowResult res = new ModifiableWindowResult("", dashboardNav.toString(), Collections.EMPTY_MAP, windowProps, null, null, WindowState.NORMAL, Mode.VIEW);
+ WindowResult res = new ModifiableWindowResult("", dashboardNav.toString(), Collections.EMPTY_MAP, windowProps, null, null, WindowState.NORMAL, Mode.VIEW);
WindowContext bluh = new WindowContext("BLUH", "BLUH", "dashboardnav", 0);
rendition.getPageResult().addWindowContext(bluh);
rendition.getPageResult().addWindowResult("BLUH", res);
@@ -127,7 +129,7 @@
public StringBuffer injectDashboardNav(RenderPageCommand rpc)
{
StringBuffer sb = new StringBuffer();
- if(rpc.getControllerContext().getServerInvocation().getServerContext().getClientRequest().getRemoteUser() == null)
+ if (rpc.getControllerContext().getServerInvocation().getServerContext().getClientRequest().getRemoteUser() == null)
{
URLContext ctx = rpc.getControllerContext().getServerInvocation().getServerContext().getURLContext();
ctx = URLContext.newInstance(ctx.getSecure(), true);
@@ -149,7 +151,7 @@
{
ViewDashboardCommand vdc = new ViewDashboardCommand("dashboard");
pageURL = rpc.getControllerContext().encodeURL(vdc, null, null);
- label = "Dashboard";
+ label = "My Dashboard";
}
// TODO: add checks for shared/private pages
@@ -170,15 +172,18 @@
sb.append("<br/><br/>");
sb.append("<a href=\"").append(pageURL).append("\">").append(label).append("</a>");
+
+ if (dashboard)
+ {
+ sb.append(" | ");
+ sb.append("<a href=\"#\">Add Content</a>");
+ sb.append(" | ");
+ sb.append("<a href=\"#\">Edit Page</a>");
+ sb.append(" | ");
+ sb.append("<a href=\"#\">Add Page</a>");
+ }
sb.append(" | ");
- sb.append("<a href=\"#\">Add Content</a>");
- sb.append(" | ");
- sb.append("<a href=\"#\">Edit Page</a>");
- sb.append(" | ");
- sb.append("<a href=\"#\">Add Page</a>");
- sb.append(" | ");
sb.append("<a href=\"").append(logoutURL).append("\">Logout</a>");
-
}
return sb;
}
@@ -191,12 +196,12 @@
// Now build the list
List navElements = new ArrayList();
- for(Iterator iterator = page.getPortal().getChildren().iterator();iterator.hasNext();)
+ for (Iterator iterator = page.getPortal().getChildren().iterator(); iterator.hasNext();)
{
- PortalObject child = (PortalObject) iterator.next();
- if(child.getType() == PortalNode.TYPE_PAGE)
+ PortalObject child = (PortalObject)iterator.next();
+ if (child.getType() == PortalNode.TYPE_PAGE)
{
- PortalObjectImpl portalObject = (PortalObjectImpl) child;
+ PortalObjectImpl portalObject = (PortalObjectImpl)child;
navElements.add(portalObject);
}
}
@@ -222,9 +227,9 @@
StringBuffer html = new StringBuffer();
html.append("<ul id=\"tabsHeader\">");
- for(Iterator i = navElements.iterator(); i.hasNext();)
+ for (Iterator i = navElements.iterator(); i.hasNext();)
{
- PortalObjectImpl navElement = (PortalObjectImpl) i.next();
+ PortalObjectImpl navElement = (PortalObjectImpl)i.next();
// build up Marks markup for the navigation , based on these nodes
String name = navElement.getName();
@@ -242,14 +247,14 @@
String id = navElement.getId();
PortalObjectPermission perm = new PortalObjectPermission(id, PortalObjectPermission.VIEW_MASK);
- if(portalAuthorizationManagerFactory.getManager().checkPermission(perm))
+ if (portalAuthorizationManagerFactory.getManager().checkPermission(perm))
{
RenderPageCommand cmd = new RenderPageCommand(navElement.getId());
String childURL = rpc.getControllerContext().encodeURL(cmd, null, null);
html.append("<li");
// if we were able to detect the selected node in the hierarchie level of the nav elements,
// then flag the node so the css can style it as the selected one
- if(page == navElement)
+ if (page == navElement)
{
html.append(" id=\"current\"");
}
@@ -259,7 +264,7 @@
html.append("</ul>");
return html;
}
- catch(Exception e)
+ catch (Exception e)
{
log.error("", e);
return null;
More information about the jboss-svn-commits
mailing list