From c8658eb17f53d246fa75f16e9154319f90b74793 Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Tue, 19 Nov 2013 11:31:41 -0500
Subject: [PATCH 1/2] VIVO-532: temporary clean up; will explore other options
 post-1.6

---
 .../templates/freemarker/page/partials/languageSelector.ftl   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/web/templates/freemarker/page/partials/languageSelector.ftl b/webapp/web/templates/freemarker/page/partials/languageSelector.ftl
index d3e178a0f..5238d6251 100644
--- a/webapp/web/templates/freemarker/page/partials/languageSelector.ftl
+++ b/webapp/web/templates/freemarker/page/partials/languageSelector.ftl
@@ -6,11 +6,11 @@
   What was the right way to do this?
  -->
 
-<#-- This is included by identity.ftl --> 
+<#-- This is included by identity.ftl  --> 
 <#if selectLocale??>    
     <#list selectLocale.locales as locale>
         <li>
-            <a href="${selectLocale.selectLocaleUrl}?selection=${locale.code}" title="${i18n().select_locale} -- ${locale.label}">
+            <a href="${selectLocale.selectLocaleUrl}?selection=${locale.code}" title="${i18n().select_locale} -- ${locale.label}" <#if locale.selected>style="padding-bottom:1px;border-bottom: 1px solid #ccdfe6"</#if>>
                 <img src="${locale.imageUrl}" height="15" style="vertical-align:middle" alt="${locale.label}"/>
             </a>
         </li>

From d5fa8b06137d59303fed9a7b1e41d6e82dbce2fd Mon Sep 17 00:00:00 2001
From: hudajkhan <hjk54@cornell.edu>
Date: Tue, 19 Nov 2013 13:24:50 -0500
Subject: [PATCH 2/2] enable type dropdown to have subclasses for new
 individual page,prevent template errors if no addurl for property, show edit
 link if only one label and no locales

---
 .../edit/EditConfigurationTemplateModel.java             | 2 +-
 webapp/web/templates/freemarker/lib/lib-properties.ftl   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java
index 5df5485e1..8a3e273ca 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java
@@ -548,7 +548,7 @@ public class EditConfigurationTemplateModel extends BaseTemplateModel {
     	    }
             for(VClass rangeVClass : rangeVClasses) {	
                 vclasses.add(rangeVClass);
-        	    List<String> subURIs = wdf.getVClassDao().getSubClassURIs(rangeVClass.getURI());
+        	    List<String> subURIs = wdf.getVClassDao().getAllSubClassURIs(rangeVClass.getURI());
         	    for (String subClassURI : subURIs) {
         	        VClass subClass = wdf.getVClassDao().getVClassByURI(subClassURI);
         	        if (subClass != null) {
diff --git a/webapp/web/templates/freemarker/lib/lib-properties.ftl b/webapp/web/templates/freemarker/lib/lib-properties.ftl
index b9352790c..95b467eda 100644
--- a/webapp/web/templates/freemarker/lib/lib-properties.ftl
+++ b/webapp/web/templates/freemarker/lib/lib-properties.ftl
@@ -118,7 +118,7 @@ name will be used as the label. -->
     </#if>
     -->
     <#if editable> 
-        <h2 id="${property.localName}">${label} ${addLink!} ${verboseDisplay!}</h2>         
+        <h2 id="${property.localName!}">${label} ${addLink!} ${verboseDisplay!}</h2>         
     </#if>
 </#macro>
 
@@ -134,8 +134,8 @@ name will be used as the label. -->
         <#local domainUri = "" /> 
     </#if>
     <#if editable>
-        <#local url = property.addUrl>
-        <#if url?has_content>
+        <#if property.addUrl?has_content>
+        	<#local url = property.addUrl>
             <@showAddLink property.localName label url rangeUri domainUri/>
         </#if>
     </#if>
@@ -274,7 +274,8 @@ name will be used as the label. -->
 	<#assign labelPropertyUri = ("http://www.w3.org/2000/01/rdf-schema#label"?url) />
 	<#assign useEditLink = false />
 	<#--edit link used if in edit mode and only one label and one language-->
-	<#if labelCount = 1 &&  editable && localesCount = 1 >
+	<#--locales count may be 0 in case where no languages/selectable locales are specified-->
+	<#if labelCount = 1 &&  editable && (localesCount >= 0) >
 		<#assign useEditLink = true/>
 	</#if>
     <#local label = individual.nameStatement>