franzz/spot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add Local Time Zone

Browse Source
This commit is contained in:
Franzz
2021-05-24 01:05:36 +02:00
parent a1ef4d1cc8
commit 209a1b6731
19 changed files with 1815 additions and 1679 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
masks/project.html
View File

@@ -204,21 +204,13 @@ function initProject(sProjectCodeName, oFocusPost){
//Page Title
self.setPageTitle(oSpot.vars(['project', 'name']));
//Timezone difference notice
var bSameTime = (
(new Date()).toLocaleString([], {timeZone: oSpot.consts.timezone}) ==
(new Date()).toLocaleString([], {timeZone: oSpot.vars(['project', 'timezone'])})
);
self.tmp('site_tz_notice', bSameTime?'':getTimeZoneDesc(oSpot.consts.timezone));
self.tmp('proj_tz_notice', bSameTime?'':getTimeZoneDesc(self.vars(['project', 'timezone'])));
//Load Track & Markers
$.when(
//Markers: Spot Messages & Medias
self.get(
'markers',
function(){},
{project_id: self.vars(['project', 'id'])},
{id_project: self.vars(['project', 'id'])},
function(e){console.log(e);}
),
//Project Geojson: Hike track
@@ -230,7 +222,7 @@ function initProject(sProjectCodeName, oFocusPost){
).done(function(aoMessages, aoTracks) {
var asData = aoMessages[0]['data'];
setMapLayers(asData['maps']);
initSpotMessages(asData['messages'] || [], aoTracks[0], aoMessages[0]['desc']=='No Data');
initSpotMessages(asData['messages'] || [], aoTracks[0], asData['empty_project']);
updateSettingsPanel(asData['last_update']);
});
@@ -268,7 +260,7 @@ function initPosts() {
updateFeed(true);
},
{
project_id: self.vars(['project', 'id']),
id_project: self.vars(['project', 'id']),
name: $('#name').val(),
content: $('#post').val()
}
@@ -590,10 +582,10 @@ function initSpotMessages(aoMessages, aoTracks, bNoFeed) {
.append(oMsg.formatted_time+(self.vars(['project', 'mode'])==self.consts.modes.blog?' ('+oMsg.relative_time+')':'')));
//Tooltip: Time Zone
if(self.tmp('site_tz_notice')!='') {
if(oMsg.formatted_time_local != oMsg.formatted_time) {
$Tooltip.append($('<p>', {'class':'timezone'})
.addIcon('fa-timezone fa-fw fa-lg')
.append(self.tmp('site_tz_notice')));
.append(oSpot.lang('local_time', oMsg.formatted_time_local)));
}
//Tooltip: Medias
@@ -743,8 +735,8 @@ function updateFeed(bFirstChunk, bDiscrete, fCallback) {
self.tmp('updatable', true);
}, {
'project_id': self.vars(['project', 'id']),
'chunk': self.tmp('news_chunk')
id_project: self.vars(['project', 'id']),
chunk: self.tmp('news_chunk')
}
);
}
@@ -789,6 +781,8 @@ function getPost(asPost) {
var sRelTime = (asPost.relative_time!='')?((self.vars('project') && self.vars(['project', 'mode'])==self.consts.modes.histo)?asPost.formatted_time.substr(0, 10):asPost.relative_time):'';
var sAbsTime = asPost.formatted_time;
var sAbsTimeLocal = asPost.formatted_time_local;
var bTimeDiff = (sAbsTime && sAbsTimeLocal != sAbsTime);
var sType = asPost.subtype || asPost.type;
var $Body = {};
@@ -800,7 +794,7 @@ function getPost(asPost) {
.data('clicked', false)
.append($('<p>').addIcon('fa-coords', true).append(getGoogleMapsLink(asPost)))
.append($('<p>').addIcon('fa-time', true).append(sAbsTime))
.append((self.tmp('site_tz_notice')!='')?$('<p>').addIcon('fa-timezone', true).append(self.tmp('site_tz_notice')):'')
.append(bTimeDiff?$('<p>').addIcon('fa-timezone', true).append(oSpot.lang('local_time', sAbsTimeLocal)):'')
.append($('<a>', {'class':'drill'})
.append($('<img>', {'class':'staticmap', title: oSpot.lang('click_zoom'), src: getWmtsApiUrl('static', asPost.latitude, asPost.longitude, 13)}))
.append($('<span>', {'class': 'drill-icon fa-stack'})
@@ -868,7 +862,7 @@ function getPost(asPost) {
.addIcon('fa-'+sType)
.append(asPost.displayed_id?' '+oSpot.lang('counter', asPost.displayed_id):'')
)
.append($('<span>', {'class':'time'}).hoverSwap(sRelTime, sAbsTime+((self.tmp('site_tz_notice')!='')?' ('+self.tmp('site_tz_notice')+')':''))))
.append($('<span>', {'class':'time', title:bTimeDiff?oSpot.lang('local_time', sAbsTimeLocal):''}).hoverSwap(sRelTime, bTimeDiff?oSpot.lang('your_time', sAbsTime):sAbsTime)))
.append($('<div>', {'class':'body'}).append($Body));
if(bLink) {
@@ -894,22 +888,19 @@ function getWmtsApiUrl(sMapId, iLat, iLng, iZoom) {
}
function getMediaLink(asData, sType) {
var bTimeDiff = (asData.posted_on_formatted && asData.posted_on_formatted_local != asData.posted_on_formatted);
var $PostedOn =
$('<span>', {'class': 'lb-caption-line', title: oSpot.lang(asData.subtype)+' '+oSpot.lang('add_on', asData.posted_on_formatted)})
$('<span>', {'class': 'lb-caption-line', title: bTimeDiff?oSpot.lang('local_time', asData.posted_on_formatted_local):''})
.addIcon('fa-upload fa-lg fa-fw', true)
.append(asData.posted_on_formatted);
var $TakenOn = (asData.taken_on == '0000-00-00 00:00:00')?'':
$('<span>', {'class': 'lb-caption-line', title: oSpot.lang(asData.subtype)+' '+oSpot.lang(asData.subtype+'_taken', asData.taken_on_formatted)})
$('<span>', {'class': 'lb-caption-line', title: bTimeDiff?oSpot.lang('local_time', asData.taken_on_formatted_local):''})
.addIcon('fa-'+asData.subtype+'-shot fa-lg fa-fw', true)
.append(asData.taken_on_formatted);
var $Timezone = (self.tmp('site_tz_notice') == '')?'':
$('<span>', {'class': 'lb-caption-line'})
.addIcon('fa-timezone fa-lg fa-fw', true)
.append(self.tmp('site_tz_notice'));
var $Title = $('<div>').append(sType=='marker'?$TakenOn:$PostedOn).append(sType=='marker'?$PostedOn:$TakenOn).append($Timezone);
var $Title = $('<div>').append(sType=='marker'?$TakenOn:$PostedOn).append(sType=='marker'?$PostedOn:$TakenOn);
var $Link =
$('<a>', {
'class': 'drill',