From 7e90e2f9e4766e97f41204626b8cbcbdf2406f4d Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 3 Jul 2012 20:20:35 +0000
Subject: [PATCH] NIHVIVO-3869 Add license tags, use "head of" relationship
 instead of "current head of", and display the geographic location clearly.

---
 .../acceptance-tests/suites/ShortViews/shortview_config.n3    | 3 ++-
 .../suites/ShortViews/view-browse-faculty.ftl                 | 2 +-
 .../suites/ShortViews/view-index-department.ftl               | 4 +++-
 .../acceptance-tests/suites/ShortViews/view-index-faculty.ftl | 2 ++
 .../suites/ShortViews/view-search-faculty.ftl                 | 2 ++
 5 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/utilities/acceptance-tests/suites/ShortViews/shortview_config.n3 b/utilities/acceptance-tests/suites/ShortViews/shortview_config.n3
index b21cb8fc..13700e49 100644
--- a/utilities/acceptance-tests/suites/ShortViews/shortview_config.n3
+++ b/utilities/acceptance-tests/suites/ShortViews/shortview_config.n3
@@ -115,7 +115,8 @@ PREFIX vivo: <http://vivoweb.org/ontology/core#>
 SELECT ?label
 WHERE
 {
-?individualUri vivo:currentlyHeadedBy ?head .
+?individualUri vivo:contributingRole ?role .
+?role vivo:leaderRoleOf ?head .
 ?head rdfs:label ?label .
 }
 LIMIT 1
diff --git a/utilities/acceptance-tests/suites/ShortViews/view-browse-faculty.ftl b/utilities/acceptance-tests/suites/ShortViews/view-browse-faculty.ftl
index 5446c929..7017922a 100644
--- a/utilities/acceptance-tests/suites/ShortViews/view-browse-faculty.ftl
+++ b/utilities/acceptance-tests/suites/ShortViews/view-browse-faculty.ftl
@@ -1,4 +1,4 @@
-<#-- Default individual browse view -->
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
 <#import "lib-properties.ftl" as p>
 
diff --git a/utilities/acceptance-tests/suites/ShortViews/view-index-department.ftl b/utilities/acceptance-tests/suites/ShortViews/view-index-department.ftl
index 58cccbc0..7e641b85 100644
--- a/utilities/acceptance-tests/suites/ShortViews/view-index-department.ftl
+++ b/utilities/acceptance-tests/suites/ShortViews/view-index-department.ftl
@@ -1,3 +1,5 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
 <#import "lib-vivo-properties.ftl" as p>
 
 <a href="${individual.profileUrl}" title="individual name">${individual.name}</a>
@@ -7,7 +9,7 @@
 <#if locations??>
     <#list locations as location>
         <#if (location.label)?? >
-            <span class="title">Not valid in ${location.label}</span>
+            <span class="title">Located in ${location.label}</span>
         </#if>
     </#list>
 </#if>
diff --git a/utilities/acceptance-tests/suites/ShortViews/view-index-faculty.ftl b/utilities/acceptance-tests/suites/ShortViews/view-index-faculty.ftl
index 3960f580..c79534e9 100644
--- a/utilities/acceptance-tests/suites/ShortViews/view-index-faculty.ftl
+++ b/utilities/acceptance-tests/suites/ShortViews/view-index-faculty.ftl
@@ -1,3 +1,5 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
 <#import "lib-vivo-properties.ftl" as p>
 
 <a href="${individual.profileUrl}" title="individual name">${individual.name}</a>
diff --git a/utilities/acceptance-tests/suites/ShortViews/view-search-faculty.ftl b/utilities/acceptance-tests/suites/ShortViews/view-search-faculty.ftl
index 99b9eb84..52257857 100644
--- a/utilities/acceptance-tests/suites/ShortViews/view-search-faculty.ftl
+++ b/utilities/acceptance-tests/suites/ShortViews/view-search-faculty.ftl
@@ -1,3 +1,5 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
 <#import "lib-vivo-properties.ftl" as p>
 
 <a href="${individual.profileUrl}" title="individual name">${individual.name}</a>