Subversion Repositories eFlore/Applications.cel

Compare Revisions

No changes between revisions

Ignore whitespace Rev 500 → Rev 501

/trunk/widget/modules/carto/Carto.php
115,7 → 115,7
$taxons = array();
if (is_array($donnees) && count($donnees) > 0) {
foreach ($donnees as $donnee) {
if (!isset($taxons[$donnee->num_taxon])) {
if (!isset($taxons[$donnee->num_taxon]) && $donnee->nom_ret != '') {
$taxon = array();
$taxon['nn'] = $donnee->num_nom_ret;
$taxon['nt'] = $donnee->num_taxon;
233,4 → 233,17
return $sortie;
}
/**
* Afficher message d'avertissement.
*/
public function executerAvertissement() {
$widget = null;
 
// Création des infos du widget
$widget['donnees']['url_base'] = sprintf($this->config['chemins']['baseURLAbsoluDyn'], '');
$widget['squelette'] = 'avertissement';
return $widget;
}
}
/trunk/widget/modules/carto/squelettes/obs_liste.tpl.html
22,4 → 22,5
<? endforeach; ?>
</ol>
<? include(dirname(__FILE__).'/obs_msg_info.tpl.html') ?>
</div>
</div>
/trunk/widget/modules/carto/squelettes/images/information-icone.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
/trunk/widget/modules/carto/squelettes/images/information.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
/trunk/widget/modules/carto/squelettes/images/information.png
New file
Property changes:
Added: svn:mime-type
+image/png
\ No newline at end of property
/trunk/widget/modules/carto/squelettes/carte_defaut.tpl.html
35,6 → 35,7
//<![CDATA[
var pointImageUrl = 'http://chart.apis.google.com/chart?cht=mm&chs=24x32&chco=FFFFFF,008CFF,000000&ext=.png';
var pointsOrigine = null;
var boundsOrigine = null;
var markerClusterer = null;
var map = null;
var nt = '<?=$num_taxon?>';
47,13 → 48,13
var carteCentre = new google.maps.LatLng(46.4, 3.10);
var carteOptions = {
zoom: 6,
center: carteCentre,
mapTypeId: google.maps.MapTypeId.ROADMAP
};
var ctaLayer = null;
 
function refreshMap() {
var points = [];
var bounds = new google.maps.LatLngBounds();
for (var i = 0; i < obs.nombre; ++i) {
var maLatLng = new google.maps.LatLng(obs.points[i].coord_x, obs.points[i].coord_y);
var pointImage = new google.maps.MarkerImage(pointImageUrl, new google.maps.Size(24, 32));
64,6 → 65,8
stationId: obs.points[i].id
});
 
bounds.extend(maLatLng);
google.maps.event.addListener(point, 'click', function() {
afficherMsgChargement();
infoBulle.open(map, this);
73,18 → 76,20
points.push(point);
}
 
if (pointsOrigine == null) {
if (pointsOrigine == null && boundsOrigine == null) {
pointsOrigine = points;
boundsOrigine = bounds;
}
executerMarkerClusterer(points);
executerMarkerClusterer(points, bounds);
}
 
function executerMarkerClusterer(points) {
function executerMarkerClusterer(points, bounds) {
if (markerClusterer) {
markerClusterer.clearMarkers();
}
markerClusterer = new MarkerClusterer(map, points);
map.fitBounds(bounds);
}
 
function afficherMsgChargement() {
124,11 → 129,15
google.maps.event.trigger(map, 'resize');
};
 
function ouvrirPopUp(url, nom) {
window.open(url, nom, 'directories=no, location=no, menubar=no, scrollbars=no, status=no, toolbar=no, width=550,height=600');
};
function filtrerParTaxon(ntAFiltrer) {
$('#taxon-'+nt).removeClass('taxon-actif');
if (nt == ntAFiltrer) {
nt = '*';
executerMarkerClusterer(pointsOrigine);
executerMarkerClusterer(pointsOrigine, boundsOrigine);
} else {
var url = '<?=$url_cel_carto?>/carte-defaut-json/<?=$utilisateur?>/<?=$projet?>/<?=$dept?>/'+ntAFiltrer+'?formatRetour=jsonp&callback=?';
$.getJSON(url, function (observations) {
153,6 → 162,7
// Create the DIV to hold the control and call the HomeControl()
// constructor passing in this DIV.
var panneauDiv = document.getElementById('panneau-lateral');
panneauDiv.index = 0;
map.controls[google.maps.ControlPosition.TOP_LEFT].push(panneauDiv);
161,6 → 171,7
ouverturePanneauDiv.index = 0;
map.controls[google.maps.ControlPosition.TOP_LEFT].push(ouverturePanneauDiv);
 
var ouvertureDiv = document.getElementById('pl-ouverture');
google.maps.event.addDomListener(ouvertureDiv, 'click', afficher);
 
178,13 → 189,17
</head>
 
<body onload="initialize()">
<h1 id="carte-titre">
<img rel="icon" type="image/png" src="http://www.tela-botanica.org/sites/commun/generique/images/favicones/tela_botanica.png" alt="logo Tela Botanica"/>
Observations issues des membres de Tela Botanica
<img src="<?=$url_base?>modules/carto/squelettes/images/information-icone.png" align="right";
alt="Données provenant du carnet en ligne" title="Données provenant du carnet en ligne"
onClick="window.open('./popup.htm', 'InfoDonnees', 'directories=no, location=no, menubar=no, scrollbars=no, status=no, toolbar=no, width=550,height=600')" />
</h1>
<div id="zone-titre">
<h1 id="carte-titre">
Observations issues des membres de <a href="http://www.tela-botanica.org/" onclick="window.open(this.href); arreter(event); return false;">Tela Botanica</a>
</h1>
<div id="zone-info">
<a href="<?=$url_base?>carto?carte=avertissement" onClick="ouvrirPopUp('<?=$url_base?>carto?carte=avertissement', 'Avertissement'); arreter(event); return false;">
<img src="<?=$url_base?>modules/carto/squelettes/images/information.png"
alt="Avertissement" title="Avertissement" />
</a>
</div>
</div>
<div id="panneau-lateral">
<div id="pl-ouverture" title="Ouvrir le panneau latéral"><span>Panneau >></span></div>
<div id="pl-fermeture" title="Fermer le panneau latéral"><span><< Fermer [x]</span></div>
/trunk/widget/modules/carto/squelettes/css/carto.css
13,11 → 13,26
h2 {
font-size:1.4em;
}
a, a:active, a:visited {
border-bottom:1px dotted #666;
color:#CCC;
text-decoration:none;
}
a:active {
outline:none;
}
a:focus {
outline:thin dotted;
}
a:hover {
color:#56B80E;
border-bottom:1px dotted #56B80E;
}
/*+-----------------------------------------------------------------------------------------------------------------+*/
/* Carte */
#carte {
width:100%;
height:100%;
height:95%;
}
.bouton {
background-color:white;
35,11 → 50,34
margin:auto;
}
/*+-----------------------------------------------------------------------------------------------------------------+*/
/* Avertissement */
#zone-avertissement {
background-color:rgba(29,30,32,0.8);
}
#zone-avertissement h1, #zone-avertissement p {
color:#CCCCCC;
}
/*+-----------------------------------------------------------------------------------------------------------------+*/
/* Carte titre */
#zone-titre {
background:url(http://www.tela-botanica.org/sites/commun/generique/images/favicones/tela_botanica.png) no-repeat 8px 8px rgba(29,30,32,0.8);
padding-left:24px;
min-height:30px;
height:5%;
}
#zone-info {
float:right;
text-align:right;
}
#zone-info img {
display:block;
padding:7px;
border:none;
}
#carte-titre {
display:inline-block;
margin:0;
padding:0.2em;
background-color:rgba(29,30,32,0.8);
color:#CCCCCC;
}
/*+-----------------------------------------------------------------------------------------------------------------+*/
55,11 → 93,10
box-shadow:2px 2px 6px #979797;-webkit-box-shadow:2px 2px 6px #979797;-moz-box-shadow:2px 2px 6px #979797;
}
#pl-entete {
height:5%;
height:10%;
min-height:75px;
}
#pl-corps {
position:relative;
top:12px;
height:80%;
overflow:auto;
padding:5px;
92,21 → 129,6
/* Panneau latéral : balises */
#panneau-lateral h2, #panneau-lateral p {
color:#CCCCCC;}
/* Panneau latéral : Liens */
#panneau-lateral a, #panneau-lateral a:active, #panneau-lateral a:visited {
border-bottom:1px solid #333333;
color:#CCCCCC;
text-decoration:none;
}
#panneau-lateral a:active {
outline:none;
}
#panneau-lateral a:focus {
outline:thin dotted;
}
#panneau-lateral a:hover {
color:#56B80E;
}
/*+-----------------------------------------------------------------------------------------------------------------+*/
/* Liste des taxons de la carte */
#taxons {
116,6 → 138,11
color:#56B80E;}
/*+-----------------------------------------------------------------------------------------------------------------+*/
/* Pop-up observations */
#contenu {
overflow:none;
margin:0;
padding:0;
}
#observations {
margin:23px 0 0 0;
padding:5px;
134,19 → 161,13
font-size:10px;
color:#CCC;
}
#observations a, #observations a:active, #observations a:visited {
border-bottom:1px solid #333333;
color:rgba(29,30,32,0.8);
text-decoration:none;
#observations a {
color:#333;
border-bottom:1px dotted #EEE;
}
#observations a:active {
outline:none;
}
#observations a:focus {
outline:thin dotted;
}
#observations a:hover {
color:#56B80E;
border-bottom:1px dotted #56B80E;
}
/*+-----------------------------------------------------------------------------------------------------------------+*/
/* Onglets */
247,8 → 268,10
padding-right:20px;
}
th.headerSortUp {
background:url(../images/trie_croissant.png) no-repeat center right #3399FF;
background:url(../images/trie_croissant.png) no-repeat center right #56B80E;
color:white;
}
th.headerSortDown {
background:url(../images/trie_decroissant.png) no-repeat center right #3399FF;
background:url(../images/trie_decroissant.png) no-repeat center right #56B80E;
color:white;
}
/trunk/widget/modules/carto/squelettes/avertissement.tpl.html
New file
0,0 → 1,33
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Avertissements - CEL widget cartographie</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
<meta http-equiv="Content-style-type" content="text/css" />
<meta http-equiv="Content-script-type" content="text/javascript" />
<meta http-equiv="Content-language" content="fr" />
<meta name="revisit-after" content="15 days" />
<meta name="robots" content="index,follow" />
<meta name="author" content="Delphine CAUQUIL, Jean-Pascal MILCENT" />
<meta name="keywords" content="Avertissement, Tela Botanica, cartographie, CEL" />
<meta name="description" content="Avertissement du widget de cartographie des observations publiques de plantes saisies dans le Carnet en Ligne (CEL)" />
 
<!-- Spécial mobile -->
<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
<!-- Favicones -->
<link rel="icon" type="image/png" href="http://www.tela-botanica.org/sites/commun/generique/images/favicones/tela_botanica.png" />
<link rel="shortcut icon" type="image/x-icon" href="http://www.tela-botanica.org/sites/commun/generique/images/favicones/tela_botanica.ico" />
<!-- CSS -->
<link href="<?=$url_base?>modules/carto/squelettes/css/carto.css" rel="stylesheet" type="text/css" media="screen" />
</head>
<body>
<div id="zone-avertissement">
<h1>Avertissements</h1>
<p></p>
</div>
</body>
</html>