Add Gravatar profile image

gaia/upload.js

@@ -591,11 +591,11 @@ class Gaia {
       	//Waypoints
       	for(var w in oGPX.waypoints) {
             oGPX.waypoints[w].filename = sFileName;
-            var sWaypointName = oGPX.waypoints[w].name;
+            /*var sWaypointName = oGPX.waypoints[w].name;
             if(sWaypointName.indexOf('Milestone - ') != -1 && sWaypointName.substr(-2) != '00') { //1 milestone every 100 miles
                 this.feedback('info', 'Ignoring milestone waypoint "'+sWaypointName+'"');
             }
-            else this.aoWaypoints.push(oGPX.waypoints[w]);
+            else */this.aoWaypoints.push(oGPX.waypoints[w]);
         }
 
       	//Tracks
@@ -648,11 +648,30 @@ class Gaia {
         let aoTrack =  this.aoTracks[iIndex];
         this.feedback('info', 'Uploading track "'+aoTrack.name+'"');
 
-        //Set color
+        //Set color: Convert Garmin Colors
         let sColor = '#4ABD32';
         switch(aoTrack.color) {
-            case 'DarkBlue':	sColor = '#2D3FC7';	break;
-            case 'Magenta':		sColor = '#B60DC3';	break;
+            case 'DarkBlue':	sColor = '#2D3FC7';	break; //Personal Color
+            case 'Magenta':		sColor = '#B60DC3';	break; //Personal Color
+
+            //Garmin Colors
+            case 'Black':		sColor = '#000000';	break;
+            case 'DarkRed':		sColor = '#F90553';	break;
+            case 'DarkGreen':	sColor = '#009B89';	break;
+            case 'DarkYellow':	sColor = '#DCEE0E';	break;
+            //case 'DarkBlue':	sColor = '#5E23CA';	break;
+            case 'DarkMagenta':	sColor = '#B60DC3';	break;
+            case 'DarkCyan':	sColor = '#00ACF8';	break;
+            case 'LightGray':	sColor = '#A4A4A4';	break;
+            case 'DarkGray':	sColor = '#577B8E';	break;
+            case 'Red':			sColor = '#F90553';	break;
+            case 'Green':		sColor = '#36C03B';	break;
+            case 'Yellow':		sColor = '#FFF011';	break;
+            case 'Blue':		sColor = '#2D3FC7';	break;
+            //case 'Magenta':	sColor = '#B60DC3';	break;
+            case 'Cyan':		sColor = '#00C3DD';	break;
+            case 'White':		sColor = '#FFFFFF';	break;
+            case 'Transparent':	sColor = '#784D3E';	break;
         }
 
         //Add track points

inc/spot.php

@@ -361,7 +361,9 @@ class Spot extends Main
 	private function getPosts()
 	{
 		$asInfo = array(
+			'select'	=> array(Db::getFullColumnName(self::POST_TABLE, '*'), 'MD5(email) AS email_hash'),
 			'from'		=> self::POST_TABLE,
+			'join'		=> array(User::USER_TABLE => Db::getId(User::USER_TABLE)),
 			'constraint'=> array(Db::getId(Project::PROJ_TABLE) => $this->oProject->getProjectId()),
 			'constOpe'	=> array(Db::getId(Project::PROJ_TABLE) => "=")
 		);

masks/project.html

@@ -15,16 +15,16 @@
 						<h1><i class="fa fa-fw push fa-map"></i>[#]lang:maps[#]</h1>
 						<div id="layers"></div>
 					</div>
+					<div class="settings-section">
+						<h1><i class="fa fa-fw push fa-project"></i>[#]lang:projects[#]</h1>
+						<div id="settings-projects"></div>
+					</div>
 					<div class="settings-section newsletter">
 						<h1><i class="fa fa-fw push fa-newsletter"></i>[#]lang:newsletter[#]</h1>
 						<input type="email" name="email" id="email" placeholder="[#]lang:nl_email_placeholder[#]" /><button id="nl_btn"><span><i class="fa"></i></span></button>
 						<div id="settings-feedback" class="feedback"></div>
 						<div id="nl_desc"></div>
 					</div>
-					<div class="settings-section">
-						<h1><i class="fa fa-fw push fa-project"></i>[#]lang:projects[#]</h1>
-						<div id="settings-projects"></div>
-					</div>
 				</div>
 			</div>
 			<div class="settings-footer"><a href="https://git.lutran.fr/franzz/spot" title="[#]lang:credits_git[#]" target="_blank"><i class="fa fa-credits push"></i>[#]lang:credits_project[#]</a> [#]lang:credits_license[#]</div>
@@ -843,9 +843,13 @@ function getPost(asPost) {
 			break;
 		case 'post':
 			bLink = true;
+			var $SigImg = asPost.email_hash?$('<img>', {'src':'https://www.gravatar.com/avatar/'+asPost.email_hash+'?d=404&s=24', 'alt':'--'}):($('<span>').text('-- '));
 			$Body = $('<div>')
-						.append($('<p>', {'class':'message'}).text(asPost.content))
-						.append($('<p>', {'class':'signature'}).text('-- '+asPost.formatted_name));
+				.append($('<p>', {'class':'message'}).text(asPost.content))
+				.append($('<p>', {'class':'signature'})
+					.append($SigImg)
+					.append($('<span>').text(asPost.formatted_name))
+				);
 			break;
 		case 'poster':
 			$Body = $('<p>', {'class':'message'})

style/_mask_project.scss

@@ -347,6 +347,12 @@ $legend-color: $post-color;
 					margin: 0.5em 0 0 0;
 					text-align: right;
 					font-style: italic;
+
+					img {
+						vertical-align: baseline;
+						margin: 0 0.2em calc((1em - 24px)/2) 0;
+						position: relative;
+					}
 				}
 				.header {
 					padding: 0.5em 1em;