[jboss-svn-commits] JBL Code SVN: r10288 - in labs/jbosslabs/trunk/portal-extensions: portal-default/src/web/WEB-INF and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: dejp
Date: 2007-03-16 18:11:35 -0400 (Fri, 16 Mar 2007)
New Revision: 10288

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/PrimaryNavigationFilter.java
   labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
Log:
theme update

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/PrimaryNavigationFilter.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/PrimaryNavigationFilter.java	2007-03-16 22:11:26 UTC (rev 10287)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/PrimaryNavigationFilter.java	2007-03-16 22:11:35 UTC (rev 10288)
@@ -11,13 +11,13 @@
 import javax.servlet.http.HttpServletRequest;
 
 import org.jboss.forge.common.Constants;
-import org.jboss.forge.common.ForgeHelper;
-import org.jboss.forge.common.projects.ProjectsHelper;
 
 public class PrimaryNavigationFilter implements Filter {
 
-	private static final String PRIMARYNAV_CURR_PAGE = "primarynav_current_page";
+	private static final String PRIMARYNAV_CURR_PAGE = "org_primarynav_current_page";
 	
+	private static final String RESOURCE_TYPE = "org_resource_type";
+	
 	private static final String RESOURCES_PAGE = "resources";
 	
 	private static final String PROJECTS_PAGE = "projects";
@@ -53,19 +53,32 @@
 	public static String getSelectedPage(HttpServletRequest request) {
 		String requestURL = request.getRequestURI(); 
 		
-		if (requestURL.contains(Constants.LINK_BASE + MYORG_PAGE)) {
-			return MYORG_PAGE;
-		} else if (requestURL.contains(Constants.LINK_BASE + COMMUNITY_PAGE)) {
-			return COMMUNITY_PAGE;
-		} else if (requestURL.contains(Constants.LINK_BASE + PROJECTS_PAGE)) {
-			return PROJECTS_PAGE;
-		} else if (requestURL.contains(Constants.LINK_BASE + RESOURCES_PAGE) || 
-				requestURL.contains(Constants.LINK_BASE + WIKI_PAGE) || 
-				requestURL.contains(Constants.LINK_BASE + FORUMS_PAGE)) {
-			return RESOURCES_PAGE;
-		} 
+		if (requestURL != null) {
+			if (requestURL.contains(Constants.LINK_BASE + MYORG_PAGE)) {
+				return MYORG_PAGE;
+			} else if (requestURL.contains(Constants.LINK_BASE + COMMUNITY_PAGE)) {
+				return COMMUNITY_PAGE;
+			} else if (requestURL.contains(Constants.LINK_BASE + PROJECTS_PAGE)) {
+				return PROJECTS_PAGE;
+			} else if (requestURL.contains(Constants.LINK_BASE + RESOURCES_PAGE) || 
+					requestURL.contains(Constants.LINK_BASE + WIKI_PAGE) || 
+					requestURL.contains(Constants.LINK_BASE + FORUMS_PAGE)) {
+			
+				setResourceType(requestURL, request);
+				
+				return RESOURCES_PAGE;
+			} 
+		}
 		
 		return null;
 	}
 	
+	public static void setResourceType(String requestURL, HttpServletRequest request) {
+		if (requestURL.contains(Constants.LINK_BASE + WIKI_PAGE)) {
+			request.setAttribute(RESOURCE_TYPE, WIKI_PAGE);
+		} else if (requestURL.contains(Constants.LINK_BASE + FORUMS_PAGE)) {
+			request.setAttribute(RESOURCE_TYPE, FORUMS_PAGE);
+		}
+	}
+	
 }

Modified: labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml	2007-03-16 22:11:26 UTC (rev 10287)
+++ labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml	2007-03-16 22:11:35 UTC (rev 10288)
@@ -215,6 +215,39 @@
 		<if-exists>overwrite</if-exists>
 		<parent-ref>default</parent-ref>
 		<page>
+			<page-name>forums</page-name>
+
+			<window>
+				<window-name>JSFForumsPortletWindow</window-name>
+				<instance-ref>JSFForumsPortletInstance</instance-ref>
+				<region>triple</region>
+				<height>0</height>
+
+				<properties>
+					<!-- use the window renderer from the emptyRenderer renderSet -->
+					<property>
+						<name>theme.windowRendererId</name>
+						<value>emptyRenderer</value>
+					</property>
+					<!-- use the decoration renderer from the emptyRenderer renderSet -->
+					<property>
+						<name>theme.decorationRendererId</name>
+						<value>emptyRenderer</value>
+					</property>
+					<!-- use the portlet renderer from the emptyRenderer renderSet -->
+					<property>
+						<name>theme.portletRendererId</name>
+						<value>emptyRenderer</value>
+					</property>
+				</properties>
+			</window>
+		</page>
+	</deployment>
+
+	<deployment>
+		<if-exists>overwrite</if-exists>
+		<parent-ref>default</parent-ref>
+		<page>
 			<page-name>con</page-name>
 			<window>
 				<window-name>ConPortletWindowDefault</window-name>
@@ -357,25 +390,6 @@
 		</page>
 		</portal>
 		</deployment>  -->
-	<!--deployment>
-		<if-exists>overwrite</if-exists>
-		<parent-ref>default</parent-ref>
-		<page>
-		<page-name>info</page-name>
-		<window>
-		<window-name>PrjInfoPortletWindowDefaultInfo</window-name>
-		<instance-ref>PrjInfoPortletInstance</instance-ref>
-		<region>triple</region>
-		<height>0</height>
-		</window>
-		<window>
-		<window-name>PollsPortletWindowInfo</window-name>
-		<instance-ref>PollsPortletInstance</instance-ref>
-		<region>rightA</region>
-		<height>1</height>
-		</window>
-		</page>
-		</deployment-->
 	<deployment>
 		<parent-ref />
 		<if-exists>keep</if-exists>