Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 3278 → Rev 3279

/trunk/widget/modules/saisie2/squelettes/saisie.tpl.html
175,7 → 175,7
<div class="col-md-6">
 
<div class="mb-3">
<label for="geolocalisation" class="col-sm-8 obligatoire" title="<?php echo $observateur['courriel-title']; ?>">
<label for="geolocalisation" class="col-sm-8 obligatoire">
<i class="fa fa-street-view" aria-hidden="true"></i>
<?php echo $observation['geolocalisation']; ?>
</label>
185,10 → 185,10
<input type="hidden" id="commune-nom" name="commune-nom" value="" style="display:none">
<input type="hidden" id="latitude" name="latitude" value="" style="display:none">
<input type="hidden" id="longitude" name="longitude" value="" style="display:none">
<input type="hidden" id="altitude" name="altitude" value="" style="display:none">
<input type="hidden" id="commune-insee" name="commune-insee" value="" style="display:none">
<input type="hidden" id="altitude" name="altitude" value="" style="display:none">
</div>
<div id="geoloc" class="col-sm-8">
<div id="geoloc" class="col-sm-8" title="<?php echo $observation['geoloc-title']; ?>">
<tb-geolocation-element
id="tb-geolocation"
layer='osm'
209,21 → 209,21
</div>
 
<div class="control-group">
<label for="lieudit" class="col-sm-8" title="">
<label for="lieudit" class="col-sm-8">
<i class="fa fa-map-signs" aria-hidden="true"></i>
<?php echo $observation['lieudit']; ?>
</label>
<div class="col-sm-8 mb-3">
<input type="text" id="lieudit" name="lieudit" class="form-control">
<input type="text" id="lieudit" name="lieudit" class="form-control" title="<?php echo $observation['lieudit-title']; ?>">
</div>
</div>
<div class="control-group">
<label for="station" class="col-sm-8" title="">
<label for="station" class="col-sm-8">
<i class="fa fa-map-marker" aria-hidden="true"></i>
<?php echo $observation['station']; ?>
</label>
<div class="col-sm-8 mb-3">
<input type="text" id="station" name="station" class="form-control">
<input type="text" id="station" name="station" class="form-control" title="<?php echo $observation['station-title']; ?>">
</div>
</div>
 
232,11 → 232,11
<div class="col-md-6">
 
<div class="control-group">
<label for="date_releve" class="col-sm-8 obligatoire" title="">
<label for="date_releve" class="col-sm-8 obligatoire" title="<?php echo $observation['date-title']; ?>">
<i class="fa fa-calendar" aria-hidden="true"></i>
<?php echo $observation['date']; ?>
</label>
<div class="col-sm-8 mb-3">
<div class="col-sm-8 mb-3" title="<?php echo $observation['date-title']; ?>">
<input type="date" id="date_releve" name="date_releve" class="form-control" max="<?php echo date('Y-m-d', time()); ?>" placeholder="jj/mm/aaaa" title="jj/mm/aaaa" required>
</div>
</div>
243,12 → 243,12
 
<?php if( ( $widget['type_especes'] === 'referentiel' || empty( $widget['type_especes'] ) ) && empty( $widget['referentiel'] ) ) : ?>
<div class="control-group">
<label for="referentiel" class="col-sm-8 obligatoire" title="">
<label for="referentiel" class="col-sm-8 obligatoire">
<i class="fa fa-book" aria-hidden="true"></i>
<?php echo $observation['referentiel']; ?>
</label>
<div class="col-sm-8 mb-3">
<select id="referentiel" class="form-control custom-select" >
<select id="referentiel" class="form-control custom-select" title="<?php echo $observation['referentiel-title']; ?>">
<option class="choisir" value="" selected hidden><?php echo $general['choisir']; ?></option>
<option value="bdtfxr" selected="selected" title="Trachéophytes de France métropolitaine">Métropole (index réduit)</option>
<option value="bdtfx" title="Trachéophytes de France métropolitaine">Métropole (BDTFX)</option>
269,7 → 269,7
 
<div id="bloc-taxon" class="control-group">
<?php $isTaxonListe = ( isset( $widget['especes']['taxons'] ) && count( (array) $widget['especes']['taxons'] ) > 0 ) ;?>
<label for="<?php echo ( !$isTaxonListe ) ? 'taxon' : 'taxon-liste';?>" class="col-sm-8" title="">
<label for="<?php echo ( !$isTaxonListe ) ? 'taxon' : 'taxon-liste';?>" class="col-sm-8">
<i class="fa fa-leaf" aria-hidden="true"></i>
<?php echo $observation['espece']; ?><?php if ( !empty( $widget['referentiel'] ) ) echo " (" . $widget['referentiel'] . ")"; ?>
</label>
281,7 → 281,7
 
<?php elseif ( isset( $widget['especes']['taxons'] ) && count( (array) $widget['especes']['taxons'] ) > 0 ) : ?>
<?php ksort( $widget['especes']['taxons'] ); ?>
<select id="taxon-liste" name="taxon-liste" class="form-control custom-select taxon-validation" title="<?php echo $observation['taxon-title'];?>">
<select id="taxon-liste" name="taxon-liste" class="form-control custom-select taxon-validation" title="<?php echo $observation['liste-espece-title']; ?>">
<option class="choisir" value="inconnue" selected hidden><?php echo $general['choisir']; ?></option>
<?php foreach ($widget['especes']['taxons'] as $taxon) : ?>
<option
297,7 → 297,7
<?php endforeach; ?>
<option value="autre"><?php echo $observation['autre-espece']; ?></option>
</select>
<span for="taxon-liste" class="error" style="display: none;"><?php echo $observation['taxon-title'];?></span>
<span for="taxon-liste" class="error" style="display: none;"><?php echo $observation['error-taxon'];?></span>
<input id="taxon" name="taxon" class="form-control" type="hidden" />
</div>
</div>
307,23 → 307,23
<?php echo $observation['autre-espece']; ?>
</label>
<div class="col-sm-8 mb-3">
<input id="taxon-autre" name="taxon-autre" class="form-control" type="text">
<input id="taxon-autre" name="taxon-autre" class="form-control" type="text" title="<?php echo $observation['espece-title']; ?>">
</div>
</div>
<?php else : ?>
<input id="taxon" name="taxon" class="form-control taxon-validation" type="text" title="<?php echo $observation['taxon-title'];?>">
<span for="taxon" class="error" style="display: none;"><?php echo $observation['taxon-title'];?></span>
<input id="taxon" name="taxon" class="form-control taxon-validation" type="text" title="<?php echo $observation['espece-title']; ?>">
<span for="taxon" class="error" style="display: none;"><?php echo $observation['error-taxon'];?></span>
</div>
</div>
<?php endif; ?>
 
<div class="control-group">
<label for="certitude" class="col-sm-8 obligatoire" title="">
<label for="certitude" class="col-sm-8 obligatoire">
<i class="fa fa-question" aria-hidden="true"></i>
<?php echo $observation['certitude']; ?>
</label>
<div class="col-sm-8 mb-3">
<select id="certitude" name="certitude" class="form-control custom-select">
<select id="certitude" name="certitude" class="form-control custom-select" title="<?php echo $observation['certitude-title']; ?>">
<option class="aDeterminer" value="à determiner" ><?php echo $observation['certADet']; ?></option>
<option class="douteuse" value="douteuse" ><?php echo $observation['certDout']; ?></option>
<option class="certaine" value="certaine" selected="selected" ><?php echo $observation['certCert']; ?></option>
337,7 → 337,7
</label>
<div class="col-sm-8 mb-3">
<?php if ( 0 < count( (array) $widget['milieux'] ) ) :?>
<select id="milieu" class="form-control custom-select" >
<select id="milieu" class="form-control custom-select" title="<?php echo $observation['liste-milieu-title']; ?>">
<option class="choisir" value="" selected hidden><?php echo $general['choisir']; ?></option>
<?php foreach ( $widget['milieux'] as $milieu ) :?>
<option value="<?php echo $milieu; ?>"><?php echo $milieu; ?></option>
344,17 → 344,17
<?php endforeach; ?>
</select>
<?php else : ?>
<input id="milieu" name="milieu" class="form-control" type="text" placeholder="<?php echo $observation['milieu-ph']; ?>">
<input id="milieu" name="milieu" class="form-control" type="text" placeholder="<?php echo $observation['milieu-ph']; ?>" title="<?php echo $observation['milieu-title']; ?>">
<?php endif; ?>
</div>
</div>
<div class="">
<label for="notes" class="col-sm-8" title="">
<label for="notes" class="col-sm-8">
<i class="fa fa-pen" aria-hidden="true"></i>
<?php echo $observation['notes']; ?>
</label>
<div class="col-sm-8 mb-3">
<textarea id="notes" form="form-observation" class="col-md-12" rows="7" name="notes" placeholder="<?php echo $observation['notes_ph']; ?>"></textarea>
<textarea id="notes" form="form-observation" class="col-md-12" rows="7" name="notes" placeholder="<?php echo $observation['notes_ph']; ?>" title="<?php echo $observation['notes-title']; ?>"></textarea>
</div>
</div>
 
715,7 → 715,6
</div>
</div>
</div>
 
<!-- carto -->
<script type="text/javascript" src="<?php echo $url_base; ?>js/tb-geoloc/tb-geoloc-lib-app.js"></script>
<script type="text/javascript">
727,7 → 726,8
var secVal = location.detail.geometry.coordinates[1],
firstVal = location.detail.geometry.coordinates[0],
latitude = '',
longitude = '';
longitude = '',
nomCommune = ( undefined !== location.detail.inseeData ) ? location.detail.inseeData.nom : location.detail.locality;
 
if ( 'object' === typeof secVal && 'object' === typeof firstVal ) {// rue
latitude = ( ( firstVal[1] + secVal[1] ) / 2 ).toFixed( 6 );
739,9 → 739,9
document.getElementById( 'latitude' ).value = latitude;
document.getElementById( 'longitude' ).value = longitude;
document.getElementById( 'pays' ).value = location.detail.osmCountry;
document.getElementById( 'commune-nom' ).value = location.detail.inseeData.nom;
document.getElementById( 'commune-nom' ).value = nomCommune;
document.getElementById( 'altitude' ).value = location.detail.elevation;
document.getElementById( 'commune-insee' ).value = location.detail.inseeData.code;
document.getElementById( 'altitude' ).value = location.detail.elevation;
});
</script>
 
783,12 → 783,12
// Mot-clé du widget/projet
widget.tagProjet = "WidgetSaisie";
// Mots-clés à ajouter aux images
widget.tagImg = "<?php echo isset($_GET['tag-img']) ? $_GET['tag-img'] : ''; ?>";
widget.separationTagImg = "<?php echo isset($_GET['motcle']) && isset($_GET['tag-img']) ? ',' : ''; ?>";
widget.tagImg = "<?php echo isset($widget['tag-img']) ? $widget['tag-img'] : ''; ?>";
widget.separationTagImg = "<?php echo isset($_GET['motcle']) && isset($widget['tag-img']) ? ',' : ''; ?>";
widget.tagImg = <?php echo isset($_GET['motcle']) ? "'".$_GET['motcle']."' + widget.separationTagImg + widget.tagImg" : 'widget.tagImg'; ?>;
// Mots-clés à ajouter aux observations
widget.tagObs = "<?php echo isset($_GET['tag-obs']) ? $_GET['tag-obs'] : ''; ?>";
widget.separationTagObs = "<?php echo isset($_GET['projet']) && isset($_GET['tag-obs']) ? ',' : ''; ?>";
widget.tagObs = "<?php echo isset($widget['tag-obs']) ? $widget['tag-obs'] : ''; ?>";
widget.separationTagObs = "<?php echo isset($_GET['projet']) && isset($widget['tag-obs']) ? ',' : ''; ?>";
widget.tagObs = <?php echo isset($_GET['projet']) ? "'".$_GET['projet']."' + widget.separationTagObs + widget.tagObs" : 'widget.tagObs'; ?>;
// Précharger le formulaire avec les infos d'une observation
widget.obsId = "<?php echo isset($_GET['id-obs']) ? $_GET['id-obs'] : ''; ?>";
/trunk/widget/modules/saisie2/i18n/fr.ini
53,25 → 53,36
[Observation]
titre = "Observation"
geolocalisation = "Geolocalisation"
geoloc-title = "Renseignez la localisation de votre observation"
alertgk-title = "Information&nbsp;: mauvaise géolocalisation"
alertgk = "Certaines informations de géolocalisation n'ont pas été transmises."
milieu = "Milieu"
milieu-title = "Type d’habitat, par exemple issu des codes Corine ou Catminat"
liste-milieu-title = "Choisir un type d'habitat"
milieu-ph = "bois, champ, falaise, ..."
date = "Date de relevé"
date-title ="Saisir la date de l’observation"
referentiel = "Référentiel"
referentiel-title = "Choisir un référentiel pour la saisie du taxon"
espece = "Espèce"
espece-title = "Saisir le taxon observé, en utilisant l’autocomplétion autant que possible"
liste-espece-title = "Choisir dans la liste le taxon observé, ou choisir \"autre\" et saisir le taxon observé, en utilisant l’autocomplétion autant que possible"
autre-espece = "Autre espèce"
taxon-title = "Une observation doit comporter au moins une image ou un nom d'espèce"
error-taxon = "Une observation doit comporter au moins une image ou un nom d'espèce"
alert-img-tax-title = "Information&nbsp;: Observation incomplète"
alert-img-tax = "Une observation doit comporter au moins un lieu, une date et un auteur, et soit un nom d'espèce, soit une image"
certitude = "Certitude"
certitude-title = "Renseigner à quel point l'identification du taxon est certaine"
certCert = "Certaine"
certDout= "Douteuse"
certADet= "À déterminer"
notes = "Notes"
notes-title = "Ajouter des informations complémentaires à votre observation"
notes-ph = "Vous pouvez éventuellement ajouter des informations complémentaires à votre observation."
lieudit = "Lieu-dit"
lieudit-title = "Toponyme plus précis que la localité"
station = "Station"
station-title = "Lieu précis de l'observation définissant une unité écologique homogène"
 
[Image]
titre = "Image(s) de cette plante"
/trunk/widget/modules/saisie2/i18n/en.ini
51,25 → 51,36
[Observation]
titre = "Observation"
geolocalisation = "Geolocalisation"
geoloc-title = "Fill in the location of your observation"
alertgk-title = "Information&nbsp;: bad geolocation"
alertgk = "Some geolocation information has not been transmitted."
milieu = "Environment"
milieu-title = "Type of habitat, for example from the Corine or Catminat codes"
liste-milieu-title = "Choose a habitat type"
milieu-ph = "wood, field, cliff, ..."
date = "Date"
date-title ="Enter the date of the observation"
referentiel = "Referential"
referentiel-title = "Choose a repository for taxon entry"
espece = "Species"
taxon-title = "An observation must include at least either a species name or an image"
espece-title = "Enter the observed taxon, using autocompletion as much as possible"
liste-espece-title = "Choose from the list the observed taxon, or choose \"other\" and enter the observed taxon, using autocompletion as much as possible"
autre-espece = "Other species"
error-taxon = "An observation must include at least either a species name or an image"
alert-img-tax-title = "Information&nbsp;: Incomplete observation"
alert-img-tax = "An observation must include at least one place, date, and author, and either a species name or an image"
certitude = "Identification"
certitude = "Certainty"
certitude-title = "Fill in how much the taxon's identification is certain"
certCert = "Certain"
certDout = "Dubious"
certADet = "To be identified"
notes = "Notes"
notes-title = "Add additional information to your observation"
notes-ph = "You can optionally add additional information to your observation."
lieudit = "Locality"
lieudit-title = "Toponym more accurate than the locality"
station = "Station"
station-title = "Specific location of the observation defining a homogeneous ecological unit"
 
[Image]
titre = "Picture(s) of this plant"