From fe43be77e4a723b63529f9ada00e53d51dbd9048 Mon Sep 17 00:00:00 2001 From: jensp Date: Fri, 27 Jan 2012 11:09:02 +0000 Subject: [PATCH] =?UTF-8?q?Zus=C3=A4tzliche=20Felder=20f=C3=BCr=20PublicPe?= =?UTF-8?q?rsonalProfile=20(Tickets=20805=20und=201098).=20Version=20des?= =?UTF-8?q?=20PPP=20Moduls=20auf=206.6.5=20angehoben.=20Updateskript=20f?= =?UTF-8?q?=C3=BCr=20Update=20von=206.6.4=20auf=206.6.5=20folgt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@1471 8810af33-2d31-482b-a856-94f89814c4df --- .../content-types/PublicPersonalProfile.pdl | 2 +- .../contenttypes/PublicPersonalProfile.xml | 59 ++++++++++---- .../ui/PublicPersonalProfileCreate.java | 51 ++++++------ .../ui/PublicPersonalProfileMiscEditForm.java | 77 ++++++++++++++++++ .../ui/PublicPersonalProfileMiscStep.java | 54 +++++++++++++ ...PublicPersonalProfilePositionEditForm.java | 14 ++-- ...sonalProfileResearchInterestsEditStep.java | 81 +++++++++++++++++++ ...cPersonalProfileResearchInterestsStep.java | 59 ++++++++++++++ .../PublicPersonalProfileResources.properties | 9 +++ ...blicPersonalProfileResources_de.properties | 9 +++ ccm-sci-types-project/application.xml | 2 +- 11 files changed, 369 insertions(+), 48 deletions(-) create mode 100644 ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileMiscEditForm.java create mode 100644 ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileMiscStep.java create mode 100644 ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResearchInterestsEditStep.java create mode 100644 ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResearchInterestsStep.java diff --git a/ccm-cms-publicpersonalprofile/pdl/com/arsdigita/content-types/PublicPersonalProfile.pdl b/ccm-cms-publicpersonalprofile/pdl/com/arsdigita/content-types/PublicPersonalProfile.pdl index 03173c541..28b99b440 100644 --- a/ccm-cms-publicpersonalprofile/pdl/com/arsdigita/content-types/PublicPersonalProfile.pdl +++ b/ccm-cms-publicpersonalprofile/pdl/com/arsdigita/content-types/PublicPersonalProfile.pdl @@ -7,7 +7,7 @@ object type PublicPersonalProfile extends ContentPage { String[0..1] profileUrl = ct_public_personal_profiles.profile_url VARCHAR(256); - String[0..1] position = ct_public_personal_profile.position VARCHAR(2048); + String[0..1] position = ct_public_personal_profiles.position VARCHAR(2048); String[0..1] researchInterests = ct_public_personal_profiles.research_interests CLOB; String[0..1] misc = ct_public_personal_profiles.misc CLOB; diff --git a/ccm-cms-publicpersonalprofile/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xml b/ccm-cms-publicpersonalprofile/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xml index 6e29dfe3c..3e33bff56 100644 --- a/ccm-cms-publicpersonalprofile/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xml +++ b/ccm-cms-publicpersonalprofile/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xml @@ -4,29 +4,54 @@ xsi:schemaLocation="http://xmlns.redhat.com/cms/content-types content-types.xsd"> + label="PublicPersonalProfile" + description="Item which is used to create a public personal profile." + objectType="com.arsdigita.cms.contenttypes.PublicPersonalProfile" + classname="com.arsdigita.cms.contenttypes.PublicPersonalProfile"> - + + labelKey="publicpersonalprofile.ui.profile_properties.title" + labelBundle="com.arsdigita.cms.contenttypes.ui.PublicPersonalProfileResources" + descriptionKey="publicpersonalprofile.ui.profile_properties.title.description" + descriptionBundle="com.arsdigita.cms.contenttypes.ui.PublicPersonalProfileResources" + component="com.arsdigita.cms.contenttypes.ui.PublicPersonalProfilePropertiesStep" + ordering="1"/> + labelKey="publicpersonalprofile.ui.profile_nav.title" + labelBundle="com.arsdigita.cms.contenttypes.ui.PublicPersonalProfileResources" + descriptionKey="publicpersonalprofile.ui.profile_nav.description" + descriptionBundle="com.arsdigita.cms.contenttypes.ui.PublicPersonalProfileResources" + component="com.arsdigita.cms.contenttypes.ui.PublicPersonalProfileNavigationStep" + ordering="2"/> + + + + + + + diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileCreate.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileCreate.java index fa3303dc0..a83ea55b3 100644 --- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileCreate.java +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileCreate.java @@ -44,8 +44,9 @@ import java.util.TooManyListenersException; /** * - * @author Jens Pelzetter - * @version $Id$ + * @author Jens Pelzetter + * @version $Id: PublicPersonalProfileCreate.java 1384 2011-12-20 18:07:11Z + * jensp $ */ public class PublicPersonalProfileCreate extends PageCreate { @@ -55,7 +56,7 @@ public class PublicPersonalProfileCreate extends PageCreate { getConfig(); public PublicPersonalProfileCreate(final ItemSelectionModel itemModel, - final CreationSelector parent) { + final CreationSelector parent) { super(itemModel, parent); } @@ -75,7 +76,7 @@ public class PublicPersonalProfileCreate extends PageCreate { add(new Label(PublicPersonalProfileGlobalizationUtil.globalize( "publicpersonalprofile.ui.create.select_person"))); ParameterModel ownerModel = - new StringParameter(PublicPersonalProfile.OWNER); + new StringParameter(PublicPersonalProfile.OWNER); SingleSelect ownerSelect = new SingleSelect(ownerModel); ownerSelect.addValidationListener(new NotNullValidationListener()); @@ -83,46 +84,49 @@ public class PublicPersonalProfileCreate extends PageCreate { ownerSelect.addPrintListener(new PrintListener() { public void prepare(final PrintEvent event) { - final SingleSelect ownerSelect = (SingleSelect) event.getTarget(); + final SingleSelect ownerSelect = (SingleSelect) event. + getTarget(); String personType = config.getPersonType(); if ((personType == null) || (personType.isEmpty())) { personType = - "com.arsdigita.cms.contenttypes.GenericPerson"; + "com.arsdigita.cms.contenttypes.GenericPerson"; } ContentTypeCollection types = - ContentType.getAllContentTypes(); + ContentType.getAllContentTypes(); types.addFilter( String.format("className = '%s'", personType)); if (types.size() == 0) { personType = - "com.arsdigita.cms.contenttypes.GenericPerson"; + "com.arsdigita.cms.contenttypes.GenericPerson"; } DataCollection persons = SessionManager.getSession(). retrieve( personType); persons.addFilter("profile is null"); persons.addFilter(String.format("version = '%s'", - ContentItem.DRAFT)); + ContentItem.DRAFT)); persons.addOrder("surname asc"); persons.addOrder("givenname asc"); persons.addOrder("language asc"); ownerSelect.addOption(new Option("", "")); //Store the parent ids of processed items to remove double entries. - final List processed = new ArrayList(); + final List processed = + new ArrayList(); while (persons.next()) { GenericPerson person = - (GenericPerson) DomainObjectFactory.newInstance(persons.getDataObject()); + (GenericPerson) DomainObjectFactory. + newInstance(persons.getDataObject()); if (processed.contains(person.getParent().getID())) { continue; } else { ownerSelect.addOption(new Option( person.getID().toString(), String.format("%s (%s)", - person.getFullName(), - person.getLanguage()))); + person.getFullName(), + person.getLanguage()))); processed.add(person.getParent().getID()); } } @@ -139,7 +143,7 @@ public class PublicPersonalProfileCreate extends PageCreate { "cms.ui.authoring.page_launch_date"))); ParameterModel launchDateParam = new DateParameter(LAUNCH_DATE); com.arsdigita.bebop.form.Date launchDate = - new com.arsdigita.bebop.form.Date( + new com.arsdigita.bebop.form.Date( launchDateParam); if (ContentSection.getConfig().getRequireLaunchDate()) { launchDate.addValidationListener( @@ -159,16 +163,17 @@ public class PublicPersonalProfileCreate extends PageCreate { PublicPersonalProfile.OWNER); if ((id == null) || id.trim().isEmpty()) { - fse.getFormData().addError(PublicPersonalProfileGlobalizationUtil.globalize("publicpersonalprofile.ui.person.required")); + fse.getFormData().addError(PublicPersonalProfileGlobalizationUtil. + globalize("publicpersonalprofile.ui.person.required")); return; } GenericPerson owner = new GenericPerson(new BigDecimal(id)); validateNameUniqueness(folder, - fse, - String.format("%s-profile", - GenericPerson.urlSave( + fse, + String.format("%s-profile", + GenericPerson.urlSave( owner.getFullName()))); } @@ -186,7 +191,7 @@ public class PublicPersonalProfileCreate extends PageCreate { GenericPerson owner = new GenericPerson(new BigDecimal(id)); String name = String.format("%s-profile", - GenericPerson.urlSave(owner.getFullName())); + GenericPerson.urlSave(owner.getFullName())); String title = String.format("%s (Profil)", owner.getFullName()); final ContentPage item = createContentPage(state); @@ -220,18 +225,18 @@ public class PublicPersonalProfileCreate extends PageCreate { DataCollection profiles = SessionManager.getSession().retrieve( PublicPersonalProfile.BASE_DATA_OBJECT_TYPE); profiles.addFilter(String.format("profileUrl = '%s'", - profileUrl)); + profileUrl)); profiles.addFilter(String.format("version = '%s'", ContentItem.DRAFT)); while (profiles.size() > 0) { i++; profileUrl = String.format("%s%d", - owner.getSurname().toLowerCase(), - i); + owner.getSurname().toLowerCase(), + i); profiles.reset(); profiles.addFilter(String.format("profileUrl = '%s'", - profileUrl)); + profileUrl)); profiles.addFilter( String.format("version = '%s'", ContentItem.DRAFT)); } diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileMiscEditForm.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileMiscEditForm.java new file mode 100644 index 000000000..d9602b95e --- /dev/null +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileMiscEditForm.java @@ -0,0 +1,77 @@ +package com.arsdigita.cms.contenttypes.ui; + +import com.arsdigita.bebop.FormData; +import com.arsdigita.bebop.FormProcessException; +import com.arsdigita.bebop.Label; +import com.arsdigita.bebop.PageState; +import com.arsdigita.bebop.event.FormInitListener; +import com.arsdigita.bebop.event.FormProcessListener; +import com.arsdigita.bebop.event.FormSectionEvent; +import com.arsdigita.bebop.form.TextArea; +import com.arsdigita.bebop.parameters.ParameterModel; +import com.arsdigita.bebop.parameters.StringParameter; +import com.arsdigita.cms.ItemSelectionModel; +import com.arsdigita.cms.contenttypes.PublicPersonalProfile; +import com.arsdigita.cms.ui.CMSDHTMLEditor; +import com.arsdigita.cms.ui.authoring.BasicItemForm; + +/** + * + * @author Jens Pelzetter + * @version $Id$ + */ +public class PublicPersonalProfileMiscEditForm + extends BasicItemForm + implements FormInitListener, FormProcessListener { + + public PublicPersonalProfileMiscEditForm(final ItemSelectionModel itemModel) { + super("PublicPersonalProfileEditMisc", itemModel); + } + + @Override + protected void addWidgets() { + add(new Label(PublicPersonalProfileGlobalizationUtil.globalize( + "publicpersonalprofile.ui.misc"))); + final ParameterModel miscParam = new StringParameter( + PublicPersonalProfile.MISC); + final TextArea misc = new CMSDHTMLEditor(miscParam); + misc.setCols(75); + misc.setRows(8); + add(misc); + } + + @Override + public void init(final FormSectionEvent fse) throws FormProcessException { + final PageState state = fse.getPageState(); + final FormData data = fse.getFormData(); + final PublicPersonalProfile profile = + (PublicPersonalProfile) getItemSelectionModel(). + getSelectedItem(state); + + data.put(PublicPersonalProfile.MISC, profile.getMisc()); + + setVisible(state, true); + } + + @Override + public void process(final FormSectionEvent fse) + throws FormProcessException { + final PageState state = fse.getPageState(); + final FormData data = fse.getFormData(); + final PublicPersonalProfile profile = + (PublicPersonalProfile) getItemSelectionModel(). + getSelectedItem(state); + + if ((profile != null) + && getSaveCancelSection().getSaveButton().isSelected(state)) { + profile.setMisc( + (String) data.get(PublicPersonalProfile.MISC)); + + profile.save(); + } + + init(fse); + } + + +} diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileMiscStep.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileMiscStep.java new file mode 100644 index 000000000..7acd0cd76 --- /dev/null +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileMiscStep.java @@ -0,0 +1,54 @@ +package com.arsdigita.cms.contenttypes.ui; + +import com.arsdigita.bebop.Component; +import com.arsdigita.cms.ItemSelectionModel; +import com.arsdigita.cms.contenttypes.PublicPersonalProfile; +import com.arsdigita.cms.ui.authoring.AuthoringKitWizard; +import com.arsdigita.cms.ui.authoring.BasicItemForm; +import com.arsdigita.cms.ui.authoring.SimpleEditStep; +import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess; +import com.arsdigita.toolbox.ui.DomainObjectPropertySheet; + +/** + * + * @author Jens Pelzetter + * @version $Id$ + */ +public class PublicPersonalProfileMiscStep extends SimpleEditStep { + + private String EDIT_MISC_SHEET_NAME = "editMisc"; + + public PublicPersonalProfileMiscStep(final ItemSelectionModel itemModel, + final AuthoringKitWizard parent) { + this(itemModel, parent, null); + } + + public PublicPersonalProfileMiscStep(final ItemSelectionModel itemModel, + final AuthoringKitWizard parent, + final String prefix) { + super(itemModel, parent, prefix); + + final BasicItemForm editPositionForm = new PublicPersonalProfileMiscEditForm( + itemModel); + add(EDIT_MISC_SHEET_NAME, + (String) PublicPersonalProfileGlobalizationUtil.globalize( + "publicpersonalprofile.ui.misc.edit").localize(), + new WorkflowLockedComponentAccess(editPositionForm, itemModel), + editPositionForm.getSaveCancelSection().getCancelButton()); + + setDisplayComponent(getPublicPersonalProfilePositionSheet(itemModel)); + } + + public static Component getPublicPersonalProfilePositionSheet( + final ItemSelectionModel itemModel) { + final DomainObjectPropertySheet sheet = new DomainObjectPropertySheet( + itemModel); + + sheet.add(PublicPersonalProfileGlobalizationUtil.globalize( + "publicpersonalprofile.ui.misc"), + PublicPersonalProfile.MISC); + + return sheet; + } + +} diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfilePositionEditForm.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfilePositionEditForm.java index b35db563d..55106e6fc 100644 --- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfilePositionEditForm.java +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfilePositionEditForm.java @@ -22,8 +22,7 @@ import com.arsdigita.cms.ui.authoring.BasicItemForm; */ public class PublicPersonalProfilePositionEditForm extends BasicItemForm - implements FormProcessListener, - FormInitListener { + implements FormProcessListener, FormInitListener { public PublicPersonalProfilePositionEditForm( final ItemSelectionModel itemModel) { @@ -46,7 +45,8 @@ public class PublicPersonalProfilePositionEditForm public void init(final FormSectionEvent fse) throws FormProcessException { final PageState state = fse.getPageState(); final FormData data = fse.getFormData(); - final PublicPersonalProfile profile = (PublicPersonalProfile) getItemSelectionModel(). + final PublicPersonalProfile profile = + (PublicPersonalProfile) getItemSelectionModel(). getSelectedItem(state); data.put(PublicPersonalProfile.POSITION, profile.getPosition()); @@ -59,13 +59,15 @@ public class PublicPersonalProfilePositionEditForm throws FormProcessException { final PageState state = fse.getPageState(); final FormData data = fse.getFormData(); - final PublicPersonalProfile profile = (PublicPersonalProfile) getItemSelectionModel(). + final PublicPersonalProfile profile = + (PublicPersonalProfile) getItemSelectionModel(). getSelectedItem(state); if ((profile != null) && getSaveCancelSection().getSaveButton().isSelected(state)) { - profile.setPosition((String) data.get(PublicPersonalProfile.POSITION)); - + profile.setPosition( + (String) data.get(PublicPersonalProfile.POSITION)); + profile.save(); } diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResearchInterestsEditStep.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResearchInterestsEditStep.java new file mode 100644 index 000000000..9e2e6faf0 --- /dev/null +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResearchInterestsEditStep.java @@ -0,0 +1,81 @@ +package com.arsdigita.cms.contenttypes.ui; + +import com.arsdigita.bebop.FormData; +import com.arsdigita.bebop.FormProcessException; +import com.arsdigita.bebop.Label; +import com.arsdigita.bebop.PageState; +import com.arsdigita.bebop.event.FormInitListener; +import com.arsdigita.bebop.event.FormProcessListener; +import com.arsdigita.bebop.event.FormSectionEvent; +import com.arsdigita.bebop.form.TextArea; +import com.arsdigita.bebop.parameters.ParameterModel; +import com.arsdigita.bebop.parameters.StringParameter; +import com.arsdigita.cms.ItemSelectionModel; +import com.arsdigita.cms.contenttypes.PublicPersonalProfile; +import com.arsdigita.cms.ui.CMSDHTMLEditor; +import com.arsdigita.cms.ui.authoring.BasicItemForm; + +/** + * + * @author Jens Pelzetter + * @version $Id$ + */ +public class PublicPersonalProfileResearchInterestsEditStep + extends BasicItemForm + implements FormProcessListener, + FormInitListener { + + public PublicPersonalProfileResearchInterestsEditStep( + final ItemSelectionModel itemModel) { + super("PublicPersonalProfileEditResearchInterests", + itemModel); + } + + @Override + protected void addWidgets() { + add(new Label(PublicPersonalProfileGlobalizationUtil.globalize( + "publicpersonalprofile.ui.research_interests"))); + final ParameterModel riParam = + new StringParameter( + PublicPersonalProfile.RESEARCH_INTERESTS); + final TextArea researchInterests = new CMSDHTMLEditor(riParam); + researchInterests.setCols(75); + researchInterests.setRows(16); + add(researchInterests); + } + + @Override + public void init(final FormSectionEvent fse) throws FormProcessException { + final PageState state = fse.getPageState(); + final FormData data = fse.getFormData(); + final PublicPersonalProfile profile = + (PublicPersonalProfile) getItemSelectionModel(). + getSelectedItem(state); + + data.put(PublicPersonalProfile.RESEARCH_INTERESTS, + profile.getResearchInterests()); + + setVisible(state, true); + + + } + + @Override + public void process(final FormSectionEvent fse) throws FormProcessException { + final PageState state = fse.getPageState(); + final FormData data = fse.getFormData(); + final PublicPersonalProfile profile = + (PublicPersonalProfile) getItemSelectionModel(). + getSelectedItem(state); + + if ((profile != null) + && getSaveCancelSection().getSaveButton().isSelected(state)) { + profile.setResearchInterests((String) data.get( + PublicPersonalProfile.RESEARCH_INTERESTS)); + + profile.save(); + } + + init(fse); + } +} diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResearchInterestsStep.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResearchInterestsStep.java new file mode 100644 index 000000000..a1f60bfd8 --- /dev/null +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResearchInterestsStep.java @@ -0,0 +1,59 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.arsdigita.cms.contenttypes.ui; + +import com.arsdigita.bebop.Component; +import com.arsdigita.cms.ItemSelectionModel; +import com.arsdigita.cms.contenttypes.PublicPersonalProfile; +import com.arsdigita.cms.ui.authoring.AuthoringKitWizard; +import com.arsdigita.cms.ui.authoring.BasicItemForm; +import com.arsdigita.cms.ui.authoring.SimpleEditStep; +import com.arsdigita.cms.ui.workflow.WorkflowLockedComponentAccess; +import com.arsdigita.toolbox.ui.DomainObjectPropertySheet; + +/** + * + * @author Jens Pelzetter + * @version $Id$ + */ +public class PublicPersonalProfileResearchInterestsStep extends SimpleEditStep { + + private String EDIT_RI_SHEET_NAME = "editResearchInterests"; + + public PublicPersonalProfileResearchInterestsStep( + final ItemSelectionModel itemModel, + final AuthoringKitWizard parent) { + this(itemModel, parent, null); + } + + public PublicPersonalProfileResearchInterestsStep( + final ItemSelectionModel itemModel, + final AuthoringKitWizard parent, + final String prefix) { + super(itemModel, parent, prefix); + + final BasicItemForm editRiForm = + new PublicPersonalProfileMiscEditForm(itemModel); + add(EDIT_RI_SHEET_NAME, (String) PublicPersonalProfileGlobalizationUtil. + globalize("publicpersonalprofile.ui.research_interests.edit"). + localize(), + new WorkflowLockedComponentAccess(editRiForm, itemModel), + editRiForm.getSaveCancelSection().getCancelButton()); + + setDisplayComponent(getResearchInterestsSheet(itemModel)); + } + + public static Component getResearchInterestsSheet( + final ItemSelectionModel itemModel) { + final DomainObjectPropertySheet sheet = new DomainObjectPropertySheet( + itemModel); + + sheet.add(PublicPersonalProfileGlobalizationUtil.globalize( + "publicpersonalprofile.ui.research_interests"), + PublicPersonalProfile.RESEARCH_INTERESTS); + + return sheet; + } +} diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResources.properties b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResources.properties index 54c9499e3..8d504f2f1 100644 --- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResources.properties +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResources.properties @@ -32,3 +32,12 @@ publicpersonalprofile.ui.navitems.delete.confirm=Do you really want to delete th publicpersonalprofile.ui.navitems.up=Up publicpersonalprofile.ui.navitems.down=Down publicpersonalprofile.ui.profile_url.reserved=The provided URL fragment is a reserved name, and can't be used. +publicpersonalprofile.ui.position.edit=Edit position +publicpersonalprofile.ui.position=Position +publicpersonalprofile.ui.profile_position.title=Position +publicpersonalprofile.ui.research_interests.edit=Edit interests +publicpersonalprofile.ui.research_interests=Interests +publicpersonalprofile.ui.research_interests.title=Interests +publicpersonalprofile.ui.misc=Miscellaneous +publicpersonalprofile.ui.misc.edit=Edit miscellaneous +publicpersonalprofile.ui.misc.title=Miscellaneous diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResources_de.properties b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResources_de.properties index f4fdd3823..1d65f89fa 100644 --- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResources_de.properties +++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/ui/PublicPersonalProfileResources_de.properties @@ -32,3 +32,12 @@ publicpersonalprofile.ui.navitems.delete.confirm=Soll dieser Navigationspunkt wi publicpersonalprofile.ui.navitems.up=Hoch publicpersonalprofile.ui.navitems.down=Runter publicpersonalprofile.ui.profile_url.reserved=Das angegebene URL-Fragment ist ein reservierter Name und kann nicht verwendet werden. +publicpersonalprofile.ui.position.edit=Position editieren +publicpersonalprofile.ui.position=Position +publicpersonalprofile.ui.profile_position.title=Position +publicpersonalprofile.ui.research_interests.edit=Schwerpunkte bearbeiten +publicpersonalprofile.ui.research_interests=Schwerpunkte +publicpersonalprofile.ui.research_interests.title=Schwerpunkte +publicpersonalprofile.ui.misc=Sonstiges +publicpersonalprofile.ui.misc.edit=Sonstiges bearbeiten +publicpersonalprofile.ui.misc.title=Sonstiges diff --git a/ccm-sci-types-project/application.xml b/ccm-sci-types-project/application.xml index c65f47627..fdf291524 100644 --- a/ccm-sci-types-project/application.xml +++ b/ccm-sci-types-project/application.xml @@ -2,7 +2,7 @@