Author: echatellier Date: 2013-02-20 16:40:59 +0100 (Wed, 20 Feb 2013) New Revision: 140 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/140 Log: Ajout d'infobulle manquante. Passage des valeurs fixe en configuration. Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java trunk/cantharella.data/src/main/resources/cantharella.conf trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java trunk/cantharella.web/src/main/resources/cantharella.conf trunk/cantharella.web/src/main/resources/web_en.properties trunk/cantharella.web/src/main/resources/web_fr.properties Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java 2013-02-20 14:57:34 UTC (rev 139) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java 2013-02-20 15:40:59 UTC (rev 140) @@ -168,11 +168,23 @@ protected String dbUserProperty; /** - * DB user + * Hibernate schema validation property. */ - @Value("${db.hbm2ddl:validate}") + @Value("${db.hbm2ddl}") protected String hbm2ddl; + /** + * Hibernate search lucene index location on filesystem. + */ + @Value("${hibernate.search.indexBase}") + protected String hibernateSearchIndexBase; + + /** + * Hibernate search analyzer. + */ + @Value("${hibernate.search.analyzer}") + protected String hibernateSearchAnalyzer; + static { // The first Locale in the list is the default one List<Locale> locales = new ArrayList<Locale>(); @@ -295,8 +307,8 @@ //hibernateProperties.setProperty("hibernate.c3p0.min_size", String.valueOf(DB_POOL_MIN_SIZE)); // minPoolSize // Hibernate search hibernateProperties.setProperty("hibernate.search.default.directory_provider", "filesystem"); - hibernateProperties.setProperty("hibernate.search.default.indexBase", "/tmp/cantharella/hs"); - hibernateProperties.setProperty("hibernate.search.analyzer", "org.apache.lucene.analysis.fr.FrenchAnalyzer"); + hibernateProperties.setProperty("hibernate.search.default.indexBase", hibernateSearchIndexBase); + hibernateProperties.setProperty("hibernate.search.analyzer", hibernateSearchAnalyzer); // Hibernate: Session //hibernateProperties.setProperty("hibernate.current_session_context_class", "thread"); Modified: trunk/cantharella.data/src/main/resources/cantharella.conf =================================================================== --- trunk/cantharella.data/src/main/resources/cantharella.conf 2013-02-20 14:57:34 UTC (rev 139) +++ trunk/cantharella.data/src/main/resources/cantharella.conf 2013-02-20 15:40:59 UTC (rev 140) @@ -31,3 +31,8 @@ # value for production #db.debug=false db.hbm2ddl=validate + +# Hibernate search lucene index location on filesystem. +hibernate.search.indexBase=/tmp/cantharella +# Hibernate search analyzer +hibernate.search.analyzer=org.apache.lucene.analysis.fr.FrenchAnalyzer \ No newline at end of file Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.html 2013-02-20 14:57:34 UTC (rev 139) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.html 2013-02-20 15:40:59 UTC (rev 140) @@ -84,7 +84,8 @@ </div> <div class="property required"> - <label for="Document.file"><wicket:message key="Document.file" /></label> + <label for="Document.file"><wicket:message key="Document.file" /> + <wicket:container wicket:id="Document.file.info"/></label> <input type="file" id="Document.file" wicket:id="Document.file" /> </div> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java 2013-02-20 14:57:34 UTC (rev 139) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java 2013-02-20 15:40:59 UTC (rev 140) @@ -44,6 +44,7 @@ import nc.ird.cantharella.web.utils.forms.SubmittableButton; import nc.ird.cantharella.web.utils.forms.SubmittableButtonEvents; import nc.ird.cantharella.web.utils.forms.AutoCompleteTextFieldString.ComparisonMode; +import nc.ird.cantharella.web.utils.panels.SimpleTooltipPanel; import nc.ird.cantharella.web.utils.renderers.MapChoiceRenderer; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -67,6 +68,7 @@ import org.apache.wicket.util.lang.Bytes; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; /** * Document management page (creation/edition). @@ -108,6 +110,10 @@ /** Multiple entry. */ private boolean multipleEntry; + /** Configuration document max upload size. */ + @Value("${document.maxUploadSize}") + protected long documentMaxUploadSize; + /** * Constructeur (mode création) * @param callerPage Page appelante @@ -189,7 +195,7 @@ } }; formView.setMultiPart(true); - formView.setMaxSize(Bytes.megabytes(1)); + formView.setMaxSize(Bytes.megabytes(documentMaxUploadSize)); formView.add(new TextField<String>("Document.titre", new PropertyModel<String>(documentModel, "titre"))); @@ -261,6 +267,7 @@ }); // Fichier + formView.add(new SimpleTooltipPanel("Document.file.info", new Model<String>(getString("Document.file.info")))); formView.add(fileUploadField); // Action : création du document Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.html 2013-02-20 14:57:34 UTC (rev 139) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.html 2013-02-20 15:40:59 UTC (rev 140) @@ -48,8 +48,9 @@ </div> <div class="property required"> - <label for="Molecule.formuleBrute"><wicket:message key="Molecule.formuleBrute" /></label> - <input type="text" id="Molecule.formuleBrute" wicket:id="Molecule.formuleBrute" /> + <label for="Molecule.formuleBrute"><wicket:message key="Molecule.formuleBrute" /> + <wicket:container wicket:id="Molecule.formuleBrute.info"/></label> + <input type="text" id="Molecule.formuleBrute" wicket:id="Molecule.formuleBrute" /> </div> <div class="property required"> @@ -61,7 +62,8 @@ <legend><wicket:message key="Molecule.nouvMolecul" /></legend> <div class="property"> - <label for="Molecule.nouvMolecul"><wicket:message key="Molecule.nouvMolecul" /></label> + <label for="Molecule.nouvMolecul"><wicket:message key="Molecule.nouvMolecul" /> + <wicket:container wicket:id="Molecule.nouvMolecul.info"/></label> <input type="checkbox" id="Molecule.nouvMolecul" wicket:id="Molecule.nouvMolecul" /> </div> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java 2013-02-20 14:57:34 UTC (rev 139) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java 2013-02-20 15:40:59 UTC (rev 140) @@ -69,6 +69,7 @@ import nc.ird.cantharella.web.utils.models.DisplayDecimalPropertyModel.DecimalDisplFormat; import nc.ird.cantharella.web.utils.models.SimpleSortableListDataProvider; import nc.ird.cantharella.web.utils.panels.PropertyLabelLinkProduitPanel; +import nc.ird.cantharella.web.utils.panels.SimpleTooltipPanel; import nc.ird.cantharella.web.utils.security.AuthRole; import nc.ird.cantharella.web.utils.security.AuthRoles; import nc.ird.cantharella.web.utils.security.AuthSession; @@ -227,6 +228,8 @@ formView.add(new TextField<String>("Molecule.nomIupca", new PropertyModel<String>(moleculeModel, "nomIupca")) .setEnabled(editEnabled)); + formView.add(new SimpleTooltipPanel("Molecule.formuleBrute.info", new Model<String>( + getString("Molecule.formuleBrute.info")))); formView.add(new TextField<String>("Molecule.formuleBrute", new PropertyModel<String>(moleculeModel, "formuleBrute")).setEnabled(editEnabled)); @@ -243,6 +246,8 @@ formView.add(nouvMoleculRefresh); // predéclaration des champs activé par la chec + formView.add(new SimpleTooltipPanel("Molecule.nouvMolecul.info", new Model<String>( + getString("Molecule.nouvMolecul.info")))); formView.add(new CheckBox("Molecule.nouvMolecul", new PropertyModel<Boolean>(moleculeModel, "nouvMolecul")) { @Override protected void onSelectionChanged(Boolean newSelection) { Modified: trunk/cantharella.web/src/main/resources/cantharella.conf =================================================================== --- trunk/cantharella.web/src/main/resources/cantharella.conf 2013-02-20 14:57:34 UTC (rev 139) +++ trunk/cantharella.web/src/main/resources/cantharella.conf 2013-02-20 15:40:59 UTC (rev 140) @@ -35,4 +35,5 @@ log4j.config=classpath:log4j.xml # value for production #log4j.config=/home/tomcat/.config/log4j_prod.xml - +#document file max upload size (Mb) +document.maxUploadSize=1 \ No newline at end of file Modified: trunk/cantharella.web/src/main/resources/web_en.properties =================================================================== --- trunk/cantharella.web/src/main/resources/web_en.properties 2013-02-20 14:57:34 UTC (rev 139) +++ trunk/cantharella.web/src/main/resources/web_en.properties 2013-02-20 15:40:59 UTC (rev 140) @@ -384,6 +384,8 @@ Molecule.masseMolaire.Required=Molar mass - can’t be null Molecule.masseMolaire.IConverter.BigDecimal=Molar mass - must be a decimal number Molecule.downloadMolFile=Download .mol file +Molecule.formuleBrute.info=Specify in order : Carbon, Hydrogen and then alphabetically +Molecule.nouvMolecul.info=All users can see molecules. Make sure that molecule is properly published. TestBio.date.IConverter.Date=The date is incorrectly formatted (DD/MM/YY) TestBio.concMasseDefaut.IConverter.BigDecimal=Default Conc./Mass - must be a decimal number @@ -412,6 +414,7 @@ Document.link=Link Document.type=Type Document.file=File +Document.file.info=File size must be less than 1Mb #BASIC# Actions=Actions Modified: trunk/cantharella.web/src/main/resources/web_fr.properties =================================================================== --- trunk/cantharella.web/src/main/resources/web_fr.properties 2013-02-20 14:57:34 UTC (rev 139) +++ trunk/cantharella.web/src/main/resources/web_fr.properties 2013-02-20 15:40:59 UTC (rev 140) @@ -382,6 +382,8 @@ Molecule.masseMolaire.Required=Masse molaire - ne peut être nul Molecule.masseMolaire.IConverter.BigDecimal=Masse molaire - doit être un nombre décimal Molecule.downloadMolFile=Télécharger au format mol +Molecule.formuleBrute.info=Indiquez dans l'ordre : Carbone, Hydrogène puis ordre alphabetique +Molecule.nouvMolecul.info=Les molécules sont visibles par tous les utilsateurs. Attention à ce que la molécule soit bien publiée. TestBio.date.IConverter.Date=La date est mal formatée (JJ/MM/AA) TestBio.concMasseDefaut.IConverter.BigDecimal=Conc./Masse par défaut - doit être un nombre décimal @@ -410,6 +412,7 @@ Document.link=Lien Document.type=Type Document.file=Fichier +Document.file.info=La taille du fichier doit faire moins de 1Mo #BASIC# Actions=Actions