Subversion Repositories eFlore/Applications.cel

Compare Revisions

No changes between revisions

Ignore whitespace Rev 3198 → Rev 3199

/branches/v2.28-semoir/widget/modules/cartopoint/CartoPoint.php
150,7 → 150,7
$widget['donnees']['groupeImageUrlTpl'] = $this->config['carto']['groupeImageUrlTpl'];
$widget['donnees']['url_widget_saisie'] = $this->config['urls']['widgetSaisie'];
$widget['donnees']['prod'] = ($this->config['parametres']['modeServeur'] == "prod");
$widget['donnees']['cleGoogleMaps'] = $this->config['api']['cleGoogleMaps'];
$widget['donnees']['cleGoogleMaps'] = $this->config['api']['cleGoogleMapsCartoPoint'];
$widget['donnees']['baseURLServicesAnnuaireTpl'] = $this->config['chemins']['baseURLServicesAnnuaireTpl'];
$widget['donnees']['baseURLServicesCelTpl'] = $this->config['chemins']['baseURLServicesCelTpl'];
 
/branches/v2.28-semoir/widget/modules/carto/Carto.php
109,7 → 109,7
$widget['donnees']['photos'] = $this->photos;
$widget['donnees']['url_limites_communales'] = $this->obtenirUrlsLimitesCommunales();
$widget['donnees']['prod'] = ($this->config['parametres']['modeServeur'] == "prod");
$widget['donnees']['cleGoogleMaps'] = $this->config['api']['cleGoogleMaps'];
$widget['donnees']['cleGoogleMaps'] = $this->config['api']['cleGoogleMapsCarto'];
$widget['squelette'] = 'carte_defaut';
200,4 → 200,4
return $widget;
}
}
?>
?>
/branches/v2.28-semoir/widget/modules/saisie/Saisie.php
158,7 → 158,7
 
$widget['donnees']['prod'] = ($this->config['parametres']['modeServeur'] == "prod");
 
$widget['donnees']['cleGoogleMaps'] = $this->config['api']['cleGoogleMaps'];
$widget['donnees']['cleGoogleMaps'] = $this->config['api']['cleGoogleMapsSaisie'];
$projetsAutorises = $this->transformerEnTableau($this->config['projets']['autorises']);
 
/branches/v2.28-semoir/widget/modules/saisie
Property changes:
Modified: svn:mergeinfo
Merged /trunk/widget/modules/saisie:r3198
/branches/v2.28-semoir/widget/widget.ini.defaut.php
58,7 → 58,10
administrateurs = aurelien@tela-botanica.org,david.delon@clapas.net,jpm@tela-botanica.org,marie@tela-botanica.org
 
[api]
; laisser vide en prod ! (2017-04-05)
; différentes clés API Google Maps pour savoir qui consomme quoi (c'est cher)
cleGoogleMaps = ""
cleGoogleMapsCarto = ""
cleGoogleMapsCartoPoint = ""
cleGoogleMapsSaisie = ""
 
;*/?>
;*/?>
/branches/v2.28-semoir/widget
Property changes:
Modified: svn:mergeinfo
Merged /trunk/widget:r3198
/branches/v2.28-semoir/.
Property changes:
Modified: svn:mergeinfo
Merged /trunk:r3198