From c3ed9c05d4aa39825239020be6eb1d817be7395c Mon Sep 17 00:00:00 2001 From: pb Date: Mon, 7 Jul 2014 10:12:52 +0000 Subject: [PATCH] Another part of adoption to widget's label attribute. git-svn-id: https://svn.libreccm.org/ccm/trunk@2740 8810af33-2d31-482b-a856-94f89814c4df --- .../ui/SciPublicationsAboutDiscussesForm.java | 5 +-- .../SciPublicationsAboutDiscussingForm.java | 5 +-- .../ui/LibrarySignaturesAddForm.java | 31 +++++++++++++------ 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/ccm-sci-assets-publicationsabout/src/com/arsdigita/cms/contentassets/ui/SciPublicationsAboutDiscussesForm.java b/ccm-sci-assets-publicationsabout/src/com/arsdigita/cms/contentassets/ui/SciPublicationsAboutDiscussesForm.java index 23fe99f40..a88432587 100644 --- a/ccm-sci-assets-publicationsabout/src/com/arsdigita/cms/contentassets/ui/SciPublicationsAboutDiscussesForm.java +++ b/ccm-sci-assets-publicationsabout/src/com/arsdigita/cms/contentassets/ui/SciPublicationsAboutDiscussesForm.java @@ -53,11 +53,12 @@ public class SciPublicationsAboutDiscussesForm extends BasicItemForm implements @Override protected void addWidgets() { - add(new Label(SciPublicationsAboutGlobalizationUtil.globalize( - "com.arsdigita.cms.contentassets.about.discusses.publication.select_discussed"))); + itemSearch = new ItemSearchWidget( ITEM_SEARCH, ContentType.findByAssociatedObjectType(Publication.class.getName())); + itemSearch.setLabel(SciPublicationsAboutGlobalizationUtil.globalize( + "com.arsdigita.cms.contentassets.about.discusses.publication.select_discussed")); itemSearch.setDisableCreatePane(true); add(itemSearch); } diff --git a/ccm-sci-assets-publicationsabout/src/com/arsdigita/cms/contentassets/ui/SciPublicationsAboutDiscussingForm.java b/ccm-sci-assets-publicationsabout/src/com/arsdigita/cms/contentassets/ui/SciPublicationsAboutDiscussingForm.java index 149e0ce97..1218c0706 100644 --- a/ccm-sci-assets-publicationsabout/src/com/arsdigita/cms/contentassets/ui/SciPublicationsAboutDiscussingForm.java +++ b/ccm-sci-assets-publicationsabout/src/com/arsdigita/cms/contentassets/ui/SciPublicationsAboutDiscussingForm.java @@ -53,11 +53,12 @@ public class SciPublicationsAboutDiscussingForm extends BasicItemForm implements @Override public void addWidgets() { - add(new Label(SciPublicationsAboutGlobalizationUtil.globalize( - "com.arsdigita.cms.contentassets.about.discusses.publication.select_discussing"))); + itemSearch = new ItemSearchWidget( ITEM_SEARCH, ContentType.findByAssociatedObjectType(Publication.class.getName())); + itemSearch.setLabel(SciPublicationsAboutGlobalizationUtil.globalize( + "com.arsdigita.cms.contentassets.about.discusses.publication.select_discussing")); add(itemSearch); } diff --git a/ccm-sci-assets-publicationslibrarysignatures/src/com/arsdigita/cms/contentassets/ui/LibrarySignaturesAddForm.java b/ccm-sci-assets-publicationslibrarysignatures/src/com/arsdigita/cms/contentassets/ui/LibrarySignaturesAddForm.java index 756b640d5..44871f839 100644 --- a/ccm-sci-assets-publicationslibrarysignatures/src/com/arsdigita/cms/contentassets/ui/LibrarySignaturesAddForm.java +++ b/ccm-sci-assets-publicationslibrarysignatures/src/com/arsdigita/cms/contentassets/ui/LibrarySignaturesAddForm.java @@ -56,9 +56,12 @@ public class LibrarySignaturesAddForm extends BasicItemForm { @Override public void addWidgets() { - add(new Label(LibrarySignaturesGlobalizationUtil.globalize( - "scipublications.librarysignatures.form.library"))); + + //add(new Label(LibrarySignaturesGlobalizationUtil.globalize( + // "scipublications.librarysignatures.form.library"))); final TextField library = new TextField(LIBRARY); + library.setLabel(LibrarySignaturesGlobalizationUtil.globalize( + "scipublications.librarysignatures.form.library")); library.addValidationListener(new NotNullValidationListener( LibrarySignaturesGlobalizationUtil.globalize( "scipublications.librarysignatures.form.library.not_null"))); @@ -67,9 +70,11 @@ public class LibrarySignaturesAddForm extends BasicItemForm { "scipublications.librarysignatures.form.library.not_empty"))); add(library); - add(new Label(LibrarySignaturesGlobalizationUtil.globalize( - "scipublications.librarysignatures.form.signature"))); + //add(new Label(LibrarySignaturesGlobalizationUtil.globalize( + // "scipublications.librarysignatures.form.signature"))); final TextField signature = new TextField(SIGNATURE); + signature.setLabel(LibrarySignaturesGlobalizationUtil.globalize( + "scipublications.librarysignatures.form.signature")); signature.addValidationListener(new NotNullValidationListener( LibrarySignaturesGlobalizationUtil.globalize( "scipublications.librarysignatures.form.signature.not_null"))); @@ -78,13 +83,19 @@ public class LibrarySignaturesAddForm extends BasicItemForm { "scipublications.librarysignatures.form.signature.not_empty"))); add(signature); - add(new Label(LibrarySignaturesGlobalizationUtil.globalize( - "scipublications.librarysignatures.form.link"))); - add(new TextField(LINK)); + //add(new Label(LibrarySignaturesGlobalizationUtil.globalize( + // "scipublications.librarysignatures.form.link"))); + final TextField link = new TextField(LINK); + link.setLabel(LibrarySignaturesGlobalizationUtil.globalize( + "scipublications.librarysignatures.form.link")); + add(link); - add(new Label(LibrarySignaturesGlobalizationUtil.globalize( - "scipublications.librarysignatures.form.misc"))); - add(new TextField(MISC)); + //add(new Label(LibrarySignaturesGlobalizationUtil.globalize( + // "scipublications.librarysignatures.form.misc"))); + final TextField misc = new TextField(MISC); + misc.setLabel(LibrarySignaturesGlobalizationUtil.globalize( + "scipublications.librarysignatures.form.misc")); + add(misc); } @Override