diff --git a/productMods/css/visualization/mapofscience/layout.css b/productMods/css/visualization/mapofscience/layout.css index fb5c3613..4a6960e1 100644 --- a/productMods/css/visualization/mapofscience/layout.css +++ b/productMods/css/visualization/mapofscience/layout.css @@ -112,7 +112,7 @@ a.clear-selected-entities { } .filterInfoIcon { - vertical-align:top; + /*vertical-align:top;*/ width:15px; margin-left: 9px; } @@ -140,6 +140,20 @@ a.clear-selected-entities { } +th#activity-count-column, +th#percentage-activity-column { +} + +.corner-triangle { + border-left: 10px solid #F6F6F6; + border-top: 10px solid #2485AE; + float: right; + font-size: 0; + line-height: 0; + margin-right: 3px; + width: 0; +} + hr.subtle-hr { background-color: #BDBDBD; border: 0 none; diff --git a/productMods/js/visualization/mapofscience/DataTableWidget.js b/productMods/js/visualization/mapofscience/DataTableWidget.js index b907db4b..d3294827 100644 --- a/productMods/js/visualization/mapofscience/DataTableWidget.js +++ b/productMods/js/visualization/mapofscience/DataTableWidget.js @@ -116,6 +116,7 @@ var DataTableWidget = Class.extend({ var percentageActivityTH = $(''); percentageActivityTH.html('% activity'); + percentageActivityTH.attr("id", "percentage-activity-column"); tr.append(levelOfScienceAreaTH); tr.append(scienceAreasTH); @@ -208,7 +209,10 @@ var DataTableWidget = Class.extend({ var searchInputBox = $("." + me.dom.searchBarParentContainerClass).find("input[type=text]"); - searchInputBox.after("X"); + searchInputBox.css("width", "140px"); + + searchInputBox.after("X" + + "information icon"); $("#reset-search").live('click', function() { me.widget.fnFilter(""); diff --git a/productMods/js/visualization/mapofscience/VisModeControllers.js b/productMods/js/visualization/mapofscience/VisModeControllers.js index c5d18651..f2f1dd5a 100644 --- a/productMods/js/visualization/mapofscience/VisModeControllers.js +++ b/productMods/js/visualization/mapofscience/VisModeControllers.js @@ -1,149 +1,151 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ -var ENTITY_VIS_MODE = "ENTITY"; - -var EntityVisModeController = Class.extend({ - init: function(map, sliderControl) { - this.visMode = ENTITY_VIS_MODE; - this.isUnloaded = true; - this.initWidgets(map, sliderControl); - this.initFilter(); - }, - initFilter: function() { - var widgets = this.widgets; - var dom = { - disciplineFilterID: "discipline-filter", - subdisciplinesFilterID: "subdisciplines-filter", - filterOptionClass: "filter-option", - activeFilterClass: "active-filter" - }; - - $("." + dom.filterOptionClass).live('click', function() { - if (!$(this).hasClass(dom.activeFilterClass)) { - if ($(this).attr('id') === dom.subdisciplinesFilterID) { - $("#" + dom.disciplineFilterID).removeClass(dom.activeFilterClass); - $.each(widgets, function(i, widget) { - widget.changeFilter(SCIMAP_TYPE.SUBDISCIPLINE); - }); - - } else if ($(this).attr('id') === dom.disciplineFilterID) { - $("#" + dom.subdisciplinesFilterID).removeClass(dom.activeFilterClass); - $.each(widgets, function(i, widget) { - widget.changeFilter(SCIMAP_TYPE.DISCIPLINE); - }); - } - - $(this).addClass('active-filter'); - } - }); - - /* Init default filter */ - $("#" + dom.subdisciplinesFilterID).trigger('click'); - }, - initWidgets: function(map, sliderControl) { - var widgets = {}; - widgets['scimap'] = new ScimapWidget(map, sliderControl); - widgets['sci_area_table'] = new DataTableWidget(widgets['scimap']); - - this.widgets = widgets; - }, - needLoaded: function() { - return this.isUnloaded; - }, - initView: function() { - $.each(this.widgets, function(i, widget) { - widget.initView(); - }); - }, - loadData: function(url, sync) { - - // Download data from server and add to markerManager if not gotten already - var me = this; - if (me.isUnloaded) { - if (sync) { - downloader.downloadAndWait(url, function(data) { - me.loadJsonData(me, data[0]); - }); - } else { - downloader.download(url, function(data) { - me.loadJsonData(me, data[0]); - }); - } - } // end if - }, - loadJsonData: function(me, data) { - - $("#" + responseContainerID).unblock(); - - $.each(me.widgets, function(i, widget) { - widget.loadJsonData(data); - }); - me.isUnloaded = false; - - me.initToolTipInfo(); - }, - initToolTipInfo: function() { -// console.log("called"); - $('.filterInfoIcon').each(function () { - - var me = $(this); - - var tipText; - var tipLocation = "topLeft"; - - if (me.attr('id') == 'imageIconOne') { - tipText = $('#toolTipOne').html(); - } else if (me.attr('id') == 'imageIconTwo') { - tipText = $('#toolTipTwo').html(); - } else { - tipText = $('#toolTipThree').html(); - tipLocation = "topRight"; - } - - me.qtip({ - content: { - text: tipText - }, - position: { - corner: { - target: 'center', - tooltip: tipLocation - } - }, - show: { - when: { - event: 'mouseover' - } - }, - hide: { - fixed: true // Make it fixed so it can be hovered over - }, - style: { - padding: '6px 6px', - // Give it some extra padding - width: 500, - textAlign: 'left', - backgroundColor: '#ffffc0', - fontSize: '.7em', - padding: '6px 10px 6px 10px', - lineHeight: '14px' - } - }); - }); - }, - // key can be discippline or subdiscipline - show: function(key) { - $.each(this.widgets, function(i, widget) { - widget.show(key); - }); - }, - hide: function(key) { - $.each(this.widgets, function(i, widget) { - widget.hide(key); - }); - }, - cleanUp: function() { - $.each(this.widgets, function(i, widget) { - widget.cleanUp(key); - }); - } +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ +var ENTITY_VIS_MODE = "ENTITY"; + +var EntityVisModeController = Class.extend({ + init: function(map, sliderControl) { + this.visMode = ENTITY_VIS_MODE; + this.isUnloaded = true; + this.initWidgets(map, sliderControl); + this.initFilter(); + }, + initFilter: function() { + var widgets = this.widgets; + var dom = { + disciplineFilterID: "discipline-filter", + subdisciplinesFilterID: "subdisciplines-filter", + filterOptionClass: "filter-option", + activeFilterClass: "active-filter" + }; + + $("." + dom.filterOptionClass).live('click', function() { + if (!$(this).hasClass(dom.activeFilterClass)) { + if ($(this).attr('id') === dom.subdisciplinesFilterID) { + $("#" + dom.disciplineFilterID).removeClass(dom.activeFilterClass); + $.each(widgets, function(i, widget) { + widget.changeFilter(SCIMAP_TYPE.SUBDISCIPLINE); + }); + + } else if ($(this).attr('id') === dom.disciplineFilterID) { + $("#" + dom.subdisciplinesFilterID).removeClass(dom.activeFilterClass); + $.each(widgets, function(i, widget) { + widget.changeFilter(SCIMAP_TYPE.DISCIPLINE); + }); + } + + $(this).addClass('active-filter'); + } + }); + + /* Init default filter */ + $("#" + dom.subdisciplinesFilterID).trigger('click'); + }, + initWidgets: function(map, sliderControl) { + var widgets = {}; + widgets['scimap'] = new ScimapWidget(map, sliderControl); + widgets['sci_area_table'] = new DataTableWidget(widgets['scimap']); + + this.widgets = widgets; + }, + needLoaded: function() { + return this.isUnloaded; + }, + initView: function() { + $.each(this.widgets, function(i, widget) { + widget.initView(); + }); + }, + loadData: function(url, sync) { + + // Download data from server and add to markerManager if not gotten already + var me = this; + if (me.isUnloaded) { + if (sync) { + downloader.downloadAndWait(url, function(data) { + me.loadJsonData(me, data[0]); + }); + } else { + downloader.download(url, function(data) { + me.loadJsonData(me, data[0]); + }); + } + } // end if + }, + loadJsonData: function(me, data) { + + $("#" + responseContainerID).unblock(); + + $.each(me.widgets, function(i, widget) { + widget.loadJsonData(data); + }); + me.isUnloaded = false; + + me.initToolTipInfo(); + }, + initToolTipInfo: function() { + + $('.filterInfoIcon').each(function () { + + var me = $(this); + + var tipText; + var tipLocation = "topLeft"; + + if (me.attr('id') == 'imageIconOne') { + tipText = $('#toolTipOne').html(); + } else if (me.attr('id') == 'imageIconTwo') { + tipText = $('#toolTipTwo').html(); + } else if (me.attr('id') == 'searchInfoIcon') { + tipText = $('#searchInfoTooltipText').html(); + } else { + tipText = $('#toolTipThree').html(); + tipLocation = "topRight"; + } + + me.qtip({ + content: { + text: tipText + }, + position: { + corner: { + target: 'center', + tooltip: tipLocation + } + }, + show: { + when: { + event: 'mouseover' + } + }, + hide: { + fixed: true // Make it fixed so it can be hovered over + }, + style: { + padding: '6px 6px', + // Give it some extra padding + width: 500, + textAlign: 'left', + backgroundColor: '#ffffc0', + fontSize: '.7em', + padding: '6px 10px 6px 10px', + lineHeight: '14px' + } + }); + }); + }, + // key can be discippline or subdiscipline + show: function(key) { + $.each(this.widgets, function(i, widget) { + widget.show(key); + }); + }, + hide: function(key) { + $.each(this.widgets, function(i, widget) { + widget.hide(key); + }); + }, + cleanUp: function() { + $.each(this.widgets, function(i, widget) { + widget.cleanUp(key); + }); + } }); \ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl b/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl index c146c671..45b9e1d7 100644 --- a/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl +++ b/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl @@ -36,6 +36,8 @@ var contextPath = "${urls.base}"; var scienceMapDataURL = "${entityMapOfScienceDataURL}"; + +var baseImageFolderPrefix = "${urls.images}/"; var imageFolderPrefix = "${urls.images}/visualization/"; var mapOfScienceImageFolderPrefix = imageFolderPrefix + "mapofscience/"; diff --git a/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl b/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl index e6c259a5..7c2f8a3d 100644 --- a/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl +++ b/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl @@ -71,23 +71,58 @@ mapped % of +For more information on this and other maps of science, see http://mapofscience.com or +http://scimaps.org + - + + + + -The publication coverage of this visualization can be improved by including more publication data in the VIVO system, and by ensuring that each publication in the VIVO system is associated with a journal that the Map of Science recognizes (based on the holdings of Thomson's ISI database and Elsevier's Scopus database). Journal names containing typos or other idiosyncracies may need to be cleaned up before they are recognized. You may contact a VIVO system administrator if publication coverage is a concern. ${headScripts.add('')} \ No newline at end of file diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java index 2adb53b4..6a1399cf 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/OrganizationToPublicationsForSubOrganizationsModelConstructor.java @@ -77,7 +77,7 @@ public class OrganizationToPublicationsForSubOrganizationsModelConstructor imple private Model executeQuery(String constructQuery) { - System.out.println("in constructed model fior orgh to publications fo " + organizationURI); + log.debug("[VIS CACHE] SubOrganizations Publications" + organizationURI); Model constructedModel = ModelFactory.createDefaultModel();