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 = $('