diff --git a/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/ui/RelatedLinkPropertiesStep.java b/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/ui/RelatedLinkPropertiesStep.java index 248216aaa..32348ead3 100755 --- a/ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/ui/RelatedLinkPropertiesStep.java +++ b/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()); diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContenttypesResources.properties b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContenttypesResources.properties index 6adaa9df7..a9c2d80cc 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContenttypesResources.properties +++ b/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 @@ -106,4 +106,6 @@ cms.contenttypes.ui.genericorgaunit.select_child=Select child 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 \ No newline at end of file +cms.contenttypes.ui.orgaunit.persons=Persons +cms.contenttypes.ui.genericorgaunit.title=Name +cms.contenttypes.ui.genericorgaunit.addendum=Addendum diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContenttypesResources_de.properties b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContenttypesResources_de.properties index 568bd8dcb..20b57709b 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContenttypesResources_de.properties +++ b/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 @@ -109,4 +109,6 @@ cms.contenttypes.ui.genericorgaunit.select_child=Untergeordnete Organizationsein 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 \ No newline at end of file +cms.contenttypes.ui.orgaunit.persons=Personen +cms.contenttypes.ui.genericorgaunit.title=Name +cms.contenttypes.ui.genericorgaunit.addendum=Zusatz diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPropertiesStep.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPropertiesStep.java index 547785a59..30f4a210d 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPropertiesStep.java +++ b/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; /** @@ -57,14 +58,14 @@ public class GenericOrganizationalUnitPropertiesStep extends SimpleEditStep { GenericOrganizationalUnit.NAME); sheet.add(ContenttypesGlobalizationUtil.globalize( "cms.contenttypes.ui.genericorgaunit.title"), - GenericOrganizationalUnit.TITLE); + GenericOrganizationalUnit.TITLE); sheet.add(ContenttypesGlobalizationUtil.globalize( "cms.contenttypes.ui.genericorganunit.addendum"), GenericOrganizationalUnit.ADDENDUM); if (!ContentSection.getConfig().getHideLaunchDate()) { - sheet.add((String) ContenttypesGlobalizationUtil.globalize( - "cms.ui.authoring.page_launch_date").localize(), + sheet.add(ContenttypesGlobalizationUtil.globalize( + "cms.ui.authoring.page_launch_date"), ContentPage.LAUNCH_DATE, new DomainObjectPropertySheet.AttributeFormatter() { @@ -124,7 +125,7 @@ public class GenericOrganizationalUnitPropertiesStep extends SimpleEditStep { AuthoringKitWizard parent) { addStep(new GenericOrganizationalUnitContactPropertiesStep(itemModel, parent), - "cms.contenttypes.ui.orgaunit.contact"); + "cms.contenttypes.ui.orgaunit.contact"); addStep(new GenericOrganizationalUnitPersonPropertiesStep(itemModel, parent), "cms.contenttypes.ui.orgaunit.persons"); @@ -137,11 +138,15 @@ public class GenericOrganizationalUnitPropertiesStep extends SimpleEditStep { * @param labelKey */ protected void addStep(SimpleEditStep step, String labelKey) { - segmentedPanel.addSegment(new Label((String) ContenttypesGlobalizationUtil. - globalize(labelKey).localize()), + segmentedPanel.addSegment(new Label(ContenttypesGlobalizationUtil. + globalize(labelKey)), step); } + protected void addStep(SimpleEditStep step, GlobalizedMessage label) { + segmentedPanel.addSegment(new Label(label), step); + } + protected SegmentedPanel getSegmentedPanel() { return segmentedPanel; } diff --git a/ccm-sci-types-organization/application.xml b/ccm-sci-types-organization/application.xml index dc3fbdf71..a56a8575f 100644 --- a/ccm-sci-types-organization/application.xml +++ b/ccm-sci-types-organization/application.xml @@ -8,6 +8,7 @@ + diff --git a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciDepartment.xml b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciDepartment.xml index 55ad11950..08404bac2 100644 --- a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciDepartment.xml +++ b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciDepartment.xml @@ -13,17 +13,17 @@ diff --git a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciOrganization.xml b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciOrganization.xml index a872d6722..575e21a32 100644 --- a/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciOrganization.xml +++ b/ccm-sci-types-organization/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SciOrganization.xml @@ -13,7 +13,7 @@ diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciMember.java b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciMember.java index 7f811fd4c..03c42046a 100644 --- a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/SciMember.java +++ b/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) { - set(ASSOCIATED_MEBER, associatedMember); + public void setAssociatedMember(Boolean associatedMember) { + set(ASSOCIATED_MEMBER, associatedMember); } } diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentPropertiesStep.java b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentPropertiesStep.java index f2438cd45..eb2767f3e 100644 --- a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentPropertiesStep.java +++ b/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")); } } } diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciMemberPropertiesStep.java b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciMemberPropertiesStep.java index e5d314830..10d61b131 100644 --- a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciMemberPropertiesStep.java +++ b/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; } diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciMemberPropertyForm.java b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciMemberPropertyForm.java index e02f407bb..897c9cebc 100644 --- a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciMemberPropertyForm.java +++ b/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); - associated.addOption(new Option("")); - add(associated); + m_associated = new CheckboxGroup(associatedParam); + m_associated.addOption(new Option("assoc", "")); + 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); - former.addOption(new Option("")); - add(former); + m_former = new CheckboxGroup(formerParam); + m_former.addOption(new Option("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()); - data.put(SciMember.FORMER_MEMBER, member.isFormerMember()); + if (member.isAssociatedMember()) { + 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)); - member.setFormerMember((Boolean) data.get(SciMember.FORMER_MEMBER)); + isSelected(fse.getPageState())) { + if (m_associated.getValue(state) == null) { + 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(); diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationPropertiesStep.java b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationPropertiesStep.java index 501ce0c70..5d34eadaf 100644 --- a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationPropertiesStep.java +++ b/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; + } } diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationResources.properties b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationResources.properties index fbb376739..cea980d47 100644 --- a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationResources.properties +++ b/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 diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationResources_de.properties b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationResources_de.properties index f444fec20..b2e4c81de 100644 --- a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationResources_de.properties +++ b/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 diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectPropertiesStep.java b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectPropertiesStep.java index db8e76f2c..5f8734ec9 100644 --- a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectPropertiesStep.java +++ b/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)); } } } diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectPublicationsStep.java b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectPublicationsStep.java new file mode 100644 index 000000000..41b38615d --- /dev/null +++ b/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")); + } +}