From b22c549cfc7a633f05ac2c643c6b1b2fecb793df Mon Sep 17 00:00:00 2001
From: Oliver Kennedy <okennedy@buffalo.edu>
Date: Sun, 12 Nov 2017 17:06:19 -0500
Subject: [PATCH] Grants and initial GNUSocial integration

---
 db/cv/okennedy/grants.json | 6 +++---
 db/lab.json                | 2 +-
 templates/person.erb       | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/db/cv/okennedy/grants.json b/db/cv/okennedy/grants.json
index 1b9a6301..3c855778 100644
--- a/db/cv/okennedy/grants.json
+++ b/db/cv/okennedy/grants.json
@@ -1,14 +1,14 @@
 [
-  { "title" : "IIS: SMALL: Databases for IoT", 
+  { "title" : "III: SMALL: Databases for IoT", 
     "agency" : "NSF: CISE: IIS: III", 
     "role" : "Co-PI", 
     "amount" : 493964, 
     "effort" : "50%", 
     "status" : "submitted", 
-    "start" : "01/2018", "end" : "12/2020",
+    "start" : "01/01/2019", "end" : "12/31/2021",
     "type" : "gift",
     "supports" : ["Saurav Singhi", "Darshana Balakrishnan"],
-    "commitment" : { "summer" : 0.58 },
+    "commitment" : { "summer" : 0.75 },
     "urls" : {
     }
   },
diff --git a/db/lab.json b/db/lab.json
index 3f3d5c4c..fd26cdd5 100644
--- a/db/lab.json
+++ b/db/lab.json
@@ -9,7 +9,7 @@
 			  "height" : 346
 			},
 			"github" : "okennedy",
-			"twitter" : "xthemage",
+			"gnusocial" : "@okennedy@social.xthemage.net",
 			"scholar" : "9Q9tiCsAAAAJ",
 			"dblp" : "hd/k/Kennedy:Oliver",
 			"cv" : "https://odin.cse.buffalo.edu/artifacts/okennedy.pdf",
diff --git a/templates/person.erb b/templates/person.erb
index f15fbe67..5b7c2d18 100755
--- a/templates/person.erb
+++ b/templates/person.erb
@@ -23,6 +23,9 @@ name = if defined? name then name else "A Mysterious Stranger" end
   <div class="links">
     <% if defined? github %><a href="http://github.com/<%=github%>">GitHub</a><% end %>
     <% if defined? twitter %><a href="http://twitter.com/<%=twitter%>">Twitter</a><% end %>
+    <% if defined? gnusocial 
+        prefix, account, host = gnusocial.split(/@/)
+      %><a href="https://<%=host%>/@<%=account%>">@<%=account%></a><% end %>
     <% if defined? scholar %><a href="http://scholar.google.com/citations?user=/<%=scholar%>">Google&nbsp;Scholar</a><% end %>
     <% if defined? dblp %><a href="http://dblp.uni-trier.de/pers/<%=dblp%>">DBLP</a><% end %>
     <% if defined? cv %><a href="<%=cv%>">CV</a><% end %>