Update new visualization icons

Update info text on Map of Science
Update new copyright text to Map of Science

productMods/css/visualization/visualization.css

@@ -75,7 +75,7 @@ span.incomplete-data-holder,
     padding-left: 1.6em;
 }
 .temporal-graph {
-    background: url(../../images/visualization/temporal_vis_small_icon.jpg) top left no-repeat;
+    background: url(../../images/visualization/temporalgraph/temporal_graph_icon.png) top left no-repeat;
 }
 .infoIcon {
     padding-right:30px;

productMods/js/visualization/mapofscience/ComparisonDataTableWidget.js

@@ -3,6 +3,9 @@
 var ComparisonDataTableWidget = Class.extend({
 	
 	dom: {
+		firstFilterLabel: "Organizations",
+		secondFilterLabel: "People",
+		
 		searchBarParentContainerClass : "comparisonSearchbar",
 		paginationContainerClass : "paginatedtabs",
 		containerID: "main-science-areas-table-container",
@@ -59,10 +62,10 @@ var ComparisonDataTableWidget = Class.extend({
 		/* Create filter */
 		var dom = me.dom;
 		var filter = $('<div class="science-areas-filter">' +
-	    	'<span id="' + dom.firstFilterID + '" class="' + dom.filterOptionClass + ' ' + dom.activeFilterClass + '">Organizations</span>'+
+	    	'<span id="' + dom.firstFilterID + '" class="' + dom.filterOptionClass + ' ' + dom.activeFilterClass + '">' + dom.firstFilterLabel + '</span>'+
 	    	/* This is temporary removed due to the person's publications mapping rate is too low to be displayed.
 		    	' | ' +
-		    	'<span id="' + dom.secondFilterID + '" class="' + dom.filterOptionClass + '">People</span>' +
+		    	'<span id="' + dom.secondFilterID + '" class="' + dom.filterOptionClass + '">' + dom.secondFilterLabel + '</span>' +
 	    	*/
 	    	'<img class="' + dom.filterInfoIconClass + '" id="comparisonImageIconTwo" src="'+ infoIconUrl +'" alt="information icon" title="" /></div>');
 		me.tableDiv.append(filter);

productMods/js/visualization/mapofscience/CustomScimaps.js

@@ -32,7 +32,10 @@ function createScimapType(map, mapName) {
 	new CopyrightPanel ({
 		map: map,
 		controlPositions: google.maps.ControlPosition.BOTTOM_RIGHT,
-		html: '&copy; 2008 The Regents of the University of California and <a href="http://cns.iu.edu" >CNS.IU.EDU</a>'
+		html: '&copy; 2008 The Regents of the University of California and and SciTech Strategies.<br>' +
+				'Map updated by <a href="http://mapofscience.com">SciTech Strategies</a>, ' +
+				'<a href="http://www.ost.uqam.ca/" title="Observatoire des sciences et des technologies">OST</a>, ' +
+				'and <a href="http://cns.iu.edu" title="CyberInfrastructure for Network Science">CNS</a> in 2010'
 	});
 	map.mapTypes.set(mapName, sciMapType);
 }

productMods/js/visualization/mapofscience/DataTableWidget.js

@@ -3,6 +3,9 @@
 var DataTableWidget = Class.extend({
 	
 	dom: {
+		firstFilterLabel: "554 Subdisciplines",
+		secondFilterLabel: "13 Disciplines",
+		
 		searchBarParentContainerClass: "searchbar",
 		paginationContainerClass: "paginatedtabs",
 		containerID: "main-science-areas-table-container",
@@ -100,8 +103,8 @@ var DataTableWidget = Class.extend({
 		
 		var dom = me.dom;
 		var filter = $('<div class="science-areas-filter">' +
-				'<span id="' + dom.firstFilterID + '" class="' + dom.filterOptionClass + ' ' + dom.activeFilterClass + '">Sub-Disciplines</span> | ' +
+				'<span id="' + dom.firstFilterID + '" class="' + dom.filterOptionClass + ' ' + dom.activeFilterClass + '">' + dom.firstFilterLabel + '</span> | ' +
-		    	'<span id="' + dom.secondFilterID + '" class="' + dom.filterOptionClass + '">Disciplines</span>' +
+		    	'<span id="' + dom.secondFilterID + '" class="' + dom.filterOptionClass + '">' + dom.secondFilterLabel + '</span>' +
 		    	'<img class="'+ dom.filterInfoIconClass +'" id="imageIconTwo" src="'+ infoIconUrl +'" alt="information icon" title="" /></div>');
 		me.tableDiv.append(filter);
 		createToolTip($("#imageIconTwo"), $('#toolTipTwo').html(), "topLeft");
@@ -120,7 +123,7 @@ var DataTableWidget = Class.extend({
 		var scienceAreasTH = $('<th>');
 		scienceAreasTH.attr("id", "science-areas-th");
 		if (this.currentSelectedFilter === SCIMAP_TYPE.SUBDISCIPLINE ) {
-			scienceAreasTH.html('Sub-Disciplines');
+			scienceAreasTH.html('Subdisciplines');
 		} else {
 			scienceAreasTH.html('Disciplines');
 		}
@@ -246,7 +249,7 @@ var DataTableWidget = Class.extend({
 		var me = this;
 		if (filterType === SCIMAP_TYPE.SUBDISCIPLINE) {
 			
-			$("#science-areas-th").html("Sub-Disciplines");
+			$("#science-areas-th").html("Subdisciplines");
 			if (me.widget) {
 				me.widget.fnSettings()._iDisplayLength = 10;
 			}

productMods/js/visualization/mapofscience/SimpleDataTableWidget.js

@@ -60,7 +60,7 @@ var SimpleDataTableWidget = Class.extend({
 		var organizationHeader = $('<div><a class="suborganization-title" href="' + 
 				entityVivoProfileURLPrefix + me.uri +'">' + 
 				truncateText(me.label, 23) + '</a><a href="' + entityMapOfScienceURLPrefix + 
-				me.label.replace(/\s+/g, '') + '"><img class="drillDownIcon" src="' + 
+				me.uri + '"><img class="drillDownIcon" src="' + 
 				drillDownIconUrl + '" alt="drill down" title="drill down" /></a></div>');
 		me.tableDiv.append(organizationHeader);
 		
@@ -78,7 +78,7 @@ var SimpleDataTableWidget = Class.extend({
 		
 		var scienceAreasTH = $('<th>');
 		scienceAreasTH.attr("id", "entity-science-areas-th");
-		scienceAreasTH.html('Sub-Disciplines');
+		scienceAreasTH.html('Subdisciplines');
 		
 		var activityCountTH = $('<th width="53">');
 		activityCountTH.html('# of pubs.');

productMods/js/visualization/mapofscience/VisCommonControl.js

@@ -87,6 +87,8 @@ function initVisModeTypeButton() {
 function initGlobalToolTips() {
 
 	createToolTip($("#imageIconOne"), $('#toolTipOne').html(), "topLeft");
+	createToolTip($("#exploreInfoIcon"), $('#exploreTooltipText').html(), "topLeft");
+	createToolTip($("#compareInfoIcon"), $('#compareTooltipText').html(), "topLeft");
 	createToolTip($("#imageIconThree"), $('#toolTipThree').html(), "topRight");
 }
 

productMods/js/visualization/mapofscience/VisModeControllers.js

@@ -91,8 +91,6 @@ var EntityVisModeController = VisModeController.extend({
 	init: function(map) {
 		this._super(map);
 		this.visMode = ENTITY_VIS_MODE;
-		this.firstFilterLabel = "554 Sub-Disciplines";
-		this.secondFilterLabel = "13 Disciplines";
 	},
 	getFilterType: function(value) {
 		if (value === 1) {
@@ -113,8 +111,6 @@ var ComparisonVisModeController = VisModeController.extend({
 	init: function(map) {
 		this._super(map);
 		this.visMode = COMPARISON_VIS_MODE;
-		this.firstFilterLabel = "Organizations";
-		this.secondFilterLabel = "People";
 	},
 	getFilterType: function(value) {
 		if (value === 1) {

productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl

@@ -17,8 +17,8 @@
     
     <section id="visualization" role="region">
         <#if isAuthor>
-            <#assign coAuthorIcon = "${urls.images}/visualization/co_author_icon.png">
+            <#assign coAuthorIcon = "${urls.images}/visualization/coauthorship/co_author_icon.png">
-            <#assign mapOfScienceIcon = "${urls.images}/visualization/mapofscience/vivo-scimap.png">
+            <#assign mapOfScienceIcon = "${urls.images}/visualization/mapofscience/scimap_icon.png">
             <#assign coAuthorVisUrl = individual.coAuthorVisUrl()>
             <#assign mapOfScienceVisUrl = individual.mapOfScienceUrl()>
             
@@ -62,7 +62,7 @@
         
         <#if isInvestigator>
             <#assign coInvestigatorVisUrl = individual.coInvestigatorVisUrl()>
-            <#assign coInvestigatorIcon = "${urls.images}/visualization/co_investigator_icon.png">
+            <#assign coInvestigatorIcon = "${urls.images}/visualization/coauthorship/co_investigator_icon.png">
             
             <div id="coinvestigator_link_container" class="collaboratorship-link-container">
                 <div class="collaboratorship-icon">

productMods/templates/freemarker/body/partials/individual/individual-visualizationMapOfScience.ftl

@@ -3,5 +3,5 @@
 <#-- Map Of Science visualization -->
 
 <div id="map-of-science">
-    <h3><img src="${urls.images}/visualization/mapofscience/vivo-scimap.png" width="25px" height="25px" /><a href="${individual.mapOfScienceUrl()}">Map of Science</a></h3>
+    <h3><img src="${urls.images}/visualization/mapofscience/scimap_icon.png" width="25px" height="25px" /><a href="${individual.mapOfScienceUrl()}">Map of Science</a></h3>
 </div>

productMods/templates/freemarker/body/partials/individual/individual-visualizationTemporalGraph.ftl

@@ -3,5 +3,5 @@
 <#-- Temporal graph visualization -->
 
 <div id="temporal-graph">
-    <h3><img src="${urls.images}/visualization/temporal_vis_icon.jpg" width="25px" height="25px" /><a href="${individual.temporalGraphUrl()}">Temporal Graph</a></h3>
+    <h3><img src="${urls.images}/visualization/temporalgraph/temporal_graph_icon.png" width="25px" height="25px" /><a href="${individual.temporalGraphUrl()}">Temporal Graph</a></h3>
 </div>

productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl

@@ -25,7 +25,7 @@
 
 </#if>
 
-<#assign mapOfScienceIcon = '${urls.images}/visualization/mapofscience/vivo-scimap.png'>
+<#assign mapOfScienceIcon = '${urls.images}/visualization/mapofscience/scimap_icon.png'>
 
 <#assign entityMapOfScienceDataURL = "${urls.base}${dataVisualizationURLRoot}?vis=${mapOfScienceVisParam}&uri=${entityURI}&output=json">
 
@@ -36,7 +36,7 @@
 <script language="JavaScript" type="text/javascript">
 
 var entityVivoProfileURLPrefix = "${urls.base}/individual?uri=";
-var entityMapOfScienceURLPrefix = "${urls.base}${shortVisualizationURLRoot}/${mapOfScienceVisParam}/";
+var entityMapOfScienceURLPrefix = "${urls.base}${shortVisualizationURLRoot}/${mapOfScienceVisParam}?uri=";
 var contextPath = "${urls.base}";
 var scienceMapDataPrefix = "${urls.base}${dataVisualizationURLRoot}?vis=${mapOfScienceVisParam}&output=json&uri=";
 var scienceMapDataURL = scienceMapDataPrefix + "${entityURI}";
@@ -47,7 +47,7 @@ var mapOfScienceImageFolderPrefix  = imageFolderPrefix + "mapofscience/";
 var disciplineLabelImageUrlPrefix = mapOfScienceImageFolderPrefix + "labels/";
 
 var infoIconUrl = "${urls.images}/iconInfo.png";
-var drillDownIconUrl = "${urls.images}/visualization/mapofscience/vivo-scimap.png";
+var drillDownIconUrl = "${urls.images}/visualization/drill_down_icon.png";
 											
 var entityLabel = '${entityLabel}';
 

productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl

@@ -43,8 +43,10 @@ corresponding changes in the included Templates. -->
     
     <#-- VIEW TYPE FILTER -->
     <div id="view-type-filter" style="display:${viewTypeFilterDisplay};">
-    	<input type="radio" name="view-type" value="ENTITY"> Explore ${entityLabel} </input><br>
+    	<input type="radio" name="view-type" value="ENTITY"> Explore ${entityLabel} </input>
-		<input type="radio" name="view-type" value="COMPARISON"> Compare organizations <#--/ people --></input><br><br>
+    	<img class="filterInfoIcon" id="exploreInfoIcon" src="${urls.images}/iconInfo.png" alt="information icon" title="" /><br>
+		<input type="radio" name="view-type" value="COMPARISON"> Compare organizations <#--/ people --></input>
+		<img class="filterInfoIcon" id="compareInfoIcon" src="${urls.images}/iconInfo.png" alt="information icon" title="" /><br><br>
     </div>
     
     <!-- <h3>What do you want to compare?</h3> -->
@@ -104,15 +106,6 @@ You can hover over a subdiscipline in the table below to show which overlaid cir
 
 <br /><br /> 
 
-<#--
-In the table below, <b># of pubs.</b> column indicates number of publications that fall under a particular field (subdiscipline or 
-discipline). Sometimes this number will be fractional. This happens when a journal in which the publication was published is associated 
-with more than one (sub)discipline. In these cases, the publication score is fractionally mapped based on the weight scores 
-of the journal.<br /><br />
-
-<b>% activity</b> column indicates the percentage of publications that fall under a particular field.
--->
-
 The table below summarizes this institution's body of publications as plotted on the map of science.  
 Each row corresponds to a field (discipline or subdiscipline) on the map.
 <br /><br />
@@ -136,8 +129,15 @@ the holdings of Thomson's ISI database and Elsevier's Scopus database). Journal
 may need to be cleaned up before they are recognized. You may contact a VIVO system administrator if publication coverage is a 
 concern.</div>
 
+<div id="exploreTooltipText" style="display:none;">
+	Overlay and examine expertise profiles for one or more organizations. Color coding by discipline.
+</div>
+
+<div id="compareTooltipText" style="display:none;">
+	Overlay and examine expertise profiles for one or more organizations. Color coding by organization.
+</div>
+
 <div id="searchInfoTooltipText" style="display:none;">
-	<!-- Search for specific subdiscipline (or discipline) label in the first column of the table. -->
 	List only subdisciplines (or disciplines) whose name contains this text.
 </div>
 
@@ -145,17 +145,18 @@ concern.</div>
 <#-- COMPARISON TOOLTIP TEXT -->
 
 <div id="comparisonToolTipTwo" style="display:none;">
-The organizations or people listed below are only those which are directly beneath ${entityLabel} in the 
+The listed organizations are children of the University of Florida node in the organizational hierarchy. 
-organization hierarchy. You may 'drill down' to see the organizations or people below a given suborganization 
+You may 'drill down' to see the organizations below a given sub-organization by selecting the chart icon 
-by selecting the chart icon next to a selected suborganization's name below the graph on the right.
+next to a selected sub-organization's name below the graph on the right.
 <br /><br />
 
-The <b># of pubs.</b> column shows how many of the publications were mapped to each field.  
+The <b># of pubs.</b> column shows how many of the publications were mapped to each subdiscipline. This 
-This count can be fractional because some publication venues are associated with more than one field.  
+count can be fractional because some publication venues are associated with more than one subdiscipline. 
-Each publication in such a venue contributes fractionally to all associated fields according to a weighting scheme.
+Each publication in such a venue contributes fractionally to all associated subdisciplines according to 
+a weighting scheme. 
 
 <br /><br />
-The <b>% activity</b> column shows what proportion of the publications were mapped to each field.
+The <b>% activity</b> column shows what proportion of the publications were mapped to each subdiscipline.
 
 </div>
 

productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl

@@ -29,7 +29,7 @@
 <#assign coAuthorPersonLevelJavaScript = '${urls.base}/js/visualization/coauthorship/coauthorship-personlevel.js'>
 <#assign commonPersonLevelJavaScript = '${urls.base}/js/visualization/personlevel/person-level.js'>
 
-<#assign coInvestigatorIcon = '${urls.images}/visualization/co_investigator_icon.png'>
+<#assign coInvestigatorIcon = '${urls.images}/visualization/coauthorship/co_investigator_icon.png'>
 
 
 <script type="text/javascript" src="${adobeFlashDetector}"></script>

productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl

@@ -23,7 +23,7 @@
 <#assign egoCoInvestigatorsListDataFileURL = '${urls.base}${dataVisualizationURLRoot}?vis=coprincipalinvestigator&uri=${egoURI}&vis_mode=copis'>
 <#assign egoCoInvestigationNetworkDataFileURL = '${urls.base}${dataVisualizationURLRoot}?vis=coprincipalinvestigator&uri=${egoURI}&vis_mode=copi_network_download'>
 
-<#assign coAuthorIcon = '${urls.images}/visualization/co_author_icon.png'>
+<#assign coAuthorIcon = '${urls.images}/visualization/coauthorship/co_investigator_icon.png'>
 
 <#assign swfLink = '${urls.images}/visualization/coauthorship/EgoCentric.swf'>
 <#assign adobeFlashDetector = '${urls.base}/js/visualization/coauthorship/AC_OETags.js'>