diff --git a/inc/project.php b/inc/project.php index 32be6b6..5cc37f0 100644 --- a/inc/project.php +++ b/inc/project.php @@ -98,6 +98,7 @@ class Project extends PhpObject { } $asProject['geofile'] = Spot::addTimestampToFilePath(self::GEO_FOLDER.$asProject['geofile']); $asProject['codename'] = $sCodeName; + $asProject['timezone_desc'] = Spot::getTimeZoneDesc($asProject['timezone']); } return $bSpecificProj?$asProject:$asProjects; } diff --git a/inc/spot.php b/inc/spot.php index 00c1977..1397e37 100755 --- a/inc/spot.php +++ b/inc/spot.php @@ -414,7 +414,7 @@ class Spot extends Main public function getTile($sMapId, $iX, $iY, $iZ) { - if(isset($_SERVER['HTTP_REFERER']) && $_SERVER['HTTP_REFERER'] == $this->asContext['serv_name']) { + if(isset($_SERVER['HTTP_REFERER']) && $_SERVER['HTTP_REFERER'] == $this->asContext['serv_name'] || Settings::DEBUG) { $asDomains = array(); $sReferer = 'https://spot.lutran.fr'; switch($sMapId) { diff --git a/masks/project.html b/masks/project.html index 5b605f4..41b306f 100755 --- a/masks/project.html +++ b/masks/project.html @@ -68,6 +68,11 @@ function initProject(sProjectCodeName){ self.tmp('first_exec', false); self.vars('project', self.vars(['projects', sProjectCodeName])); + //Timezone difference notice + var bSameTZ = (oSpot.consts.site_timezone == oSpot.vars(['project', 'timezone'])); + self.tmp('site_tz_notice', bSameTZ?'':' ('+oSpot.consts.site_timezone_desc+')'); + self.tmp('proj_tz_notice', bSameTZ?'':' ('+self.vars(['project', 'timezone_desc'])+')'); + $.when( //Markers: Spot Messages & Pictures self.get( @@ -235,7 +240,7 @@ function initSpotMessages(aoMessages, aoTracks) { if(oMsg.pics) { var $Pics = $('
').addIcon('fa-message', true).append(asPost.lat_dms+' '+asPost.lon_dms)) - .append($('
').addIcon('fa-time', true).append(sAbsTime)) + .append($('
').addIcon('fa-time', true).append(sAbsTime+self.tmp('site_tz_notice')))
.append(
$('', {'class':'staticmap', title: 'Click pour zoomer', src: getStaticMapUrl(asPost.latitude, asPost.longitude)})
.data('lat', asPost.latitude)
@@ -386,8 +391,8 @@ function getPost(asPost) {
);
break;
case 'picture':
- var $Image = $('
', {'src': asPost.thumb_path/*, 'style':'transform:rotate('+asPost.rotate+'deg);'*/});
- $Body = $('', {href: asPost.pic_path, 'data-lightbox': self.consts.title, 'data-title': 'Photo ajoutée le '+sAbsTime+' et prise le '+asPost.taken_on_formatted+' (heure française)'}).append($Image);
+ var $Image = $('
', {'src': asPost.thumb_path, title: 'Click pour zoomer'/*, 'style':'transform:rotate('+asPost.rotate+'deg);'*/});
+ $Body = $('', {href: asPost.pic_path, 'data-lightbox': self.consts.title, 'data-title': 'Photo ajoutée le '+sAbsTime+' et prise le '+asPost.taken_on_formatted+self.tmp('site_tz_notice')}).append($Image);
break;
case 'post':
$Body = $('