Verschiedene Korrekturen und Ergänzungen.

git-svn-id: https://svn.libreccm.org/ccm/trunk@574 8810af33-2d31-482b-a856-94f89814c4df

ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/ui/RelatedLinkPropertiesStep.java

@@ -57,6 +57,7 @@ public class RelatedLinkPropertiesStep extends LinkPropertiesStep {
      *
      * @return The display component to use for the authoring step
      */
+    @Override
     public Component getDisplayComponent() {
         SimpleContainer container = new SimpleContainer();
         LinkTable table;
@@ -77,6 +78,7 @@ public class RelatedLinkPropertiesStep extends LinkPropertiesStep {
      *
      * @return The edit form
      */
+    @Override
     protected FormSection getEditSheet() {
         return new RelatedLinkPropertyForm(getItemSelectionModel(), 
                                            getLinkSelectionModel());

ccm-cms/src/com/arsdigita/cms/contenttypes/ContenttypesResources.properties

@@ -96,7 +96,7 @@ cms.contenttypes.ui.genericorgaunit.contact.title=Contacts
 cms.contenttypes.ui.genericorgaunit.contact.type=Type
 cms.contenttypes.ui.genericorgaunit.contact.order=Order
 cms.contenttypes.ui.genericorgaunit.edit_basic_properties=Edit base properties
-cms.contenttypes.ui.genericorganunit.name=Name
+cms.contenttypes.ui.genericorganunit.name=URL
 cms.contenttypes.ui.genericorgaunit.persons.confirm_delete=Confirm Delete
 cms.contenttypes.ui.genericorgaunit.persons.delete=Remove person
 cms.contenttypes.ui.genericorgaunit.persons.name=Name
@@ -107,3 +107,5 @@ cms.contenttypes.ui.genericorgaunit.select_contact=Select contact
 cms.contenttypes.ui.orgaunit.contact=Contact points
 cms.contenttypes.ui.orgaunit.departments=Departments
 cms.contenttypes.ui.orgaunit.persons=Persons
+cms.contenttypes.ui.genericorgaunit.title=Name
+cms.contenttypes.ui.genericorgaunit.addendum=Addendum

ccm-cms/src/com/arsdigita/cms/contenttypes/ContenttypesResources_de.properties

@@ -99,7 +99,7 @@ cms.contenttypes.ui.genericorgaunit.contact.title=Kontakte
 cms.contenttypes.ui.genericorgaunit.contact.type=Typ
 cms.contenttypes.ui.genericorgaunit.contact.order=Reihenfolge
 cms.contenttypes.ui.genericorgaunit.edit_basic_properties=Basiseigenschaften bearbeiten
-cms.contenttypes.ui.genericorganunit.name=Name
+cms.contenttypes.ui.genericorganunit.name=URL
 cms.contenttypes.ui.genericorgaunit.persons.confirm_delete=Person wirklich entfernen?
 cms.contenttypes.ui.genericorgaunit.persons.delete=Person entfernen
 cms.contenttypes.ui.genericorgaunit.persons.name=Name
@@ -110,3 +110,5 @@ cms.contenttypes.ui.genericorgaunit.select_contact=Kontakt ausw\u00e4hlen
 cms.contenttypes.ui.orgaunit.contact=Kontaktinformationen
 cms.contenttypes.ui.orgaunit.departments=Untergeordnete Organizationseinheiten
 cms.contenttypes.ui.orgaunit.persons=Personen
+cms.contenttypes.ui.genericorgaunit.title=Name
+cms.contenttypes.ui.genericorgaunit.addendum=Zusatz

ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPropertiesStep.java

@@ -20,6 +20,7 @@ import com.arsdigita.cms.ui.authoring.SimpleEditStep;
 import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess;
 
 import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil;
+import com.arsdigita.globalization.GlobalizedMessage;
 import java.text.DateFormat;
 
 /**
@@ -63,8 +64,8 @@ public class GenericOrganizationalUnitPropertiesStep extends SimpleEditStep {
                   GenericOrganizationalUnit.ADDENDUM);
 
         if (!ContentSection.getConfig().getHideLaunchDate()) {
-            sheet.add((String) ContenttypesGlobalizationUtil.globalize(
+            sheet.add(ContenttypesGlobalizationUtil.globalize(
-                    "cms.ui.authoring.page_launch_date").localize(),
+                    "cms.ui.authoring.page_launch_date"),
                       ContentPage.LAUNCH_DATE,
                       new DomainObjectPropertySheet.AttributeFormatter() {
 
@@ -137,11 +138,15 @@ public class GenericOrganizationalUnitPropertiesStep extends SimpleEditStep {
      * @param labelKey
      */
     protected void addStep(SimpleEditStep step, String labelKey) {
-        segmentedPanel.addSegment(new Label((String) ContenttypesGlobalizationUtil.
+        segmentedPanel.addSegment(new Label(ContenttypesGlobalizationUtil.
-                globalize(labelKey).localize()),
+                globalize(labelKey)),
                                   step);
     }
 
+    protected void addStep(SimpleEditStep step, GlobalizedMessage label) {
+        segmentedPanel.addSegment(new Label(label), step);
+    }
+
     protected SegmentedPanel getSegmentedPanel() {
         return segmentedPanel;
     }

ccm-sci-types-organization/application.xml

@@ -8,6 +8,7 @@
   <ccm:dependencies>
     <ccm:requires name="ccm-core" version="6.6.0" relation="ge"/>
     <ccm:requires name="ccm-cms" version="6.6.0" relation="ge"/>
+    <ccm:requires name="ccm-cms-assets-relatedlink" version="6.6.0" relation="ge"/>
   </ccm:dependencies>
   <ccm:directories>
     <ccm:directory name="pdl"/>

ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciDepartment.xml

@@ -13,17 +13,17 @@
     <ctd:authoring-kit createComponent="com.arsdigita.cms.ui.authoring.PageCreate">
       
       <ctd:authoring-step
-	  labelKey="publications.ui.publication_properties.title"
+	  labelKey="sciorganization.ui.department.properties.title"
-	  labelBundle="com.arsdigita.cms.contenttypes.ui.SciDepartmentResources"
+	  labelBundle="com.arsdigita.cms.contenttypes.ui.SciOrganizationResources"
 	  descriptionKey="publications.ui.publication_properties.title.description"
-	  descriptionBundle="com.arsdigita.cms.contenttypes.ui.SciDepartmentResources"
+	  descriptionBundle="com.arsdigita.cms.contenttypes.ui.SciOrganizationResources"
 	  component="com.arsdigita.cms.contenttypes.ui.SciDepartmentPropertiesStep"
 	  ordering="1"/>
 
       <ctd:authoring-step
-	      labelKey="sciorganization.ui.department_description.title"
+	      labelKey="sciorganization.ui.department.description.title"
 	      labelBundle="com.arsdigita.cms.contenttypes.ui.SciOrganizationResources"
-	      descriptionKey="sciorganization.ui.department_description.title.description"
+	      descriptionKey="sciorganization.ui.department.description.title"
 	      component="com.arsdigita.cms.contenttypes.ui.SciDepartmentDescriptionStep"
 	      ordering="2"/>	  	
 

ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciOrganization.xml

@@ -13,7 +13,7 @@
     <ctd:authoring-kit createComponent="com.arsdigita.cms.ui.authoring.PageCreate">
       
       <ctd:authoring-step
-	  labelKey="publications.ui.publication_properties.title"
+	  labelKey="sciorganization.ui.organization.properties.title"
 	  labelBundle="com.arsdigita.cms.contenttypes.ui.SciOrganizationResources"
 	  descriptionKey="publications.ui.publication_properties.title.description"
 	  descriptionBundle="com.arsdigita.cms.contenttypes.ui.SciOrganizationResources"
@@ -21,7 +21,7 @@
 	  ordering="1"/>
 
       <ctd:authoring-step
-	  labelKey="sciorganization.ui.organizsation_description.title"
+	  labelKey="sciorganization.ui.organization.description.title"
 	  labelBundle="com.arsdigita.cms.contenttypes.ui.SciOrganizationResources"
 	  descriptionKey="sciorganization.ui.organization_description.title.description"
 	  component="com.arsdigita.cms.contenttypes.ui.SciOrganizationDescriptionStep"

ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciProject.xml

@@ -14,16 +14,16 @@
       
 	  <ctd:authoring-step
 	      labelKey="sciorganization.ui.project_properties.title"
-	      labelBundle="com.arsdigita.cms.contenttypes.ui.SciProjectResources"
+	      labelBundle="com.arsdigita.cms.contenttypes.ui.SciOrganizationResources"
-	      descriptionKey="sciorganization.ui.project_properties.title.description"
+	      descriptionKey="sciorganization.ui.project_properties.title"
 	      descriptionBundle="com.arsdigita.cms.contenttypes.ui.SciProjectResources"
 	      component="com.arsdigita.cms.contenttypes.ui.SciProjectPropertiesStep"
 	      ordering="1"/>
 	  
 	  <ctd:authoring-step
 	      labelKey="sciorganization.ui.project_description.title"
-	      labelBundle="com.arsdigita.cms.contenttypes.ui.SciProjectResources"
+	      labelBundle="com.arsdigita.cms.contenttypes.ui.SciOrganizationResources"
-	      descriptionKey="sciorganization.ui.project_description.title.description"
+	      descriptionKey="sciorganization.ui.project_description.title"
 	      component="com.arsdigita.cms.contenttypes.ui.SciProjectDescriptionStep"
 	      ordering="2"/>	  	
 

ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciMember.java

@@ -40,7 +40,7 @@ import java.math.BigDecimal;
  */
 public class SciMember extends GenericPerson {
 
-    public static final String ASSOCIATED_MEBER = "associatedMember";
+    public static final String ASSOCIATED_MEMBER = "associatedMember";
     public static final String FORMER_MEMBER = "formerMember";
     public static final String BASE_DATA_OBJECT_TYPE =
                                "com.arsdigita.cms.contenttypes.SciMember";
@@ -84,10 +84,10 @@ public class SciMember extends GenericPerson {
     }
 
     public Boolean isAssociatedMember() {
-        return (Boolean) get(ASSOCIATED_MEBER);
+        return (Boolean) get(ASSOCIATED_MEMBER);
     }
 
-    public void setAssoicatedMember(Boolean associatedMember) {
+    public void setAssociatedMember(Boolean associatedMember) {
-        set(ASSOCIATED_MEBER, associatedMember);
+        set(ASSOCIATED_MEMBER, associatedMember);
     }
 }

ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentPropertiesStep.java

@@ -50,6 +50,10 @@ public class SciDepartmentPropertiesStep
                                   (DomainObjectPropertySheet) GenericOrganizationalUnitPropertiesStep.
                 getGenericOrganizationalUnitPropertySheet(itemModel);
 
+        sheet.add(SciOrganizationGlobalizationUtil.globalize(
+                "sciorganizations.ui.department.shortdescription"),
+                  SciDepartment.DEPARTMENT_SHORT_DESCRIPTION);
+
         return sheet;
     }
 
@@ -73,7 +77,7 @@ public class SciDepartmentPropertiesStep
                 getCancelButton());
 
         basicProperties.setDisplayComponent(
-                getGenericOrganizationalUnitPropertySheet(itemModel));
+                getSciDepartmentPropertySheet(itemModel));
 
         getSegmentedPanel().addSegment(
                 new Label((String) SciOrganizationGlobalizationUtil.globalize(
@@ -92,33 +96,39 @@ public class SciDepartmentPropertiesStep
         if (!config.getDepartmentAddContactHide()) {
             addStep(new GenericOrganizationalUnitContactPropertiesStep(itemModel,
                                                                        parent),
-                    "sciorganization.ui.department.contacts");
+                    SciOrganizationGlobalizationUtil.globalize(
+                    "sciorganization.ui.department.contacts"));
         }
 
         if (!config.getDepartmentAddPersonHide()) {
             addStep(new SciDepartmentMemberStep(itemModel,
                                                 parent),
-                    "sciorganization.ui.department.members");
+                    SciOrganizationGlobalizationUtil.globalize(
+                    "sciorganization.ui.department.members"));
         }
 
         if (!config.getDepartmentAddSubDepartmentHide()) {
             addStep(new SciDepartmentSubDepartmentsStep(itemModel, parent),
-                    "sciorganization.ui.department.subdepartments");
+                    SciOrganizationGlobalizationUtil.globalize(
+                    "sciorganization.ui.department.subdepartments"));
         }
 
         if (!config.getDepartmentSetSuperDepartmentHide()) {
             addStep(new SciDepartmentSuperDepartmentStep(itemModel, parent),
-                    "sciorganization.ui.department.superdepartment");
+                    SciOrganizationGlobalizationUtil.globalize(
+                    "sciorganization.ui.department.superdepartment"));
         }
 
         if (!config.getDepartmentAddProjectHide()) {
             addStep(new SciDepartmentProjectsStep(itemModel, parent),
-                    "sciorganization.ui.department.projects");
+                    SciOrganizationGlobalizationUtil.globalize(
+                    "sciorganization.ui.department.projects"));
         }
 
         if (!config.getDepartmentSetOrganizationHide()) {
             addStep(new SciDepartmentOrganizationStep(itemModel, parent),
-                    "sciorganization.ui.department.organization");
+                    SciOrganizationGlobalizationUtil.globalize(
+                    "sciorganization.ui.department.organization"));
         }
     }
 }

ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciMemberPropertiesStep.java

@@ -1,6 +1,7 @@
 package com.arsdigita.cms.contenttypes.ui;
 
 import com.arsdigita.bebop.Component;
+import com.arsdigita.bebop.PageState;
 import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.cms.contenttypes.GenericPerson;
 import com.arsdigita.cms.contenttypes.SciMember;
@@ -8,6 +9,7 @@ import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
 import com.arsdigita.cms.ui.authoring.BasicPageForm;
 import com.arsdigita.cms.ui.authoring.SimpleEditStep;
 import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess;
+import com.arsdigita.domain.DomainObject;
 import com.arsdigita.toolbox.ui.DomainObjectPropertySheet;
 
 /**
@@ -44,12 +46,50 @@ public class SciMemberPropertiesStep extends SimpleEditStep {
         sheet = (DomainObjectPropertySheet) GenericPersonPropertiesStep.
                 getGenericPersonPropertySheet(itemModel);
 
+        DomainObjectPropertySheet.AttributeFormatter associatedFormatter =
+                                                     new DomainObjectPropertySheet.AttributeFormatter() {
+
+            public String format(DomainObject obj, String attribute,
+                                 PageState state) {
+                SciMember member;
+
+                member = (SciMember) obj;
+
+                if (member.isAssociatedMember()) {
+                    return (String) SciOrganizationGlobalizationUtil.globalize(
+                            "sciorganization.ui.member.yes").localize();
+                } else {
+                    return (String) SciOrganizationGlobalizationUtil.globalize(
+                            "sciorganization.ui.member.no").localize();
+                }
+            }
+        };
+
+        DomainObjectPropertySheet.AttributeFormatter formerFormatter =
+                                                     new DomainObjectPropertySheet.AttributeFormatter() {
+
+            public String format(DomainObject obj, String attribute,
+                                 PageState state) {
+                SciMember member;
+
+                member = (SciMember) obj;
+
+                if (member.isFormerMember()) {
+                    return (String) SciOrganizationGlobalizationUtil.globalize(
+                            "sciorganization.ui.member.yes").localize();
+                } else {
+                    return (String) SciOrganizationGlobalizationUtil.globalize(
+                            "sciorganization.ui.member.no").localize();
+                }
+            }
+        };
+
         sheet.add(SciOrganizationGlobalizationUtil.globalize(
                 "sciorganization.ui.member.associatedMember"),
-                SciMember.ASSOCIATED_MEBER);
+                  SciMember.ASSOCIATED_MEMBER, associatedFormatter);
         sheet.add(SciOrganizationGlobalizationUtil.globalize(
                 "sciorganization.ui.member.formerMember"),
-                  SciMember.FORMER_MEMBER);
+                  SciMember.FORMER_MEMBER, formerFormatter);
 
         return sheet;
     }

ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciMemberPropertyForm.java

@@ -21,6 +21,7 @@ package com.arsdigita.cms.contenttypes.ui;
 
 import com.arsdigita.bebop.FormData;
 import com.arsdigita.bebop.Label;
+import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.event.FormInitListener;
 import com.arsdigita.bebop.event.FormSectionEvent;
 import com.arsdigita.bebop.event.FormSubmissionListener;
@@ -32,6 +33,7 @@ import com.arsdigita.bebop.parameters.ParameterModel;
 import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.cms.contenttypes.GenericPerson;
 import com.arsdigita.cms.contenttypes.SciMember;
+import org.apache.log4j.Logger;
 
 /**
  * Form for editing the basic properties of a {@link SciMember}. This form
@@ -47,7 +49,11 @@ public class SciMemberPropertyForm
         implements FormInitListener,
                    FormSubmissionListener {
 
+    private static final Logger logger =
+                                Logger.getLogger(SciMemberPropertyForm.class);
     private SciMemberPropertiesStep m_step;
+    private CheckboxGroup m_associated;
+    private CheckboxGroup m_former;
 
     public SciMemberPropertyForm(ItemSelectionModel itemModel) {
         this(itemModel, null);
@@ -66,19 +72,19 @@ public class SciMemberPropertyForm
         add(new Label(SciOrganizationGlobalizationUtil.globalize(
                 "sciorganization.ui.member.associatedMember")));
         ParameterModel isAssociated = new BooleanParameter(
-                SciMember.ASSOCIATED_MEBER);
+                SciMember.ASSOCIATED_MEMBER);
         ArrayParameter associatedParam = new ArrayParameter(isAssociated);
-        CheckboxGroup associated = new CheckboxGroup(associatedParam);
+        m_associated = new CheckboxGroup(associatedParam);
-        associated.addOption(new Option(""));
+        m_associated.addOption(new Option("assoc", ""));
-        add(associated);
+        add(m_associated);
 
         add(new Label(SciOrganizationGlobalizationUtil.globalize(
                 "sciorganization.ui.member.formerMember")));
         ParameterModel isFormer = new BooleanParameter(SciMember.FORMER_MEMBER);
         ArrayParameter formerParam = new ArrayParameter(isFormer);
-        CheckboxGroup former = new CheckboxGroup(formerParam);
+        m_former = new CheckboxGroup(formerParam);
-        former.addOption(new Option(""));
+        m_former.addOption(new Option("former", ""));
-        add(former);
+        add(m_former);
     }
 
     @Override
@@ -88,21 +94,37 @@ public class SciMemberPropertyForm
         FormData data = fse.getFormData();
         SciMember member = (SciMember) super.initBasicWidgets(fse);
 
-        data.put(SciMember.ASSOCIATED_MEBER, member.isAssociatedMember());
+        if (member.isAssociatedMember()) {
-        data.put(SciMember.FORMER_MEMBER, member.isFormerMember());
+            m_associated.setValue(fse.getPageState(), "assoc");
+        }
+        if (member.isFormerMember()) {
+            m_former.setValue(fse.getPageState(), "former");
+        }        
     }
 
     @Override
     public void process(FormSectionEvent fse) {
         super.process(fse);
         
-        FormData data = fse.getFormData();
+        PageState state = fse.getPageState();
         SciMember member = (SciMember) super.processBasicWidgets(fse);
 
         if ((member != null) && getSaveCancelSection().getSaveButton().
                 isSelected(fse.getPageState())) {            
-            member.setAssoicatedMember((Boolean) data.get(SciMember.ASSOCIATED_MEBER));
+            if (m_associated.getValue(state) == null) {
-            member.setFormerMember((Boolean) data.get(SciMember.FORMER_MEMBER));
+                logger.debug("Setting associated member status to false...");
+                member.setAssociatedMember(false);
+            } else {
+                logger.debug("Setting associated member status to true...");
+                member.setAssociatedMember(true);
+            }
+            if (m_former.getValue(state) == null) {
+                logger.debug("Setting former member status to false...");
+                member.setFormerMember(false);
+            } else {
+                logger.debug("Setting former member status to true...");
+                member.setFormerMember(true);
+            }           
 
             member.save();
 

ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationPropertiesStep.java

@@ -19,6 +19,7 @@
  */
 package com.arsdigita.cms.contenttypes.ui;
 
+import com.arsdigita.bebop.Component;
 import com.arsdigita.bebop.Label;
 import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.cms.contenttypes.SciOrganization;
@@ -27,6 +28,7 @@ import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
 import com.arsdigita.cms.ui.authoring.BasicPageForm;
 import com.arsdigita.cms.ui.authoring.SimpleEditStep;
 import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess;
+import com.arsdigita.toolbox.ui.DomainObjectPropertySheet;
 
 /**
  * Step for editing the basic properties of a {@link SciOrganization}.
@@ -60,7 +62,7 @@ public class SciOrganizationPropertiesStep
                 getCancelButton());
 
         basicProperties.setDisplayComponent(
-                getGenericOrganizationalUnitPropertySheet(itemModel));
+                getSciOrganizationPropertySheet(itemModel));
 
         getSegmentedPanel().addSegment(
                 new Label((String) SciOrganizationGlobalizationUtil.globalize(
@@ -80,23 +82,39 @@ public class SciOrganizationPropertiesStep
         if (!config.getOrganizationAddContactHide()) {
             addStep(new GenericOrganizationalUnitContactPropertiesStep(itemModel,
                                                                        parent),
-                    "sciorganization.ui.organization.contacts");
+                    SciOrganizationGlobalizationUtil.globalize(
+                    "sciorganization.ui.organization.contacts"));
         }
 
         if (!config.getOrganizationAddPersonHide()) {
             addStep(new SciOrganizationMemberStep(itemModel,
                                                   parent),
-                    "sciorganization.ui.organization_members");
+                    SciOrganizationGlobalizationUtil.globalize(
+                    "sciorganization.ui.organization_members"));
         }
 
         if (!config.getOrganizationAddDepartmentHide()) {
             addStep(new SciOrganizationDepartmentsStep(itemModel, parent),
-                    "sciorganization.ui.organization.departments");
+                    SciOrganizationGlobalizationUtil.globalize(
+                    "sciorganization.ui.organization.departments"));
         }
 
         if (!config.getOrganizationAddProjectHide()) {
             addStep(new SciOrganizationProjectsStep(itemModel, parent),
-                    "sciorganization.ui.organization.projects");
+                    SciOrganizationGlobalizationUtil.globalize(
+                    "sciorganization.ui.organization.projects"));
         }
     }
+
+    public static Component getSciOrganizationPropertySheet(
+            ItemSelectionModel itemModel) {
+        DomainObjectPropertySheet sheet = (DomainObjectPropertySheet) GenericOrganizationalUnitPropertiesStep.
+                getGenericOrganizationalUnitPropertySheet(itemModel);
+
+        sheet.add(SciOrganizationGlobalizationUtil.globalize(
+                "sciorganizations.ui.organization.shortdescription"),
+                  SciOrganization.ORGANIZATION_SHORT_DESCRIPTION);
+
+        return sheet;
+    }
 }

ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationResources.properties

@@ -106,3 +106,27 @@ sciorganization.ui.department.description=Description
 sciorganization.ui.department.description.upload=Upload description
 sciorganization.ui.department.description.upload.mimetype=Type of file
 sciorganization.ui.orgnization.add_member=Add member
+sciorganization.ui.member.yes=Yes
+sciorganization.ui.member.no=No
+sciorganization.ui.organization.contacts=Contacts
+sciorganization.ui.organization_members=Members of the organization
+sciorganization.ui.organization.departments=Departments
+sciorganization.ui.organization.projects=Projects
+sciorganization.ui.organizsation_description.title=Description
+sciorganization.ui.organization.properties.title=Properties
+sciorganization.ui.organization.description.title=Description
+sciorganization.ui.department.properties.title=Properties
+sciorganization.ui.department.contacts=Contacts
+sciorganization.ui.department.members=Members of the department
+sciorganization.ui.department.subdepartments=Subdivisions
+sciorganization.ui.department.projects=Projects of the department
+sciorganization.ui.department.description.title=Description
+sciorganization.ui.project_properties.title=Properties
+sciorganization.ui.project.edit_basic_properties=Edit basic properties
+sciorganization.ui.project.contacts=Contacts
+sciorganization.ui.project.members=Members of the project
+sciorganization.ui.project.subprojects=Subprojects
+sciorganization.ui.project.organizations=Involved organizations
+sciorganization.ui.project.departments=Involved departments
+sciorganization.ui.project.publications=Publications of the project
+sciorganization.ui.project_description.title=Description

ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationResources_de.properties

@@ -106,3 +106,27 @@ sciorganization.ui.department.description=Beschreibung
 sciorganization.ui.department.description.upload=Beschreibung hochladen
 sciorganization.ui.department.description.upload.mimetype=Dateityp
 sciorganization.ui.orgnization.add_member=Mitglied hinzuf\u00fcgen
+sciorganization.ui.member.yes=Ja
+sciorganization.ui.member.no=Nein
+sciorganization.ui.organization.contacts=Kontakte
+sciorganization.ui.organization_members=Mitglieder der Organisation
+sciorganization.ui.organization.departments=Abteilungen
+sciorganization.ui.organization.projects=Projekte
+sciorganization.ui.organizsation_description.title=Beschreibung
+sciorganization.ui.organization.properties.title=Eigenschaften
+sciorganization.ui.organization.description.title=Beschreibung
+sciorganization.ui.department.properties.title=Eigenschaften
+sciorganization.ui.department.contacts=Kontakte
+sciorganization.ui.department.members=Mitglieder der Abteilung
+sciorganization.ui.department.subdepartments=Unterabteilungen
+sciorganization.ui.department.projects=Projekte der Abteilung
+sciorganization.ui.department.description.title=Beschreibung
+sciorganization.ui.project_properties.title=Eigenschaften
+sciorganization.ui.project.edit_basic_properties=Basiseigenschaften bearbeiten
+sciorganization.ui.project.contacts=Kontakte
+sciorganization.ui.project.members=Mitglieder des Projektes
+sciorganization.ui.project.subprojects=Unterprojekte
+sciorganization.ui.project.organizations=Beteiligte Organisationen
+sciorganization.ui.project.departments=Beteiligte Abteilungen
+sciorganization.ui.project.publications=Publikationen des Projektes
+sciorganization.ui.project_description.title=Beschreibung

ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectPropertiesStep.java

@@ -21,6 +21,7 @@ package com.arsdigita.cms.contenttypes.ui;
 
 import com.arsdigita.bebop.Component;
 import com.arsdigita.bebop.Label;
+import com.arsdigita.cms.ContentType;
 import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.cms.contenttypes.SciOrganizationConfig;
 import com.arsdigita.cms.contenttypes.SciProject;
@@ -85,7 +86,7 @@ public class SciProjectPropertiesStep
 
         getSegmentedPanel().addSegment(
                 new Label((String) SciOrganizationGlobalizationUtil.globalize(
-                "sciorganization.ui.project.basic_properties").
+                "sciorganization.ui.project.edit_basic_properties").
                 localize()),
                 basicProperties);
     }
@@ -99,35 +100,48 @@ public class SciProjectPropertiesStep
         if (!config.getProjectAddContactHide()) {
             addStep(new GenericOrganizationalUnitContactPropertiesStep(itemModel,
                                                                        parent),
-                    "sciorganization.ui.project.contacts");
+                    SciOrganizationGlobalizationUtil.globalize("sciorganization.ui.project.contacts"));
         }
 
         if (!config.getProjectAddPersonHide()) {
             addStep(new SciProjectMemberStep(itemModel,
                                              parent),
-                    "sciorganization.ui.project.members");
+                    SciOrganizationGlobalizationUtil.globalize("sciorganization.ui.project.members"));
         }
 
         if (!config.getProjectSetSuperProjectHide()) {
             addStep(new SciProjectSuperProjectStep(itemModel,
                                                    parent),
-                    "sciorganization.ui.project.superproject");
+                    SciOrganizationGlobalizationUtil.globalize("sciorganization.ui.project.superproject"));
         }
 
         if (!config.getProjectAddSubProjectHide()) {
             addStep(new SciProjectSubprojectsStep(itemModel,
                                                   parent),
-                    "sciorganization.ui.project.subprojects");
+                    SciOrganizationGlobalizationUtil.globalize("sciorganization.ui.project.subprojects"));
         }
 
         if (!config.getProjectAddOrganizationHide()) {
             addStep(new SciProjectOrganizationsStep(itemModel, parent),
-                    "sciorganization.ui.project.organizations");
+                    SciOrganizationGlobalizationUtil.globalize("sciorganization.ui.project.organizations"));
         }
 
         if (!config.getProjectAddDepartmentHide()) {
             addStep(new SciProjectDepartmentsStep(itemModel, parent),
-                    "sciorganization.ui.project.departments");
+                   SciOrganizationGlobalizationUtil.globalize( "sciorganization.ui.project.departments"));
+        }
+
+        if ((!config.getProjectMaterialsHide())
+            && ContentType.findByAssociatedObjectType(
+                "com.arsdigita.cms.contenttypes.Publication") != null) {
+            /*
+             * Must add this step manually since the basic class is not
+             * SimpleEditStep...
+             */
+            getSegmentedPanel().addSegment(new Label(SciOrganizationGlobalizationUtil.
+                    globalize("sciorganization.ui.project.publications")),
+                                           new SciProjectPublicationsStep(
+                    itemModel, parent));
         }
     }
 }

ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectPublicationsStep.java

@@ -0,0 +1,33 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.arsdigita.cms.contenttypes.ui;
+
+import com.arsdigita.bebop.FormSection;
+import com.arsdigita.cms.ContentType;
+import com.arsdigita.cms.ItemSelectionModel;
+import com.arsdigita.cms.contentassets.ui.RelatedLinkPropertiesStep;
+import com.arsdigita.cms.contentassets.ui.RelatedLinkPropertyForm;
+import com.arsdigita.cms.ui.authoring.AuthoringKitWizard;
+
+/**
+ *
+ * @author jensp
+ */
+public class SciProjectPublicationsStep extends RelatedLinkPropertiesStep {
+
+    public SciProjectPublicationsStep(ItemSelectionModel itemModel,
+                                      AuthoringKitWizard parent) {
+        super(itemModel, parent);
+    }
+
+    @Override
+    protected FormSection getEditSheet() {
+        return new RelatedLinkPropertyForm(getItemSelectionModel(),
+                                           getLinkSelectionModel(),
+                                           ContentType.
+                findByAssociatedObjectType(
+                "com.arsdigita.cms.contenttypes.Publication"));
+    }
+}