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

NIHVIVO-1706: Added confirmation alert for photo deletion in image upload and individual templates

Browse source
This commit is contained in:
mb863 2011-01-17 02:44:22 +00:00
parent 1d2b6b821f
commit b47f16cc94
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
webapp/web/js/imageUpload/imageUploadUtils.js
View file

@ -2,12 +2,10 @@
$(document).ready(function(){ $(document).ready(function(){
// Confirmation alert for photo deletion // Confirmation alert for photo deletion in image upload and individual templates
$('a.thumbnail').click(function(){ $('#photoUploadDefaultImage a.thumbnail,#share-contact a:eq(2)').click(function(){
//$('#share-contact a [title="delete this relationship"]').click(function(){
var answer = confirm('Are you sure you want to delete your photo?'); var answer = confirm('Are you sure you want to delete your photo?');
return answer; return answer;
}); });
}); });

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

@ -118,12 +118,12 @@ name will be used as the label. -->
<#-- Don't assume that if the mainImage property is populated, there is a thumbnail image (though that is the general case). <#-- Don't assume that if the mainImage property is populated, there is a thumbnail image (though that is the general case).
If there's a mainImage statement but no thumbnail image, treat it as if there is no image. --> If there's a mainImage statement but no thumbnail image, treat it as if there is no image. -->
<#if (mainImage.statements)?has_content && thumbUrl?has_content> <#if (mainImage.statements)?has_content && thumbUrl?has_content>
<a href="${individual.imageUrl}"><img class="individual-photo2" src="${thumbUrl}" title="click to view larger image" alt="${individual.name}" width="115" /></a> <a href="${individual.imageUrl}"><img class="individual-photo" src="${thumbUrl}" title="click to view larger image" alt="${individual.name}" width="115" /></a>
<@p.editingLinks mainImage.statements[0] showEditLinks /> <@p.editingLinks mainImage.statements[0] showEditLinks />
<#else> <#else>
<@p.addLinkWithLabel mainImage showEditLinks "Photo" /> <@p.addLinkWithLabel mainImage showEditLinks "Photo" />
<#if placeholderImage?has_content> <#if placeholderImage?has_content>
<img class="individual-photo2" src="${placeholderImage}" title = "no image" alt="placeholder image" width="115" /> <img class="individual-photo" src="${placeholderImage}" title = "no image" alt="placeholder image" width="115" />
</#if> </#if>
</#if> </#if>