Merge branch 'develop' of github.com:vivo-project/VIVO into develop

This commit is contained in:
Stephen V. Williams 2013-08-26 09:41:23 -06:00
commit 957b6345e7
15 changed files with 554 additions and 82 deletions

View file

@ -97,6 +97,7 @@
stateString: '${i18n().map_state_string}',
statewideLocations: '${i18n().statewide_locations}',
researchersInString: '${i18n().researchers_in}',
inString: '${i18n().in}',
noFacultyFound: '${i18n().no_faculty_found}',
placeholderImage: '${i18n().placeholder_image}',
viewAllFaculty: '${i18n().view_all_faculty}',
@ -108,7 +109,7 @@
if ( $('input.search-homepage').css('text-align') == "right" ) {
$('input.search-homepage').attr("value","${i18n().limit_search} \u2192");
}
</script>
<@lh.getGeoResearcherCount/>
</body>
</html>