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

replace incorrect label on entity comparison page

Browse source
This commit is contained in:
Benjamin Gross 2016-03-15 16:00:08 -06:00
parent 129f8b3e26
commit 18d551b1a2
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/main/webapp/js/visualization/entitycomparison/util.js
View file

@ -1085,7 +1085,7 @@ function prepareTableForDataTablePagination(jsonData, dataTableParams){
checkboxTH.html(' ');
var entityLabelTH = $('<th>');
entityLabelTH.html(i18nStringsUtil.entityTypeString);
entityLabelTH.html(i18nStringsUtil.entityLabel);
var activityCountTH = $('<th>');
if ($("select.comparisonValues option:selected").text() === i18nStringsUtil.byPublications) {
@ -1374,4 +1374,4 @@ function setTickSizeOfAxes(){
FlotOptions.yaxis.tickSize =
TickSize.getTickSize(calcMaxWithinComparisonParameter(checkedLabelToEntityRecord), 'y');
}
}

3
webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl
View file

@ -125,6 +125,7 @@ var i18nStringsUtil = {
byPublications: '${i18n().by_publications}',
publicationCount: '${i18n().publication_count}',
grantCount: '${i18n().grant_count}',
entityLabel: '${i18n().entity_label}',
entityType: '${i18n().entity_type}',
noMatchingEntities: '${i18n().no_matching_entities_found}',
clerSearchQuery: '${i18n().clear_search_query}',
@ -201,4 +202,4 @@ var COMPARISON_PARAMETERS_INFO = {
</script>
${scripts.add('<script type="text/javascript" src="${urls.base}/js/visualization/entitycomparison/gui-event-manager.js"></script>')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/visualization/entitycomparison/gui-event-manager.js"></script>')}

2
webapp/src/main/webapp/themes/wilma/i18n/all.properties
View file

@ -595,7 +595,6 @@ link = link
#
parent_entity = parent entity
map_of_science_icon = map of science icon
entity_label = entity label
explore_activity = Explore activity
explore_capitalized = Explore
across_subdisciplines = across 554 scientific subdisciplines
@ -772,6 +771,7 @@ in_current_incomplete_year = in the current incomplete year (not charted above)
publication_count = Publication Count
grant_count = Grant Count
entity_type = Entity Type
entity_label = Entity Label
no_matching_entities_found = No matching entities found
clear_search_query = clear search query
short_max_entity_note = A Maximum of 10 entities can be compared.