Author: bpoussin Date: 2012-08-03 11:48:46 +0200 (Fri, 03 Aug 2012) New Revision: 220 Url: http://chorem.org/repositories/revision/chorem/220 Log: ajout de la possibilite de mettre un tag help sur les champs qui sera affiche lors de la saisie. Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties =================================================================== --- trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-08-03 09:33:09 UTC (rev 219) +++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2012-08-03 09:48:46 UTC (rev 220) @@ -87,7 +87,9 @@ org.chorem.entities.Touch.class.tagvalue.preload=Touch.participant org.chorem.entities.Touch.class.tagvalue.toString=%Interval.beginDate$tF - %Touch.type$s - %Touch.goal|nogoal$s org.chorem.entities.Touch.class.tagvalue.sortOrder=Interval.beginDate desc,Touch.type,Touch.goal +org.chorem.entities.Touch.attribute.goal.tagvalue.help=But de la prise de contact org.chorem.entities.Touch.attribute.goal.tagvalue.subtype=text/rst +org.chorem.entities.Touch.attribute.digest.tagvalue.help=R\u00e9sum\u00e9 de l'\u00e9change durant la prise de contact org.chorem.entities.Touch.attribute.digest.tagvalue.subtype=text/rst org.chorem.entities.Touch.attribute.type.tagvalue.choiceQuery=SELECT Touch.type WHERE extension=Touch org.chorem.entities.Attachment.class.tagvalue.version=7.0 @@ -98,6 +100,7 @@ org.chorem.entities.Quotation.class.tagvalue.toString=%Interval.beginDate$tF-%Interval.endDate$tF %Quotation.reference|noref$s(%Quotation.category|noCategory$s) %Quotation.description|nodescription$s org.chorem.entities.Quotation.class.tagvalue.sortOrder=Interval.beginDate,Interval.endDate,Quotation.reference,Quotation.type,Quotation.description org.chorem.entities.Quotation.attribute.status.tagvalue.allowed=LEAD,DRAFT,SENT,REJECTED,ACCEPTED,STARTED,DELIVERED,RSV,WARRANTY,CLOSED +org.chorem.entities.Quotation.attribute.conversionHope.tagvalue.help=Pourcentage de r\u00e9ussite du projet org.chorem.entities.Quotation.attribute.conversionHope.tagvalue.min=0 org.chorem.entities.Quotation.attribute.conversionHope.tagvalue.max=100 org.chorem.entities.Invoice.class.tagvalue.version=9.0 Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java =================================================================== --- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2012-08-03 09:33:09 UTC (rev 219) +++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2012-08-03 09:48:46 UTC (rev 220) @@ -133,6 +133,10 @@ } break; } + String help = field.getTagValue("help"); + if (StringUtils.isNotBlank(help)) { + /*{<i class="icon-question-sign" title="<%=help%>"></i>}*/ + } } else { /*{<div class="alert alert-error"><%=wikitty.getId()%> doesn't have field '<%=fqfield%>'</div>}*/ }