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:
parent
e9a2cae473
commit
63a3e318ea
8 changed files with 703 additions and 673 deletions
|
@ -1,85 +1,85 @@
|
|||
@CHARSET "UTF-8";
|
||||
|
||||
thead th, tr.even td{
|
||||
background-color: white;
|
||||
background-color: white;
|
||||
}
|
||||
|
||||
.paginatedtabs{
|
||||
/* border-top: 1px #3D454E solid; */
|
||||
text-align: center;
|
||||
margin-bottom: 10px;
|
||||
padding-top: 10px;
|
||||
font-size: 1.2em;
|
||||
/* border-top: 1px #3D454E solid; */
|
||||
text-align: center;
|
||||
margin-bottom: 10px;
|
||||
padding-top: 10px;
|
||||
font-size: 1.2em;
|
||||
}
|
||||
|
||||
.paginatedtabs span{
|
||||
padding-right: 5px;
|
||||
cursor: pointer;
|
||||
padding-right: 5px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.datatablewrapper td, th{
|
||||
border-bottom: 1px #F1F2EE solid;
|
||||
border-right: 1px #F1F2EE solid;
|
||||
border-left: 1px #F1F2EE solid;
|
||||
text-align: left;
|
||||
padding: 5px;
|
||||
font-size: 10px;
|
||||
border-bottom: 1px #F1F2EE solid;
|
||||
border-right: 1px #F1F2EE solid;
|
||||
border-left: 1px #F1F2EE solid;
|
||||
text-align: left;
|
||||
padding: 5px;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.showentries {
|
||||
text-align: center;
|
||||
margin-bottom: 10px;
|
||||
text-align: center;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.searchbar{
|
||||
margin-bottom: -10px;
|
||||
text-align: left;
|
||||
margin-bottom: -10px;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.datatablewrapper th{
|
||||
border-top: 1px #3D454E solid;
|
||||
background:#F1F2ee;
|
||||
font-weight:bold;
|
||||
font-size:12px;
|
||||
border-top: 1px #3D454E solid;
|
||||
background:#F1F2ee;
|
||||
font-weight:bold;
|
||||
font-size:12px;
|
||||
}
|
||||
|
||||
/*
|
||||
.datatablewrapper th{
|
||||
border-top: 1px #3D454E solid;
|
||||
border-bottom: 1px #3D454E solid;
|
||||
border-right: 1px #3D454E solid;
|
||||
padding: 5px;
|
||||
border-top: 1px #3D454E solid;
|
||||
border-bottom: 1px #3D454E solid;
|
||||
border-right: 1px #3D454E solid;
|
||||
padding: 5px;
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
|
||||
.sorting_asc {
|
||||
background: url('sort_asc.png') no-repeat center right;
|
||||
background: url('sort_asc.png') no-repeat center right;
|
||||
}
|
||||
|
||||
.sorting_desc {
|
||||
background: url('sort_desc.png') no-repeat center right;
|
||||
background: url('sort_desc.png') no-repeat center right;
|
||||
}
|
||||
|
||||
.sorting {
|
||||
background: url('sort_both.png') no-repeat center right;
|
||||
background: url('sort_both.png') no-repeat center right;
|
||||
}
|
||||
|
||||
.sorting_asc_disabled {
|
||||
background: url('sort_asc_disabled.png') no-repeat center right;
|
||||
background: url('sort_asc_disabled.png') no-repeat center right;
|
||||
}
|
||||
|
||||
.sorting_desc_disabled {
|
||||
background: url('sort_desc_disabled.png') no-repeat center right;
|
||||
background: url('sort_desc_disabled.png') no-repeat center right;
|
||||
}
|
||||
|
||||
/*
|
||||
tr.odd {
|
||||
background-color: #E2E4FF;
|
||||
background-color: #E2E4FF;
|
||||
}
|
||||
|
||||
tr.even {
|
||||
background-color: white;
|
||||
background-color: white;
|
||||
}
|
||||
*/
|
||||
|
|
|
@ -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>');
|
||||
labelDiv.append('<a class="temporal-vis-url" href="' + getTemporalVisURL(entity) + '"><img src = "' + temporalGraphSmallIcon + '"/></a>');
|
||||
|
||||
/*
|
||||
* 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) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue