Subversion Repositories eFlore/Applications.del

Compare Revisions

Ignore whitespace Rev 624 → Rev 625

/trunk/src/org/tela_botanica/del/client/vues/plateformedetermination/determinationVue.css
1,7 → 1,65
.zoneDetermination {width:900px}
.zoneVote {margin-left:5px; height:100%}
.zoneBarreRepartition {border:solid 1px #DDD; padding: 15px;}
.zoneDetailImage {/*border:#DDD solid 1px; -moz-border-radius:10px 0 0 10px; padding:20px; height:100%*/}
.zoneImage {margin-bottom:10px; margin-right:15px}
.boutonProposer {float:right; padding:10px; background:url(./img/add.png) no-repeat 5px 12px #DDD; padding-left:20px; cursor:pointer}
.barreRepartition>div:first-child {
width: 300px;
}
 
.barreRepartition>div>div:first-child {
float: left;
font-weight:bold;
}
 
.zoneVote {
margin-left: 5px;
height: 100%;
float: left;
border-left: solid 1px #DDD;
border-right: solid 1px #DDD;
padding-left: 10px;
padding-right:10px;
}
 
.taxonPlusProbable {
float: left;
}
 
.zoneBarreRepartition {
border: solid 1px #DDD;
padding: 15px;
}
 
.zoneDetailImage {
height: 100%;
width: 18%;
float: left;
clear: left;
}
 
.zoneImage {
margin-bottom: 10px;
margin-right: 15px
}
 
.zoneImage div {
clear: left;
padding-top: 5px;
}
 
.zoneImage div img {
float: left;
padding: 0 5px 0 0;
}
 
.boutonProposer {
float: left;
padding: 5px;
cursor: pointer;
background:#8EB533;
border-radius:10px;
border:none;
margin-right:10px;
margin-top:10px;
}
 
.zoneOutils {
width: 15%;
padding-left:10px;
}
/trunk/src/org/tela_botanica/del/client/vues/plateformedetermination/DeterminationVue.ui.xml
6,19 → 6,31
<ui:with field="constants" type="org.tela_botanica.del.client.i18n.Vocabulary"/>
<ui:style src="determinationVue.css" />
<g:HorizontalPanel styleName="{style.zoneDetermination}">
<g:VerticalPanel styleName="{style.zoneDetailImage}">
<g:HTMLPanel>
<g:HTMLPanel>
<g:Label text="Métadonnées" styleName="titre"/>
<g:HTMLPanel ui:field="metadonnees" />
</g:HTMLPanel>
<g:HTMLPanel styleName="{style.zoneDetailImage}">
<g:VerticalPanel ui:field="detailImageObservation" styleName="{style.zoneImage}"/>
<g:VerticalPanel ui:field="formulaireRechercheEflore"/>
</g:VerticalPanel>
<g:VerticalPanel styleName="{style.zoneVote}">
<g:HTMLPanel ui:field="metadonnees"/>
<g:VerticalPanel ui:field="vote" />
<g:VerticalPanel ui:field="barreRepartition" styleName="{style.zoneBarreRepartition} repartitionVoteTaxonPopulaire"/>
<g:HTML><br /></g:HTML>
<g:VerticalPanel ui:field="forum" />
<g:Button text="{constants.proposerSaDetermination}" ui:field="boutonAjoutProposition" styleName="{style.boutonProposer}" />
</g:VerticalPanel>
</g:HorizontalPanel>
<g:VerticalPanel ui:field="voteProtocole" />
</g:HTMLPanel>
<g:HTMLPanel styleName="{style.zoneVote}">
<g:Label styleName="titre">Détermination/Confirmation</g:Label>
<g:HTMLPanel>
<g:Label styleName="gauche">Détermination la plus probable :&nbsp;</g:Label>
<g:HTMLPanel ui:field="barreRepartition" styleName="gauche {style.barreRepartition}"/>
</g:HTMLPanel>
<g:HTMLPanel>
<g:Button text="{constants.proposerSaDetermination}" ui:field="boutonAjoutProposition" styleName="{style.boutonProposer}" />
<g:Button text="Ajouter un commentaire" ui:field="boutonAjoutCommentaire" styleName="{style.boutonProposer}" />
</g:HTMLPanel>
<g:VerticalPanel ui:field="forum" />
</g:HTMLPanel>
<g:HTMLPanel styleName="{style.zoneOutils} gauche">
<g:VerticalPanel ui:field="formulaireRechercheEflore"/>
</g:HTMLPanel>
</g:HTMLPanel>
 
</ui:UiBinder>
/trunk/src/org/tela_botanica/del/client/vues/plateformedetermination/DeterminationPresenteur.java
3,6 → 3,7
import java.util.List;
 
import org.tela_botanica.del.client.cache.CacheClient;
import org.tela_botanica.del.client.composants.metadonnees.MetadonneesEnLigneVue;
import org.tela_botanica.del.client.composants.metadonnees.MetadonneesPresenteur;
import org.tela_botanica.del.client.composants.metadonnees.MetadonneesVue;
import org.tela_botanica.del.client.composants.observations.ObservationImagesPresenteur;
34,16 → 35,17
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.HasWidgets;
import com.google.gwt.user.client.ui.IsWidget;
import com.google.gwt.user.client.ui.Panel;
import com.google.gwt.user.client.ui.VerticalPanel;
 
public class DeterminationPresenteur extends Presenteur {
 
public interface Vue extends IsWidget {
public VerticalPanel getForum();
public VerticalPanel getDetailImageObservation();
public VerticalPanel getFormulaireRechercheEflore();
public VerticalPanel getVote();
public VerticalPanel getBarreRepartition();
public Panel getForum();
public Panel getDetailImageObservation();
public Panel getFormulaireRechercheEflore();
public Panel getVoteProtocole();
public Panel getBarreRepartition();
public Button getBoutonAjoutProposition();
public HasWidgets getMetadonnees();
}
60,9 → 62,9
public void go(HasWidgets composite) {
 
if (CacheClient.getInstance().getImageCourante() != null) {
new MetadonneesPresenteur(new MetadonneesVue(), CacheClient.getInstance().getObservationCourante(), ModeRecherche.MODE_OBSERVATION).go(vue.getMetadonnees());
new MetadonneesPresenteur(new MetadonneesEnLigneVue(), CacheClient.getInstance().getObservationCourante(), ModeRecherche.MODE_OBSERVATION).go(vue.getMetadonnees());
new ObservationImagesPresenteur(new ObservationImagesVue(), CacheClient.getInstance().getObservationCourante()).go(vue.getDetailImageObservation());
new EnsembleVotesPresenteur(new EnsembleVotesVue()).go(vue.getVote());
new EnsembleVotesPresenteur(new EnsembleVotesVue()).go(vue.getVoteProtocole());
}
new ForumPresenteur(new ForumVue()).go(vue.getForum());
new FormulaireRechercheEflorePresenteur().go(vue.getFormulaireRechercheEflore());
106,7 → 108,6
if (fenetreOverlaySimplePresenteur != null && fenetreOverlaySimplePresenteur.fenetreModaleEstOuverte()) {
fenetreOverlaySimplePresenteur.fermerFenetreModale();
}
calculerEtAfficherVoteDeterminationPlusPopulaire();
}
});
}
/trunk/src/org/tela_botanica/del/client/vues/plateformedetermination/DeterminationVue.java
12,7 → 12,7
public class DeterminationVue extends Composite implements DeterminationPresenteur.Vue {
 
@UiField
VerticalPanel forum, detailImageObservation, formulaireRechercheEflore, vote, barreRepartition;
Panel forum, detailImageObservation, formulaireRechercheEflore, voteProtocole, barreRepartition;
@UiField
Button boutonAjoutProposition;
29,23 → 29,23
initWidget(uiBinder.createAndBindUi(this));
}
 
public VerticalPanel getForum() {
public Panel getForum() {
return forum;
}
 
public VerticalPanel getDetailImageObservation() {
public Panel getDetailImageObservation() {
return detailImageObservation;
}
 
public VerticalPanel getFormulaireRechercheEflore() {
public Panel getFormulaireRechercheEflore() {
return formulaireRechercheEflore;
}
 
public VerticalPanel getVote() {
return vote;
public Panel getVoteProtocole() {
return voteProtocole;
}
public VerticalPanel getBarreRepartition() {
public Panel getBarreRepartition() {
return barreRepartition;
}