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

VIVO-372: check the domainUri to correctly display the manage icon

Browse source
This commit is contained in:
tworrall 2013-10-16 15:53:44 -04:00
parent 8be60063e0
commit 4e851d0c35
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyTemplateModel.java
View file

@ -129,6 +129,10 @@ public abstract class PropertyTemplateModel extends BaseTemplateModel {
return rangeUri; return rangeUri;
} }
public String getDomainUri() {
return domainUri;
}
public String getAddUrl() { public String getAddUrl() {
//log.info("addUrl=" + addUrl); //log.info("addUrl=" + addUrl);
return (addUrl != null) ? addUrl : ""; return (addUrl != null) ? addUrl : "";

2
webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
View file

@ -12,7 +12,7 @@
<article class="property" role="article"> <article class="property" role="article">
<#-- Property display name --> <#-- Property display name -->
<#if rangeClass == "Authorship" && editable > <#if rangeClass == "Authorship" && editable && property.domainUri?contains("Person")>
<h3 id="${property.localName}-${rangeClass}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> <h3 id="${property.localName}-${rangeClass}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property />
<a id="managePubLink" class="manageLinks" href="${urls.base}/managePublications?subjectUri=${subjectUri[1]!}" title="${i18n().manage_publications_link}" <#if verbose>style="padding-top:10px"</#if> > <a id="managePubLink" class="manageLinks" href="${urls.base}/managePublications?subjectUri=${subjectUri[1]!}" title="${i18n().manage_publications_link}" <#if verbose>style="padding-top:10px"</#if> >
${i18n().manage_publications_link} ${i18n().manage_publications_link}

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

@ -128,16 +128,21 @@ name will be used as the label. -->
<#else> <#else>
<#local rangeUri = "" /> <#local rangeUri = "" />
</#if> </#if>
<#if property.domainUri?? >
<#local domainUri = property.domainUri />
<#else>
<#local domainUri = "" />
</#if>
<#if editable> <#if editable>
<#local url = property.addUrl> <#local url = property.addUrl>
<#if url?has_content> <#if url?has_content>
<@showAddLink property.localName label url rangeUri/> <@showAddLink property.localName label url rangeUri domainUri/>
</#if> </#if>
</#if> </#if>
</#macro> </#macro>
<#macro showAddLink propertyLocalName label url rangeUri> <#macro showAddLink propertyLocalName label url rangeUri domainUri="">
<#if rangeUri?contains("Authorship") || rangeUri?contains("URL") || rangeUri?contains("Editorship") || label == "hasResearchArea"> <#if (rangeUri?contains("Authorship") && domainUri?contains("IAO_0000030")) || (rangeUri?contains("Editorship") && domainUri?contains("IAO_0000030"))|| rangeUri?contains("URL") || label == "hasResearchArea">
<a class="add-${propertyLocalName}" href="${url}" title="${i18n().manage_list_of} ${label?lower_case}"> <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> <img class="add-individual" src="${urls.images}/individual/manage-icon.png" alt="${i18n().manage}" /></a>
<#else> <#else>