| /branches/v2.25-scarificateur/war/i18n/messages_fr.js |
|---|
| 370,6 → 370,8 |
| "referentiel-bdtfxr" : "Métropole (index réduit)", |
| "referentiel-bdtxa" : "Antilles Françaises (BDTXA)", |
| "referentiel-bdtre" : "Réunion (BDTRE)", |
| "referentiel-aublet" : "Guyane (AUBLET2)", |
| "referentiel-florical" : "Nouvelle-Calédonie (FLORICAL)", |
| "referentiel-isfan" : "Afrique du Nord (ISFAN)", |
| "referentiel-apd" : "Afrique de l'Ouest et du Centre (APD)", |
| "referentiel-lbf" : "Liban (LBF)", |
| /branches/v2.25-scarificateur/war/i18n/messages_en.js |
|---|
| 369,6 → 369,8 |
| "referentiel-bdtfxr" : "Metropolitan France (reduced index)", |
| "referentiel-bdtxa" : "French Antilles (BDTXA)", |
| "referentiel-bdtre" : "Reunion Island (BDTRE)", |
| "referentiel-aublet" : "French Guyana (AUBLET2)", |
| "referentiel-florical" : "New Caledonia (FLORICAL)", |
| "referentiel-isfan" : "North Africa (ISFAN)", |
| "referentiel-apd" : "West and Center Africa (APD)", |
| "referentiel-lbf" : "Lebanon (LBF)", |
| /branches/v2.25-scarificateur/war/config.defaut.js |
|---|
| 12,7 → 12,7 |
| utiliseRedirectionImage:"1", |
| referentielGeo:"WGS84", |
| cleGoogleMaps:"ABQIAAAADBUAHF9l14gI02QVAbUYJBRqPsByHDhzHLE0yoC9hASLZaFmoRT4_9Zkiscf-BaH_gEy7DVHX5BxwQ", |
| referentielsDispos:"bdtfx:v2.00;bdtxa:v1.01;bdtre:v0.01;isfan:v1.00;apd:v3.4.0;lbf:v1.00;autre", |
| referentielsDispos:"bdtfx:v2.00;bdtxa:v1.01;bdtre:v0.01;isfan:v1.00;apd:v3.4.0;lbf:v1.00;florical:v1.00;aublet:v1.00;autre", |
| lienEfloreBaseUrl:"www.tela-botanica.org/eflore", |
| licence:"", |
| tailleMaxUpload:"10000000", |
| /branches/v2.25-scarificateur/widget/modules/saisie/squelettes/defaut/defaut.tpl.html |
|---|
| 392,6 → 392,8 |
| <option value="bdtfx" title="Trachéophytes de France métropolitaine">Métropole (BDTFX)</option> |
| <option value="bdtxa" title="Trachéophytes des Antilles">Antilles françaises (BDTXA)</option> |
| <option value="bdtre" title="Trachéophytes de La Réunion">Réunion (BDTRE)</option> |
| <option value="aublet" title="Guyane">Guyane (AUBLET2)</option> |
| <option value="florical" title="Nouvelle-Calédonie">Nouvelle-Calédonie (FLORICAL)</option> |
| <option value="isfan" title="Afrique du Nord">Afrique du Nord (ISFAN)</option> |
| <option value="apd" title="Afrique de l'Ouest et du Centre">Afrique de l'Ouest et du Centre (APD)</option> |
| <option value="lbf" title="Liban">Liban (LBF)</option> |
| /branches/v2.25-scarificateur/widget/modules/saisie/squelettes/defaut/defaut_en.tpl.html |
|---|
| 394,6 → 394,8 |
| <option value="bdtfxr" selected="selected" title="Tracheophytes of metropolitan France">Metropolitan France (short index)</option> |
| <option value="bdtfx" title="Tracheophytes of metropolitan France">Metropolitan France (BDTFX)</option> |
| <option value="bdtxa" title="Tracheophytes of french Antilles">French Antilles (BDTXA)</option> |
| <option value="aublet" title="Guyane">Guyana (AUBLET2)</option> |
| <option value="florical" title="Nouvelle-Calédonie">New-Caledonia (FLORICAL)</option> |
| <option value="bdtre" title="Tracheophytes of La Réunion">Réunion Island (BDTRE)</option> |
| <option value="isfan" title="Northern Africa">Northern Africa (ISFAN)</option> |
| <option value="apd" title="Western and central Africa">Western and central Africa (APD)</option> |
| /branches/v2.25-scarificateur/widget/modules/saisie/squelettes/defaut/js/WidgetSaisie.js |
|---|
| 342,6 → 342,12 |
| } else if(this.nomSciReferentiel == 'apd') { |
| latLng = new google.maps.LatLng(8.75624, 1.80176);// Afrique de l'Ouest et du Centre |
| zoomDefaut = 4; |
| } else if(this.nomSciReferentiel == 'florical') { |
| latLng = new google.maps.LatLng(-21.40722, 165.4541);// Nouvelle-Calédonie |
| zoomDefaut = 7; |
| } else if(this.nomSciReferentiel == 'aublet') { |
| latLng = new google.maps.LatLng(3.80287, -53.09692);// Guyane |
| zoomDefaut = 7; |
| } else { |
| latLng = new google.maps.LatLng(46.30871, 2.54395);// Centre de la France - @WARNING Prémilhat !! :) |
| zoomDefaut = 5; |
| /branches/v2.25-scarificateur/widget/modules/saisie |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/widget/modules/saisie:r2981-2987 |
| /branches/v2.25-scarificateur/widget |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/widget:r2981-2987 |
| /branches/v2.25-scarificateur/jrest/bibliotheque/GestionObservation.php |
|---|
| 387,7 → 387,9 |
| if (!$parametres['nom_referentiel']) { |
| $parametres['nom_referentiel'] = Cel::$default_referentiel; |
| } |
| $code_referentiel = substr(trim($parametres['nom_referentiel']), 0, 5); |
| $nom_ref_nettoye = trim($parametres['nom_referentiel']); |
| $morceaux = preg_split('/.v?[0-9]/', $nom_ref_nettoye); |
| $code_referentiel = $morceaux[0]; |
| // TODO/XXX: quoi ?! |
| // si on n'a un nom_ret_nn mais pas de nom_sel_nn ni de nom_sel, on efface tout => WTF ? |
| /branches/v2.25-scarificateur/jrest/jrest.ini.php.defaut |
|---|
| 57,6 → 57,8 |
| isfan = "tb_eflore.isfan_v2013" |
| apd = "tb_eflore.apd_v3_4_0" |
| lbf = "tb_eflore.lbf_v1_00" |
| florical = "tb_eflore.florical_v1_00" |
| aublet = "tb_eflore.aublet_v1_00" |
| bdtre = "tb_eflore.bdtre_v0_01" |
| [cel] |
| /branches/v2.25-scarificateur/jrest |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/jrest:r2981-2987 |
| /branches/v2.25-scarificateur/src/org/tela_botanica/client/vues/observation/FormulaireSaisieObservationVue.java |
|---|
| 2196,6 → 2196,16 |
| lon = 35.30; |
| zoom = 7; |
| break; |
| case "florical" : |
| lat = -21.40722; |
| lon = 165.4541; |
| zoom = 7; |
| break; |
| case "aublet" : |
| lat = 3.80287; |
| lon = -53.09692; |
| zoom = 7; |
| break; |
| case "bdtfx" : |
| default: |
| lat = 47.0504; |
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/observation/FormulaireSaisieObservationVue.java:r2981-2987 |
| /branches/v2.25-scarificateur/. |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk:r2981-2987 |