From 649b0cfd459c6eb0d794a770ef3afff1a1df77af Mon Sep 17 00:00:00 2001
From: Ted Lawless <lawlesst@gmail.com>
Date: Wed, 20 Jul 2016 10:36:55 -0400
Subject: [PATCH] Fix/capability map label (#40)

* Adjust quotes.

* Change capability map labels to be first, last, title rather thant title first, last
---
 .../main/webapp/js/visualization/capabilitymap/graph_new.js   | 2 +-
 .../freemarker/visualization/capabilitymap/capabilityMap.ftl  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js b/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js
index 633ebf54..a1e01a19 100755
--- a/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js
+++ b/webapp/src/main/webapp/js/visualization/capabilitymap/graph_new.js
@@ -68,7 +68,7 @@ var Person = function(info) {
     this.setInfo(info);
 }
 Person.prototype.fullname = function() {
-    return this.info["md_Z"] + " " + this.info["md_A"] + " " + this.info["md_B"];
+    return this.info["md_A"] + " " + this.info["md_B"] + ", " + this.info["md_Z"];
 }
 Person.prototype.queryText = function(capabilities) {
     return ("\"" + this.info["md_A"] + "+" + this.info["md_B"] + "\"+[" + capabilities.map(function(a) { return decodeURIComponent(a.term); }).join("+") + "]").replace(/<\/?strong>/g, "");
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/capabilitymap/capabilityMap.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/capabilitymap/capabilityMap.ftl
index 8584e830..42593961 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/capabilitymap/capabilityMap.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/capabilitymap/capabilityMap.ftl
@@ -62,7 +62,7 @@ ${stylesheets.add(
             </p>
             <h3>Getting Started</h3>
             <p>
-                Enter a research area into the search field above and press ‘Search’.
+                Enter a research area into the search field above and press 'Search'.
                 The resulting diagram displays the search term, rendered in orange,
                 connected to the blue group of researchers that are active in that area.
                 Enter another search term to see how researchers from both searches relate.
@@ -76,7 +76,7 @@ ${stylesheets.add(
             <p>
                 By clicking on any node in the visualisation,
                 additional information can be viewed in the
-                ‘Info’ tab on the right-hand side.
+                'Info' tab on the right-hand side.
                 For groups of people, the participants in the group
                 and their information can be viewed,
                 and individual researchers can be removed from the graph.