LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing some more labels 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2883 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2014-09-26 12:06:49 +00:00
parent 18c47d2f9f
commit 5ea5533f07
6 changed files with 33 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumePropertyForm.java
View File

@ -88,7 +88,8 @@ public class ArticleInCollectedVolumePropertyForm
add(chapter); add(chapter);
reviewed = new CheckboxGroup("reviewedGroup"); reviewed = new CheckboxGroup("reviewedGroup");
reviewed.addOption(new Option(REVIEWED, "")); reviewed.addOption(new Option(REVIEWED, new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.articleInCollectedVolume.reviewed"))));
reviewed.setLabel(PublicationGlobalizationUtil.globalize( reviewed.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.articleInCollectedVolume.reviewed")); "publications.ui.articleInCollectedVolume.reviewed"));
add(reviewed); add(reviewed);

48
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalPropertyForm.java
View File

@ -45,10 +45,10 @@ import java.util.GregorianCalendar;
* @author Jens Pelzetter * @author Jens Pelzetter
*/ */
public class ArticleInJournalPropertyForm public class ArticleInJournalPropertyForm
extends PublicationPropertyForm extends PublicationPropertyForm
implements FormInitListener, implements FormInitListener,
FormProcessListener, FormProcessListener,
FormSubmissionListener { FormSubmissionListener {
private static final String REVIEWED = "reviewed"; private static final String REVIEWED = "reviewed";
private ArticleInJournalPropertiesStep m_step; private ArticleInJournalPropertiesStep m_step;
@ -71,51 +71,47 @@ public class ArticleInJournalPropertyForm
super.addWidgets(); super.addWidgets();
ParameterModel volumeParam = ParameterModel volumeParam = new IntegerParameter(ArticleInJournal.VOLUME);
new IntegerParameter(ArticleInJournal.VOLUME);
TextField volume = new TextField(volumeParam); TextField volume = new TextField(volumeParam);
//volume.addValidationListener(new NotNullValidationListener()); //volume.addValidationListener(new NotNullValidationListener());
//volume.addValidationListener(new NotEmptyValidationListener()); //volume.addValidationListener(new NotEmptyValidationListener());
volume.setLabel(PublicationGlobalizationUtil.globalize( volume.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.articleinjournal.volume")); "publications.ui.articleinjournal.volume"));
add(volume); add(volume);
ParameterModel issueParam = new StringParameter(ArticleInJournal.ISSUE); ParameterModel issueParam = new StringParameter(ArticleInJournal.ISSUE);
TextField issue = new TextField(issueParam); TextField issue = new TextField(issueParam);
issue.setLabel(PublicationGlobalizationUtil.globalize( issue.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.articleinjournal.issue")); "publications.ui.articleinjournal.issue"));
add(issue); add(issue);
ParameterModel pagesFromParam = ParameterModel pagesFromParam = new IntegerParameter(ArticleInJournal.PAGES_FROM);
new IntegerParameter(ArticleInJournal.PAGES_FROM);
TextField pagesFrom = new TextField(pagesFromParam); TextField pagesFrom = new TextField(pagesFromParam);
pagesFrom.setLabel(PublicationGlobalizationUtil.globalize( pagesFrom.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.articleinjournal.pages_from")); "publications.ui.articleinjournal.pages_from"));
add(pagesFrom); add(pagesFrom);
ParameterModel pagesToParam = ParameterModel pagesToParam = new IntegerParameter(ArticleInJournal.PAGES_TO);
new IntegerParameter(ArticleInJournal.PAGES_TO);
TextField pagesTo = new TextField(pagesToParam); TextField pagesTo = new TextField(pagesToParam);
pagesTo.setLabel(PublicationGlobalizationUtil.globalize( pagesTo.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.articleinjournal.pages_to")); "publications.ui.articleinjournal.pages_to"));
add(pagesTo); add(pagesTo);
Calendar today = new GregorianCalendar(); Calendar today = new GregorianCalendar();
ParameterModel pubDateParam = ParameterModel pubDateParam = new DateParameter(ArticleInJournal.PUBLICATION_DATE);
new DateParameter(ArticleInJournal.PUBLICATION_DATE); com.arsdigita.bebop.form.Date pubDate = new com.arsdigita.bebop.form.Date(
com.arsdigita.bebop.form.Date pubDate = pubDateParam);
new com.arsdigita.bebop.form.Date(
pubDateParam);
pubDate.setYearAsc(false); pubDate.setYearAsc(false);
pubDate.setYearRange(1900, today.get(Calendar.YEAR) + 2); pubDate.setYearRange(1900, today.get(Calendar.YEAR) + 2);
pubDate.setLabel(PublicationGlobalizationUtil.globalize( pubDate.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.articleinjournal.publicationDate")); "publications.ui.articleinjournal.publicationDate"));
add(pubDate); add(pubDate);
reviewed = new CheckboxGroup("reviewedGroup"); reviewed = new CheckboxGroup("reviewedGroup");
reviewed.addOption(new Option(REVIEWED, "")); reviewed.addOption(new Option(REVIEWED, new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.articleinjournal.reviewed"))));
reviewed.setLabel(PublicationGlobalizationUtil.globalize( reviewed.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.articleinjournal.reviewed")); "publications.ui.articleinjournal.reviewed"));
add(reviewed); add(reviewed);
} }
@ -152,15 +148,15 @@ public class ArticleInJournalPropertyForm
ArticleInJournal article = (ArticleInJournal) processBasicWidgets(fse); ArticleInJournal article = (ArticleInJournal) processBasicWidgets(fse);
if ((article != null) && getSaveCancelSection().getSaveButton(). if ((article != null) && getSaveCancelSection().getSaveButton().
isSelected(fse.getPageState())) { isSelected(fse.getPageState())) {
article.setVolume((Integer) data.get(ArticleInJournal.VOLUME)); article.setVolume((Integer) data.get(ArticleInJournal.VOLUME));
article.setIssue((String) data.get(ArticleInJournal.ISSUE)); article.setIssue((String) data.get(ArticleInJournal.ISSUE));
article.setPagesFrom( article.setPagesFrom(
(Integer) data.get(ArticleInJournal.PAGES_FROM)); (Integer) data.get(ArticleInJournal.PAGES_FROM));
article.setPagesTo( article.setPagesTo(
(Integer) data.get(ArticleInJournal.PAGES_TO)); (Integer) data.get(ArticleInJournal.PAGES_TO));
article.setPublicationDate( article.setPublicationDate(
(Date) data.get(ArticleInJournal.PUBLICATION_DATE)); (Date) data.get(ArticleInJournal.PUBLICATION_DATE));
if (reviewed.getValue(fse.getPageState()) == null) { if (reviewed.getValue(fse.getPageState()) == null) {
article.setReviewed(false); article.setReviewed(false);

3
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumePropertyForm.java
View File

@ -65,7 +65,8 @@ public class CollectedVolumePropertyForm
super.addWidgets(); super.addWidgets();
reviewed = new CheckboxGroup("reviewedGroup"); reviewed = new CheckboxGroup("reviewedGroup");
reviewed.addOption(new Option(REVIEWED, "")); reviewed.addOption(new Option(REVIEWED, new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.collectedVolume.reviewed"))));
reviewed.setLabel(PublicationGlobalizationUtil.globalize( reviewed.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.collectedVolume.reviewed")); "publications.ui.collectedVolume.reviewed"));
add(reviewed); add(reviewed);

4
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/MonographPropertyForm.java
View File

@ -20,6 +20,7 @@ package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormData;
import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.event.FormInitListener; import com.arsdigita.bebop.event.FormInitListener;
import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormProcessListener;
import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.event.FormSectionEvent;
@ -61,7 +62,8 @@ public class MonographPropertyForm
super.addWidgets(); super.addWidgets();
reviewed = new CheckboxGroup("reviewedGroup"); reviewed = new CheckboxGroup("reviewedGroup");
reviewed.addOption(new Option(REVIEWED, "")); reviewed.addOption(new Option(REVIEWED, new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.monograph.reviewed"))));
reviewed.setLabel(PublicationGlobalizationUtil.globalize( reviewed.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.monograph.reviewed")); "publications.ui.monograph.reviewed"));
add(reviewed); add(reviewed);

11
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ReviewPropertyForm.java
View File

@ -18,24 +18,13 @@
*/ */
package com.arsdigita.cms.contenttypes.ui; package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.FormData;
import com.arsdigita.bebop.FormProcessException; import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.event.FormInitListener; import com.arsdigita.bebop.event.FormInitListener;
import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormProcessListener;
import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.bebop.event.FormSectionEvent;
import com.arsdigita.bebop.event.FormSubmissionListener; import com.arsdigita.bebop.event.FormSubmissionListener;
import com.arsdigita.bebop.form.TextField;
import com.arsdigita.bebop.parameters.DateParameter;
import com.arsdigita.bebop.parameters.IntegerParameter;
import com.arsdigita.bebop.parameters.ParameterModel;
import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.contenttypes.Review;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
/** /**
* *

3
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/WorkingPaperPropertyForm.java
View File

@ -63,7 +63,8 @@ public class WorkingPaperPropertyForm
super.addWidgets(); super.addWidgets();
reviewed = new CheckboxGroup("reviewedGroup"); reviewed = new CheckboxGroup("reviewedGroup");
reviewed.addOption(new Option(REVIEWED, "")); reviewed.addOption(new Option(REVIEWED, new Label(PublicationGlobalizationUtil.globalize(
"publications.ui.workingpaper.reviewed"))));
reviewed.setLabel(PublicationGlobalizationUtil.globalize( reviewed.setLabel(PublicationGlobalizationUtil.globalize(
"publications.ui.workingpaper.reviewed")); "publications.ui.workingpaper.reviewed"));
add(reviewed); add(reviewed);