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

1. Cleaned up coauth & copi person level pages.

Browse source 
2. Modified styles per recommendation from IU Designer Elisha.
3. Made changes to content for different sparkline content providers.
This commit is contained in:
cdtank 2011-01-05 00:51:40 +00:00
parent f8278ed47f
commit 2e6163aeb6
12 changed files with 269 additions and 377 deletions
Download patch file Download diff file Expand all files Collapse all files

11
productMods/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl
View file

@ -12,7 +12,7 @@
<#assign sparklineContainerID = visContainerID + "_spark">
</#if>
<div class="staticPageBackground" style="width: 50%; float: right;">
<div class="staticPageBackground">
<div id="${visContainerID}">
<script type="text/javascript">
@ -83,7 +83,7 @@
var sparksText = ' from <span class="sparkline_range">${sparklineVO.earliestYearConsidered?c}'
+ ' to ${sparklineVO.latestRenderedPublicationYear?c}</span> '
+ ' <a href="${sparklineVO.downloadDataLink}" class="inline_href">(.CSV File)</a> ';
+ ' <br /><a href="${sparklineVO.downloadDataLink}">(.CSV File)</a> ';
</#if>
@ -162,11 +162,11 @@
<#--</span>-->
<#else>
<!-- For Full Sparkline - Print the Table of Couauthor Counts per Year -->
<p>
<#if displayTable?? && displayTable>
<p>
<#assign tableID = "sparkline_data_table" />
<#assign tableID = "coauthors_sparkline_data_table" />
<#assign tableCaption = "Unique Co-Authors per year " />
<#assign tableActivityColumnName = "Count" />
<#assign tableContent = sparklineVO.yearToActivityCount />
@ -179,7 +179,6 @@
</p>
</#if>
</p>
</#if>
</div>

11
productMods/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl
View file

@ -12,7 +12,7 @@
<#assign sparklineContainerID = visContainerID + "_spark">
</#if>
<div class="staticPageBackground" style="width: 50%; float: right;">
<div class="staticPageBackground">
<div id="${visContainerID}">
<script type="text/javascript">
@ -82,7 +82,7 @@
var sparksText = ' from <span class="sparkline_range">${sparklineVO.earliestYearConsidered?c}'
+ ' to ${sparklineVO.latestRenderedGrantYear?c}</span> '
+ ' <a href="${sparklineVO.downloadDataLink}" class="inline_href">(.CSV File)</a> ';
+ '<br /> <a href="${sparklineVO.downloadDataLink}">(.CSV File)</a> ';
</#if>
$('#${sparklineContainerID} td.sparkline_text').html(sparksText).css("font-weight", "bold");
@ -161,11 +161,10 @@
<#--</span>-->
<#else>
<!-- For Full Sparkline - Print the Table of CoInvestigator Counts per Year -->
<p>
<#if displayTable?? && displayTable>
<p>
<#assign tableID = "sparkline_data_table" />
<#assign tableID = "coinve_sparkline_data_table" />
<#assign tableCaption = "Unique Co-Investigators per year " />
<#assign tableActivityColumnName = "Count" />
<#assign tableContent = sparklineVO.yearToActivityCount />
@ -178,7 +177,5 @@
</p>
</#if>
</p>
</#if>
</div>
</div>

11
productMods/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl
View file

@ -12,7 +12,7 @@
<#assign sparklineContainerID = visContainerID + "_spark">
</#if>
<div class="staticPageBackground" style="width: 50%; float: left;">
<div class="staticPageBackground">
<div id="${visContainerID}">
<script type="text/javascript">
@ -82,7 +82,7 @@
var sparksText = ' from <span class="sparkline_range">${sparklineVO.earliestYearConsidered?c}'
+ ' to ${sparklineVO.latestRenderedGrantYear?c}</span> '
+ ' <a href="${sparklineVO.downloadDataLink}" class="inline_href">(.CSV File)</a> ';
+ '<br /> <a href="${sparklineVO.downloadDataLink}" >(.CSV File)</a> ';
</#if>
@ -161,7 +161,7 @@
<#if displayTable?? && displayTable>
<p>
<#assign tableID = "sparkline_data_table" />
<#assign tableID = "grant_sparkline_data_table" />
<#assign tableCaption = "Grants per year " />
<#assign tableActivityColumnName = "Grants" />
<#assign tableContent = sparklineVO.yearToActivityCount />
@ -178,7 +178,4 @@
</#if>
</div>
</div>

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

@ -52,11 +52,9 @@ var visualizationDataRoot = "${dataVisualizationURLRoot}";
<script type="text/javascript" src="${commonPersonLevelJavaScript}"></script>
<#assign coAuthorStyle = "${urls.base}/css/visualization/personlevel/coauthor_style.css" />
<#assign pageStyle = "${urls.base}/css/visualization/personlevel/page.css" />
<#assign vizStyle = "${urls.base}/css/visualization/visualization.css" />
<link href="${coAuthorStyle}" rel="stylesheet" type="text/css" />
<link href="${pageStyle}" rel="stylesheet" type="text/css" />
<link rel="stylesheet" type="text/css" href="${vizStyle}" />
@ -92,53 +90,57 @@ $(document).ready(function(){
<div id="ego_profile">
<#-- Label -->
<h2 style="width:20%"><span id="ego_label" class="author_name"></span></h2>
<h2><span id="ego_label" class="author_name"></span></h2>
<#-- Moniker-->
<em id="ego_moniker" class="moniker"></em>
<em id="ego_moniker" class="moniker"></em>
<div class = "toggle_visualization">
<div style="float:left;margin-top: 5%;margin-right: 10px; height:100%;"><img src="${coInvestigatorIcon}"/></div>
<div><h3>Co-Investigator Network <br/><a class="view-all-style" href="${coprincipalinvestigatorURL}">View <span class= "pictos-arrow-10">4</span></a></h3></div>
</div>
<span class="pictos-arrow-14">4</span><a href="${egoVivoProfileURL}">Back to Profile</a>
</div>
<div class = "toggle_visualization">
<div id="coinvestigator_link_container">
<div class="collaboratorship-icon"><a href="${coprincipalinvestigatorURL}"><img src="${coInvestigatorIcon}" /></a></div>
<div class="collaboratorship-link">
<h3><a href="${coprincipalinvestigatorURL}">Co-Investigator Network</a></h3><a class="view-all-style" href="${coprincipalinvestigatorURL}">View <span class= "pictos-arrow-10">4</span></a>
</div>
</div>
</div>
<div style="clear:both;"></div>
<#if (numOfAuthors?? && numOfAuthors > 0) >
<div class="sub_headings"><h3>Co-Author Network </h3></div>
<div style=" width: 20%; margin-top:25px;"><span class="pictos-arrow-14">4</span><a href="${egoVivoProfileURL}" style="color:#171717;text-decoration:none;">Back to Profile</a></div>
<div style="clear:both;"></div>
<#if (numOfAuthors?? && numOfAuthors > 0) >
<div class="sub_headings"><h2>Co-Author Network </h2></div>
<#if (numOfCoAuthorShips?? && numOfCoAuthorShips > 0) || (numOfAuthors?? && numOfAuthors > 0) >
<div class = "fileDownloadPlaceHolder"><a href="${egoCoAuthorshipNetworkDataFileURL}">(GraphML File)</a></div>
<#else>
<#if (numOfCoAuthorShips?? && numOfCoAuthorShips > 0) || (numOfAuthors?? && numOfAuthors > 0) >
<div class = "graphml-file-link"><a href="${egoCoAuthorshipNetworkDataFileURL}">(GraphML File)</a></div>
<#else>
<#if numOfAuthors?? && numOfAuthors <= 0 >
<#assign authorsText = "multi-author" />
</#if>
<span id="no_coauthorships">Currently there are no ${authorsText!} papers for
<a href="${egoVivoProfileURL}"><span id="no_coauthorships_person" class="author_name">this author</span></a>
in the VIVO database.
</span>
</#if>
<#else>
<span id="no_coauthorships">Currently there are no papers for
<a href="${egoVivoProfileURL}"><span id="no_coauthorships_person" class="author_name">this author</span></a> in the
VIVO database.
</span>
</#if>
</div>
<#if numOfAuthors?? && numOfAuthors <= 0 >
<#assign authorsText = "multi-author" />
</#if>
<div id="no_coauthorships">Currently there are no ${authorsText!} papers for
<a href="${egoVivoProfileURL}"><span id="no_coauthorships_person" class="author_name">this author</span></a>
in the VIVO database.
</div>
</#if>
<#else>
<span id="no_coauthorships">Currently there are no papers for
<a href="${egoVivoProfileURL}"><span id="no_coauthorships_person" class="author_name">this author</span></a> in the
VIVO database.
</span>
</#if>
<#if (numOfCoAuthorShips?? && numOfCoAuthorShips > 0) || (numOfAuthors?? && numOfAuthors > 0) >
<div id="bodyPannel">
<div id="visPanel" style="float: right; width: 600px;">
<div id="visPanel">
<script language="JavaScript" type="text/javascript">
<!--
renderCollaborationshipVisualization();
@ -146,14 +148,16 @@ $(document).ready(function(){
</script>
</div>
<div id="dataPanel">
<h4 id ="profileTitle"> <b>Profile</b></h4>
<h4 id ="profileTitle">Profile</h4>
<div id="data-panel-content">
<div id="profileImage" class="thumbnail"></div>
<div><h2><span id="authorName" class="neutral_author_name">&nbsp;</span></h2></div>
<h4><span id="authorName" class="neutral_author_name">&nbsp;</span></h4>
<div class="italicize"><span id="profileMoniker" class="author_moniker"></span></div>
<em id="profileMoniker" class="moniker"></em>
<div><a href="#" id="profileUrl">VIVO profile</a> | <a href="#" id="coAuthorshipVisUrl">Co-author network</a></div>
<br />
<div class="author_stats" id="num_works"><span class="numbers" style="width: 40px;" id="works"></span>&nbsp;&nbsp;
<span class="author_stats_text">Publication(s)</span></div>
<div class="author_stats" id="num_authors"><span class="numbers" style="width: 40px;" id="coAuthors"></span>
@ -165,20 +169,21 @@ $(document).ready(function(){
&nbsp;&nbsp;<span>Last Publication</span></div>
<div id="incomplete-data">Note: This information is based solely on publications which have been loaded into the VIVO system.
This may only be a small sample of the person's total work. </div>
</div>
</div>
</div>
</#if>
<#-- Sparkline -->
<div style="width: 67%; height: 175px; margin-left: 33%;">
<div id="sparkline-container">
<#assign displayTable = false />
<#assign sparklineVO = egoPubSparklineVO />
<#include "personPublicationSparklineContent.ftl">
<div id="publication-count-sparkline-include"><#include "personPublicationSparklineContent.ftl"></div>
<#assign sparklineVO = uniqueCoauthorsSparklineVO />
<#include "coAuthorshipSparklineContent.ftl">
<div id="coauthor-count-sparkline-include"><#include "coAuthorshipSparklineContent.ftl"></div>
</div>
<#if (numOfAuthors?? && numOfAuthors > 0) >
@ -217,4 +222,4 @@ $(document).ready(function(){
</#if>
</div>
</div>

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

@ -50,11 +50,9 @@ var visualizationDataRoot = "${dataVisualizationURLRoot}";
<script type="text/javascript" src="${coInvestigatorPersonLevelJavaScript}"></script>
<script type="text/javascript" src="${commonPersonLevelJavaScript}"></script>
<#assign coInvestigatorStyle = "${urls.base}/css/visualization/personlevel/coinvestigator_style.css" />
<#assign pageStyle = "${urls.base}/css/visualization/personlevel/page.css" />
<#assign vizStyle = "${urls.base}/css/visualization/visualization.css" />
<link href="${coInvestigatorStyle}" rel="stylesheet" type="text/css" />
<link href="${pageStyle}" rel="stylesheet" type="text/css" />
<link rel="stylesheet" type="text/css" href="${vizStyle}" />
@ -90,71 +88,75 @@ $(document).ready(function(){
<div id="ego_profile">
<#-- Label -->
<h2 style="width:20%"><span id="ego_label" class="investigator_name"></span></h2>
<h2><span id="ego_label" class="investigator_name"></span></h2>
<#-- Moniker-->
<em id="ego_moniker" class="moniker"></em>
<span class="pictos-arrow-14">4</span><a href="${egoVivoProfileURL}">Back to Profile</a>
<div class = "toggle_visualization">
<div style="float:left;margin-top: 5%;margin-right: 10px; height:100%;"><img src="${coAuthorIcon}"/></div>
<div><h3>Co-Author Network <br/><a class="view-all-style" href="${coauthorshipURL}">View <span class= "pictos-arrow-10">4</span></a></h3></div>
</div>
<div style=" width: 20%; margin-top:25px;"><span class="pictos-arrow-14">4</span><a href="${egoVivoProfileURL}" style="color:#171717;text-decoration:none;">Back to Profile</a></div>
</div>
<div style="clear:both;"></div>
<div class = "toggle_visualization">
<div id="coauthorship_link_container">
<div class="collaboratorship-icon"><a href="${coauthorshipURL}"><img src="${coAuthorIcon}" /></a></div>
<div class="collaboratorship-link">
<h3><a href="${coauthorshipURL}">Co-Author Network</a></h3><a class="view-all-style" href="${coauthorshipURL}">View <span class= "pictos-arrow-10">4</span></a>
</div>
</div>
</div>
<div style="clear:both;"></div>
<#if (numOfInvestigators?? && numOfInvestigators > 0) >
<div class="sub_headings"><h2 >Co-Investigator Network </h2></div>
<#if (numOfCoInvestigations?? && numOfCoInvestigations > 0) || (numOfInvestigators?? && numOfInvestigators > 0) >
<div class = "fileDownloadPlaceHolder"><a href="${egoCoInvestigationNetworkDataFileURL}">(GraphML File)</a></div>
<#else>
<#if (numOfInvestigators?? && numOfInvestigators > 0) >
<div class="sub_headings"><h3 >Co-Investigator Network </h3></div>
<#if (numOfCoInvestigations?? && numOfCoInvestigations > 0) || (numOfInvestigators?? && numOfInvestigators > 0) >
<div class = "graphml-file-link"><a href="${egoCoInvestigationNetworkDataFileURL}">(GraphML File)</a></div>
<#else>
<#if numOfInvestigators?? && numOfInvestigators <= 0 >
<#assign investigatorsText = "multi-investigator" />
</#if>
<span id="no_coinvestigations">Currently there are no ${investigatorsText!} grants for
<a href="${egoVivoProfileURL}"><span id="no_coinvestigations_person" class="investigator_name">this investigator</span></a>
in the VIVO database.
</span>
</#if>
<#if numOfInvestigators?? && numOfInvestigators <= 0 >
<#assign investigatorsText = "multi-investigator" />
</#if>
<span id="no_coinvestigations">Currently there are no ${investigatorsText!} grants for
<a href="${egoVivoProfileURL}"><span id="no_coinvestigations_person" class="investigator_name">this investigator</span></a>
in the VIVO database.
</span>
</#if>
<#else>
<span id="no_coinvestigations">Currently there are no grants for
<a href="${egoVivoProfileURL}"><span id="no_coinvestigations_person" class="investigator_name">this investigator</span></a> in the
VIVO database.
</span>
</#if>
<#else>
<span id="no_coinvestigations">Currently there are no grants for
<a href="${egoVivoProfileURL}"><span id="no_coinvestigations_person" class="investigator_name">this investigator</span></a> in the
VIVO database.
</span>
</#if>
</div>
<#if (numOfCoInvestigations?? && numOfCoInvestigations > 0) || (numOfInvestigators?? && numOfInvestigators > 0) >
<div id="bodyPannel">
<div id="visPanel" style="float: right; width: 600px;">
<div id="visPanel">
<script language="JavaScript" type="text/javascript">
<!--
renderCoInvestigationVisualization();
renderCollaborationshipVisualization();
//-->
</script>
</div>
<div id="dataPanel">
<h4 id ="profileTitle"> <b>Profile</b></h4>
<h4 id ="profileTitle">Profile</h4>
<div id="data-panel-content">
<div id="profileImage" class="thumbnail"></div>
<div><h2><span id="investigatorName" class="neutral_investigator_name">&nbsp;</span></h2></div>
<h4><span id="investigatorName" class="neutral_investigator_name">&nbsp;</span></h4>
<em id="profileMoniker" class="moniker"></em>
<div class="italicize"><span id="profileMoniker" class="investigator_moniker"></span></div>
<div><a href="#" id="profileUrl">VIVO profile</a> | <a href="#" id="coInvestigationVisUrl">Co-investigator network</a></div>
<br />
<div class="investigator_stats" id="num_works"><span class="numbers" style="width: 40px;" id="works"></span>&nbsp;&nbsp;
<span class="investigator_stats_text">Grant(s)</span></div>
<div class="investigator_stats" id="num_investigators"><span class="numbers" style="width: 40px;" id="coInvestigators"></span>
@ -166,18 +168,21 @@ $(document).ready(function(){
&nbsp;&nbsp;<span>Last Grant</span></div>
<div id="incomplete-data">Note: This information is based solely on grants which have been loaded into the VIVO system.
This may only be a small sample of the person's total work. </div>
</div>
</div>
</div>
</#if>
<#-- Sparkline -->
<div style="width: 67%; height: 175px; margin-left: 33%;">
<div id="sparkline-container">
<#assign displayTable = false />
<#assign sparklineVO = egoGrantSparklineVO />
<#include "personGrantSparklineContent.ftl">
<div id="grant-count-sparkline-include"><#include "personGrantSparklineContent.ftl"></div>
<#assign sparklineVO = uniqueCoInvestigatorsSparklineVO />
<#include "coInvestigationSparklineContent.ftl">
<div id="coinvestigator-count-sparkline-include"><#include "coInvestigationSparklineContent.ftl"></div>
</div>
<#if (numOfInvestigators?? && numOfInvestigators > 0) >

6
productMods/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl
View file

@ -12,7 +12,7 @@
<#assign sparklineContainerID = visContainerID + "_spark">
</#if>
<div class="staticPageBackground" style="width: 50%; float: left;">
<div class="staticPageBackground">
<div id="${visContainerID}">
<script type="text/javascript">
@ -84,7 +84,7 @@
var sparksText = ' from <span class="sparkline_range">${sparklineVO.earliestYearConsidered?c}'
+ ' to ${sparklineVO.latestRenderedPublicationYear?c}</span> '
+ ' <a href="${sparklineVO.downloadDataLink}" class="inline_href">(.CSV File)</a> ';
+ ' <br /><a href="${sparklineVO.downloadDataLink}">(.CSV File)</a> ';
</#if>
$('#${sparklineContainerID} td.sparkline_text').html(sparksText);
@ -163,7 +163,7 @@
<#if displayTable?? && displayTable>
<p>
<#assign tableID = "sparkline_data_table" />
<#assign tableID = "publications_sparkline_data_table" />
<#assign tableCaption = "Publications per year " />
<#assign tableActivityColumnName = "Publications" />
<#assign tableContent = sparklineVO.yearToActivityCount />