From c27938d19b13db3f102f31b45ea87bc7f0408e55 Mon Sep 17 00:00:00 2001 From: nac26 Date: Tue, 18 Jan 2011 12:23:02 +0000 Subject: [PATCH] NIHVIVO-1071 Changed title attributes of edit links to use "entry" instead of "relationship". imageUploadUtils.js was updated only to reflect this change, but still needs work to resolve the bug described in NIHVIVO-1776 --- webapp/web/js/imageUpload/imageUploadUtils.js | 2 +- .../freemarker/body/partials/individual/lib-properties.ftl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/webapp/web/js/imageUpload/imageUploadUtils.js b/webapp/web/js/imageUpload/imageUploadUtils.js index e3f0a03f5..a14ef44d0 100644 --- a/webapp/web/js/imageUpload/imageUploadUtils.js +++ b/webapp/web/js/imageUpload/imageUploadUtils.js @@ -3,7 +3,7 @@ $(document).ready(function(){ // Confirmation alert for photo deletion in image upload and individual templates - $('#photoUploadDefaultImage a.thumbnail,#share-contact a[title="delete this relationship"]').click(function(){ + $('#photoUploadDefaultImage a.thumbnail,#share-contact a[title="delete this entry"]').click(function(){ var answer = confirm('Are you sure you want to delete your photo?'); return answer; }); diff --git a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl index 186570071..5e69ced8e 100644 --- a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl +++ b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl @@ -46,7 +46,7 @@ name will be used as the label. --> <#if showEditingLinks> <#local url = property.addUrl> <#if url?has_content> - add + add @@ -68,14 +68,14 @@ name will be used as the label. --> <#macro editLink statement> <#local url = statement.editUrl> <#if url?has_content> - edit + edit <#macro deleteLink statement> <#local url = statement.deleteUrl> <#if url?has_content> - delete + delete