Subversion Repositories eFlore/Applications.coel

Compare Revisions

Ignore whitespace Rev 1946 → Rev 1947

/trunk/widget/modules/carto/squelettes/scripts/carto.js
8,9 → 8,9
attribution: 'Map data &copy;'+new Date().getFullYear()+' <a href="http://maps.google.com">Google</a>',
maxZoom: 18
},
coucheOSM = new L.TileLayer("http://osm.tela-botanica.org/tuiles/osmfr/{z}/{x}/{y}.png",
coucheOSM = new L.TileLayer("https://osm.tela-botanica.org/tuiles/osmfr/{z}/{x}/{y}.png",
optionsCoucheOSM),
coucheSatellite = new L.TileLayer("http://mt1.google.com/vt/lyrs=y@218131653&hl=fr&src=app&x={x}&y={y}&z={z}",
coucheSatellite = new L.TileLayer("https://mt1.google.com/vt/lyrs=y@218131653&hl=fr&src=app&x={x}&y={y}&z={z}",
optionsCoucheGoogle),
optionsCarte = {
center : new L.LatLng(46, 2),
/trunk/widget/modules/carto/squelettes/carto.tpl.html
11,7 → 11,7
<meta property="og:title" content="CoEL - Cartographie des herbiers" />
<meta property="og:site_name" content="Tela Botanica" />
<meta property="og:description" content="Représentation cartographique des herbiers recensés dans Collections en Ligne" />
<meta property="og:image" content="http://resources.tela-botanica.org/tb/img/256x256/carre_englobant.png" />
<meta property="og:image" content="https://resources.tela-botanica.org/tb/img/256x256/carre_englobant.png" />
<meta property="og:image:type" content="image/png" />
<meta property="og:image:width" content="256" />
<meta property="og:image:height" content="256" />
19,20 → 19,17
 
<title>Localisation des collections d'herbiers</title>
<link rel="icon" type="image/png" href="http://resources.tela-botanica.org/tb/img/16x16/favicon.png" />
<link rel="shortcut icon" type="image/x-icon" href="http://resources.tela-botanica.org/tb/img/16x16/favicon.ico" />
<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.css" />
<!--[if lte IE 8]>
<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7/leaflet.ie.css" />
<![endif]-->
<link rel="icon" type="image/png" href="https://resources.tela-botanica.org/tb/img/16x16/favicon.png" />
<link rel="shortcut icon" type="image/x-icon" href="https://resources.tela-botanica.org/tb/img/16x16/favicon.ico" />
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css" />
<link rel="stylesheet" href="<?=$url_base?>modules/carto/squelettes/css/carto.css" />
<link rel="stylesheet" href="<?=$url_base?>modules/carto/squelettes/css/MarkerCluster.css" />
<link rel="stylesheet" href="<?=$url_base?>modules/carto/squelettes/css/MarkerCluster.Default.css" />
<script type="text/javascript" src="http://cdn.leafletjs.com/leaflet-0.7/leaflet.js"></script>
<script type="text/javascript" src="http://resources.tela-botanica.org/jquery/1.6.4/jquery-1.6.4.min.js"></script>
<script type="text/javascript" src="http://resources.tela-botanica.org/jquery/jquery-ui/1.8.18/js/jquery-ui-1.8.18.custom.min.js"></script>
<script type="text/javascript" src="http://resources.tela-botanica.org/jquery/jquery-tmpl/jquery.tmpl.min.js"></script>
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.js"></script>
<script type="text/javascript" src="https://resources.tela-botanica.org/jquery/1.6.4/jquery-1.6.4.min.js"></script>
<script type="text/javascript" src="https://resources.tela-botanica.org/jquery/jquery-ui/1.8.18/js/jquery-ui-1.8.18.custom.min.js"></script>
<script type="text/javascript" src="https://resources.tela-botanica.org/jquery/jquery-tmpl/jquery.tmpl.min.js"></script>
<script src="<?=$url_base?>modules/carto/squelettes/scripts/leaflet.markercluster.js"></script>
<script type="text/javascript">
//<![CDATA[
56,7 → 53,7
</head>
 
<body>
<div id="logo-tb"><img src="http://resources.tela-botanica.org/tb/img/128x128/logo_carre_officiel.png" /></div>
<div id="logo-tb"><img src="https://resources.tela-botanica.org/tb/img/128x128/logo_carre_officiel.png" /></div>
<div id="map"></div>
<!-- Squelette du contenu de la popup -->
/trunk/widget/Widget.php
34,8 → 34,9
public function __construct($fichier_ini = 'widget.ini.php') {
// Chargement de la configuration
self::$config = parse_ini_file($fichier_ini, TRUE);
// Paramêtres de config dynamiques
self::$config['chemins']['baseURLAbsoluDyn'] = 'http://'.$_SERVER['SERVER_NAME'].self::$config['chemins']['baseURL'].'%s';
// Paramètres de config dynamiques
$protocole = (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on')) ? 'https://' : 'http://';
self::$config['chemins']['baseURLAbsoluDyn'] = $protocole . $_SERVER['SERVER_NAME'].self::$config['chemins']['baseURL'].'%s';
// Gestion de la mémoire maximum allouée aux services
ini_set('memory_limit', self::$config['parametres']['limiteMemoire']);
/trunk/widget/widget.ini.defaut.php
25,5 → 25,5
; URL de base absolue des Widgets du CEL construit dynamiquement dans le fichier WidgetCommun.php
baseURLAbsoluDyn = ""
; URL des services web sous forme de template | utiliser avec sprintf
baseURLServicesTpl = "http://api.tela-botanica.org/services/coel/"
baseURLServicesTpl = "https://api.tela-botanica.org/services/coel/"
;*/?>