[jboss-svn-commits] JBL Code SVN: r19711 - in labs/jbosslabs/trunk/portal-extensions: forge-portlets/src/web/WEB-INF and 1 other directories.

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

Author: unibrew
Date: 2008-04-24 15:04:16 -0400 (Thu, 24 Apr 2008)
New Revision: 19711

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/PrimaryNavigationFilter.java
   labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml
   labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
Log:
[JBLAB] new portal pages for new menu

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	2008-04-24 18:24:23 UTC (rev 19710)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/PrimaryNavigationFilter.java	2008-04-24 19:04:16 UTC (rev 19711)
@@ -24,6 +24,10 @@
 	
 	private static final String COMMUNITY_PAGE = "community";
 	
+	private static final String DOWNLOADS_PAGE = "download";
+	
+	private static final String DOCS_PAGE = "docs";
+	
 	private static final String MYORG_PAGE = "myorg";
 	
 	private static final String WIKI_PAGE = "wiki";
@@ -66,9 +70,15 @@
 				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)) {
+			} else if (requestURL.contains(Constants.LINK_BASE + DOWNLOADS_PAGE)) {
+                                return DOWNLOADS_PAGE;
+                        } else if (requestURL.contains(Constants.LINK_BASE + DOCS_PAGE)) {
+                                return DOCS_PAGE;
+                        } else if (requestURL.contains(Constants.LINK_BASE + FORUMS_PAGE)) {
+                                return FORUMS_PAGE;
+                        } else if (requestURL.contains(Constants.LINK_BASE + WIKI_PAGE)) {
+                                return WIKI_PAGE;
+                        } else if (requestURL.contains(Constants.LINK_BASE + RESOURCES_PAGE)) {
 			
 				setResourceType(requestURL, request);
 				

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml	2008-04-24 18:24:23 UTC (rev 19710)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/web/WEB-INF/portlet-instances.xml	2008-04-24 19:04:16 UTC (rev 19711)
@@ -192,9 +192,26 @@
             </preferences>
         </instance>
     </deployment>
-<deployment>
+    <deployment>
         <if-exists>overwrite</if-exists>
         <instance>
+            <instance-id>FreezoneDocsPageInstance</instance-id>
+            <portlet-ref>FreezonePortlet</portlet-ref>
+            <preferences>
+                <preference>
+                    <name>projectId</name>
+                    <value>default</value>
+                </preference>
+                <preference>
+                    <name>page</name>
+                    <value>docs/index.html</value>
+                </preference>
+            </preferences>
+        </instance>
+    </deployment>
+    <deployment>
+        <if-exists>overwrite</if-exists>
+        <instance>
             <instance-id>FreezoneForumsPageInstance</instance-id>
             <portlet-ref>FreezonePortlet</portlet-ref>
             <preferences>

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	2008-04-24 18:24:23 UTC (rev 19710)
+++ labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml	2008-04-24 19:04:16 UTC (rev 19711)
@@ -391,6 +391,30 @@
 	</deployment>
 
 	<deployment>
+                <if-exists>overwrite</if-exists>
+                <parent-ref>default</parent-ref>
+                <page>
+                        <page-name>docs</page-name>
+                                <properties>
+                                <!-- Set the emptyRenderer for this page -->
+                                <property>
+                                        <name>theme.renderSetId</name>
+                                        <value>emptyRenderer</value>
+                                </property>
+                        </properties>
+
+                        <window>
+                                <window-name>FreezoneDocsWindow</window-name>
+                                <instance-ref>
+                                        FreezoneDocsPageInstance
+                                </instance-ref>
+                                <region>triple</region>
+                                <height>0</height>
+                        </window>
+                </page>
+        </deployment>
+
+	<deployment>
 		<if-exists>overwrite</if-exists>
 		<parent-ref>default</parent-ref>
 		<page>