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

NIHVIVO 3789 add indicator image until deletion completes

Browse source
This commit is contained in:
tworrall 2012-06-13 20:35:16 +00:00
parent 173a9454c4
commit b731dc2675
3 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
productMods/templates/freemarker/edit/forms/css/customForm.css
View file

@ -140,10 +140,10 @@ section#pubsContainer li {
section#pubsContainer input { section#pubsContainer input {
margin-right:8px; margin-right:8px;
} }
/* ---------------------------------- */
/* --------- MISCELLANEOUS -------- */
/* ------------------------------- */
img#indicator {
padding-left:60px;
}

12
productMods/templates/freemarker/edit/forms/js/manageWebpagesForIndividual.js
View file

@ -157,6 +157,9 @@ var manageWebpages = {
if (!confirm(message)) { if (!confirm(message)) {
return false; return false;
} }
$('a#returnToIndividual').hide();
$('img#indicator').removeClass('hidden');
if ($(link)[0] === $('.remove:last')[0]) { if ($(link)[0] === $('.remove:last')[0]) {
removeLast = true; removeLast = true;
@ -182,7 +185,7 @@ var manageWebpages = {
// Remove from the DOM // Remove from the DOM
$(this).remove(); $(this).remove();
// Actions that depend on the webpage having been removed from the DOM: // Actions that depend on the webpage having been removed from the DOM:
numWebpages = $('.webpage').length; // retrieve the new length after removing webpage from the DOM numWebpages = $('.webpage').length; // retrieve the new length after removing webpage from the DOM
@ -195,6 +198,13 @@ var manageWebpages = {
if (numWebpages < 2) { if (numWebpages < 2) {
manageWebpages.disableDD(); manageWebpages.disableDD();
} }
$('img#indicator').fadeOut(100, function() {
$(this).addClass('hidden');
})
$('a#returnToIndividual').fadeIn(100, function() {
$(this).show();
});
}); });
} else { } else {

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

@ -59,6 +59,7 @@
<a href="${showAddFormUrl}" id="showAddForm" class="button green" title="add new web page">Add New Web Page</a> <a href="${showAddFormUrl}" id="showAddForm" class="button green" title="add new web page">Add New Web Page</a>
<a href="${cancelUrl}" id="returnToIndividual" class="return" title="return to individual">Return to Individual</a> <a href="${cancelUrl}" id="returnToIndividual" class="return" title="return to individual">Return to Individual</a>
<img id="indicator" class="hidden" src="${urls.base}/images/indicatorWhite.gif" />
</section> </section>
@ -69,7 +70,7 @@ var customFormData = {
}; };
</script> </script>
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />', ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/customForm.css" />',
'<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/manageWebpagesForIndividual.css" />', '<link rel="stylesheet" href="${urls.base}/templates/freemarker/edit/forms/css/manageWebpagesForIndividual.css" />',
'<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css" />')} '<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css" />')}