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

productMods/css/visualization/entitycomparison/layout.css

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

productMods/js/visualization/entitycomparison/gui-event-manager.js

@@ -263,7 +263,7 @@ var processJSONData = {
 		return sum;
 	},
 	
-	setupGlobals: function(jsonContent) {
+	setupGlobals: function(jsonContent, resetFilter) {
 		
 		var entityLevels = new Array();
 		var entityActivityCount = {
@@ -325,6 +325,12 @@ var processJSONData = {
 	    	
 	    });
 		
+		/*
+		 * 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";
@@ -341,6 +347,7 @@ var processJSONData = {
 				$("#organizations-filter").removeClass("active-filter");
 				
 			}
+		}
 		
 		if (processJSONData.isParentEntityAvailable) {
 			$("#subject-parent-entity").show();
@@ -373,7 +380,7 @@ var processJSONData = {
 	 */
 	loadData: function(jsonData, dataTableParams) {
 	    
-		processJSONData.setupGlobals(jsonData);
+		processJSONData.setupGlobals(jsonData, true);
 		
 		temporalGraphProcessor.dataTable = prepareTableForDataTablePagination(jsonData, dataTableParams);
 	    
@@ -619,11 +626,15 @@ temporalGraphProcessor = {
 		
 		var currentSelectedEntityURIs = [];
 		
+		console.log(URIToCheckedEntities);
+		
 		$.each(URIToCheckedEntities, function(index, entity){
 			currentSelectedEntityURIs.push(index);
 		});
 		
 		clearRenderedObjects();
+		
+		console.log(URIToCheckedEntities);
 		initConstants();
 		
 		/*

productMods/js/visualization/entitycomparison/util.js

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

productMods/templates/freemarker/visualization/entitycomparison/entityComparisonBody.ftl

@@ -8,7 +8,7 @@
         </div>
         
         <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="leftUpper">
@@ -65,6 +65,9 @@
                 <div id="people-organizations-filter">
                 	<span id="organizations-filter" class="filter-option active-filter">Organizations</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 id="paginatedTable"></div>