From e33070b3a8c245f659d5649700feb8817cb8efbf Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Mon, 14 Oct 2013 16:29:01 -0400
Subject: [PATCH] VIVO-359 and VIVO-345

---
 doc/install.html                              | 24 ++++++++++++++
 .../individual/individual-properties.ftl      |  2 ++
 .../individual-property-group-tabs.ftl        |  2 ++
 .../freemarker/lib/lib-properties.ftl         | 33 ++++++++++++-------
 4 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/doc/install.html b/doc/install.html
index cdba8cb20..c409b190c 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -250,6 +250,30 @@
                 support websites. 
             </p>
 
+            <p>
+                The following browsers are supported for this release
+            </p>
+    	    <ul>
+    	    	<li>
+    	    		Mac:
+		 	        <ul>
+		 	            <li>Chrome 30.0.1599.69 and above</li>
+		 	            <li>FireFox 3.6.28, 10.0.12, 24</li>
+		 	            <li>Opera 12.02</li>
+		 	            <li>Safari 5.0.3</li>
+		 	        </ul>
+    	    	</li>
+    	    	<li>
+		            PC:
+		 	        <ul>
+		 	            <li>Chrome 25.1364.2 and above</li>
+		 	            <li>FireFox 10.0.12, 24</li>
+		 	            <li>Internet Explorer 8, 9, 10</li>
+		 	            <li>Opera 12.02</li>
+		 	        </ul>
+		 	    </li>
+    	    </ul>
+
             <h3 id="create_database">II. Create an empty MySQL database </h3>
             <p>
                 Decide on a database name, username, and password. Log into your 
diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
index 35c5e5666..610d4b409 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
@@ -32,6 +32,8 @@
                     </h3>
                 <#elseif rangeClass == "Name" && property.statements?has_content && editable >
                     <h3 id="${property.localName}">${property.name}  <@p.verboseDisplay property /> </h3>
+                <#elseif rangeClass == "Title" && property.statements?has_content && editable >
+                    <h3 id="${property.localName}">${property.name}  <@p.verboseDisplay property /> </h3>
                 <#else>
                     <h3 id="${property.localName}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> </h3>
                 </#if>
diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl
index 3b77322c8..bb9bd9dc8 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl
@@ -10,6 +10,7 @@
 <ul class="propertyTabsList">
     <li  class="groupTabSpacer">&nbsp;</li>
 <#list propertyGroups.all as groupTabs>
+    <#if ( groupTabs.properties?size > 0 ) >
     <#assign groupName = groupTabs.getName(nameForOtherGroup)>
     <#if groupName?has_content>
 		<#--the function replaces spaces in the name with underscores, also called for the property group menu-->
@@ -26,6 +27,7 @@
             <li class="nonSelectedGroupTab clickable" groupName="${groupNameHtmlId}">${groupName?capitalize}</li>
             <li class="groupTabSpacer">&nbsp;</li>
         </#if>
+    </#if>
 </#list>
 <#if (propertyGroups.all?size > 1) >
     <li  class="nonSelectedGroupTab clickable" groupName="viewAll">${i18n().view_all_capitalized}</li>
diff --git a/webapp/web/templates/freemarker/lib/lib-properties.ftl b/webapp/web/templates/freemarker/lib/lib-properties.ftl
index 7e1fa765b..fb69a6a8a 100644
--- a/webapp/web/templates/freemarker/lib/lib-properties.ftl
+++ b/webapp/web/templates/freemarker/lib/lib-properties.ftl
@@ -122,17 +122,22 @@ name will be used as the label. -->
     </#if>
 </#macro>
 
-<#macro addLink property editable label="${property.name}">
+<#macro addLink property editable label="${property.name}">    
+    <#if property.rangeUri?? >
+        <#local rangeUri = property.rangeUri /> 
+    <#else>
+        <#local rangeUri = "" /> 
+    </#if>
     <#if editable>
         <#local url = property.addUrl>
         <#if url?has_content>
-            <@showAddLink property.localName property.name label url />
+            <@showAddLink property.localName label url rangeUri/>
         </#if>
     </#if>
 </#macro>
 
-<#macro showAddLink propertyLocalName propertyName label url>
-    <#if propertyName == "authors" || propertyName == "webpage" || propertyLocalName == "hasResearchArea">
+<#macro showAddLink propertyLocalName label url rangeUri>
+    <#if rangeUri?contains("Authorship") || rangeUri?contains("URL") || rangeUri?contains("Editorship") || label == "hasResearchArea">
         <a class="add-${propertyLocalName}" href="${url}" title="${i18n().manage_list_of} ${label?lower_case}">
         <img class="add-individual" src="${urls.images}/individual/manage-icon.png" alt="${i18n().manage}" /></a>
     <#else>
@@ -147,17 +152,23 @@ name will be used as the label. -->
 
 
 <#macro propertyListItem property statement editable >
+    <#if property.rangeUri?? >
+        <#local rangeUri = property.rangeUri /> 
+    <#else>
+        <#local rangeUri = "" /> 
+    </#if>
     <li role="listitem">    
         <#nested>       
-        <@editingLinks "${property.localName}" "${property.name}" statement editable/>
+        <@editingLinks "${property.localName}" "${property.name}" statement editable rangeUri/>
     </li>
 </#macro>
 
-<#macro editingLinks propertyLocalName propertyName statement editable>
-    <#if editable && (propertyName != "authors" && propertyName != "webpage" && propertyLocalName != "hasResearchArea")>
-        <@editLink propertyLocalName propertyName statement />
-        <@deleteLink propertyLocalName propertyName statement />
-     
+<#macro editingLinks propertyLocalName propertyName statement editable rangeUri="">
+    <#if editable >
+        <#if (!rangeUri?contains("Authorship") && !rangeUri?contains("URL") && !rangeUri?contains("Editorship") && propertyLocalName != "hasResearchArea")>
+            <@editLink propertyLocalName propertyName statement />
+            <@deleteLink propertyLocalName propertyName statement />
+        </#if>    
     </#if>
 </#macro>
 <#macro editLink propertyLocalName propertyName statement>
@@ -250,7 +261,7 @@ name will be used as the label. -->
     <#local label = individual.nameStatement>
     ${label.value}
     <#if useEditLink>
-    	<@editingLinks "label" "" label editable />
+    	<@editingLinks "label" "" label editable ""/>
     <#elseif (editable && (labelCount > 0)) || (languageCount > 1)>
     	<#--We display the link even when the user is not logged in case of multiple labels with different languages-->
     	<#assign labelLink = ""/>