[jboss-svn-commits] JBL Code SVN: r9533 - 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-02-15 08:57:58 -0500 (Thu, 15 Feb 2007)
New Revision: 9533

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-primarynav/src/java/org/jboss/forge/primarynav/PrimaryNavigationUtils.java
   labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
Log:
correcting links

Modified: labs/jbosslabs/trunk/portal-extensions/forge-primarynav/src/java/org/jboss/forge/primarynav/PrimaryNavigationUtils.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-primarynav/src/java/org/jboss/forge/primarynav/PrimaryNavigationUtils.java	2007-02-15 13:28:58 UTC (rev 9532)
+++ labs/jbosslabs/trunk/portal-extensions/forge-primarynav/src/java/org/jboss/forge/primarynav/PrimaryNavigationUtils.java	2007-02-15 13:57:58 UTC (rev 9533)
@@ -49,8 +49,10 @@
 
     private static final String BUNDLE_NAME = "Resource";
     
-    private static final String PAGE_BASE = "/portal/portal/default/";
+    private static final String PAGE_BASE = "/portal/default/";
     
+    private static final String PROJECTS_MAIN_PAGE = "/file-access/default/theme/html/projects_main.htm";
+    
     static String getNavigationJsp() {
         return PRIMARY_NAV_DIR + File.separator + PRIMARY_NAV_JSP;
     }
@@ -101,6 +103,7 @@
 			pageCtx.put("name", getPageName(page, request.getLocale()));
 			
 			String pageURL = PAGE_BASE + page;
+			
 			pageCtx.put("url", pageURL);
 			
 			if (selectedPage != null && page.equals(selectedPage)) {

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-02-15 13:28:58 UTC (rev 9532)
+++ labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml	2007-02-15 13:57:58 UTC (rev 9533)
@@ -168,12 +168,6 @@
 		<parent-ref>default</parent-ref>
 		<page>
 			<page-name>contribute</page-name>
-			<properties>
-				<property>
-					<name>order</name>
-					<value>4</value>
-				</property>
-			</properties>
 
 			<window>
 				<window-name>
@@ -240,6 +234,14 @@
     <deployment>
         <if-exists>overwrite</if-exists>
         <parent-ref>default</parent-ref>
+				<properties>
+					<!-- Set the emptyRenderer for this page -->
+					<property>
+						<name>theme.renderSetId</name>
+						<value>emptyRenderer</value>
+					</property>
+				</properties>
+        
         <page>
             <!--  login page -->
             <page-name>login</page-name>
@@ -303,25 +305,11 @@
 	</deployment>
 	<deployment>
 		<if-exists>overwrite</if-exists>
-		<parent-ref>default.home</parent-ref>
+		<parent-ref>default</parent-ref>
 		<page>
 			<page-name>podcast</page-name>
 			<window>
-				<window-name>FreezoneNavigationWindow</window-name>
-				<instance-ref>FreezoneNavigationInstance</instance-ref>
-				<region>left</region>
-				<height>0</height>
-			</window>
-			<window>
 				<window-name>
-					AdsPortletWindowDefaultPodcast
-				</window-name>
-				<instance-ref>AdsPortletInstance</instance-ref>
-				<region>left</region>
-				<height>2</height>
-			</window>
-			<window>
-				<window-name>
 					PodcastPortletWindowDefaultPodcast
 				</window-name>
 				<instance-ref>PodcastPortletInstance</instance-ref>
@@ -335,12 +323,6 @@
 		<parent-ref>default</parent-ref>
 		<page>
 			<page-name>admin</page-name>
-			<!--<window>
-				<window-name>FreezoneNavigationWindow</window-name>
-				<instance-ref>FreezoneNavigationInstance</instance-ref>
-				<region>left</region>
-				<height>0</height>
-			</window>-->
 			<window>
 				<window-name>RolePortletWindowDefaultAdmin</window-name>
 				<instance-ref>RolePortletInstance</instance-ref>
@@ -387,26 +369,12 @@
 			</security-constraint>
 		</page>
 	</deployment>
-	
 	<deployment>
 		<if-exists>overwrite</if-exists>
 		<parent-ref>default</parent-ref>
 		<page>
 			<page-name>info</page-name>
-
-			<!--window>
-				<window-name>NavigationPortletWindowDefaultInfo</window-name>
-				<instance-ref>LabsNavigationPortletInstance</instance-ref>
-				<region>left</region>
-				<height>0</height>
-			</window>
 			<window>
-				<window-name>AdsPortletWindowDefaultInfo</window-name>
-				<instance-ref>AdsPortletInstance</instance-ref>
-				<region>left</region>
-				<height>2</height>
-			</window-->
-			<window>
 				<window-name>PrjInfoPortletWindowDefaultInfo</window-name>
 				<instance-ref>PrjInfoPortletInstance</instance-ref>
 				<region>triple</region>