Tweak marker popup look
This commit is contained in:
Bartek Fabiszewski
parent
53043c0057
commit
60c38997d1
17
api_gmaps.js
17
api_gmaps.js
@ -125,22 +125,7 @@ function setMarker(p,i,posLen) {
|
||||
else if (i==posLen-1) { marker.setIcon('//maps.google.com/mapfiles/markerB.png') }
|
||||
else { marker.setIcon('//maps.gstatic.com/mapfiles/ridefinder-images/mm_20_gray.png') }
|
||||
// popup
|
||||
var content = '<div id="popup">'+
|
||||
'<div id="pheader">'+lang['user']+': '+p.username.toUpperCase()+'<br />'+lang['track']+': '+p.trackname.toUpperCase()+
|
||||
'</div>'+
|
||||
'<div id="pbody">'+
|
||||
((p.comments != null)?'<div id="pcomments">'+p.comments+'</div>':'')+
|
||||
'<div id="pleft"><b>'+lang['time']+':</b> '+p.dateoccured+'<br />'+
|
||||
((p.speed != null)?'<b>'+lang['speed']+':</b> '+(p.speed.toKmH()*factor_kmh)+' '+unit_kmh+'<br />':'')+
|
||||
((p.altitude != null)?'<b>'+lang['altitude']+':</b> '+(p.altitude*factor_m).toFixed()+' '+unit_m+'<br />':'')+
|
||||
((p.accuracy != null)?'<b>'+lang['accuracy']+':</b> '+(p.accuracy*factor_m).toFixed()+' '+unit_m+'<br />':'')+
|
||||
'</div>'+
|
||||
((latest==0)?
|
||||
('<div id="pright"><b>'+lang['ttime']+':</b> '+p.totalSeconds.toHMS()+'<br />'+
|
||||
'<b>'+lang['aspeed']+':</b> '+((p.totalSeconds>0)?((p.totalMeters/p.totalSeconds).toKmH()*factor_kmh).toFixed():0)+' '+unit_kmh+'<br />'+
|
||||
'<b>'+lang['tdistance']+':</b> '+(p.totalMeters.toKm()*factor_km).toFixed(2)+' '+unit_km+'<br />'+'</div>'):'')+
|
||||
'<div id="pfooter">'+lang['point']+' '+(i+1)+' '+lang['of']+' '+(posLen)+'</div>'+
|
||||
'</div></div>';
|
||||
var content = getPopupHtml(p,i,posLen);
|
||||
popup = new google.maps.InfoWindow();
|
||||
popup.listener = google.maps.event.addListener(marker, 'click', (function(marker,content) {
|
||||
return function() {
|
||||
|
||||
@ -158,24 +158,8 @@ function setMarker(p,i,posLen) {
|
||||
var marker = new OpenLayers.Marker(lonLat,icon);
|
||||
layerMarkers.addMarker(marker);
|
||||
|
||||
|
||||
// popup
|
||||
var content = '<div id="popup">'+
|
||||
'<div id="pheader">'+lang['user']+': '+p.username.toUpperCase()+'<br />'+lang['track']+': '+p.trackname.toUpperCase()+
|
||||
'</div>'+
|
||||
'<div id="pbody">'+
|
||||
((p.comments != null)?'<div id="pcomments">'+p.comments+'</div>':'')+
|
||||
'<div id="pleft"><b>'+lang['time']+':</b> '+p.dateoccured+'<br />'+
|
||||
((p.speed != null)?'<b>'+lang['speed']+':</b> '+(p.speed.toKmH()*factor_kmh)+' '+unit_kmh+'<br />':'')+
|
||||
((p.altitude != null)?'<b>'+lang['altitude']+':</b> '+(p.altitude*factor_m).toFixed()+' '+unit_m+'<br />':'')+
|
||||
((p.accuracy != null)?'<b>'+lang['accuracy']+':</b> '+(p.accuracy*factor_m).toFixed()+' '+unit_m+'<br />':'')+
|
||||
'</div>'+
|
||||
((latest==0)?
|
||||
('<div id="pright"><b>'+lang['ttime']+':</b> '+p.totalSeconds.toHMS()+'<br />'+
|
||||
'<b>'+lang['aspeed']+':</b> '+((p.totalSeconds>0)?((p.totalMeters/p.totalSeconds).toKmH()*factor_kmh).toFixed():0)+' '+unit_kmh+'<br />'+
|
||||
'<b>'+lang['tdistance']+':</b> '+(p.totalMeters.toKm()*factor_km).toFixed(2)+' '+unit_km+'<br />'+'</div>'):'')+
|
||||
'<div id="pfooter">'+lang['point']+' '+(i+1)+' '+lang['of']+' '+(posLen)+'</div>'+
|
||||
'</div></div>';
|
||||
var content = getPopupHtml(p,i,posLen);
|
||||
marker.events.register("mousedown", marker, (function() {
|
||||
return function() {
|
||||
// remove popups
|
||||
@ -185,7 +169,7 @@ function setMarker(p,i,posLen) {
|
||||
};
|
||||
}
|
||||
// show popup
|
||||
var popup = new OpenLayers.Popup.FramedCloud("id "+(i+1),lonLat,null,content,icon,true);
|
||||
var popup = new OpenLayers.Popup.FramedCloud("popup_"+(i+1),lonLat,null,content,icon,true);
|
||||
map.addPopup(popup);
|
||||
if (document.getElementById('bottom').style.display=='block') {
|
||||
chart.setSelection([{row:i,column:null}]);
|
||||
|
||||
@ -52,6 +52,7 @@ if ($userId) {
|
||||
$xml->writeElement("bearing", $position->bearing);
|
||||
$xml->writeElement("dateoccured", $position->time);
|
||||
$xml->writeElement("accuracy", $position->accuracy);
|
||||
$xml->writeElement("provider", $position->provider);
|
||||
$xml->writeElement("comments", $position->comment);
|
||||
$xml->writeElement("username", $position->userLogin);
|
||||
$xml->writeElement("trackid", $position->trackId);
|
||||
|
||||
1
images/accuracy_dark.svg
Normal file
1
images/accuracy_dark.svg
Normal file
@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M6 12c0 2.206 1.794 4 4 4 1.761 0 3.242-1.151 3.775-2.734l2.224-1.291.001.025c0 3.314-2.686 6-6 6s-6-2.686-6-6 2.686-6 6-6c1.084 0 2.098.292 2.975.794l-2.21 1.283c-.248-.048-.503-.077-.765-.077-2.206 0-4 1.794-4 4zm4-2c-1.105 0-2 .896-2 2s.895 2 2 2 2-.896 2-2l-.002-.015 3.36-1.95c.976-.565 2.704-.336 3.711.159l4.931-2.863-3.158-1.569.169-3.632-4.945 2.87c-.07 1.121-.734 2.736-1.705 3.301l-3.383 1.964c-.29-.163-.621-.265-.978-.265zm7.995 1.911l.005.089c0 4.411-3.589 8-8 8s-8-3.589-8-8 3.589-8 8-8c1.475 0 2.853.408 4.041 1.107.334-.586.428-1.544.146-2.18-1.275-.589-2.69-.927-4.187-.927-5.523 0-10 4.477-10 10s4.477 10 10 10c5.233 0 9.521-4.021 9.957-9.142-.301-.483-1.066-1.061-1.962-.947z"/></svg>
|
||||
|
After Width: | Height: | Size: 796 B |
1
images/altitude_dark.svg
Normal file
1
images/altitude_dark.svg
Normal file
@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M21.103 14.598c-.509-1.504-2.306-2.497-3.806-1.91l-6.235-10.688-11.062 20h20.25c2.067 0 3.75-1.682 3.75-3.75 0-1.774-1.239-3.265-2.897-3.652zm-.853 5.402h-3.26c-1.515-.008-2.505-1.653-1.708-3.009l-3.595-6.334-1.078 1.906-1-1.906-3.026 3.635 4.521-8.344 5.521 9.552c.875-1.781 3.328-.688 2.688 1.104 1.271-.5 2.687.224 2.687 1.646 0 .965-.785 1.75-1.75 1.75zm-2.236-8.579l-2.656-4.625.867-.498 2.656 4.625-.867.498zm3.298 1.579l-2.656-4.625.867-.498 2.656 4.625-.867.498z"/></svg>
|
||||
|
After Width: | Height: | Size: 571 B |
1
images/calendar_dark.svg
Normal file
1
images/calendar_dark.svg
Normal file
@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M24 2v22h-24v-22h3v1c0 1.103.897 2 2 2s2-.897 2-2v-1h10v1c0 1.103.897 2 2 2s2-.897 2-2v-1h3zm-2 6h-20v14h20v-14zm-2-7c0-.552-.447-1-1-1s-1 .448-1 1v2c0 .552.447 1 1 1s1-.448 1-1v-2zm-14 2c0 .552-.447 1-1 1s-1-.448-1-1v-2c0-.552.447-1 1-1s1 .448 1 1v2zm6.687 13.482c0-.802-.418-1.429-1.109-1.695.528-.264.836-.807.836-1.503 0-1.346-1.312-2.149-2.581-2.149-1.477 0-2.591.925-2.659 2.763h1.645c-.014-.761.271-1.315 1.025-1.315.449 0 .933.272.933.869 0 .754-.816.862-1.567.797v1.28c1.067 0 1.704.067 1.704.985 0 .724-.548 1.048-1.091 1.048-.822 0-1.159-.614-1.188-1.452h-1.634c-.032 1.892 1.114 2.89 2.842 2.89 1.543 0 2.844-.943 2.844-2.518zm4.313 2.518v-7.718h-1.392c-.173 1.154-.995 1.491-2.171 1.459v1.346h1.852v4.913h1.711z"/></svg>
|
||||
|
After Width: | Height: | Size: 825 B |
1
images/clock_dark.svg
Normal file
1
images/clock_dark.svg
Normal file
@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12 2c5.514 0 10 4.486 10 10s-4.486 10-10 10-10-4.486-10-10 4.486-10 10-10zm0-2c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm5.848 12.459c.202.038.202.333.001.372-1.907.361-6.045 1.111-6.547 1.111-.719 0-1.301-.582-1.301-1.301 0-.512.77-5.447 1.125-7.445.034-.192.312-.181.343.014l.985 6.238 5.394 1.011z"/></svg>
|
||||
|
After Width: | Height: | Size: 430 B |
4
images/distance.svg
Normal file
4
images/distance.svg
Normal file
@ -0,0 +1,4 @@
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
|
||||
<path fill="white" d="M6 11v-4l-6 5 6 5v-4h12v4l6-5-6-5v4z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 157 B |
4
images/distance_blue.svg
Normal file
4
images/distance_blue.svg
Normal file
@ -0,0 +1,4 @@
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
|
||||
<path fill="#297b9a" d="M24 24v-8h-24v8h24zm-22-6h2v2h1v-2h2v3h1v-3h2v2h1v-2h2v2h1v-2h2v3h1v-3h2v2h1v-2h2v4h-20v-4zm14-10h-8v4l-8-6 8-6v4h8v-4l8 6-8 6v-4z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 253 B |
4
images/gps_dark.svg
Normal file
4
images/gps_dark.svg
Normal file
@ -0,0 +1,4 @@
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
|
||||
<path d="M4.9 4.4L3.1 2.6 5.7 0l1.8 1.8L4.9 4.4zM7.4 6.8L5.6 5l2.6-2.6L10 4.2 7.4 6.8zM9.9 9.3L8.1 7.5l2.6-2.6L12.5 6.7 9.9 9.3zM12.3 14.4c-0.4 0-0.8-0.1-1-0.4l-1.4-1.4c-0.3-0.3-0.4-0.6-0.4-1s0.1-0.8 0.4-1l3.8-3.8c0.3-0.3 0.6-0.4 1-0.4s0.8 0.1 1 0.4L17.1 8.2c0.3 0.3 0.4 0.6 0.4 1 0 0.4-0.1 0.8-0.4 1l-3.8 3.8C13.1 14.3 12.7 14.4 12.3 14.4zM16.4 15.9L14.6 14.1l2.6-2.6 1.8 1.8L16.4 15.9zM10.5 17.4l-4-4c0 0 0.1 0 0.1-0.1 0 0 0.1-0.1 0.3-0.1C7 13.1 7.2 13.1 7.3 13c0.1-0.1 0.3-0.1 0.5-0.1 0.2 0 0.4-0.1 0.6-0.1 0.7 0 1.4 0.3 1.9 0.9 0.6 0.6 0.9 1.2 0.9 1.9 0 0.1 0 0.3 0 0.4 0 0.1-0.1 0.3-0.1 0.4 0 0.1-0.1 0.2-0.1 0.3s-0.1 0.2-0.1 0.3c0 0.1-0.1 0.1-0.1 0.2 0 0.1-0.1 0.1-0.1 0.1L10.5 17.4zM18.9 18.3L17.1 16.5l2.6-2.6 1.8 1.8L18.9 18.3zM8.1 20.5H8l-0.4-0.1c-0.9-0.3-1.8-0.8-2.5-1.5 -0.7-0.7-1.2-1.5-1.5-2.5l-0.1-0.4v-0.1c0-0.1 0-0.2 0.1-0.2 0.1-0.1 0.1-0.1 0.2-0.1l0.8-0.3h0.1c0.1 0 0.2 0 0.2 0.1 0.1 0.1 0.1 0.1 0.1 0.2l0.1 0.4c0.2 0.7 0.6 1.3 1.1 1.8s1.1 0.9 1.8 1.1l0.4 0.1c0.1 0 0.2 0.1 0.2 0.1 0.1 0.1 0.1 0.2 0.1 0.2v0.1l-0.3 0.8c0 0.1-0.1 0.1-0.2 0.2C8.2 20.4 8.2 20.5 8.1 20.5zM8.1 23.8H8L7.6 23.7c-1.2-0.2-2.4-0.7-3.4-1.4S2.3 20.7 1.6 19.7s-1.2-2.2-1.4-3.4l-0.1-0.4v-0.1c0-0.1 0-0.2 0.1-0.3 0.1-0.1 0.1-0.1 0.2-0.1L1.2 15.2h0.1c0.1 0 0.2 0 0.3 0.1s0.1 0.1 0.1 0.2l0.1 0.4c0.2 1 0.6 2 1.2 2.8 0.6 0.9 1.3 1.6 2.2 2.2 0.9 0.6 1.8 1 2.8 1.2L8.4 22.2c0.1 0 0.1 0 0.2 0.1l0.1 0.1c0 0.1 0 0.1 0 0.2v0.1l-0.2 0.8c0 0 0 0.1-0.1 0.1l-0.1 0.1c0 0-0.1 0-0.1 0.1C8.2 23.8 8.2 23.8 8.1 23.8zM21.4 20.8L19.6 19l2.6-2.6L24 18.2 21.4 20.8z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.6 KiB |
4
images/network_dark.svg
Normal file
4
images/network_dark.svg
Normal file
@ -0,0 +1,4 @@
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
|
||||
<path d="M15.929 11.517c.848-1.003 1.354-2.25 1.354-3.601s-.506-2.598-1.354-3.601l1.57-1.439c1.257 1.375 2.022 3.124 2.022 5.04s-.766 3.664-2.022 5.041l-1.57-1.44zm-10.992-10.076l-1.572-1.441c-2.086 2.113-3.365 4.876-3.365 7.916s1.279 5.802 3.364 7.916l1.572-1.441c-1.672-1.747-2.697-4.001-2.697-6.475s1.026-4.728 2.698-6.475zm1.564 11.515l1.57-1.439c-.848-1.003-1.354-2.25-1.354-3.601s.506-2.598 1.354-3.601l-1.57-1.439c-1.257 1.375-2.022 3.124-2.022 5.04s.765 3.664 2.022 5.04zm14.134-12.956l-1.571 1.441c1.672 1.747 2.697 4.001 2.697 6.475s-1.025 4.728-2.697 6.475l1.572 1.441c2.085-2.115 3.364-4.877 3.364-7.916s-1.279-5.803-3.365-7.916zm-12.564 24l2.995-7.788c.148-.386.52-.641.934-.641s.785.255.934.641l2.995 7.788h2.154l-5.083-13.268c1.162-.414 2-1.512 2-2.816 0-1.657-1.344-3-3-3s-3 1.343-3 3c0 1.304.838 2.403 2 2.816l-5.042 13.268h2.113z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 946 B |
1
images/route_dark.svg
Normal file
1
images/route_dark.svg
Normal file
@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M17.492 15.432c-.433 0-.855-.087-1.253-.259l.467-1.082c.25.107.514.162.786.162.222 0 .441-.037.651-.11l.388 1.112c-.334.118-.683.177-1.039.177zm-10.922-.022c-.373 0-.741-.066-1.093-.195l.407-1.105c.221.081.451.122.686.122.26 0 .514-.05.754-.148l.447 1.09c-.382.157-.786.236-1.201.236zm8.67-.783l-1.659-.945.583-1.024 1.66.945-.584 1.024zm-6.455-.02l-.605-1.011 1.639-.981.605 1.011-1.639.981zm3.918-1.408c-.243-.101-.5-.153-.764-.153-.23 0-.457.04-.674.119l-.401-1.108c.346-.125.708-.188 1.075-.188.42 0 .83.082 1.217.244l-.453 1.086zm7.327-.163c-.534 0-.968.433-.968.968 0 .535.434.968.968.968.535 0 .969-.434.969-.968 0-.535-.434-.968-.969-.968zm-16.061 0c-.535 0-.969.433-.969.968 0 .535.434.968.969.968s.969-.434.969-.968c0-.535-.434-.968-.969-.968zm18.031-.832v6.683l-4 2.479v-4.366h-1v4.141l-4-2.885v-3.256h-2v3.255l-4 2.885v-4.14h-1v4.365l-4-2.479v-13.294l4 2.479v3.929h1v-3.927l4-2.886v4.813h2v-4.813l1.577 1.138c-.339-.701-.577-1.518-.577-2.524l.019-.345-2.019-1.456-5.545 4-6.455-4v18l6.455 4 5.545-4 5.545 4 6.455-4v-11.618l-.039.047c-.831.982-1.614 1.918-1.961 3.775zm2-8.403c0-2.099-1.9-3.801-4-3.801s-4 1.702-4 3.801c0 3.121 3.188 3.451 4 8.199.812-4.748 4-5.078 4-8.199zm-5.5.199c0-.829.672-1.5 1.5-1.5s1.5.671 1.5 1.5-.672 1.5-1.5 1.5-1.5-.671-1.5-1.5zm-.548 8c-.212-.992-.547-1.724-.952-2.334v2.334h.952z"/></svg>
|
||||
|
After Width: | Height: | Size: 1.4 KiB |
4
images/speed_blue.svg
Normal file
4
images/speed_blue.svg
Normal file
@ -0,0 +1,4 @@
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
|
||||
<path fill="#297b9a" d="M20.043 11.76c-.141-.427-.314-.844-.516-1.242l-2.454 1.106c.217.393.39.81.517 1.242l2.453-1.106zm-12.572-.904c.271-.354.579-.674.918-.957l-1.89-1.968c-.328.293-.637.614-.919.957l1.891 1.968zm1.714-1.514c.38-.221.781-.396 1.198-.523l-1.033-2.569c-.412.142-.813.317-1.2.524l1.035 2.568zm-2.759 3.615c.121-.435.287-.854.498-1.25l-2.47-1.066c-.196.403-.364.823-.498 1.25l2.47 1.066zm9.434-6.2c-.387-.205-.79-.379-1.2-.519l-1.023 2.573c.418.125.82.299 1.2.519l1.023-2.573zm2.601 2.131c-.281-.342-.59-.664-.918-.957l-1.891 1.968c.34.283.648.604.919.957l1.89-1.968zm-5.791-3.06c-.219-.017-.437-.026-.648-.026-.213 0-.432.009-.65.026v2.784c.216-.025.434-.038.65-.038.215 0 .434.013.648.038v-2.784zm11.33 8.172c0-6.627-5.373-12-12-12s-12 5.373-12 12c0 2.583.816 5.042 2.205 7h19.59c1.389-1.958 2.205-4.417 2.205-7zm-9.08 5c-.007-1.086-.606-2.031-1.496-2.522l-1.402-6.571-1.402 6.571c-.889.491-1.489 1.436-1.496 2.522h-5.821c-.845-1.5-1.303-3.242-1.303-5 0-5.514 4.486-10 10-10s10 4.486 10 10c0 1.758-.458 3.5-1.303 5h-5.777z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.1 KiB |
1
images/speed_dark.svg
Normal file
1
images/speed_dark.svg
Normal file
@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M20.043 11.76c-.141-.427-.314-.844-.516-1.242l-2.454 1.106c.217.393.39.81.517 1.242l2.453-1.106zm-12.572-.904c.271-.354.579-.674.918-.957l-1.89-1.968c-.328.293-.637.614-.919.957l1.891 1.968zm1.714-1.514c.38-.221.781-.396 1.198-.523l-1.033-2.569c-.412.142-.813.317-1.2.524l1.035 2.568zm-2.759 3.615c.121-.435.287-.854.498-1.25l-2.47-1.066c-.196.403-.364.823-.498 1.25l2.47 1.066zm9.434-6.2c-.387-.205-.79-.379-1.2-.519l-1.023 2.573c.418.125.82.299 1.2.519l1.023-2.573zm2.601 2.131c-.281-.342-.59-.664-.918-.957l-1.891 1.968c.34.283.648.604.919.957l1.89-1.968zm-5.791-3.06c-.219-.017-.437-.026-.648-.026-.213 0-.432.009-.65.026v2.784c.216-.025.434-.038.65-.038.215 0 .434.013.648.038v-2.784zm11.33 8.172c0-6.627-5.373-12-12-12s-12 5.373-12 12c0 2.583.816 5.042 2.205 7h19.59c1.389-1.958 2.205-4.417 2.205-7zm-9.08 5c-.007-1.086-.606-2.031-1.496-2.522l-1.402-6.571-1.402 6.571c-.889.491-1.489 1.436-1.496 2.522h-5.821c-.845-1.5-1.303-3.242-1.303-5 0-5.514 4.486-10 10-10s10 4.486 10 10c0 1.758-.458 3.5-1.303 5h-5.777z"/></svg>
|
||||
|
After Width: | Height: | Size: 1.1 KiB |
4
images/stats.svg
Normal file
4
images/stats.svg
Normal file
@ -0,0 +1,4 @@
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
|
||||
<path fill="#bce" d="M7 24h-6v-6h6v6zm8-9h-6v9h6v-9zm8-4h-6v13h6v-13zm0-11l-6 1.221 1.716 1.708-6.85 6.733-3.001-3.002-7.841 7.797 1.41 1.418 6.427-6.39 2.991 2.993 8.28-8.137 1.667 1.66 1.201-6.001z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 298 B |
4
images/stats_blue.svg
Normal file
4
images/stats_blue.svg
Normal file
@ -0,0 +1,4 @@
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
|
||||
<path fill="#297b9a" d="M7 24h-6v-6h6v6zm8-9h-6v9h6v-9zm8-4h-6v13h6v-13zm0-11l-6 1.221 1.716 1.708-6.85 6.733-3.001-3.002-7.841 7.797 1.41 1.418 6.427-6.39 2.991 2.993 8.28-8.137 1.667 1.66 1.201-6.001z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 301 B |
4
images/time.svg
Normal file
4
images/time.svg
Normal file
@ -0,0 +1,4 @@
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
|
||||
<path fill="white" d="M12 0c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm6 14h-7v-8h2v6h5v2z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 216 B |
4
images/time_blue.svg
Normal file
4
images/time_blue.svg
Normal file
@ -0,0 +1,4 @@
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
|
||||
<path fill="#297b9a" d="M11 6v8h7v-2h-5v-6h-2zm10.854 7.683l1.998.159c-.132.854-.351 1.676-.652 2.46l-1.8-.905c.2-.551.353-1.123.454-1.714zm-2.548 7.826l-1.413-1.443c-.486.356-1.006.668-1.555.933l.669 1.899c.821-.377 1.591-.844 2.299-1.389zm1.226-4.309c-.335.546-.719 1.057-1.149 1.528l1.404 1.433c.583-.627 1.099-1.316 1.539-2.058l-1.794-.903zm-20.532-5.2c0 6.627 5.375 12 12.004 12 1.081 0 2.124-.156 3.12-.424l-.665-1.894c-.787.2-1.607.318-2.455.318-5.516 0-10.003-4.486-10.003-10s4.487-10 10.003-10c2.235 0 4.293.744 5.959 1.989l-2.05 2.049 7.015 1.354-1.355-7.013-2.184 2.183c-2.036-1.598-4.595-2.562-7.385-2.562-6.629 0-12.004 5.373-12.004 12zm23.773-2.359h-2.076c.163.661.261 1.344.288 2.047l2.015.161c-.01-.755-.085-1.494-.227-2.208z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 840 B |
4
images/user_dark.svg
Normal file
4
images/user_dark.svg
Normal file
@ -0,0 +1,4 @@
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
|
||||
<path d="M20.822 18.096c-3.439-.794-6.64-1.49-5.09-4.418 4.72-8.912 1.251-13.678-3.732-13.678-5.082 0-8.464 4.949-3.732 13.678 1.597 2.945-1.725 3.641-5.09 4.418-3.073.71-3.188 2.236-3.178 4.904l.004 1h23.99l.004-.969c.012-2.688-.092-4.222-3.176-4.935z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 351 B |
@ -36,7 +36,7 @@ $lang["accuracy"] = "Accuracy";
|
||||
$lang["altitude"] = "Altitude";
|
||||
$lang["ttime"] = "Total time";
|
||||
$lang["aspeed"] = "Average speed";
|
||||
$lang["tdistance"] = "Total dist.";
|
||||
$lang["tdistance"] = "Total distance";
|
||||
$lang["point"] = "Point"; //Point x of y
|
||||
$lang["of"] = "of";
|
||||
$lang["summary"] = "Trip summary";
|
||||
@ -64,5 +64,7 @@ $lang["oldpassword"] = "Old password";
|
||||
$lang["newpassword"] = "New password";
|
||||
$lang["newpasswordrepeat"] = "Repeat new password";
|
||||
$lang["changepass"] = "Change password";
|
||||
$lang["gps"] = "GPS";
|
||||
$lang["network"] = "Network";
|
||||
|
||||
?>
|
||||
|
||||
@ -63,5 +63,7 @@ $lang["oldpassword"] = "Obecne hasło";
|
||||
$lang["newpassword"] = "Nowe hasło";
|
||||
$lang["newpasswordrepeat"] = "Powtórz nowe hasło";
|
||||
$lang["changepass"] = "Zmień hasło";
|
||||
$lang["gps"] = "GPS";
|
||||
$lang["network"] = "Sieć";
|
||||
|
||||
?>
|
||||
|
||||
36
main.css
36
main.css
@ -102,6 +102,13 @@ select {
|
||||
#user, #track, #summary, #export, #other, #units {
|
||||
padding-bottom: 10px;
|
||||
}
|
||||
#summary span {
|
||||
display: block;
|
||||
padding-top: .3em;
|
||||
}
|
||||
#summary span img {
|
||||
margin-bottom: -2px;
|
||||
}
|
||||
#login {
|
||||
font-family: Verdana, sans-serif;
|
||||
position: relative;
|
||||
@ -127,28 +134,33 @@ select {
|
||||
padding-top: 1.2em;
|
||||
color: yellow;
|
||||
}
|
||||
#popup {
|
||||
width:370px;
|
||||
min-height:130px;
|
||||
}
|
||||
#popup * {
|
||||
font-family: Roboto, Verdana, sans-serif;
|
||||
font-size: 12px;
|
||||
}
|
||||
#pheader {
|
||||
font-weight: bolder;
|
||||
padding-bottom: 5px;
|
||||
border-bottom: 1px solid gray;
|
||||
float: left;
|
||||
font-size: .9rem;
|
||||
color: #297b9a;
|
||||
padding-bottom: .5rem;
|
||||
}
|
||||
#pheader div {
|
||||
float: left;
|
||||
padding-right: 2em;
|
||||
}
|
||||
#pbody {
|
||||
clear: both;
|
||||
padding-top: .2rem;
|
||||
border-top: 1px solid #6cdae7;;
|
||||
font-size: .8rem;
|
||||
white-space: nowrap;
|
||||
}
|
||||
#pcomments {
|
||||
clear: both;
|
||||
color: #903;
|
||||
}
|
||||
#pleft,#pright {
|
||||
float:left;
|
||||
#pleft, #pright {
|
||||
display: inline-block;
|
||||
padding-top: 5px;
|
||||
}
|
||||
#pleft {
|
||||
padding-right: 20px;
|
||||
}
|
||||
#pfooter {
|
||||
|
||||
44
main.js
44
main.js
@ -142,6 +142,7 @@ function parsePosition(p) {
|
||||
if (bearing != null) { bearing = parseInt(bearing); }
|
||||
var accuracy = getNode(p,'accuracy'); // may be null
|
||||
if (accuracy != null) { accuracy = parseInt(accuracy); }
|
||||
var provider = getNode(p,'provider'); // may be null
|
||||
var comments = getNode(p,'comments'); // may be null
|
||||
var username = getNode(p,'username');
|
||||
var trackname = getNode(p,'trackname');
|
||||
@ -156,6 +157,7 @@ function parsePosition(p) {
|
||||
'speed': speed,
|
||||
'bearing': bearing,
|
||||
'accuracy': accuracy,
|
||||
'provider': provider,
|
||||
'comments': comments,
|
||||
'username': username,
|
||||
'trackname': trackname,
|
||||
@ -166,6 +168,44 @@ function parsePosition(p) {
|
||||
};
|
||||
}
|
||||
|
||||
function getPopupHtml(p, i, count) {
|
||||
var dateTime = p.dateoccured.split(" ");
|
||||
var date = dateTime[0];
|
||||
var time = dateTime[1];
|
||||
var provider = '';
|
||||
if (p.provider == 'gps') {
|
||||
provider = ' (<img class="icon" alt="'+lang['gps']+'" title="'+lang['gps']+'" src="images/gps_dark.svg" />)';
|
||||
} else if (p.provider == 'network') {
|
||||
provider = ' (<img class="icon" alt="'+lang['network']+'" title="'+lang['network']+'" src="images/network_dark.svg" />)';
|
||||
}
|
||||
popup =
|
||||
'<div id="popup">'+
|
||||
'<div id="pheader">'+
|
||||
'<div><img alt="'+lang['user']+'" title="'+lang['user']+'" src="images/user_dark.svg" /> '+p.username+'</div>'+
|
||||
'<div><img alt="'+lang['track']+'" title="'+lang['track']+'" src="images/route_dark.svg" /> '+p.trackname+'</div>'+
|
||||
'</div>'+
|
||||
'<div id="pbody">'+
|
||||
((p.comments != null)?'<div id="pcomments">'+p.comments+'</div>':'')+
|
||||
'<div id="pleft">'+
|
||||
'<img class="icon" alt="'+lang['time']+'" title="'+lang['time']+'" src="images/calendar_dark.svg" /> '+date+'<br />'+
|
||||
'<img class="icon" alt="'+lang['time']+'" title="'+lang['time']+'" src="images/clock_dark.svg" /> '+time+'<br />'+
|
||||
((p.speed != null)?'<img class="icon" alt="'+lang['speed']+'" title="'+lang['speed']+'" src="images/speed_dark.svg" /> '+(p.speed.toKmH()*factor_kmh)+' '+unit_kmh+'<br />':'')+
|
||||
((p.altitude != null)?'<img class="icon" alt="'+lang['altitude']+'" title="'+lang['altitude']+'" src="images/altitude_dark.svg" /> '+(p.altitude*factor_m).toFixed()+' '+unit_m+'<br />':'')+
|
||||
((p.accuracy != null)?'<img class="icon" alt="'+lang['accuracy']+'" title="'+lang['accuracy']+'" src="images/accuracy_dark.svg" /> '+(p.accuracy*factor_m).toFixed()+' '+unit_m+provider+'<br />':'')+
|
||||
'</div>'+
|
||||
((latest==0)?
|
||||
('<div id="pright">'+
|
||||
'<img class="icon" src="images/stats_blue.svg" style="padding-left: 3em;" /><br />'+
|
||||
'<img class="icon" alt="'+lang['ttime']+'" title="'+lang['ttime']+'" src="images/time_blue.svg" /> '+p.totalSeconds.toHMS()+'<br />'+
|
||||
'<img class="icon" alt="'+lang['aspeed']+'" title="'+lang['aspeed']+'" src="images/speed_blue.svg" /> '+((p.totalSeconds>0)?((p.totalMeters/p.totalSeconds).toKmH()*factor_kmh).toFixed():0)+' '+unit_kmh+'<br />'+
|
||||
'<img class="icon" alt="'+lang['tdistance']+'" title="'+lang['tdistance']+'" src="images/distance_blue.svg" /> '+(p.totalMeters.toKm()*factor_km).toFixed(2)+' '+unit_km+'<br />'+'</div>')
|
||||
:
|
||||
'')+
|
||||
'<div id="pfooter">'+lang['point']+' '+(i + 1)+' '+lang['of']+' '+count+'</div>'+
|
||||
'</div></div>';
|
||||
return popup;
|
||||
}
|
||||
|
||||
function load(type,userid,trackid) {
|
||||
var url = 'download.php?type='+type+'&userid='+userid+'&trackid='+trackid;
|
||||
window.location.assign(url);
|
||||
@ -175,8 +215,8 @@ function updateSummary(l,d,s) {
|
||||
var t = document.getElementById('summary');
|
||||
if (latest==0){
|
||||
t.innerHTML = '<u>'+lang['summary']+'</u><br />'+
|
||||
lang['tdistance']+': '+(d.toKm()*factor_km).toFixed(2)+' '+unit_km+'<br />'+
|
||||
lang['ttime']+': '+s.toHMS();
|
||||
'<span><img class="icon" alt="'+lang['tdistance']+'" title="'+lang['tdistance']+'" src="images/distance.svg" /> '+(d.toKm()*factor_km).toFixed(2)+' '+unit_km+'</span>'+
|
||||
'<span><img class="icon" alt="'+lang['ttime']+'" title="'+lang['ttime']+'" src="images/time.svg" /> '+s.toHMS()+'</span>';
|
||||
}
|
||||
else {
|
||||
t.innerHTML = '<u>'+lang['latest']+':</u><br />'+l;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user