diff --git a/ccm-core/src/com/arsdigita/bebop/DescriptiveComponent.java b/ccm-core/src/com/arsdigita/bebop/DescriptiveComponent.java index 55629068c..4379e93f4 100755 --- a/ccm-core/src/com/arsdigita/bebop/DescriptiveComponent.java +++ b/ccm-core/src/com/arsdigita/bebop/DescriptiveComponent.java @@ -43,8 +43,7 @@ abstract public class DescriptiveComponent extends SimpleComponent { /** Property to store informational text for the user about the Link, e.g. * how to use it, or when to use it (or not to use it). */ - private GlobalizedMessage m_hint = GlobalizationUtil - .globalize("bebop.hint.no_entry_yet"); + private GlobalizedMessage m_hint; //= GlobalizationUtil.globalize("bebop.hint.no_entry_yet"); /** Property to store a (localized) label (or title) of this widget. A * label is the text (name) displayed for the user to identify and diff --git a/ccm-core/src/com/arsdigita/bebop/form/Date.java b/ccm-core/src/com/arsdigita/bebop/form/Date.java index 311ca4514..a89d72026 100755 --- a/ccm-core/src/com/arsdigita/bebop/form/Date.java +++ b/ccm-core/src/com/arsdigita/bebop/form/Date.java @@ -59,6 +59,7 @@ public class Date extends Widget implements BebopConstants { private int m_year_begin; private int m_year_end; private Locale m_locale; + private boolean yearAsc = true; /** * Inner class for the year fragment @@ -70,8 +71,9 @@ public class Date extends Widget implements BebopConstants { /** * Constructor. + * * @param name - * @param parent + * @param parent */ public YearFragment(String name, Date parent) { super(name); @@ -80,9 +82,10 @@ public class Date extends Widget implements BebopConstants { } /** - * + * * @param ps - * @return + * + * @return */ @Override protected ParameterData getParameterData(PageState ps) { @@ -94,17 +97,18 @@ public class Date extends Widget implements BebopConstants { } /** - * - * @param autoCurrentYear + * + * @param autoCurrentYear */ public void setAutoCurrentYear(final boolean autoCurrentYear) { this.autoCurrentYear = autoCurrentYear; } /** - * + * * @param ps - * @return + * + * @return */ @Override public Object getValue(PageState ps) { @@ -126,7 +130,7 @@ public class Date extends Widget implements BebopConstants { } /** - * + * */ protected class MonthFragment extends SingleSelect { @@ -160,7 +164,7 @@ public class Date extends Widget implements BebopConstants { } /** - * + * */ protected class DayFragment extends TextField { @@ -228,7 +232,8 @@ public class Date extends Widget implements BebopConstants { /** * Constructor. - * @param name + * + * @param name */ public Date(String name) { this(new DateParameter(name)); @@ -250,17 +255,32 @@ public class Date extends Widget implements BebopConstants { // a) skipYearAllowed is true // b) skipDayAllowed is true and skipMonthAllowed is true, to unset a date if (((IncompleteDateParameter) this.getParameterModel()).isSkipYearAllowed() - || (((IncompleteDateParameter) this.getParameterModel()).isSkipDayAllowed() - && ((IncompleteDateParameter) this.getParameterModel()).isSkipMonthAllowed())) { + || (((IncompleteDateParameter) this.getParameterModel()).isSkipDayAllowed() + && ((IncompleteDateParameter) this.getParameterModel()) + .isSkipMonthAllowed())) { m_year.addOption(new Option("", "")); } } - for (int year = m_year_begin; year <= m_year_end; year += 1) { - m_year.addOption(new Option(String.valueOf(year))); + if (yearAsc) { + for (int year = m_year_begin; year <= m_year_end; year++) { + m_year.addOption(new Option(String.valueOf(year))); + } + } else { + for(int year = m_year_end; year >= m_year_begin; year--) { + m_year.addOption(new Option(String.valueOf(year))); + } } } } + public boolean getYearAsc() { + return yearAsc; + } + + public void setYearAsc(final boolean yearAsc) { + this.yearAsc = yearAsc; + } + public void addYear(java.util.Date date) { Calendar cal = new GregorianCalendar(); cal.setTime(date); @@ -276,7 +296,8 @@ public class Date extends Widget implements BebopConstants { /** * Returns a string naming the type of this widget. - * @return + * + * @return */ @Override public String getType() { @@ -286,6 +307,7 @@ public class Date extends Widget implements BebopConstants { /** * Sets the MAXLENGTH attribute for the INPUT tag used to render this form * element. + * * @param length */ public void setMaxLength(int length) { @@ -299,7 +321,8 @@ public class Date extends Widget implements BebopConstants { /** * The XML tag for this derived class of Widget. - * @return + * + * @return */ @Override protected String getElementTag() { @@ -307,9 +330,9 @@ public class Date extends Widget implements BebopConstants { } /** - * + * * @param ps - * @param parent + * @param parent */ @Override public void generateWidget(PageState ps, Element parent) { diff --git a/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/SciPublicationsPersonsService.java b/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/SciPublicationsPersonsService.java index 3bdf78486..07d6685e4 100644 --- a/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/SciPublicationsPersonsService.java +++ b/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/SciPublicationsPersonsService.java @@ -72,7 +72,7 @@ public class SciPublicationsPersonsService { if (publicationsAsset == null) { SciPublicationsPersonsPersonsPublications.create(person); } else { - final SciPublicationsPersonsPublicationsPersons publications = new SciPublicationsPersonsPublicationsPersons(publicationsAsset); + final SciPublicationsPersonsPersonsPublications publications = new SciPublicationsPersonsPersonsPublications(publicationsAsset); publications.update(); } } diff --git a/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/ui/SciPublicationsPersonsPersonForm.java b/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/ui/SciPublicationsPersonsPersonForm.java index d08122f5b..bc5b7f7fa 100644 --- a/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/ui/SciPublicationsPersonsPersonForm.java +++ b/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/ui/SciPublicationsPersonsPersonForm.java @@ -86,14 +86,16 @@ public class SciPublicationsPersonsPersonForm extends BasicItemForm { final ParameterModel relationParam = new StringParameter(RELATION); final SingleSelect relationSelect = new SingleSelect(relationParam); relationSelect.addValidationListener(new NotNullValidationListener()); - relationSelect.addOption(new Option("", new Label(ContenttypesGlobalizationUtil.globalize( - "cms.ui.select_one")))); + try { relationSelect.addPrintListener(new PrintListener() { @Override public void prepare(final PrintEvent event) { final SingleSelect target = (SingleSelect) event.getTarget(); + target.clearOptions(); + target.addOption(new Option("", new Label(ContenttypesGlobalizationUtil.globalize( + "cms.ui.select_one")))); final RelationAttributeCollection relations = new RelationAttributeCollection( SciPublicationsPersonsService.RELATION_ATTRIBUTE); relations.addLanguageFilter(Kernel.getConfig().getDefaultLanguage()); diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/de/SciPublications.xml b/ccm-sci-bundle/web/themes/mandalay/lang/de/SciPublications.xml index d7f398775..1239a2113 100644 --- a/ccm-sci-bundle/web/themes/mandalay/lang/de/SciPublications.xml +++ b/ccm-sci-bundle/web/themes/mandalay/lang/de/SciPublications.xml @@ -60,6 +60,7 @@ Wird in folgenden Publikationen behandelt Behandelt folgende Publikationen Bibliotheken + Personen in dieser Publikation Schlüsselwörter diff --git a/ccm-sci-bundle/web/themes/mandalay/lang/en/SciPublications.xml b/ccm-sci-bundle/web/themes/mandalay/lang/en/SciPublications.xml index 9dc231a5e..fffb3f213 100644 --- a/ccm-sci-bundle/web/themes/mandalay/lang/en/SciPublications.xml +++ b/ccm-sci-bundle/web/themes/mandalay/lang/en/SciPublications.xml @@ -58,6 +58,7 @@ Keywords Libraries + Persons discussed by this publication Abstract Authors diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/publications-persons.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/publications-persons.xsl index 934655bc5..7f2cce257 100644 --- a/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/publications-persons.xsl +++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/publications-persons.xsl @@ -78,7 +78,12 @@ XSL file for displaying the informations from the related persons asset. , - + + + + + + diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalPropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalPropertyForm.java index 9ea50a9b1..7ec582595 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalPropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalPropertyForm.java @@ -106,6 +106,7 @@ public class ArticleInJournalPropertyForm com.arsdigita.bebop.form.Date pubDate = new com.arsdigita.bebop.form.Date( pubDateParam); + pubDate.setYearAsc(false); pubDate.setYearRange(1900, today.get(Calendar.YEAR) + 2); pubDate.setLabel(PublicationGlobalizationUtil.globalize( "publications.ui.articleinjournal.publicationDate"));