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

1. More changes to the front-end for temporal vis re:text & info-icons.

Browse source
This commit is contained in:
cdtank 2011-04-19 16:45:11 +00:00
parent 86b855df95
commit c65f02a3d6
4 changed files with 39 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
productMods/css/visualization/entitycomparison/layout.css
View file

@ -50,6 +50,12 @@ for the message is getting set to 50%, hence we need to override it here.
text-decoration: none; text-decoration: none;
} }
.filterInfoIcon {
vertical-align:top;
width:15px;
margin-left: 9px;
}
.current-year-bar, .current-year-bar,
.known-bar { .known-bar {
display: inline-block; display: inline-block;

31
productMods/js/visualization/entitycomparison/gui-event-manager.js
View file

@ -263,7 +263,7 @@ var processJSONData = {
return sum; return sum;
}, },
setupGlobals: function(jsonContent) { setupGlobals: function(jsonContent, resetFilter) {
var entityLevels = new Array(); var entityLevels = new Array();
var entityActivityCount = { var entityActivityCount = {
@ -325,21 +325,28 @@ var processJSONData = {
}); });
if (entityActivityCount.ORGANIZATION >= entityActivityCount.PERSON) { /*
* We do not want to change the current filter setting if the user has changed the parameter
* from the dropdown box. Only when the temporal vis is loaded directly we want to make sure
* that the group of entites that has the most activity is shown.
* */
if (resetFilter) {
if (entityActivityCount.ORGANIZATION >= entityActivityCount.PERSON) {
temporalGraphProcessor.currentSelectedFilter = "ORGANIZATIONS"; temporalGraphProcessor.currentSelectedFilter = "ORGANIZATIONS";
$("#organizations-filter").addClass("active-filter"); $("#organizations-filter").addClass("active-filter");
$("#people-filter").removeClass("active-filter"); $("#people-filter").removeClass("active-filter");
} else { } else {
temporalGraphProcessor.currentSelectedFilter = "PEOPLE"; temporalGraphProcessor.currentSelectedFilter = "PEOPLE";
$("#people-filter").addClass("active-filter"); $("#people-filter").addClass("active-filter");
$("#organizations-filter").removeClass("active-filter"); $("#organizations-filter").removeClass("active-filter");
}
} }
if (processJSONData.isParentEntityAvailable) { if (processJSONData.isParentEntityAvailable) {
@ -373,7 +380,7 @@ var processJSONData = {
*/ */
loadData: function(jsonData, dataTableParams) { loadData: function(jsonData, dataTableParams) {
processJSONData.setupGlobals(jsonData); processJSONData.setupGlobals(jsonData, true);
temporalGraphProcessor.dataTable = prepareTableForDataTablePagination(jsonData, dataTableParams); temporalGraphProcessor.dataTable = prepareTableForDataTablePagination(jsonData, dataTableParams);
@ -619,11 +626,15 @@ temporalGraphProcessor = {
var currentSelectedEntityURIs = []; var currentSelectedEntityURIs = [];
console.log(URIToCheckedEntities);
$.each(URIToCheckedEntities, function(index, entity){ $.each(URIToCheckedEntities, function(index, entity){
currentSelectedEntityURIs.push(index); currentSelectedEntityURIs.push(index);
}); });
clearRenderedObjects(); clearRenderedObjects();
console.log(URIToCheckedEntities);
initConstants(); initConstants();
/* /*

6
productMods/js/visualization/entitycomparison/util.js
View file

@ -97,12 +97,6 @@
var iStartButton, iEndButton, i, iLen; var iStartButton, iEndButton, i, iLen;
var oClasses = oSettings.oClasses; var oClasses = oSettings.oClasses;
// console.log(iPageCount,
// iPageCountHalf,
// iPages,
// iCurrentPage,
// oClasses);
/* Pages calculation */ /* Pages calculation */
if (iPages < iPageCount) { if (iPages < iPageCount) {
iStartButton = 1; iStartButton = 1;

5
productMods/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl
View file

@ -8,7 +8,7 @@
</div> </div>
<h2 id="header-entity-label"><span><a id="organizationMoniker" href="${organizationVivoProfileURL}">${organizationLabel}</a>&nbsp; <h2 id="header-entity-label"><span><a id="organizationMoniker" href="${organizationVivoProfileURL}">${organizationLabel}</a>&nbsp;
<img id="incomplete-data-disclaimer" class="infoIcon" src="${urls.images}/iconInfo.png" alt="information icon" title="This information is based solely on ${currentParameterObject.value} which have been loaded into the VIVO system." /></span></h2> <img id="incomplete-data-disclaimer" class="infoIcon" src="${urls.images}/iconInfo.png" alt="information icon" title="This information is based solely on ${currentParameterObject.value} which have been loaded into the VIVO system" /></span></h2>
<div id="leftblock"> <div id="leftblock">
<div id="leftUpper"> <div id="leftUpper">
@ -65,6 +65,9 @@
<div id="people-organizations-filter"> <div id="people-organizations-filter">
<span id="organizations-filter" class="filter-option active-filter">Organizations</span> | <span id="organizations-filter" class="filter-option active-filter">Organizations</span> |
<span id="people-filter" class="filter-option">People</span> <span id="people-filter" class="filter-option">People</span>
<img class="filterInfoIcon" src="${urls.images}/iconInfo.png"
alt="information icon"
title="Note: the organizations or people listed below are only those which are directly beneath ${organizationLabel} in the organization hierarchy. You may 'drill down' to see the organizations or people below a given sub-organization by selecting the chart icon next to a selected sub-organization's name below the graph on the right." />
</div> </div>
<div id="paginatedTable"></div> <div id="paginatedTable"></div>