From 62a2965867500a75ea6bf21d6c792d9a46772a17 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Wed, 19 Oct 2011 13:16:26 +0000
Subject: [PATCH] =?UTF-8?q?-=20ccm-cms-publicpersonalprofile:=20=C3=84nder?=
 =?UTF-8?q?ung=20der=20Navigationsstruktur:=20Home-Link=20geht=20jetzt=20a?=
 =?UTF-8?q?uf=20RootPage,=20in=20den=20Breadcrumbs=20wird=20der=20Name=20d?=
 =?UTF-8?q?er=20Person=20=20=20angezeigt=20-=20ccm-sci-types-project:=20Kl?=
 =?UTF-8?q?eine=20Korrekturen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.libreccm.org/ccm/trunk@1177 8810af33-2d31-482b-a856-94f89814c4df
---
 .../PublicPersonalProfileXmlUtil.java         | 34 +++++++++++--------
 .../arsdigita/cms/contenttypes/SciProject.xml |  2 +-
 .../cms/contenttypes/SciProjectConfig.java    | 16 +++++----
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java
index d84d95d2f..e642055d3 100644
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java
@@ -1,7 +1,9 @@
 package com.arsdigita.cms.contenttypes;
 
+import com.arsdigita.cms.CMS;
 import com.arsdigita.cms.contentassets.RelatedLink;
 import com.arsdigita.cms.publicpersonalprofile.PublicPersonalProfiles;
+import com.arsdigita.dispatcher.DispatcherHelper;
 import com.arsdigita.domain.DomainObjectFactory;
 import com.arsdigita.globalization.GlobalizationHelper;
 import com.arsdigita.persistence.DataCollection;
@@ -62,15 +64,12 @@ public class PublicPersonalProfileXmlUtil {
         navList.addAttribute("isSelected", "true");
         navList.addAttribute("sortKey", "");
         navList.addAttribute("title", "publicPersonalProfileNavList");
-        if (previewMode) {
-            navList.addAttribute("url", String.format("%s/%s",
-                    appUrl,
-                    profile.getProfileUrl()));
-        } else {
-            navList.addAttribute("url", String.format("%s/%s",
-                    appUrl,
-                    profile.getProfileUrl()));
-        }
+        /*navList.addAttribute("url", String.format("%s/%s",
+        appUrl,
+        profile.getProfileUrl()));*/
+        navList.addAttribute("url", String.format("/ccm/%s",
+                UI.getConfig().getRootPage()));
+
 
         if (config.getShowHomeNavEntry()) {
             Element navHome =
@@ -92,11 +91,11 @@ public class PublicPersonalProfileXmlUtil {
             } else {
                 navHome.addAttribute("title", homeLabel);
             }
-            //navHome.addAttribute("url", String.format("%s/%s",
-            //                                        appUrl,
-            //                                      profile.getProfileUrl()));
-            navHome.addAttribute("url", String.format("/ccm/%s",
-                    UI.getConfig().getRootPage()));
+            navHome.addAttribute("url", String.format("%s/%s",
+                    appUrl,
+                    profile.getProfileUrl()));
+            //navHome.addAttribute("url", String.format("/ccm/%s",
+            //      UI.getConfig().getRootPage()));
         }
 
         //Get the available Navigation items
@@ -124,6 +123,13 @@ public class PublicPersonalProfileXmlUtil {
         homeElem.addAttribute("url", String.format("/ccm/%s",
                 UI.getConfig().getRootPage()));
 
+        final Element profileElem = pathElem.newChildElement("nav:category",
+                "http://ccm.redhat.com/london/navigation");
+        profileElem.addAttribute("url", String.format("%s/%s",
+                appUrl,
+                profile.getProfileUrl()));
+        profileElem.addAttribute("title", profile.getOwner().getFullName());
+
         //Get the related links of the profiles
         DataCollection links =
                 RelatedLink.getRelatedLinks(profile,
diff --git a/ccm-sci-types-project/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciProject.xml b/ccm-sci-types-project/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciProject.xml
index 85be1a32b..c1edfc501 100644
--- a/ccm-sci-types-project/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciProject.xml
+++ b/ccm-sci-types-project/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciProject.xml
@@ -24,7 +24,7 @@
 	      labelKey="sciorganization.ui.project.members"
 	      labelBundle="com.arsdigita.cms.contenttypes.ui.SciOrganizationResources"
 	      descriptionKey="sciorganization.ui.project.members.description"
-	      component="com.arsdigita.cms.contenttypes.ui.SciProjectMemberStep"
+	      component="com.arsdigita.cms.contenttypes.ui.SciProjectMembersStep"
 	      ordering="2"/>
               
             <ctd:authoring-step
diff --git a/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/SciProjectConfig.java b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/SciProjectConfig.java
index 63d746da1..8c10139f7 100644
--- a/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/SciProjectConfig.java
+++ b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/SciProjectConfig.java
@@ -75,7 +75,7 @@ public class SciProjectConfig extends AbstractConfig {
         enableFundingVolume = new BooleanParameter(
                 "com.arsdigita.cms.contenttypes.sciproject.enable_funding_volume", 
                 Parameter.REQUIRED, 
-                this);
+                Boolean.TRUE);
         
         fundingVolumeLength = new IntegerParameter(
                 "com.arsdigita.cms.contenttypes.sciproject.enable_funding_length", 
@@ -126,23 +126,25 @@ public class SciProjectConfig extends AbstractConfig {
         return (Boolean) get(enableMembersMerge);
     }
     
-    public boolean getEnableFunding() {
+    public final boolean getEnableFunding() {
         return (Boolean) get(enableFunding);        
     }
     
-    public boolean getEnableFundingDhtml() {
+    public final boolean getEnableFundingDhtml() {
         return (Boolean) get(enableFundingDhtml);        
     }
     
-    public boolean getEnableFundingVolume() {
-        return (Boolean) get(enableFundingVolume);
+    public final boolean getEnableFundingVolume() {
+        Object value = get(enableFundingVolume);
+        return (Boolean) value;
+        //return (Boolean) get(enableFundingVolume);
     }
     
-    public int getFundingVolumeLength() {
+    public final int getFundingVolumeLength() {
         return (Integer) get(fundingVolumeLength);
     }
     
-    public String getPermittedPersonType() {
+    public final String getPermittedPersonType() {
         return (String) get(permittedPersonType);
     }
 }