Subversion Repositories eFlore/Applications.cel

Compare Revisions

No changes between revisions

Ignore whitespace Rev 2349 → Rev 2350

/trunk/widget/modules/cartopoint/squelettes/css/carto.css
141,14 → 141,25
 
#zone-chargement-point {
display: none;
background-color: white;
height: 70px;
padding: 10px;
position: fixed;
left: 110px;
top: 10px;
z-index: 3000;
width: 180px;
height: 42px;
padding: 7px;
text-align: center;
width: 230px;
z-index: 3000;
background-color: rgba(255, 255, 255, 0.85);
border: solid #dedede 1px;
border-radius: 4px;
}
#legende-chargement {
padding-top: 7px;
}
#img-chargement {
float: left;
margin-right: 5px;
}
 
#chargement {
margin:25px;
245,7 → 256,12
z-index: 3002;
width: 60px;
}
 
.image-logo {
padding: 5px;
background-color: rgba(255, 255, 255, 0.9);
border: solid #dedede 1px;
border-radius: 4px;
}
#logo a {
border-bottom: none;
}
316,7 → 332,7
padding:0;
margin:0;
position:absolute;
top: 75px;
top: 90px;
left:0;
bottom:0;
width: 83px;
694,4 → 710,9
color: white;
white-space: pre-wrap;
width: 300px;
}
 
/* hack Fancybox pour que le popup soit toujours au dessus */
#fancybox-wrap {
z-index: 3100;
}
/trunk/widget/modules/cartopoint/squelettes/images/logo_telabotanica.jpg
Cannot display: file marked as a binary type.
svn:mime-type = image/jpeg
/trunk/widget/modules/cartopoint/squelettes/images/chargement_transparent.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/widget/modules/cartopoint/squelettes/images/chargement_transparent.gif
New file
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/trunk/widget/modules/cartopoint/squelettes/carte_defaut.tpl.html
91,9 → 91,9
</head>
 
<body>
<div id="zone-chargement-point" class="element-overlay" class="element-overlay">
<img src="<?=$url_base?>modules/cartopoint/squelettes/images/chargement.gif" alt="Chargement en cours..." />
<p> Chargement des points en cours... </p>
<div id="zone-chargement-point" class="element-overlay">
<img id="img-chargement" src="<?=$url_base?>modules/cartopoint/squelettes/images/chargement_transparent.gif" alt="Chargement en cours..." />
<div id="legende-chargement">Chargement des points en cours...</div>
</div>
<?php if($logo != null) { ?>
<div id="logo">
112,7 → 112,7
<a href="http://www.tela-botanica.org/site:accueil"
title="Aller à l'accueil de Tela Botanica"
onclick="ouvrirNouvelleFenetre(this, event)">
<img height="60px" class="image-logo" src="http://www.tela-botanica.org/sites/commun/generique/images/logos/logo_tela.gif" alt="TB" />
<img height="60px" class="image-logo" src="http://resources.tela-botanica.org/tb/img/128x128/logo_carre_officiel.png" alt="TB" />
</a>
</div>
<?php } ?>
/trunk/widget/modules/cartopoint/squelettes/scripts/carto.js
367,16 → 367,22
}
}
 
var listener = null,
var listener = null, // pourquoi on le conserve, et on met 3 trucs différents dedans ?
timer = null;
 
function attribuerListenerCarte() {
listener = google.maps.event.addListener(map, 'bounds_changed', function(){
listener = google.maps.event.addListener(map, 'bounds_changed', function() {
programmerRafraichissementCarte();
});
listener = google.maps.event.addListener(map, 'zoom_changed', function(){
listener = google.maps.event.addListener(map, 'zoom_changed', function() {
programmerRafraichissementCarte();
});
listener = google.maps.event.addListener(map, 'click', function() {
if (infoBulleOuverte) {
infoBulle.close();
surFermetureInfoBulle();
}
});
}
 
function programmerRafraichissementCarte() {
439,7 → 445,7
}
 
function afficherMessageChargementPoints() {
centrerDansLaPage($('#zone-chargement-point'));
//centrerDansLaPage($('#zone-chargement-point'));
$('#zone-chargement-point').css('display','block');
}
 
695,7 → 701,6
filtre = '';
for (i in filtreTableau) {
if (filtreTableau[i] != undefined && filtreTableau[i] != '' && decodeURIComponent(filtreTableau[i]) != '*') {
console.log(i + ' ' + filtreTableau[i]);
filtresGardes.push(i + '=' + filtreTableau[i]);
}
}
798,7 → 803,6
actualiserInfosStation(observations);
creerTitreInfoBulle();
surClicPagePagination(0, null);
console.log(observations);
mettreAJourUrlSaisie(observations);
}
1259,7 → 1263,7
var largeurPanneauLateralFerme = null;
function afficherPanneauLateral() {
// fixer la hauteur
$('#panneau-lateral').height($(window).height() - $('#panneau-lateral').offset().top);
$('#panneau-lateral').height($(window).height() - $('#panneau-lateral').offset().top - 30);
largeurPanneauLateralFerme = $('#panneau-lateral').width();
$('#panneau-lateral').width(300);
$('#pl-contenu').css('display', 'block');