NIHVIVO-1332 Editing link for rdfs:label

webapp/web/edit/editDatapropStmtRequestDispatch.jsp

@@ -58,7 +58,7 @@
     String command      = vreq.getParameter("cmd");
     
     String vitroNsProp = (String) vreq.getParameter("vitroNsProp");
-    boolean isVitroNsProp = (vitroNsProp != null && vitroNsProp.equals("true")) ? true : false;
+    boolean isVitroNsProp = "true".equals(vitroNsProp) ? true : false;
 
     if( subjectUri == null || subjectUri.trim().length() == 0 ) {
         log.error("required subjectUri parameter missing");

webapp/web/templates/freemarker/body/individual/individual.ftl

@@ -26,7 +26,9 @@
             <#else>                
                 <h1 class="fn">
                     <#-- Label -->
-                    ${individual.name}
+                    <#assign label = individual.nameStatement>
+                    ${label.value}
+                    <@p.editingLinks label editing />
                         
                     <#-- Moniker -->
                     <#if individual.moniker?has_content>

webapp/web/templates/freemarker/lib/lib-datetime.ftl

@@ -101,8 +101,9 @@
 <#-- Convert the string dateTimeString to a datetime object -->
 <#function toDateTime dateTimeString>
     <#-- First convert the datetime string to a string format that Freemarker 
-         understands, then to a datetime object --> 
-    <#return dateTimeString?replace("T", " ")?replace("Z", "")?datetime("yyyy-MM-dd HH:mm:ss")>
+         understands, then to a datetime object. For now, strip away a time zone rather
+         than displaying it. --> 
+    <#return dateTimeString?replace("T", " ")?replace("Z.*$", "", "r")?datetime("yyyy-MM-dd HH:mm:ss")>
 </#function>
 
 <#-- Apply a precision and format type to format a datetime -->