litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint-rel-1.6' of github.com:vivo-project/VIVO into maint-rel-1.6

Browse source
This commit is contained in:
Jon Corson-Rikert 2013-12-04 16:47:25 -05:00
commit 3daf02651a
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
productMods/WEB-INF/resources/reasoner_plugins.txt
View file

@ -0,0 +1 @@
edu.cornell.mannlib.vitro.webapp.reasoner.plugin.DisableSameAs

3
productMods/js/homePageMaps.js
View file

@ -369,10 +369,11 @@ $(document).ready(function(){
var html = i18nStrings.currentlyNoResearchers; var html = i18nStrings.currentlyNoResearchers;
$('section#home-geo-focus div#timeIndicatorGeo span').html(html); $('section#home-geo-focus div#timeIndicatorGeo span').html(html);
$('section#home-geo-focus').css("height","175px"); $('section#home-geo-focus').css("height","175px");
$('section#home-geo-focus div#timeIndicator').css("margin-top","50px"); $('section#home-geo-focus div#timeIndicatorGeo').css("margin-top","50px");
$('section#home-geo-focus div#mapGlobal').hide(); $('section#home-geo-focus div#mapGlobal').hide();
$('section#home-geo-focus div#mapCountry').hide(); $('section#home-geo-focus div#mapCountry').hide();
$('section#home-geo-focus div#mapLocal').hide(); $('section#home-geo-focus div#mapLocal').hide();
$('section#home-geo-focus div#mapControls').hide();
} }
else { else {
$.each(results, function() { $.each(results, function() {