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

1. Made minor changes to image display logic

Browse source 
2. Made sparkline text changes as requested by Nick C.
This commit is contained in:
cdtank 2010-07-15 17:02:33 +00:00
parent 94d8de065e
commit b3dc7364ef
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationCodeGenerator.java
View file

@ -342,12 +342,12 @@ public class VisualizationCodeGenerator {
* */ * */
visualizationCode.append("$('#" + visDivNames.get("SHORT_SPARK") + " td.sparkline_number').text(renderedShortSparks);"); visualizationCode.append("$('#" + visDivNames.get("SHORT_SPARK") + " td.sparkline_number').text(renderedShortSparks);");
visualizationCode.append("var shortSparksText = ''" + visualizationCode.append("var shortSparksText = ''" +
"+ ' Papers with year from '" + "+ ' publications within the last 10 years '" +
"+ ' " + totalPublications + " '" + /*"+ ' " + totalPublications + " '" +
"+ ' total " + "+ ' total " +
"<span class=\"sparkline_range\">" + "<span class=\"sparkline_range\">" +
"(" + shortSparkMinYear + " - " + currentYear + ")" + "(" + shortSparkMinYear + " - " + currentYear + ")" +
"</span>'" + "</span>'" +*/
"+ '';" + "+ '';" +
"$('#" + visDivNames.get("SHORT_SPARK") + " td.sparkline_text').html(shortSparksText);"); "$('#" + visDivNames.get("SHORT_SPARK") + " td.sparkline_text').html(shortSparksText);");
@ -396,11 +396,11 @@ public class VisualizationCodeGenerator {
visualizationCode.append("$('#" + visDivNames.get("FULL_SPARK") + " td.sparkline_number').text('" + renderedFullSparks + "');"); visualizationCode.append("$('#" + visDivNames.get("FULL_SPARK") + " td.sparkline_number').text('" + renderedFullSparks + "');");
visualizationCode.append("var allSparksText = ''" + visualizationCode.append("var allSparksText = ''" +
"+ ' papers with year from '" + "+ ' publications '" +
"+ ' " + totalPublications + " '" + /*"+ ' " + totalPublications + " '" +*/
"+ ' total " + "+ ' between " +
"<span class=\"sparkline_range\">" + "<span class=\"sparkline_range\">" +
"(" + minPubYearConsidered + " - " + currentYear + ")" + "" + minPubYearConsidered + " & " + currentYear + "" +
"</span> '" + "</span> '" +
"+ ' " + csvDownloadURLHref + " ';" + "+ ' " + csvDownloadURLHref + " ';" +
"$('#" + visDivNames.get("FULL_SPARK") + " td.sparkline_text').html(allSparksText);"); "$('#" + visDivNames.get("FULL_SPARK") + " td.sparkline_text').html(allSparksText);");
@ -590,7 +590,7 @@ public class VisualizationCodeGenerator {
System.out.println("context parth full n/w " + contextPath); System.out.println("context parth full n/w " + contextPath);
fullTimelineLink = "<a href='" + fullTimelineNetworkURL + "'>View full timeline and co-author network</a><br />"; fullTimelineLink = "<a href='" + fullTimelineNetworkURL + "'>View all publications over career and co-author network</a><br />";
valueObjectContainer.setFullTimelineNetworkLink(fullTimelineNetworkURL); valueObjectContainer.setFullTimelineNetworkLink(fullTimelineNetworkURL);

6
webapp/web/js/visualization/personlevel/person_level.js
View file

@ -82,10 +82,14 @@ $.fn.image = function(src, successFunc, failureFunc){
function setProfileImage(imageContainerID, mainImageURL, contextPath) { function setProfileImage(imageContainerID, mainImageURL, contextPath) {
if (imageContainerID == "" || !mainImageURL) { if (imageContainerID == "") {
return; return;
} }
if (!mainImageURL) {
$("#" + imageContainerID).empty();
}
var rawPath = getWellFormedURLs(mainImageURL, "image"); var rawPath = getWellFormedURLs(mainImageURL, "image");
var imageLink = contextPath + rawPath; var imageLink = contextPath + rawPath;