diff --git a/productMods/images/visualization/mapofscience/vivo-scimap.png b/productMods/images/visualization/mapofscience/vivo-scimap.png new file mode 100644 index 00000000..f2ce3c3a Binary files /dev/null and b/productMods/images/visualization/mapofscience/vivo-scimap.png differ diff --git a/productMods/images/visualization/temporalgraph/temporal-drill-down.png b/productMods/images/visualization/temporalgraph/temporal-drill-down.png new file mode 100644 index 00000000..cb405f73 Binary files /dev/null and b/productMods/images/visualization/temporalgraph/temporal-drill-down.png differ diff --git a/productMods/images/visualization/temporalgraph/temporal-drill-up.png b/productMods/images/visualization/temporalgraph/temporal-drill-up.png new file mode 100644 index 00000000..f0f2c988 Binary files /dev/null and b/productMods/images/visualization/temporalgraph/temporal-drill-up.png differ diff --git a/productMods/js/visualization/entitycomparison/util.js b/productMods/js/visualization/entitycomparison/util.js index ee52a3c7..e5d7c691 100644 --- a/productMods/js/visualization/entitycomparison/util.js +++ b/productMods/js/visualization/entitycomparison/util.js @@ -627,7 +627,7 @@ function createLegendRow(entity, bottomDiv) { * there is no drill-down possible, so don't diaply the temporal graph icon. * */ if (entity.visMode !== "PERSON") { - labelDiv.append(''); + labelDiv.append(''); } diff --git a/productMods/js/visualization/mapofscience/DataTableWidget.js b/productMods/js/visualization/mapofscience/DataTableWidget.js index 8d36a7b9..4471eecb 100644 --- a/productMods/js/visualization/mapofscience/DataTableWidget.js +++ b/productMods/js/visualization/mapofscience/DataTableWidget.js @@ -237,7 +237,6 @@ var DataTableWidget = Class.extend({ } me.currentSelectedFilter = SCIMAP_TYPE.SUBDISCIPLINE; $("a#csv").attr("href", entityMapOfScienceSubDisciplineCSVURL); - $("a#csv").html("Export All Sub-Disciplines"); } else { @@ -247,7 +246,6 @@ var DataTableWidget = Class.extend({ me.widget.fnSettings()._iDisplayLength = 13; } $("a#csv").attr("href", entityMapOfScienceDisciplineCSVURL); - $("a#csv").html("Export All Disciplines"); } diff --git a/productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl b/productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl index 356c759b..5faf712b 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl @@ -18,7 +18,7 @@
<#if isAuthor> <#assign coAuthorIcon = "${urls.images}/visualization/co_author_icon.png"> - <#assign mapOfScienceIcon = "${urls.images}/visualization/mapofscience/vivo_scimap.jpg"> + <#assign mapOfScienceIcon = "${urls.images}/visualization/mapofscience/vivo-scimap.png"> <#assign coAuthorVisUrl = individual.coAuthorVisUrl> <#assign mapOfScienceVisUrl = individual.mapOfScienceUrl> diff --git a/productMods/templates/freemarker/body/partials/individual/individual-visualizationMapOfScience.ftl b/productMods/templates/freemarker/body/partials/individual/individual-visualizationMapOfScience.ftl index a1b4473a..3198681e 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-visualizationMapOfScience.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-visualizationMapOfScience.ftl @@ -3,5 +3,5 @@ <#-- Map Of Science visualization -->
-

Map of Science

+

Map of Science

\ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl index f85e85df..3c54e22e 100644 --- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl +++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl @@ -29,7 +29,8 @@ <#assign organizationPublicationTemporalGraphDataURL = "${urls.base}${dataVisualizationURLRoot}?vis=entity_comparison&uri=${organizationURI}&vis_mode=json"> <#assign organizationGrantTemporalGraphDataURL = "${urls.base}${dataVisualizationURLRoot}?vis=entity_grant_count&uri=${organizationURI}&vis_mode=json"> -<#assign temporalGraphSmallIcon = '${urls.images}/visualization/temporal_vis_small_icon.jpg'> +<#assign temporalGraphSmallIcon = '${urls.images}/visualization/temporalgraph/temporal-drill-up.png'> +<#assign temporalGraphDrillDownIcon = '${urls.images}/visualization/temporalgraph/temporal-drill-down.png'> <#assign temporalGraphDownloadCSVCommonURL = '${urls.base}${dataVisualizationURLRoot}?uri=${organizationURI}&labelField=label'> @@ -101,6 +102,7 @@ ${stylesheets.add(' -<#assign mapOfScienceIcon = '${urls.images}/visualization/mapofscience/vivo_scimap.jpg'> +<#assign mapOfScienceIcon = '${urls.images}/visualization/mapofscience/vivo-scimap.png'> <#assign entityMapOfScienceDataURL = "${urls.base}${dataVisualizationURLRoot}?vis=${mapOfScienceVisParam}&uri=${entityURI}&output=json"> <#assign entityMapOfScienceDisciplineCSVURL = "${urls.base}${dataVisualizationURLRoot}?vis=${mapOfScienceVisParam}&uri=${entityURI}&output=csv&vis_mode=discipline"> diff --git a/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl b/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl index 1fcdb936..c341d260 100644 --- a/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl +++ b/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl @@ -56,7 +56,7 @@ corresponding changes in the included Templates. -->