litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6

Browse source
This commit is contained in:
brianjlowe 2013-11-19 13:29:01 -05:00
commit 7057b40931
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/EditConfigurationTemplateModel.java
View file

@ -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) {

9
webapp/web/templates/freemarker/lib/lib-properties.ftl
View file

@ -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>

4
webapp/web/templates/freemarker/page/partials/languageSelector.ftl
View file

@ -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>