diff --git a/productMods/css/visualization/visualization.css b/productMods/css/visualization/visualization.css index 33e0d26d..06cf178d 100644 --- a/productMods/css/visualization/visualization.css +++ b/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; diff --git a/productMods/images/visualization/co_author_icon.png b/productMods/images/visualization/co_author_icon.png deleted file mode 100755 index 464ca75c..00000000 Binary files a/productMods/images/visualization/co_author_icon.png and /dev/null differ diff --git a/productMods/images/visualization/co_investigator_icon.png b/productMods/images/visualization/co_investigator_icon.png deleted file mode 100755 index edd74b25..00000000 Binary files a/productMods/images/visualization/co_investigator_icon.png and /dev/null differ diff --git a/productMods/images/visualization/coauthorship/co_author_icon.png b/productMods/images/visualization/coauthorship/co_author_icon.png new file mode 100644 index 00000000..44297874 Binary files /dev/null and b/productMods/images/visualization/coauthorship/co_author_icon.png differ diff --git a/productMods/images/visualization/coauthorship/co_investigator_icon.png b/productMods/images/visualization/coauthorship/co_investigator_icon.png new file mode 100644 index 00000000..b277202a Binary files /dev/null and b/productMods/images/visualization/coauthorship/co_investigator_icon.png differ diff --git a/productMods/images/visualization/collaboration/co_author_icon_old.png b/productMods/images/visualization/collaboration/co_author_icon_old.png deleted file mode 100755 index c3fe8672..00000000 Binary files a/productMods/images/visualization/collaboration/co_author_icon_old.png and /dev/null differ diff --git a/productMods/images/visualization/collaboration/co_investigator_icon_old.png b/productMods/images/visualization/collaboration/co_investigator_icon_old.png deleted file mode 100755 index 10d2c6dc..00000000 Binary files a/productMods/images/visualization/collaboration/co_investigator_icon_old.png and /dev/null differ diff --git a/productMods/images/visualization/drill_down_icon.png b/productMods/images/visualization/drill_down_icon.png new file mode 100644 index 00000000..4d7342e8 Binary files /dev/null and b/productMods/images/visualization/drill_down_icon.png differ diff --git a/productMods/images/visualization/drill_up_icon.png b/productMods/images/visualization/drill_up_icon.png new file mode 100644 index 00000000..c7db012d Binary files /dev/null and b/productMods/images/visualization/drill_up_icon.png differ diff --git a/productMods/images/visualization/mapofscience/scimap_icon.png b/productMods/images/visualization/mapofscience/scimap_icon.png new file mode 100644 index 00000000..4224e215 Binary files /dev/null and b/productMods/images/visualization/mapofscience/scimap_icon.png differ diff --git a/productMods/images/visualization/mapofscience/vivo-scimap.png b/productMods/images/visualization/mapofscience/vivo-scimap.png deleted file mode 100644 index f2ce3c3a..00000000 Binary files a/productMods/images/visualization/mapofscience/vivo-scimap.png and /dev/null differ diff --git a/productMods/images/visualization/mapofscience/vivo_scimap.jpg b/productMods/images/visualization/mapofscience/vivo_scimap.jpg deleted file mode 100644 index 6a6161c9..00000000 Binary files a/productMods/images/visualization/mapofscience/vivo_scimap.jpg and /dev/null differ diff --git a/productMods/images/visualization/temporal_vis_icon.jpg b/productMods/images/visualization/temporal_vis_icon.jpg deleted file mode 100644 index c5fb2ea6..00000000 Binary files a/productMods/images/visualization/temporal_vis_icon.jpg and /dev/null differ diff --git a/productMods/images/visualization/temporal_vis_small_icon.jpg b/productMods/images/visualization/temporal_vis_small_icon.jpg deleted file mode 100644 index 98336705..00000000 Binary files a/productMods/images/visualization/temporal_vis_small_icon.jpg and /dev/null differ diff --git a/productMods/images/visualization/temporalgraph/temporal_graph_icon.png b/productMods/images/visualization/temporalgraph/temporal_graph_icon.png new file mode 100644 index 00000000..dc7dfc83 Binary files /dev/null and b/productMods/images/visualization/temporalgraph/temporal_graph_icon.png differ diff --git a/productMods/images/visualization/temporal_vis_placeholder.jpg b/productMods/images/visualization/temporalgraph/temporal_vis_placeholder.jpg similarity index 100% rename from productMods/images/visualization/temporal_vis_placeholder.jpg rename to productMods/images/visualization/temporalgraph/temporal_vis_placeholder.jpg diff --git a/productMods/js/visualization/mapofscience/ComparisonDataTableWidget.js b/productMods/js/visualization/mapofscience/ComparisonDataTableWidget.js index 7e2f0cc2..e651a9ae 100644 --- a/productMods/js/visualization/mapofscience/ComparisonDataTableWidget.js +++ b/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 = $('
' + - 'Organizations'+ + '' + dom.firstFilterLabel + ''+ /* This is temporary removed due to the person's publications mapping rate is too low to be displayed. ' | ' + - 'People' + + '' + dom.secondFilterLabel + '' + */ 'information icon
'); me.tableDiv.append(filter); diff --git a/productMods/js/visualization/mapofscience/CustomScimaps.js b/productMods/js/visualization/mapofscience/CustomScimaps.js index 97a16f2e..1d4ceb2a 100644 --- a/productMods/js/visualization/mapofscience/CustomScimaps.js +++ b/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: '© 2008 The Regents of the University of California and CNS.IU.EDU' + html: '© 2008 The Regents of the University of California and and SciTech Strategies.
' + + 'Map updated by SciTech Strategies, ' + + 'OST, ' + + 'and CNS in 2010' }); map.mapTypes.set(mapName, sciMapType); } diff --git a/productMods/js/visualization/mapofscience/DataTableWidget.js b/productMods/js/visualization/mapofscience/DataTableWidget.js index 187cde2f..869a5785 100644 --- a/productMods/js/visualization/mapofscience/DataTableWidget.js +++ b/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 = $('
' + - 'Sub-Disciplines | ' + - 'Disciplines' + + '' + dom.firstFilterLabel + ' | ' + + '' + dom.secondFilterLabel + '' + 'information icon
'); me.tableDiv.append(filter); createToolTip($("#imageIconTwo"), $('#toolTipTwo').html(), "topLeft"); @@ -120,7 +123,7 @@ var DataTableWidget = Class.extend({ var scienceAreasTH = $(''); 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; } diff --git a/productMods/js/visualization/mapofscience/SimpleDataTableWidget.js b/productMods/js/visualization/mapofscience/SimpleDataTableWidget.js index 543713c8..cf12ffb5 100644 --- a/productMods/js/visualization/mapofscience/SimpleDataTableWidget.js +++ b/productMods/js/visualization/mapofscience/SimpleDataTableWidget.js @@ -60,7 +60,7 @@ var SimpleDataTableWidget = Class.extend({ var organizationHeader = $('
' + truncateText(me.label, 23) + 'drill down
'); me.tableDiv.append(organizationHeader); @@ -78,7 +78,7 @@ var SimpleDataTableWidget = Class.extend({ var scienceAreasTH = $(''); scienceAreasTH.attr("id", "entity-science-areas-th"); - scienceAreasTH.html('Sub-Disciplines'); + scienceAreasTH.html('Subdisciplines'); var activityCountTH = $(''); activityCountTH.html('# of pubs.'); diff --git a/productMods/js/visualization/mapofscience/VisCommonControl.js b/productMods/js/visualization/mapofscience/VisCommonControl.js index 6cef9a81..d3f93724 100644 --- a/productMods/js/visualization/mapofscience/VisCommonControl.js +++ b/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"); } diff --git a/productMods/js/visualization/mapofscience/VisModeControllers.js b/productMods/js/visualization/mapofscience/VisModeControllers.js index 002c9c15..930bbdfb 100644 --- a/productMods/js/visualization/mapofscience/VisModeControllers.js +++ b/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) { diff --git a/productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl b/productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl index 7f5c57c8..0611f52b 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl @@ -17,8 +17,8 @@
<#if isAuthor> - <#assign coAuthorIcon = "${urls.images}/visualization/co_author_icon.png"> - <#assign mapOfScienceIcon = "${urls.images}/visualization/mapofscience/vivo-scimap.png"> + <#assign coAuthorIcon = "${urls.images}/visualization/coauthorship/co_author_icon.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">