1. Added comment about the new visualization.topLevelOrg property for deploy.proeprties. Added similar content for install.txt.
2. Made front-end improvements to temporal graph vis per Katy's suggestions. 3. Made improvements to person level vis front-end.
This commit is contained in:
cdtank
parent
e9a2cae473
commit
63a3e318ea
8 changed files with 703 additions and 673 deletions
|
|
@ -164,6 +164,23 @@ example value: defaultAdmin
|
|||
property name: selfEditing.idMatchingProperty
|
||||
example value: http://vivo.mydomain.edu/ns#networkId
|
||||
|
||||
NOTE: If you want to use an external authentication system like Shibboleth or
|
||||
CUWebAuth, you will need to set two additional properties in this file. See
|
||||
the section below entitled "Using an External Authentication System with VIVO".
|
||||
|
||||
Temporal Graph Visualization is used to compare different
|
||||
organizations/people within an organization on different parameters
|
||||
like number of publications, grants. This parameter will be used
|
||||
as a default in case a URI is not provided. It will be also used
|
||||
whenever this visualization is to be rendered for top level organization.
|
||||
In absence of this parameter a SPARQL query will be fired which will
|
||||
attempt to provide a top level organization.The name of a property
|
||||
that can be used to associate an Individual with a user account.
|
||||
When a user logs in with a name that matches the value of this property,
|
||||
the user will be authorized to edit that Individual.
|
||||
property name: visualization.topLevelOrg
|
||||
example value: http://vivo-trunk.indiana.edu/individual/topLevelOrgURI
|
||||
|
||||
NOTE: If you want to use an external authentication system like Shibboleth or
|
||||
CUWebAuth, you will need to set two additional properties in this file. See
|
||||
the section below entitled "Using an External Authentication System with VIVO".
|
||||
|
|
|
|||
|
|
@ -124,3 +124,13 @@ selfEditing.idMatchingProperty = http://vivo.mydomain.edu/ns#networkId
|
|||
#
|
||||
#externalAuth.buttonText = Log in using BearCat Shibboleth
|
||||
#externalAuth.netIdHeaderName = remote_userID
|
||||
|
||||
#
|
||||
# Temporal Graph Visualization is used to compare different organizations/people
|
||||
# within an organization on different parameters like number of publications, grants.
|
||||
# This parameter will be used as a default in case a URI is not provided. It will be
|
||||
# also used whenever this visualization is to be rendered for top level organization.
|
||||
# In absence of this parameter a SPARQL query will be fired which will attempt to
|
||||
# provide a top level organization.
|
||||
|
||||
# visualization.topLevelOrg = http://vivo-trunk.indiana.edu/individual/topLevelOrgURI
|
||||
|
|
@ -28,15 +28,16 @@ h2 {
|
|||
|
||||
a.temporalGraphLinks {
|
||||
margin-top: 10px;
|
||||
float:right;
|
||||
/*float:right;*/
|
||||
height: 20px;
|
||||
text-decoration: none;
|
||||
width: 30%;
|
||||
margin: 0 1% 0 1%;
|
||||
/*margin: 0 1% 0 1%;*/
|
||||
background-color: #EAEAEA;
|
||||
text-align: center;
|
||||
padding: 3px;
|
||||
padding-top: 4px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
#reset-search {
|
||||
|
|
@ -53,11 +54,12 @@ form{
|
|||
font-size: 12px;
|
||||
float:right;
|
||||
background-color: white;
|
||||
color:black;
|
||||
color: #595B5B;
|
||||
display: block;
|
||||
height: 150px;
|
||||
text-align: center;
|
||||
padding-top: 50px;
|
||||
position: absolute !important;
|
||||
}
|
||||
|
||||
#xaxislabel{
|
||||
|
|
@ -110,6 +112,17 @@ position: inherit;
|
|||
color:red;
|
||||
}
|
||||
|
||||
#header-entity-label {
|
||||
|
||||
font-size: 1.1em;
|
||||
font-weight: bold;
|
||||
|
||||
}
|
||||
|
||||
#header-entity-label a {
|
||||
color: #13968C;
|
||||
}
|
||||
|
||||
.ellipsis {
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
|
|
@ -119,6 +132,7 @@ position: inherit;
|
|||
width: 125px;
|
||||
margin-right: 10px;
|
||||
display:inline-block;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.ellipsis.multiline {
|
||||
|
|
@ -130,17 +144,20 @@ position: inherit;
|
|||
}
|
||||
|
||||
#bottom,#graphContainer {
|
||||
float: right;
|
||||
/*float: right;*/
|
||||
}
|
||||
|
||||
#graphContainer {
|
||||
margin-bottom: 15px;
|
||||
width: 450px;
|
||||
height: 250px;
|
||||
margin-left: 23px;
|
||||
}
|
||||
|
||||
#leftblock {
|
||||
float: left;
|
||||
margin-left: 5%;
|
||||
width: 36%;
|
||||
/*margin-left: 5%;*/
|
||||
width: 39%;
|
||||
}
|
||||
|
||||
#text {
|
||||
|
|
@ -156,7 +173,7 @@ position: inherit;
|
|||
|
||||
#rightblock {
|
||||
float:right;
|
||||
margin-right:5%;
|
||||
margin-right:3%;
|
||||
width:54%;
|
||||
margin-top: -43px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ thead th, tr.even td{
|
|||
border-left: 1px #F1F2EE solid;
|
||||
text-align: left;
|
||||
padding: 5px;
|
||||
font-size: 10px;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.showentries {
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@
|
|||
*/
|
||||
function init(graphContainer) {
|
||||
|
||||
$('#yaxislabel').css("color", "#595B5B");
|
||||
var optionSelected = $("select.comparisonValues option:selected").val();
|
||||
// TODO: make use of the id on the select field instead of a generic one.
|
||||
$("#comparisonParameter").text("Total Number of " + $("select.comparisonValues option:selected").val());
|
||||
|
|
@ -395,7 +394,15 @@ function createLegendRow(entity, bottomDiv) {
|
|||
var labelDiv = $('<div>');
|
||||
labelDiv.attr('class', 'easy-deselect-label');
|
||||
labelDiv.html('<div class="entity-label-url ellipsis"></div>');
|
||||
|
||||
/*
|
||||
* We should display a further drill-down option only when available. In case of people
|
||||
* there is no drill-down possible, so don't diaply the temporal graph icon.
|
||||
* */
|
||||
if (entity.visMode !== "PERSON") {
|
||||
labelDiv.append('<a class="temporal-vis-url" href="' + getTemporalVisURL(entity) + '"><img src = "' + temporalGraphSmallIcon + '"/></a>');
|
||||
}
|
||||
|
||||
|
||||
var checkbox = $('<input>');
|
||||
checkbox.attr('type', 'checkbox');
|
||||
|
|
@ -456,19 +463,7 @@ function getVIVOURL(entity){
|
|||
|
||||
function getTemporalVisURL(entity) {
|
||||
|
||||
var result = '';
|
||||
|
||||
if(entity.visMode == "PERSON"){
|
||||
|
||||
result = subOrganizationVivoProfileURL + "uri="+ entity.entityURI;
|
||||
|
||||
} else{
|
||||
|
||||
result = subOrganizationTemporalGraphURL + "&" +
|
||||
"uri=" + entity.entityURI ;
|
||||
}
|
||||
|
||||
return result;
|
||||
return subOrganizationTemporalGraphURL + "&uri=" + entity.entityURI ;
|
||||
}
|
||||
|
||||
function getVIVOProfileURL(given_uri) {
|
||||
|
|
|
|||
|
|
@ -292,7 +292,8 @@ var subOrganizationTemporalGraphURL = "${subOrganizationTemporalGraphURL}";
|
|||
|
||||
<div id="body">
|
||||
|
||||
<h2 style="width: 36%; padding-left:45px;"><a href="" id = "organizationMoniker"></a></h2>
|
||||
<h2><span id="header-entity-label"><a id="organizationMoniker" href="#"></a></span></h2>
|
||||
|
||||
<div id="leftblock">
|
||||
<div id="leftUpper">
|
||||
<h3>How do you want to compare?</h3>
|
||||
|
|
@ -302,11 +303,6 @@ var subOrganizationTemporalGraphURL = "${subOrganizationTemporalGraphURL}";
|
|||
<select class="comparisonValues" style="margin-bottom: 20px;">
|
||||
<option value="Publications" selected="selected">by Publications</option>
|
||||
<option value="Grants">by Grants</option>
|
||||
<#--
|
||||
<option value="People" disabled="disabled">by People</option>
|
||||
<option value="Item4" disabled="disabled">by Item4</option>
|
||||
<option value="Item5" disabled="disabled">by Item5</option>
|
||||
-->
|
||||
</select>
|
||||
|
||||
</div>
|
||||
|
|
@ -331,8 +327,9 @@ var subOrganizationTemporalGraphURL = "${subOrganizationTemporalGraphURL}";
|
|||
|
||||
</div>
|
||||
<h3>Who do you want to compare?</h3>
|
||||
<div id="paginatedTable">
|
||||
</div>
|
||||
<div id="paginatedTable"></div>
|
||||
<br />
|
||||
<a id="csv" href="${TemporalGraphDownloadFile}" class="temporalGraphLinks">Save as CSV</a>
|
||||
</div>
|
||||
<#--
|
||||
<div id = "stopwordsdiv">
|
||||
|
|
@ -340,25 +337,22 @@ var subOrganizationTemporalGraphURL = "${subOrganizationTemporalGraphURL}";
|
|||
</div>
|
||||
-->
|
||||
</div>
|
||||
|
||||
<div id="rightblock">
|
||||
|
||||
<h4 id="headerText" style="padding-left:60px;">Comparing <span id="comparisonHeader">Publications</span> of <span id="entityHeader">Institutions</span> in <span id="organizationLabel"></span></h4>
|
||||
<div id="graphContainer" style="width: 450px; height: 250px;"></div>
|
||||
<h4 id="headerText">Comparing <span id="comparisonHeader">Publications</span> of <span id="entityHeader">Institutions</span> in <span id="organizationLabel"></span></h4>
|
||||
|
||||
<div id="temporal-graph">
|
||||
<div id="yaxislabel"></div>
|
||||
<div id="graphContainer"></div>
|
||||
<div id="xaxislabel">Year</div>
|
||||
</div>
|
||||
|
||||
<div id="bottom" style="width: 450px; height: 350px;">
|
||||
<div id="xaxislabel">Year</div>
|
||||
|
||||
<div id="bottomButtons">
|
||||
<a id="clear" style="cursor:pointer;" class="temporalGraphLinks" >Remove All</a>
|
||||
<a id="csv" href="${TemporalGraphDownloadFile}" class="temporalGraphLinks" >Save as CSV</a>
|
||||
<#-- <a id="image" href = "" class="temporalGraphLinks" onClick="window.print()"> Save as Image</a>
|
||||
--> </div><br/>
|
||||
|
||||
<h4><span id="comparisonParameter"></span></h4>
|
||||
|
||||
<p class="displayCounter">You have selected <span id="counter">0</span> of a maximum <span
|
||||
id="total">10</span> <span id="entityleveltext"> schools</span> to compare.</p>
|
||||
<p class="displayCounter">You have selected <span id="counter">0</span> of a maximum
|
||||
<span id="total">10</span> <span id="entityleveltext"> schools</span> to compare.
|
||||
<a id="clear" class="temporalGraphLinks">Clear</a></p>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -90,14 +90,11 @@ $(document).ready(function(){
|
|||
<div id="ego_profile">
|
||||
|
||||
<#-- Label -->
|
||||
<h2><span id="ego_label" class="author_name"></span></h2>
|
||||
<h2><a href="${egoVivoProfileURL}"><span id="ego_label" class="author_name"></span></a></h2>
|
||||
|
||||
<#-- Moniker-->
|
||||
<em id="ego_moniker" class="moniker"></em>
|
||||
|
||||
<br />
|
||||
<img class="" src="${urls.images}/arrowBackIcon.gif" alt="arrow icon" /><a href="${egoVivoProfileURL}">Back to Profile</a>
|
||||
|
||||
</div>
|
||||
|
||||
<div class = "toggle_visualization">
|
||||
|
|
@ -175,6 +172,8 @@ $(document).ready(function(){
|
|||
</div>
|
||||
</#if>
|
||||
|
||||
<#if (numOfAuthors?? && numOfAuthors > 0) >
|
||||
|
||||
<#-- Sparkline -->
|
||||
<div id="sparkline-container">
|
||||
|
||||
|
|
@ -187,8 +186,6 @@ $(document).ready(function(){
|
|||
<div id="coauthor-count-sparkline-include"><#include "coAuthorshipSparklineContent.ftl"></div>
|
||||
</div>
|
||||
|
||||
<#if (numOfAuthors?? && numOfAuthors > 0) >
|
||||
|
||||
<div class="vis_stats">
|
||||
|
||||
<div class="sub_headings" id="table_heading"><h3>Tables</h3></div>
|
||||
|
|
|
|||
|
|
@ -88,12 +88,10 @@ $(document).ready(function(){
|
|||
<div id="ego_profile">
|
||||
|
||||
<#-- Label -->
|
||||
<h2><span id="ego_label" class="investigator_name"></span></h2>
|
||||
<h2><a href="${egoVivoProfileURL}"><span id="ego_label" class="investigator_name"></span></a></h2>
|
||||
|
||||
<#-- Moniker-->
|
||||
<em id="ego_moniker" class="moniker"></em>
|
||||
<br />
|
||||
<img class="" src="${urls.images}/arrowBackIcon.gif" alt="arrow icon" /><a href="${egoVivoProfileURL}">Back to Profile</a>
|
||||
|
||||
</div>
|
||||
|
||||
|
|
@ -173,6 +171,9 @@ $(document).ready(function(){
|
|||
</div>
|
||||
</#if>
|
||||
|
||||
|
||||
<#if (numOfInvestigators?? && numOfInvestigators > 0) >
|
||||
|
||||
<#-- Sparkline -->
|
||||
<div id="sparkline-container">
|
||||
|
||||
|
|
@ -185,7 +186,6 @@ $(document).ready(function(){
|
|||
<div id="coinvestigator-count-sparkline-include"><#include "coInvestigationSparklineContent.ftl"></div>
|
||||
</div>
|
||||
|
||||
<#if (numOfInvestigators?? && numOfInvestigators > 0) >
|
||||
|
||||
<div class="vis_stats">
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue