/trunk/src/org/tela_botanica/del/client/modeles/Observation.java |
---|
237,5 → 237,9 |
public void setCourrielAuteur(String courrielAuteur) { |
this.courrielAuteur = courrielAuteur; |
} |
public boolean estADeterminer() { |
return nomRetenu == null || nomRetenu.isEmpty() || motsClefs.contains("aDeterminer"); |
} |
} |
/trunk/src/org/tela_botanica/del/client/modeles/Image.java |
---|
14,6 → 14,7 |
private String url; |
private String urlFormat; |
private String miniature; |
private List<String> motsClefs; |
public String getUrl() { |
return url; |
92,5 → 93,24 |
public void setObservation(Observation observation) { |
this.observation = observation; |
} |
public List<String> getMotsClefs() { |
return motsClefs; |
} |
public void setMotsClefs(List<String> motsClefs) { |
this.motsClefs = motsClefs; |
} |
public void ajouterMotsClef(String motsClefs) { |
if (this.motsClefs == null) { |
this.motsClefs = new ArrayList<String>(); |
} |
this.motsClefs.add(motsClefs); |
} |
public boolean estADeterminer() { |
return observation == null || observation.estADeterminer() || motsClefs.contains("aDeterminer"); |
} |
} |
/trunk/src/org/tela_botanica/del/client/utils/UtilitairesServiceResultat.java |
---|
26,6 → 26,7 |
import com.google.gwt.json.client.JSONObject; |
import com.google.gwt.json.client.JSONParser; |
import com.google.gwt.json.client.JSONValue; |
import com.google.gwt.user.client.Window; |
/** |
* Centralisation des methodes de parsing du code JSON retourné par les |
50,6 → 51,7 |
image.setUrlFormat("http://www.tela-botanica.org/appli:cel-img:" + getIdAvecPadding(idImage) + "%s%.jpg"); |
image.setUrl("http://www.tela-botanica.org/appli:cel-img:" + getIdAvecPadding(idImage) + "CRS.jpg"); |
image.setMiniature("http://www.tela-botanica.org/appli:cel-img:" + getIdAvecPadding(idImage) + "XS.jpg"); |
image.setMotsClefs(parserMotsCles(UtilitairesServiceResultat.getValeurOuVide(imageJson, "mots_cles_texte"))); |
return image; |
} |
81,9 → 83,7 |
observation.setMilieu(getValeurOuVide(observationJson, "milieu")); |
observation.setLieuDit(getValeurOuVide(observationJson, "lieudit")); |
observation.setNumNomenclatural(getValeurOuVide(observationJson, "determination.nn")); |
// TODO: renvoyer les mots clés des observations |
// observation.setMotsClefs(parserMotsCles(UtilitairesServiceResultat.getValeurOuVide(observationJson, |
// "mots_cles_texte"))); |
observation.setMotsClefs(parserMotsCles(UtilitairesServiceResultat.getValeurOuVide(observationJson, "mots_cles_texte"))); |
JSONValue propositions = observationJson.get("commentaires"); |
boolean creerPropositionAPartirObs = true; |
381,7 → 381,7 |
String[] tabMotsCle = motsClesTexte.split(","); |
List<String> motsClesParses = new ArrayList<String>(); |
for (int i = 0; i < tabMotsCle.length; i++) { |
motsClesParses.add(tabMotsCle[i]); |
motsClesParses.add(tabMotsCle[i].trim()); |
} |
return motsClesParses; |
/trunk/src/org/tela_botanica/del/client/vues/rechercheimages/resultats/images/ImageVue.java |
---|
6,6 → 6,7 |
import com.google.gwt.uibinder.client.UiField; |
import com.google.gwt.user.client.ui.Composite; |
import com.google.gwt.user.client.ui.HTML; |
import com.google.gwt.user.client.ui.HTMLPanel; |
import com.google.gwt.user.client.ui.HasWidgets; |
import com.google.gwt.user.client.ui.HorizontalPanel; |
import com.google.gwt.user.client.ui.Image; |
25,6 → 26,9 |
@UiField |
protected HTML nomEspece, nomAuteur; |
@UiField |
protected HTMLPanel zoneVoter, zonePlus; |
@UiField |
protected HorizontalPanel voter; |
65,6 → 69,13 |
imagePrincipale.setUrl(image.getUrl()); |
imagePrincipale.setTitle(image.getUrlFormat("L")); |
imagePrincipale.setAltText(image.getObservation().getAuteur() + " - " + image.getObservation().getNomRetenu()); |
String styleZoneVote = "image_determinee"; |
if(image.estADeterminer()) { |
styleZoneVote = "image_non_determinee"; |
} |
zoneVoter.addStyleName(styleZoneVote); |
zonePlus.addStyleName(styleZoneVote); |
} |
@Override |
/trunk/src/org/tela_botanica/del/client/vues/rechercheimages/resultats/images/image.css |
---|
6,7 → 6,7 |
.observations img { |
width: 250px; |
padding: 0 |
padding: 0; |
} |
.zoneCache { |
18,7 → 18,7 |
color: white; |
width: 250px; |
z-index: 1000; |
margin-top: 30px |
margin-top: 30px; |
} |
.enSavoirPlus { |
28,7 → 28,7 |
height: 30px; |
cursor: pointer; |
margin-top: 3px; |
margin-left: 3px |
margin-left: 3px; |
} |
.zoom { |
46,7 → 46,7 |
font-weight: bold; |
color: white; |
padding-left: 5px; |
padding-right: 1px |
padding-right: 1px; |
} |
.espece p,.auteur p { |
54,7 → 54,8 |
margin: 0px; |
overflow: hidden; |
text-overflow: ellipsis; |
white-space: pre |
white-space: pre; |
min-height: 13px; |
} |
.zoneDetail { |
63,7 → 64,6 |
.zonePlus { |
position: absolute; |
background: #333; |
width: 246px; |
padding: 2px; |
margin-top: -88px; |
72,7 → 72,7 |
text-align: left; |
cursor: pointer; |
overflow: hidden; |
text-overflow: ellipsis |
text-overflow: ellipsis; |
} |
.zoneImage { |
79,22 → 79,21 |
cursor: pointer; |
height: 280px; |
margin-bottom: 20px; |
background: #DDD |
background: #DDD; |
} |
.zoneVoter { |
margin-top: -48px; |
text-align: center; |
background: #333; |
opacity: 0.9; |
width: 250px; |
position: absolute; |
height: 27px; |
padding-top: 5px |
padding-top: 5px; |
} |
.metadonnees { |
text-align: left |
text-align: left; |
} |
.auteur { |
/trunk/src/org/tela_botanica/del/client/vues/rechercheimages/resultats/images/ImageVue.ui.xml |
---|
20,7 → 20,7 |
<g:HTML ui:field="nomAuteur" styleName="petit {style.auteur}">Auteur</g:HTML> |
<g:HTML ui:field="nomEspece" styleName="{style.espece}"></g:HTML> |
</g:HTMLPanel> |
<g:HTMLPanel styleName="{style.zoneVoter} arrondi-faible"><g:HorizontalPanel ui:field="voter"/></g:HTMLPanel> |
<g:HTMLPanel styleName="{style.zoneVoter} arrondi-faible" ui:field="zoneVoter"><g:HorizontalPanel ui:field="voter"/></g:HTMLPanel> |
</g:HTMLPanel> |
</ui:UiBinder> |