From 54ca2a4b798c1ce31d0eeeef4d363de9a06572d7 Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Fri, 23 May 2014 11:36:36 -0400
Subject: [PATCH] VIVO-763: display the url type on the manage page

---
 .../templates/freemarker/edit/forms/addEditWebpageForm.ftl   | 2 +-
 .../freemarker/edit/forms/manageWebpagesForIndividual.ftl    | 4 ++--
 .../generators/ManageWebpagesForIndividualGenerator.java     | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/productMods/templates/freemarker/edit/forms/addEditWebpageForm.ftl b/productMods/templates/freemarker/edit/forms/addEditWebpageForm.ftl
index 5912cb61..8b9810d7 100644
--- a/productMods/templates/freemarker/edit/forms/addEditWebpageForm.ftl
+++ b/productMods/templates/freemarker/edit/forms/addEditWebpageForm.ftl
@@ -69,7 +69,7 @@
     <input  size="70"  type="text" id="url" name="url" value="${url}" role="input" />
    
     <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">
         <input type="hidden" name="rank" value="${newRank}" />
diff --git a/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl b/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
index c4f0b1d0..c4288518 100644
--- a/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
+++ b/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
@@ -36,7 +36,8 @@
             </#if>
             
             <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 class="editingLinks">
                 <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/customFormUtils.js"></script>',
               '<script type="text/javascript" src="${urls.base}/templates/freemarker/edit/forms/js/manageWebpagesForIndividual.js"></script>')}
-
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java
index 8911b395..b05f9fe3 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageWebpagesForIndividualGenerator.java
@@ -94,13 +94,16 @@ public class ManageWebpagesForIndividualGenerator extends BaseEditConfigurationG
         + "PREFIX core: <http://vivoweb.org/ontology/core#> \n"
         + "PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> \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"
         + "    ?vcard vcard:hasURL ?link . \n"
         + "    ?link a vcard:URL \n"
         + "    OPTIONAL { ?link vcard:url ?url } \n"
         + "    OPTIONAL { ?link rdfs:label ?label } \n"
         + "    OPTIONAL { ?link core:rank ?rank } \n"
+        + "    OPTIONAL { ?link vitro:mostSpecificType ?type } \n"
+        + "    OPTIONAL { ?type rdfs:label ?typeLabel } \n"
         + "} ORDER BY ?rank";