LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- ccm-cms-publicpersonalprofile: Änderung der Navigationsstruktur: Home-Link geht jetzt auf RootPage, in den Breadcrumbs wird der Name der Person 

angezeigt
- ccm-sci-types-project: Kleine Korrekturen


git-svn-id: https://svn.libreccm.org/ccm/trunk@1177 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2011-10-19 13:16:26 +00:00
parent 4a32d33f55
commit 62a2965867
3 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java
View File

@ -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,

2
ccm-sci-types-project/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciProject.xml
View File

@ -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

16
ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/SciProjectConfig.java
View File

@ -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);
}
}