diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContenttypesResources.properties b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContenttypesResources.properties index eef413b81..9d4d6301d 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContenttypesResources.properties +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContenttypesResources.properties @@ -170,3 +170,5 @@ cms.contenttypes.ui.contact.contactEntry.description=Descriptions cms.ui.select_one=Please choose cms.contenttypes.ui.genericorgaunit.persons.status=Status cms.ui.edit_assoc=Edit +cms.contenttypes.ui.person.contact.type=Contact Type +cms.contenttypes.ui.person.contact.title=Title 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 041000cd9..0f57dd28d 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ContenttypesResources_de.properties +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ContenttypesResources_de.properties @@ -180,3 +180,5 @@ cms.contenttypes.ui.contact.contactEntry.description=Beschreibung cms.ui.select_one=Bitte ausw\u00e4hlen cms.contenttypes.ui.genericorgaunit.persons.status=Status cms.ui.edit_assoc=Bearbeiten +cms.contenttypes.ui.person.contact.type=Art des Kontaktes +cms.contenttypes.ui.person.contact.title=Titel diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEditPersonPropertyForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEditPersonPropertyForm.java index 5b4fda2d3..b2448d211 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEditPersonPropertyForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEditPersonPropertyForm.java @@ -1,11 +1,22 @@ /* - * GenericContactEditPersonPropertyForm.java + * Copyright (c) 2012 Soeren Bernstein * - * Created on 8. Juli 2009, 10:27 + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. */ + package com.arsdigita.cms.contenttypes.ui; import com.arsdigita.bebop.FormData; @@ -82,6 +93,9 @@ public class GenericContactEditPersonPropertyForm extends BasicPageForm addSubmissionListener(this); } + /** + * + */ @Override public void addWidgets() { add(new Label(ContenttypesGlobalizationUtil diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEntriesTable.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEntriesTable.java index e2d476309..76d975ef8 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEntriesTable.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEntriesTable.java @@ -70,18 +70,21 @@ public class GenericContactEntriesTable extends Table implements TableActionList // define columns tab_model.add(new TableColumn( 0, - new Label(ContenttypesGlobalizationUtil.globalize("cms.contenttypes.ui.contact.contactEntry.key")), + new Label(ContenttypesGlobalizationUtil.globalize( + "cms.contenttypes.ui.contact.contactEntry.key")), TABLE_COL_EDIT)); tab_model.add(new TableColumn( 1, - new Label(ContenttypesGlobalizationUtil.globalize("cms.contenttypes.ui.contact.contactEntry.value")))); + new Label(ContenttypesGlobalizationUtil.globalize( + "cms.contenttypes.ui.contact.contactEntry.value")))); tab_model.add(new TableColumn( 2, - new Label(ContenttypesGlobalizationUtil. - globalize("cms.contenttypes.ui.contact.contactEntry.description")))); + new Label(ContenttypesGlobalizationUtil.globalize( + "cms.contenttypes.ui.contact.contactEntry.description")))); tab_model.add(new TableColumn( 3, - new Label(ContenttypesGlobalizationUtil.globalize("cms.contenttypes.ui.contact.contactEntry.action")), + new Label(ContenttypesGlobalizationUtil.globalize( + "cms.contenttypes.ui.contact.contactEntry.action")), TABLE_COL_DEL)); setModelBuilder(new ContactTableModelBuilder(itemModel)); @@ -184,7 +187,7 @@ public class GenericContactEntriesTable extends Table implements TableActionList 0, MAX_DESC_LENGTH) : m_contactEntry.getDescription(); case 3: - return GlobalizationUtil.globalize("cms.ui.delete").localize(); + return new Label(GlobalizationUtil.globalize("cms.ui.delete")); default: return null; } @@ -246,7 +249,8 @@ public class GenericContactEntriesTable extends Table implements TableActionList if (canDelete) { ControlLink link = new ControlLink(value.toString()); link.setConfirmation( - ContenttypesGlobalizationUtil.globalize("cms.contenttypes.ui.contact.confirm_delete")); + ContenttypesGlobalizationUtil.globalize( + "cms.contenttypes.ui.contact.confirm_delete")); return link; } else { return new Label(value.toString()); diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactTypeTable.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactTypeTable.java index ad6c47270..190e3bde9 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactTypeTable.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactTypeTable.java @@ -60,29 +60,25 @@ public class GenericContactTypeTable extends Table implements TableActionListene this.m_itemModel = itemModel; // if table is empty: - setEmptyView(new Label(ContenttypesGlobalizationUtil.globalize("cms.contenttypes.ui.contacttypes.none"))); + setEmptyView(new Label(ContenttypesGlobalizationUtil.globalize( + "cms.contenttypes.ui.contacttypes.none"))); TableColumnModel tab_model = getColumnModel(); // define columns tab_model.add(new TableColumn( 0, ContenttypesGlobalizationUtil - .globalize("cms.contenttypes.ui.contacttypes.key") - // .localize() - , + .globalize("cms.contenttypes.ui.contacttypes.key"), TABLE_COL_EDIT)); tab_model.add(new TableColumn( 1, ContenttypesGlobalizationUtil - .globalize("cms.contenttypes.ui.contacttypes.title") - //.localize() + .globalize("cms.contenttypes.ui.contacttypes.title") )); tab_model.add(new TableColumn( 2, ContenttypesGlobalizationUtil - .globalize("cms.contenttypes.ui.contacttypes.action") - .localize() - , + .globalize("cms.contenttypes.ui.contacttypes.action"), TABLE_COL_DEL)); setModelBuilder(new GenericContactTypeTableModelBuilder(itemModel)); @@ -109,7 +105,8 @@ public class GenericContactTypeTable extends Table implements TableActionListene public TableModel makeModel(Table table, PageState state) { table.getRowSelectionModel().clearSelection(state); - RelationAttribute contacttype = (RelationAttribute) m_itemModel.getSelectedObject(state); + RelationAttribute contacttype = (RelationAttribute) m_itemModel + .getSelectedObject(state); return new GenericContactTypeTableModel(table, state, contacttype); } } @@ -169,9 +166,8 @@ public class GenericContactTypeTable extends Table implements TableActionListene case 1: return m_contacttypeCollection.getName(); case 2: - return GlobalizationUtil.globalize("cms.ui.delete") - //.localize() - ; + return new Label(GlobalizationUtil.globalize("cms.ui.delete") + ); default: return null; } diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrgaUnitSubordinateOrgaUnitsTableCustomizer.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrgaUnitSubordinateOrgaUnitsTableCustomizer.java index eeb41b414..588679edc 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrgaUnitSubordinateOrgaUnitsTableCustomizer.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrgaUnitSubordinateOrgaUnitsTableCustomizer.java @@ -1,3 +1,22 @@ +/* + * Copyright (c) 2011 Jens Pelzetter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + package com.arsdigita.cms.contenttypes.ui; /** diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitContactTable.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitContactTable.java index d8441e33d..18cdc608a 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitContactTable.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitContactTable.java @@ -222,10 +222,9 @@ public class GenericOrganizationalUnitContactTable extends Table implements case 1: return m_contact.getTitle(); case 2: - return GlobalizationUtil.globalize("cms.ui.edit_assoc"). - localize(); + return new Label(GlobalizationUtil.globalize("cms.ui.edit_assoc")); case 3: - return GlobalizationUtil.globalize("cms.ui.delete").localize(); + return new Label(GlobalizationUtil.globalize("cms.ui.delete")); default: return null; } diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonsTable.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonsTable.java index f05b2d3d0..46a443ade 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonsTable.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonsTable.java @@ -181,8 +181,8 @@ public class GenericOrganizationalUnitPersonsTable extends Table implements role.close(); return roleName; } else { - return ContenttypesGlobalizationUtil.globalize( - "cms.ui.unknownRole").localize(); + return new Label(ContenttypesGlobalizationUtil.globalize( + "cms.ui.unknownRole")); } case 2: RelationAttributeCollection status = new RelationAttributeCollection( @@ -194,15 +194,15 @@ public class GenericOrganizationalUnitPersonsTable extends Table implements status.close(); return statusName; } else { - return ContenttypesGlobalizationUtil.globalize( - "cms.ui.unknownStatus").localize(); + return new Label(ContenttypesGlobalizationUtil.globalize( + "cms.ui.unknownStatus")); } case 3: - return ContenttypesGlobalizationUtil.globalize( - "cms.ui.edit_assoc").localize(); + return new Label(ContenttypesGlobalizationUtil.globalize( + "cms.ui.edit_assoc")); case 4: - return ContenttypesGlobalizationUtil.globalize( - "cms.ui.delete").localize(); + return new Label(ContenttypesGlobalizationUtil.globalize( + "cms.ui.delete")); default: return null; } diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactTable.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactTable.java index c00990c9e..f83c22f8b 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactTable.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactTable.java @@ -41,7 +41,6 @@ import com.arsdigita.cms.contenttypes.GenericPersonContactCollection; import com.arsdigita.cms.contenttypes.GenericPerson; import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil; import com.arsdigita.cms.dispatcher.ItemResolver; -// import com.arsdigita.cms.dispatcher.Utilities; import com.arsdigita.cms.util.GlobalizationUtil; import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.globalization.GlobalizationHelper; @@ -227,7 +226,7 @@ public class GenericPersonContactTable extends Table implements case 1: return m_contact.getTitle(); case 2: - return GlobalizationUtil.globalize("cms.ui.delete"); + return new Label(GlobalizationUtil.globalize("cms.ui.delete")); default: return null; }