From d7ce5b2c58618c3a3220f0c61663433254b0237f Mon Sep 17 00:00:00 2001
From: fkloft <felix.kloft+github@gmail.com>
Date: Sun, 12 Apr 2015 01:11:30 +0200
Subject: [PATCH] [mission] show mission type

---
 images/mission-type-hidden.png     | Bin 0 -> 143 bytes
 images/mission-type-random.png     | Bin 0 -> 129 bytes
 images/mission-type-sequential.png | Bin 0 -> 119 bytes
 images/mission-type-unknown.png    | Bin 0 -> 129 bytes
 plugins/missions.css               |   8 ++++++++
 plugins/missions.user.js           |  27 ++++++++++++++++++---------
 6 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 images/mission-type-hidden.png
 create mode 100644 images/mission-type-random.png
 create mode 100644 images/mission-type-sequential.png
 create mode 100644 images/mission-type-unknown.png

diff --git a/images/mission-type-hidden.png b/images/mission-type-hidden.png
new file mode 100644
index 0000000000000000000000000000000000000000..ceb1f14ae1b4f31f48e4a720a52cc4c7f63b1c60
GIT binary patch
literal 143
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh@3?y?HWJG`zTYyi9>#E<rn|}W|*~fGiD8g70
z<QL4~@a#q!kYn!Y;uyklJvo7a=^HZ-j}3oA4~qiZr5;`$o-+z(7!E2N&|x?t<j}^$
neE4rY`vHj~X$+m51`G@ii#U(1u(<ONXas|&tDnm{r-UW|y*ell

literal 0
HcmV?d00001

diff --git a/images/mission-type-random.png b/images/mission-type-random.png
new file mode 100644
index 0000000000000000000000000000000000000000..f06d3f293ea7d185d73aaf246a69e2a12c2d3c3a
GIT binary patch
literal 129
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh@3?y?HWJG`zTYyi9E0Esw`-l4Ei!XsJ#*!ev
zU<QY0H`0I{O-~oc5RU7~2@H+w9ugc9tO_$anVTXb6lOGYHaRY6_{iY=^FDKe6bHlI
XO7@ADzOknQH8FU)`njxgN@xNACm<pJ

literal 0
HcmV?d00001

diff --git a/images/mission-type-sequential.png b/images/mission-type-sequential.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8c811b32ee205ba15eac2ea3652882ba58f2c45
GIT binary patch
literal 119
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh@3?y?HWJG`zTYyi9E0Esw`-l4Ei!XsJ#*!ev
zU<QY0H`0I{c~2L|5RU7~2?y9%8X}lFQY9qb{kLW~reGG~!?2o<;ruz)!)yI#`~fOu
N@O1TaS?83{1OO9$AMOAE

literal 0
HcmV?d00001

diff --git a/images/mission-type-unknown.png b/images/mission-type-unknown.png
new file mode 100644
index 0000000000000000000000000000000000000000..dba67fb08592ca98646da2aa603019c5d6df88fc
GIT binary patch
literal 129
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh@3?y?HWJG`zTYyi9Ywz!njlaL=obQ<j6k#k0
z@(X5gcy=QV$kFt4aSY+Oo}AFYbc~&c=Z(CC#0{+m8E%Dj4UhN*ERQh@@Pt(}Oyy@`
Y@MPx{4L_Q+4XBC1)78&qol`;+0H9zYKL7v#

literal 0
HcmV?d00001

diff --git a/plugins/missions.css b/plugins/missions.css
index 2cdf7e22..bdefb74b 100644
--- a/plugins/missions.css
+++ b/plugins/missions.css
@@ -45,6 +45,14 @@
 	margin-bottom: 2px;
 }
 
+.plugin-mission-info {
+	display: inline-block;
+}
+.plugin-mission-info.time    { min-width: 8em; }
+.plugin-mission-info.rating  { min-width: 6em; }
+.plugin-mission-info.players { min-width: 4em; }
+.plugin-mission-info.type    { min-width: 4em; }
+
 .plugin-mission-info img {
 	height: 14px;
 	margin-right: 8px;
diff --git a/plugins/missions.user.js b/plugins/missions.user.js
index 75c2875c..213bac77 100644
--- a/plugins/missions.user.js
+++ b/plugins/missions.user.js
@@ -25,9 +25,9 @@ var decodeWaypoint = function(data) {
 		guid: data[1],
 		title: data[2],
 		typeNum: data[3],
-		type: [null, "Portal", "Field Trip"][data[3]],
+		type: [null, 'Portal', 'Field Trip'][data[3]],
 		objectiveNum: data[4],
-		objective: [null, "Hack this Portal", "Capture or Upgrade Portal", "Create Link from Portal", "Create Field from Portal", "Install a Mod on this Portal", "Take a Photo", "View this Field Trip Waypoint", "Enter the Passphrase"][data[4]],
+		objective: [null, 'Hack this Portal', 'Capture or Upgrade Portal', 'Create Link from Portal', 'Create Field from Portal', 'Install a Mod on this Portal', 'Take a Photo', 'View this Field Trip Waypoint', 'Enter the Passphrase'][data[4]],
 	};
 	if (result.typeNum === 1) {
 		result.portal = window.decodeArray.portalSummary(data[5]);
@@ -48,7 +48,7 @@ var decodeMission = function(data) {
 		medianCompletionTimeMs: data[6],
 		numUniqueCompletedPlayers: data[7],
 		typeNum: data[8],
-		type: [null, "Sequential", "Non Sequential", "Hidden"][data[8]],
+		type: [null, 'Sequential', 'Non Sequential', 'Hidden'][data[8]],
 		waypoints: data[9].map(decodeWaypoint),
 		image: data[10]
 	};
@@ -63,7 +63,7 @@ var decodeMissionSummary = function(data) {
 	};
 };
 var timeToRemaining = function(t) {
-	var data = parseInt(t / 86400) + 'd ' + (new Date(t % 86400 * 1000)).toUTCString().replace(/.*(\d{2}):(\d{2}):(\d{2}).*/, "$1h $2m $3s");
+	var data = parseInt(t / 86400) + 'd ' + (new Date(t % 86400 * 1000)).toUTCString().replace(/.*(\d{2}):(\d{2}):(\d{2}).*/, '$1h $2m $3s');
 	data = data.replace('0d', '');
 	data = data.replace('00h', '');
 	data = data.replace('00m', '');
@@ -75,6 +75,13 @@ window.plugin.missions = {
 	// 3 weeks.
 	portalMissionsCacheTime: 21 * 24 * 3600 * 1E3,
 
+	missionTypeImages: [
+		'@@INCLUDEIMAGE:images/mission-type-unknown.png@@',
+		'@@INCLUDEIMAGE:images/mission-type-sequential.png@@',
+		'@@INCLUDEIMAGE:images/mission-type-random.png@@',
+		'@@INCLUDEIMAGE:images/mission-type-hidden.png@@',
+	],
+
 	onPortalSelected: function(event) {
 		/*if(event.selectedPortalGuid === event.unselectedPortalGuid) {
 		    return;
@@ -89,7 +96,7 @@ window.plugin.missions = {
 		// After select.
 		setTimeout(function() {
 			// #resodetails
-			$('.linkdetails').append('<aside><a href="#" onclick="plugin.missions.openPortalMissions();" >Missions</a></aside>');
+			$('.linkdetails').append('<aside><a tabindex="0" onclick="plugin.missions.openPortalMissions();" >Missions</a></aside>');
 		}, 0);
 	},
 
@@ -313,7 +320,9 @@ window.plugin.missions = {
 			infoWaypoints.className = 'plugin-mission-info waypoints';
 			infoWaypoints.textContent = cachedMission.waypoints.length + ' ';
 			img = infoWaypoints.insertBefore(document.createElement('img'), infoWaypoints.firstChild);
-			img.src = 'https://commondatastorage.googleapis.com/ingress.com/img/map_icons/linkmodeicon.png';
+			img.src = this.missionTypeImages[cachedMission.typeNum] || this.missionTypeImages[0];
+			img.title = cachedMission.type || 'Unknown mission type';
+			img.className = 'help';
 		}
 		
 		return container;
@@ -358,12 +367,12 @@ window.plugin.missions = {
 			var perma = '/intel?ll='+lat+','+lng+'&z=17&pll='+lat+','+lng;
 			
 			title.href = perma;
-			title.addEventListener("click", function(ev) {
+			title.addEventListener('click', function(ev) {
 				renderPortalDetails(waypoint.portal.guid);
 				ev.preventDefault();
 				return false;
 			}, false);
-			title.addEventListener("dblclick", function(ev) {
+			title.addEventListener('dblclick', function(ev) {
 				zoomToAndShowPortal(waypoint.portal.guid, [lat, lng]);
 				ev.preventDefault();
 				return false;
@@ -632,7 +641,7 @@ window.plugin.missions = {
 		}
 
 		$('<style>').prop('type', 'text/css').html('@@INCLUDESTRING:plugins/missions.css@@').appendTo('head');
-		$('#toolbox').append('<a href="#" onclick="plugin.missions.openTopMissions();" >Missions in view</a>');
+		$('#toolbox').append('<a tabindex="0" onclick="plugin.missions.openTopMissions();">Missions in view</a>');
 
 		// window.addPortalHighlighter('Mission start point', this.highlight.bind(this));
 		window.addHook('portalSelected', this.onPortalSelected.bind(this));