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

1. Fixed the bug NIHVIVO-1803.

Browse source 
2. Changed the code/style that shows/hides collaborator links (co-pi & co-author n/ws) for a person, so that the code that will check if any publications/grants are attached to a person can manipulate visibility of these links.
This commit is contained in:
cdtank 2011-01-20 16:55:55 +00:00
parent 2a0d21ad3c
commit 1a36693cb1
4 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
productMods/css/visualization/visualization.css
View file

@ -47,13 +47,9 @@ span.incomplete-data-holder,
text-decoration: underline; text-decoration: underline;
} }
#coauthorship_link_container { .collaboratorship-link-container {
display: none;
}
#coauthorship_link_container,
#coinvestigator_link_container {
margin-top: 20px; margin-top: 20px;
display: none;
} }
.sparkline_text { .sparkline_text {

15
productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl
View file

@ -13,7 +13,7 @@
<div id="vis_container_coauthor">&nbsp;</div> <div id="vis_container_coauthor">&nbsp;</div>
<div id="coauthorship_link_container"> <div id="coauthorship_link_container" class="collaboratorship-link-container">
<div class="collaboratorship-icon"> <div class="collaboratorship-icon">
<a href="${coAuthorURL}"><img src="${coAuthorIcon}" alt="Co-author Network icon" width="22px" height="23px" /></a> <a href="${coAuthorURL}"><img src="${coAuthorIcon}" alt="Co-author Network icon" width="22px" height="23px" /></a>
</div> </div>
@ -22,7 +22,7 @@
</div> </div>
</div> </div>
<div id="coinvestigator_link_container"> <div id="coinvestigator_link_container" class="collaboratorship-link-container">
<div class="collaboratorship-icon"> <div class="collaboratorship-icon">
<a href="${coInvestigatorURL}"><img src="${coInvestigatorIcon}" alt="Co-investigator Network icon" width="22px" height="23px" /></a> <a href="${coInvestigatorURL}"><img src="${coInvestigatorIcon}" alt="Co-investigator Network icon" width="22px" height="23px" /></a>
</div> </div>
@ -37,6 +37,17 @@
<script type="text/javascript"> <script type="text/javascript">
var visualizationUrl = '${individual.visualizationUrl}'; var visualizationUrl = '${individual.visualizationUrl}';
$(document).ready(function(){
/*
Collaboratorship links do not show up by default. They should show up only if there any data to
show on that page.
*/
$("#coinvestigator_link_container").show();
});
</script> </script>
</#if> </#if>

11
productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl
View file

@ -80,6 +80,13 @@ $(document).ready(function(){
setProfileName('no_coauthorships_person', $('#ego_label').text()); setProfileName('no_coauthorships_person', $('#ego_label').text());
} }
</#if> </#if>
/*
Collaboratorship links do not show up by default. They should show up only if there any data to
show on that page.
*/
$("#coinvestigator_link_container").show();
}); });
</script> </script>
@ -98,10 +105,10 @@ $(document).ready(function(){
</div> </div>
<div class = "toggle_visualization"> <div class = "toggle_visualization">
<div id="coinvestigator_link_container"> <div id="coinvestigator_link_container" class="collaboratorship-link-container">
<div class="collaboratorship-icon"><a href="${coprincipalinvestigatorURL}"><img src="${coInvestigatorIcon}" /></a></div> <div class="collaboratorship-icon"><a href="${coprincipalinvestigatorURL}"><img src="${coInvestigatorIcon}" /></a></div>
<div class="collaboratorship-link"> <div class="collaboratorship-link">
<h3><a href="${coprincipalinvestigatorURL}">Co-Investigator Network</a></h3> <h3><a href="${coprincipalinvestigatorURL}">Co-Investigator Network</a></h3>
</div> </div>
</div> </div>
</div> </div>

11
productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl
View file

@ -79,6 +79,13 @@ $(document).ready(function(){
setProfileName('no_coinvestigations_person', $('#ego_label').text()); setProfileName('no_coinvestigations_person', $('#ego_label').text());
} }
</#if> </#if>
/*
Collaboratorship links do not show up by default. They should show up only if there any data to
show on that page.
*/
$("#coauthorship_link_container").show();
}); });
</script> </script>
@ -96,10 +103,10 @@ $(document).ready(function(){
</div> </div>
<div class = "toggle_visualization"> <div class = "toggle_visualization">
<div id="coauthorship_link_container"> <div id="coauthorship_link_container" class="collaboratorship-link-container">
<div class="collaboratorship-icon"><a href="${coauthorshipURL}"><img src="${coAuthorIcon}" /></a></div> <div class="collaboratorship-icon"><a href="${coauthorshipURL}"><img src="${coAuthorIcon}" /></a></div>
<div class="collaboratorship-link"> <div class="collaboratorship-link">
<h3><a href="${coauthorshipURL}">Co-Author Network</a></h3> <h3><a href="${coauthorshipURL}">Co-Author Network</a></h3>
</div> </div>
</div> </div>
</div> </div>