Cantharella-commits

Download

cantharella-commits@list.forge.codelutin.com

June 2013

3 participants
22 discussions

r237 - trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document
by echatellier＠users.forge.codelutin.com June 5, 2013

June 5, 2013

Author: echatellier Date: 2013-06-05 09:23:17 +0200 (Wed, 05 Jun 2013) New Revision: 237 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/237 Log: Set multiline label for document description Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java 2013-06-03 13:26:05 UTC (rev 236) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java 2013-06-05 07:23:17 UTC (rev 237) @@ -39,6 +39,7 @@ import nc.ird.cantharella.web.utils.models.DisplayMapValuePropertyModel; import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.markup.html.basic.MultiLineLabel; import org.apache.wicket.markup.html.form.Button; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.link.Link; @@ -106,7 +107,7 @@ .add(new ReplaceEmptyLabelBehavior())); add(new Label("Document.editeur", new PropertyModel<String>(documentModel, "editeur")) .add(new ReplaceEmptyLabelBehavior())); - add(new Label("Document.description", new PropertyModel<String>(documentModel, "description")) + add(new MultiLineLabel("Document.description", new PropertyModel<String>(documentModel, "description")) .add(new ReplaceEmptyLabelBehavior())); add(new Label("Document.langue", new DisplayMapValuePropertyModel<String>(documentModel, "langue", WebContext.LANGUAGES.get(getSession().getLocale()))).add(new ReplaceEmptyLabelBehavior()));

1 0

r236 - trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule
by echatellier＠users.forge.codelutin.com June 3, 2013

June 3, 2013

Author: echatellier Date: 2013-06-03 15:26:05 +0200 (Mon, 03 Jun 2013) New Revision: 236 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/236 Log: Fix multiline labels Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java 2013-05-29 08:49:38 UTC (rev 235) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java 2013-06-03 13:26:05 UTC (rev 236) @@ -60,6 +60,7 @@ import org.apache.wicket.MarkupContainer; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.markup.html.basic.MultiLineLabel; import org.apache.wicket.markup.html.form.Button; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.link.Link; @@ -135,11 +136,11 @@ .add(new ReplaceEmptyLabelBehavior())); nouvMoleculRefresh.add(new Label("Molecule.identifieePar", new PropertyModel<Personne>(moleculeModel, "identifieePar")).add(new ReplaceEmptyLabelBehavior())); - nouvMoleculRefresh.add(new Label("Molecule.publiOrigine", new PropertyModel<String>(moleculeModel, + nouvMoleculRefresh.add(new MultiLineLabel("Molecule.publiOrigine", new PropertyModel<String>(moleculeModel, "publiOrigine")).add(new ReplaceEmptyLabelBehavior())); add(nouvMoleculRefresh); - add(new Label("Molecule.complement", new PropertyModel<String>(moleculeModel, "complement")) + add(new MultiLineLabel("Molecule.complement", new PropertyModel<String>(moleculeModel, "complement")) .add(new ReplaceEmptyLabelBehavior())); add(new PropertyLabelLinkPanel<Personne>("Molecule.createur", new PropertyModel<Personne>(moleculeModel,

1 0