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

VIVO-763: display the url type on the manage page

Browse source
This commit is contained in:
tworrall 2014-05-23 11:36:36 -04:00
parent c70aa2ae5a
commit 54ca2a4b79
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
productMods/templates/freemarker/edit/forms/addEditWebpageForm.ftl
View file

@ -69,7 +69,7 @@
<input size="70" type="text" id="url" name="url" value="${url}" role="input" /> <input size="70" type="text" id="url" name="url" value="${url}" role="input" />
<label for="label">${i18n().webpage_name}</label> <label for="label">${i18n().webpage_name}</label>
<input size="70" type="text" id="label" name="label" value="${label?html}" role="input" />${label} <input size="70" type="text" id="label" name="label" value="${label?html}" role="input" />
<#if editMode="add"> <#if editMode="add">
<input type="hidden" name="rank" value="${newRank}" /> <input type="hidden" name="rank" value="${newRank}" />

2
productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
View file

@ -37,6 +37,7 @@
<span class="webpageName"> <span class="webpageName">
<a href="${webpage.url}" title="${i18n().webpage_url}">${anchor}</a> <a href="${webpage.url}" title="${i18n().webpage_url}">${anchor}</a>
<#if webpage.typeLabel??>(<#if webpage.typeLabel == "URL">Standard Web Link<#else>${webpage.typeLabel}</#if></#if>)
</span> </span>
<span class="editingLinks"> <span class="editingLinks">
<a href="${baseEditWebpageUrl}&objectUri=${webpage.vcard}&predicateUri=${predicateUri}&linkUri=${webpage.link}" class="edit" title="${i18n().edit_webpage_link}">${i18n().edit_capitalized}</a> | <a href="${baseEditWebpageUrl}&objectUri=${webpage.vcard}&predicateUri=${predicateUri}&linkUri=${webpage.link}" class="edit" title="${i18n().edit_webpage_link}">${i18n().edit_capitalized}</a> |
@ -84,4 +85,3 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/js/utils.js"></s
'<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>', '<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>', '<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>',
'<script type="text/javascript" src="${urls.base}/templates/freemarker/edit/forms/js/manageWebpagesForIndividual.js"></script>')} '<script type="text/javascript" src="${urls.base}/templates/freemarker/edit/forms/js/manageWebpagesForIndividual.js"></script>')}

5
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java
View file

@ -94,13 +94,16 @@ public class ManageWebpagesForIndividualGenerator extends BaseEditConfigurationG
+ "PREFIX core: <http://vivoweb.org/ontology/core#> \n" + "PREFIX core: <http://vivoweb.org/ontology/core#> \n"
+ "PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> \n" + "PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> \n"
+ "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"
+ "SELECT DISTINCT ?vcard ?link ?url ?label ?rank WHERE { \n" + "PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> \n"
+ "SELECT DISTINCT ?vcard ?link ?url ?label ?rank ?typeLabel WHERE { \n"
+ " ?subject <http://purl.obolibrary.org/obo/ARG_2000028> ?vcard . \n" + " ?subject <http://purl.obolibrary.org/obo/ARG_2000028> ?vcard . \n"
+ " ?vcard vcard:hasURL ?link . \n" + " ?vcard vcard:hasURL ?link . \n"
+ " ?link a vcard:URL \n" + " ?link a vcard:URL \n"
+ " OPTIONAL { ?link vcard:url ?url } \n" + " OPTIONAL { ?link vcard:url ?url } \n"
+ " OPTIONAL { ?link rdfs:label ?label } \n" + " OPTIONAL { ?link rdfs:label ?label } \n"
+ " OPTIONAL { ?link core:rank ?rank } \n" + " OPTIONAL { ?link core:rank ?rank } \n"
+ " OPTIONAL { ?link vitro:mostSpecificType ?type } \n"
+ " OPTIONAL { ?type rdfs:label ?typeLabel } \n"
+ "} ORDER BY ?rank"; + "} ORDER BY ?rank";