-

Capability Map

-

Build a ‘first pass’ capability map by typing in a search term that could be said to represent a broad research capability.

+

${i18n().capability_map}

+

${i18n().cap_map_intro}

@@ -43,9 +58,9 @@ ${stylesheets.add( - - - + + +

@@ -56,56 +71,27 @@ ${stylesheets.add(

- Welcome to the Capability Mapping tool. - This tool visualises how researchers relate to other - researchers via search terms. + ${i18n().cap_map_text_intro}

-

Getting Started

+

${i18n().cap_map_text_headline1}

- Enter a research area into the search field above and press 'Search'. - The resulting diagram displays the search term, rendered in orange, - connected to the blue group of researchers that are active in that area. - Enter another search term to see how researchers from both searches relate. - Keep adding search terms to build a capability map. + ${i18n().cap_map_text1}

- Tip: you can expand a broad search term into smaller concepts - by clicking ‘search and expand’. + ${i18n().cap_map_text2}

-

Interacting with the visualisation

+

${i18n().cap_map_text_headline2}

- By clicking on any node in the visualisation, - additional information can be viewed in the - 'Info' tab on the right-hand side. - For groups of people, the participants in the group - and their information can be viewed, - and individual researchers can be removed from the graph. - Selecting a search term will display all attached groups. - Under each group full information for each person is retrieved, - and the number of matching grants and publications - for each researcher within the mapped capabilities is shown. - Clicking on a researcher's name will lead to the original search - results. + ${i18n().cap_map_text3}

-

Visual cues

+

${i18n().cap_map_text_headline3}

- To make the visualisation easier to read, - search terms and groups are scaled according - to the number of results returned. - Groups are also given different shades - according to the number of connected search terms. - The darker the shade, the more search terms a group is connected to. + ${i18n().cap_map_text4}

-

Advanced features

-

Changing the cutoff value

+

${i18n().cap_map_text_headline4}

+

${i18n().cap_map_text_headline5}

- The amount of researchers retrieved for each search term - for is limited by the cutoff value in the search form - (10 by default). - Increasing this cutoff will increase the likelihood - of an intersection between different search terms. - This will also increase the complexity of the graph, - however, and may make it difficult to identify patterns. + ${i18n().cap_map_text5}

@@ -118,28 +104,32 @@ ${stylesheets.add(
-

Current search terms

+

${i18n().cap_map_cur_search_terms}

    -
  • This panel displays a list of the search terms currently - on the graph. Search for something to begin.
    • +
  • + ${i18n().cap_map_text6} +

- Key +

${i18n().cap_map_key1}
+
${i18n().cap_map_key2}
+
${i18n().cap_map_key3}
+
${i18n().cap_map_key4}
+
${i18n().cap_map_key5}
+
${i18n().cap_map_key6}

- This panel displays information about individual - search terms and groups. Click on a group to display - its information. + ${i18n().cap_map_text7}

@@ -164,4 +154,3 @@ ${stylesheets.add(
- diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl index 46b0b2ec..f5377d2d 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl @@ -159,17 +159,17 @@ var totalPubs = onlyUnknownYearPublications ? unknownYearPublicationCounts : renderedShortSparks; if (totalPubs === 1) { - var pubDisplay = "${i18n().co_author}"; + var pubDisplay = "${i18n().co_author?js_string}"; } else { - var pubDisplay = "${i18n().co_authors}"; + var pubDisplay = "${i18n().co_authors?js_string}"; } $('#${sparklineContainerID} td.sparkline_number').text(totalPubs).css("font-weight", "bold").attr("class", "grey").append(" " + pubDisplay + "
"); - var sparksText = ' ${i18n().within_last_10_years}'; + var sparksText = ' ${i18n().within_last_10_years?js_string}'; if (totalPubs !== totalPublicationCount) { - sparksText += ' (' + totalPublicationCount + ' ${i18n().total})'; + sparksText += ' (' + totalPublicationCount + ' ${i18n().total?js_string})'; } <#else> @@ -188,22 +188,22 @@ var totalPubs = onlyUnknownYearPublications ? unknownYearPublicationCounts : renderedSparks; if ( totalPubs == 1 ) { - var pubDisplay = "${i18n().co_author}"; + var pubDisplay = "${i18n().co_author?js_string}"; } else { - var pubDisplay = "${i18n().co_authors}"; + var pubDisplay = "${i18n().co_authors?js_string}"; } $('#${sparklineContainerID} td.sparkline_number').text(totalPubs).css("font-weight", "bold").attr("class", "grey").append(" " + pubDisplay + "
"); - var sparksText = ' ${i18n().from} ${sparklineVO.earliestYearConsidered?c}' + var sparksText = ' ${i18n().from?js_string} ${sparklineVO.earliestYearConsidered?c}' + ' - ${sparklineVO.latestRenderedPublicationYear?c}'; if (totalPubs !== totalPublicationCount) { - sparksText += ' (' + totalPublicationCount + ' ${i18n().total})'; + sparksText += ' (' + totalPublicationCount + ' ${i18n().total?js_string})'; } if (totalPublicationCount) { - sparksText += '
(.CSV ${i18n().file_capitalized}) '; + sparksText += '
(.CSV ${i18n().file_capitalized}) '; } diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl index c4149708..ff98bbdd 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl @@ -161,17 +161,17 @@ if (totalGrants === 1) { - var grantDisplay = "${i18n().co_investigator}"; + var grantDisplay = "${i18n().co_investigator?js_string}"; } else { - var grantDisplay = "${i18n().co_investigators}"; + var grantDisplay = "${i18n().co_investigators?js_string}"; } $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append(" " + grantDisplay + "
"); - var sparksText = ' ${i18n().within_last_10_years}'; + var sparksText = ' ${i18n().within_last_10_years?js_string}'; if (totalGrants !== totalGrantCount) { - sparksText += ' (' + totalGrantCount + ' ${i18n().total})'; + sparksText += ' (' + totalGrantCount + ' ${i18n().total?js_string})'; } <#else> @@ -190,18 +190,18 @@ var totalGrants = onlyUnknownYearGrants ? unknownYearGrantCounts : renderedSparks; if (totalGrants === 1) { - var grantDisplay = "${i18n().co_investigator}"; + var grantDisplay = "${i18n().co_investigator?js_string}"; } else { - var grantDisplay = "${i18n().co_investigators}"; + var grantDisplay = "${i18n().co_investigators?js_string}"; } $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append(" " + grantDisplay + "
"); - var sparksText = ' ${i18n().from} ${sparklineVO.earliestYearConsidered?c}' + var sparksText = ' ${i18n().from?js_string} ${sparklineVO.earliestYearConsidered?c}' + ' through ${sparklineVO.latestRenderedGrantYear?c}'; if (totalGrants !== totalGrantCount) { - sparksText += ' (' + totalGrantCount + ' ${i18n().total})'; + sparksText += ' (' + totalGrantCount + ' ${i18n().total?js_string})'; } if (totalGrantCount) { diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl index 9e79169f..fd4b7b4b 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl @@ -34,25 +34,25 @@ <#assign temporalGraphDownloadCSVCommonURL = '${urls.base}${dataVisualizationURLRoot}?uri=${organizationURI}&labelField=label'> -<#assign publicationParameter = { "name": "${i18n().publication}", - "pluralName": "${i18n().publications}", - "verbName": "${i18n().published}", - "dropDownText": "${i18n().by_publications}", +<#assign publicationParameter = { "name": "${i18n().publication?js_string}", + "pluralName": "${i18n().publications?js_string}", + "verbName": "${i18n().published?js_string}", + "dropDownText": "${i18n().by_publications?js_string}", "viewLink": "${organizationPublicationTemporalGraphURL}", "viewBaseLink": "${subOrganizationPublicationTemporalGraphCommonURL}", "dataLink": "${organizationPublicationTemporalGraphDataURL}", "csvLink": "${temporalGraphDownloadCSVCommonURL}&vis=entity_comparison", - "value": "${i18n().publications}" }> + "value": "${i18n().publications?js_string}" }> -<#assign grantParameter = { "name": "${i18n().grant}", - "pluralName": "${i18n().grants}", - "verbName": "${i18n().granted}", - "dropDownText": "${i18n().by_grants}", +<#assign grantParameter = { "name": "${i18n().grant?js_string}", + "pluralName": "${i18n().grants?js_string}", + "verbName": "${i18n().granted?js_string}", + "dropDownText": "${i18n().by_grants?js_string}", "viewLink": "${organizationGrantTemporalGraphURL}", "viewBaseLink": "${subOrganizationGrantTemporalGraphCommonURL}", "dataLink": "${organizationGrantTemporalGraphDataURL}", "csvLink": "${temporalGraphDownloadCSVCommonURL}&vis=entity_grant_count", - "value": "${i18n().grants}" }> + "value": "${i18n().grants?js_string}" }> <#assign parameterOptions = [publicationParameter, grantParameter]> @@ -70,68 +70,68 @@ we will use rev 293 (dev build version) of the flot & excanvas files. diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl index 315259e9..f7d4d73a 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl @@ -156,17 +156,17 @@ var totalGrants = onlyUnknownYearGrants ? unknownYearGrantCounts : renderedShortSparks; if (totalGrants === 1) { - var grantDisplay = "${i18n().grant}"; + var grantDisplay = "${i18n().grant?js_string}"; } else { - var grantDisplay = "${i18n().grants}"; + var grantDisplay = "${i18n().grants?js_string}"; } $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append(" " + grantDisplay + "
"); - var sparksText = ' ${i18n().within_last_10_years}'; + var sparksText = ' ${i18n().within_last_10_years?js_string}'; if (totalGrants !== totalGrantCount) { - sparksText += ' (' + totalGrantCount + ' ${i18n().total})'; + sparksText += ' (' + totalGrantCount + ' ${i18n().total?js_string})'; } <#else> @@ -185,9 +185,9 @@ var totalGrants = onlyUnknownYearGrants ? unknownYearGrantCounts : renderedSparks; if (totalGrants === 1) { - var grantDisplay = "${i18n().grant}"; + var grantDisplay = "${i18n().grant?js_string}"; } else { - var grantDisplay = "${i18n().grants}"; + var grantDisplay = "${i18n().grants?js_string}"; } $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append(" " + grantDisplay + "
"); @@ -196,7 +196,7 @@ + ' through ${sparklineVO.latestRenderedGrantYear?c}'; if (totalGrants !== totalGrantCount) { - sparksText += ' (' + totalGrantCount + ' ${i18n().total})'; + sparksText += ' (' + totalGrantCount + ' ${i18n().total?js_string})'; } if (totalGrantCount) { diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/aboutMapOfScience.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/aboutMapOfScience.ftl deleted file mode 100644 index 48253410..00000000 --- a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/aboutMapOfScience.ftl +++ /dev/null @@ -1,52 +0,0 @@ -<#-- $This file is distributed under the terms of the license in LICENSE$ --> - -<#assign aboutImagesRoot = '${urls.images}/visualization/mapofscience/about/'> - -

About VIVO's Map of Science Visualization

-

Reference Basemap

-

The VIVO Map of Science visualization uses the UCSD map of science and classification -system that was computed using paper-level data from about 25,000 journals from Elsevier's -Scopus and Clarivate Analytics' Web of Science (WoS) for the years 2001-2010. The UCSD map -of science assigns the 25,000 journals to 554 subdisciplines that are further aggregated -into 13 main disciplines of science. In the map, each discipline has a distinct color -(green for 'Biology', brown for 'Earth Sciences', etc.) and a label. (Sub)disciplines that -are similar closer to one another on the map. (Sub)disciplines that are especially similar -are connected by grey lines.

- -

Data Overlay

-

Publication activity of a university, organization, or person can be overlaid on the -map to generate expertise profiles. The process is as follows: (1) The set of unique -journals is identified, (2) the number of times each journal served as a publication venue -is calculated, and (3) the area size of the 13 disciplines and 554 subdisciplines is -calculated based on these journal publication venue counts. Note that some journals are -associated with exactly one (sub)discipline while others, e.g., interdisciplinary ones like -Science or Nature, are fractionally associated with multiple -(sub)disciplines. Subdisciplines inherit the colors of their parent disciplines. -(Sub)disciplines without any associated publications are given in gray.

- - - - -

Expertise Profile Comparison Map

-

Publication activity of up to three organizations or persons can be compared via "Compare -organizations." In the table on the left, select up to three organizations. The expertise -profile of each organizations will be represented as data overlay. Each organizations is -represented in a distinct color and a top-10 list of subdisciplines with the highest number -of publications is given below the comparison map. Data can be saved as CSV file.

- - - -

Interactivity

-

The map can be explored at two levels-by 13 disciplines or 554 subdisciplines. Clicking -on a node in the map brings up the number of fractionally associated journal publications -and the percentage of publications mapped to this (sub)discipline. Hover over a discipline -in the table on the left to see what circles it corresponds to on the map. Use slider below -map, on the right to reduce number of subdisciplines shown to improve legibility

- -

Links

-

For more information on the UCSD map of science and classification system, see -https://doi.org/10.1371/journal.pone.0039464. -For other maps of science, see -http://scimaps.org and -http://mapofscience.com.

diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl index 249cdd91..4d6d6c56 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceSetup.ftl @@ -67,43 +67,43 @@ var entityMapOfScienceSubDisciplineCSVURLPrefix = "${urls.base}${dataVisualizati var entityMapOfScienceDisciplineCSVURL = "${entityMapOfScienceDisciplineCSVURL}"; var entityMapOfScienceSubDisciplineCSVURL = "${entityMapOfScienceSubDisciplineCSVURL}"; var i18nStrings = { - firstString: '${i18n().vis_first_link}', - lastString: '${i18n().vis_last_link}', - previousString: '${i18n().vis_previous_link}', - nextString: '${i18n().vis_next_link}', - organizationsString: '${i18n().organizations_capitalized}', - peopleString: '${i18n().people_capitalized}', - infoIconString: '${i18n().info_icon}', - entityTypeString: '${i18n().entity_type}', - organizationString: '${i18n().organization_capitalized}', - personString: '${i18n().person_capitalized}', - numberOfPubs: '${i18n().of_pubs}', - maxNbrForComp: '${i18n().max_nbr_for_comp}', - noMatchingScienceAreas: '${i18n().no_matching_science_areas}', - clearSearchQuery: '${i18n().clear_search_query}', - saveAllAsCSV: '${i18n().save_all_as_csv}', - drillDownString: '${i18n().drill_down}', - subdisciplinesString: '${i18n().subdisciplines}', - disciplinesString: '${i18n().disciplines}', - scienceAreaLevel: '${i18n().science_area_level}', - ofActivityString: '${i18n().of_activity}', - subdisciplinesLower: '${i18n().subdisciplines_lower}', - disciplinesLower: '${i18n().disciplines_lower}', - showDisciplineLabels: '${i18n().show_discipline_labels}', - noAttributedPubs: '${i18n().no_attributed_publications}', - noneOfThe: '${i18n().none_of_the}', - pubsAttributedTo: '${i18n().publications_attributed_to}', - beenScienceLocated: '${i18n().been_science_located}', - pubAttributedTo: '${i18n().publication_attributed_to}', - notScienceLocated: '${i18n().not_science_located}', - publicationsString: '${i18n().publications}', - publicationString: '${i18n().publication}', - noJournalInformation: '${i18n().no_journal_information}', - noMatchingMapLocation: '${i18n().no_matching_map_location}', - loadingDataFor: '${i18n().loading_data_for}', - mapBeingRefreshed: '${i18n().map_being_refreshed_msg}', - publicationsPubs: '${i18n().publication_pubs}', - percentActivity: '${i18n().percent_activity}' + firstString: '${i18n().vis_first_link?js_string}', + lastString: '${i18n().vis_last_link?js_string}', + previousString: '${i18n().vis_previous_link?js_string}', + nextString: '${i18n().vis_next_link?js_string}', + organizationsString: '${i18n().organizations_capitalized?js_string}', + peopleString: '${i18n().people_capitalized?js_string}', + infoIconString: '${i18n().info_icon?js_string}', + entityTypeString: '${i18n().entity_type?js_string}', + organizationString: '${i18n().organization_capitalized?js_string}', + personString: '${i18n().person_capitalized?js_string}', + numberOfPubs: '${i18n().of_pubs?js_string}', + maxNbrForComp: '${i18n().max_nbr_for_comp?js_string}', + noMatchingScienceAreas: '${i18n().no_matching_science_areas?js_string}', + clearSearchQuery: '${i18n().clear_search_query?js_string}', + saveAllAsCSV: '${i18n().save_all_as_csv?js_string}', + drillDownString: '${i18n().drill_down?js_string}', + subdisciplinesString: '${i18n().subdisciplines?js_string}', + disciplinesString: '${i18n().disciplines?js_string}', + scienceAreaLevel: '${i18n().science_area_level?js_string}', + ofActivityString: '${i18n().of_activity?js_string}', + subdisciplinesLower: '${i18n().subdisciplines_lower?js_string}', + disciplinesLower: '${i18n().disciplines_lower?js_string}', + showDisciplineLabels: '${i18n().show_discipline_labels?js_string}', + noAttributedPubs: '${i18n().no_attributed_publications?js_string}', + noneOfThe: '${i18n().none_of_the?js_string}', + pubsAttributedTo: '${i18n().publications_attributed_to?js_string}', + beenScienceLocated: '${i18n().been_science_located?js_string}', + pubAttributedTo: '${i18n().publication_attributed_to?js_string}', + notScienceLocated: '${i18n().not_science_located?js_string}', + publicationsString: '${i18n().publications?js_string}', + publicationString: '${i18n().publication?js_string}', + noJournalInformation: '${i18n().no_journal_information?js_string}', + noMatchingMapLocation: '${i18n().no_matching_map_location?js_string}', + loadingDataFor: '${i18n().loading_data_for?js_string}', + mapBeingRefreshed: '${i18n().map_being_refreshed_msg?js_string}', + publicationsPubs: '${i18n().publication_pubs?js_string}', + percentActivity: '${i18n().percent_activity?js_string}' }; diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceTooltips.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceTooltips.ftl deleted file mode 100644 index df9aaac1..00000000 --- a/webapp/src/main/webapp/templates/freemarker/visualization/mapOfScience/mapOfScienceTooltips.ftl +++ /dev/null @@ -1,70 +0,0 @@ -<#-- $This file is distributed under the terms of the license in LICENSE$ --> - -<#-- START TOOLTIP TEXT --> - - - - - - - - - - - - - - -<#-- COMPARISON TOOLTIP TEXT --> - - - - -<#-- END TOOLTIP TEXT --> diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl index 0de27ad1..c3fbebcc 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl @@ -39,16 +39,16 @@ var visualizationDataRoot = "${dataVisualizationURLRoot}"; // --> var i18nStringsCoauthorship = { - coAuthorsString: '${i18n().co_authors_capitalized}', - authorString: '${i18n().author_capitalized}', - publicationsWith: '${i18n().publications_with}', - publicationsString: "${i18n().through_today}", - coauthorsString: '${i18n().co_author_s_capitalized}' + coAuthorsString: '${i18n().co_authors_capitalized?js_string}', + authorString: '${i18n().author_capitalized?js_string}', + publicationsWith: '${i18n().publications_with?js_string}', + publicationsString: '${i18n().through_today?js_string}', + coauthorsString: '${i18n().co_author_s_capitalized?js_string}' }; var i18nStringsPersonLvl = { - fileCapitalized: '${i18n().file_capitalized}', - contentRequiresFlash: '${i18n().content_requires_flash}', - getFlashString: '${i18n().get_flash}' + fileCapitalized: '${i18n().file_capitalized?js_string}', + contentRequiresFlash: '${i18n().content_requires_flash?js_string}', + getFlashString: '${i18n().get_flash?js_string}' }; diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl index fadfb334..12e7a863 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl @@ -42,16 +42,16 @@ var visualizationDataRoot = "${dataVisualizationURLRoot}"; // --> var i18nStringsCoPi = { - coInvestigatorString: '${i18n().co_investigators_capitalized}', - investigatorString: '${i18n().investigator_capitalized}', - grantsWithString: '${i18n().grants_with}', - grantsCapitalized: '${i18n().grant_s_capitalized}', - coInvestigatorCapitalized: '${i18n().co_investigator_s_capitalized}' + coInvestigatorString: '${i18n().co_investigators_capitalized?js_string}', + investigatorString: '${i18n().investigator_capitalized?js_string}', + grantsWithString: '${i18n().grants_with?js_string}', + grantsCapitalized: '${i18n().grant_s_capitalized?js_string}', + coInvestigatorCapitalized: '${i18n().co_investigator_s_capitalized?js_string}' }; var i18nStringsPersonLvl = { - fileCapitalized: '${i18n().file_capitalized}', - contentRequiresFlash: '${i18n().content_requires_flash}', - getFlashString: '${i18n().get_flash}' + fileCapitalized: '${i18n().file_capitalized?js_string}', + contentRequiresFlash: '${i18n().content_requires_flash?js_string}', + getFlashString: '${i18n().get_flash?js_string}' }; diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountNoSparkline.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountNoSparkline.ftl index 974ec0a8..ce1bfc8b 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountNoSparkline.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountNoSparkline.ftl @@ -63,7 +63,7 @@ if ( !onlyUnknownYearPublications ) { if ( td1Text == tenYearCount ) { - td2Text += "${i18n().last_ten_full_years} " ; + td2Text += "${i18n().last_ten_full_years?js_string} " ; } else { td2Text += "" + tenYearCount + " ${i18n().last_ten_full_years} " ; diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl index d83f6c47..bf7e7519 100644 --- a/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl +++ b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl @@ -158,9 +158,9 @@ var sparksText = ""; if ( !onlyUnknownYearPublications ) { - $('#${sparklineContainerID} td.sparkline_number').text(totalPubs + " ${i18n().last_ten_full}").attr("class", "grey-text"); + $('#${sparklineContainerID} td.sparkline_number').text(totalPubs + " ${i18n().last_ten_full?js_string}").attr("class", "grey-text"); - sparksText += "${i18n().years}"; + sparksText += "${i18n().years?js_string}"; if (totalPubs !== totalPublicationCount) { //sparksText += ' (' + totalPublicationCount + ' ${i18n().total})' ; @@ -190,18 +190,18 @@ var totalPubs = onlyUnknownYearPublications ? unknownYearPublicationCounts : renderedSparks; if ( totalPubs == 1 ) { - var pubDisplay = "${i18n().publication}"; + var pubDisplay = "${i18n().publication?js_string}"; } else { - var pubDisplay = "${i18n().publications}"; + var pubDisplay = "${i18n().publications?js_string}"; } $('#${sparklineContainerID} td.sparkline_number').text(totalPubs).attr("class", "grey-text").append(" "+ pubDisplay +"
"); - var sparksText = ' ${i18n().from} ${sparklineVO.earliestYearConsidered?c}' + var sparksText = ' ${i18n().from?js_string} ${sparklineVO.earliestYearConsidered?c}' + ' - ${sparklineVO.latestRenderedPublicationYear?c}'; if (totalPubs !== totalPublicationCount) { - sparksText += ' (' + totalPublicationCount + ' ${i18n().total})'; + sparksText += ' (' + totalPublicationCount + ' ${i18n().total?js_string})'; } if (totalPublicationCount) { diff --git a/webapp/src/main/webapp/themes/tenderfoot/i18n/all.properties b/webapp/src/main/webapp/themes/tenderfoot/i18n/all.properties deleted file mode 100644 index 22890324..00000000 --- a/webapp/src/main/webapp/themes/tenderfoot/i18n/all.properties +++ /dev/null @@ -1,101 +0,0 @@ -collapsed_menu_name = Menu -address_street_two = address street two -loading_website_image = Loading website image -view = view -currently_no_papers_for = Currently there are no {0} papers for -identity_index = Index -service_provider_role = Service Provider Role -intro_searchvivo = Search VIVO -grant_type = grant Type -grants_in_vivo = grants in VIVO -last_grant = Last Grant -no_departments_found = No academic departments found. -leadership_role = Leadership Role -menu_contactus = Contact Us -countries = countries -menu_welcomestart = Welcome -view_all_faculty = view all faculty -menu_copyright = copyright -last_publication = Last publication -menu_item = menu item -address_street_three = address street three -vivo_profile = VIVO profile -identity_myprofile = My profile -unable_to_handle_grant_editing = This form is unable to handle the editing of this grant because it is associated with multiple grant individuals. -unable_to_handle_position_editing = This form is unable to handle the editing of this position because it is associated with multiple Position individuals. -address_label = address label -no_grants_for = Currently there are no grants for -no_faculty_found = No faculty members found. -create_capitalized = Create -first_publication = First publication -address_street_one = address street one -select_award = Selected Award -first_name = First name -change_selection = change selection -menu_support = Support -indiv_foafperson_for = for -statewide_locations = state-wide locations. -password = password -place_of_grant = Place of grant -menu_logout = Log out -identity_edit = Edit Page -menu_loginfull = Log in to manage this site -reviewer_role = Reviewer Role -menu_login = Log in -view_all_departments = view all academic departments -identity_admin = Site Admin -intro_title = Welcome to VIVO -menu_version = Version -grant_date = grant Date -loading_data = loading data -to = to -collection_capitalized = Collection -create_entry = Create Entry -first_grant = First Grant -map_states_string = states. -limit_search = limit search -identity_user = user -menu_about = About -grant_entry_for = grant entry for -regions = regions -faculty_who_are_members_of_org = Here are the faculty in the {0} department who are members of this organization. -placeholder_image = placeholder image -indiv_foafperson_return = return to -enter_new_role_value = Please enter a new value in the Role field. -last_name = Last name -countries_and_regions = countries and regions. -currently_no_researchers = There are currently no researchers with a defined geographic focus. -research_area = individuals in the department with this research area -identity_myaccount = My account -province_or_region = Province or Region -full_name = Full name -researchers = researchers -email_address = Email Address -years_participation_in = Years of Participation in -menu_termuse = Terms of Use -identity_title = VIVO | connect share discover -map_state_string = state. -intro_filtersearch = Filter search -return_to_grant = Return to grant -display_more = more -intro_para2 = Browse or search information on people, departments, courses, grants, and publications. -intro_para1 = VIVO is a research-focused discovery tool that enables collaboration among scholars of all disciplines. -profile_capitalized = Profile -organizer_role = Organizer Role -faculty_memberships = Faculty Memberships -edit_mailing_address = Edit Mailing Address -add_capitalized = Add -attendee_capitalized = Attendee -researchers_in = researchers in -menu_powered = Powered by -view_all_members_of_org = View all the members of this organization. - -grants_text_one = This body is from the the template file \ - vivo/productMods/templates/freemarker/body/menupage/grants.ftl. \ - In the display model, the grants page has a display:requiresBodyTemplate \ - property that defines that the grants page overrides the default template. \ - The default template for these pages is at /vitro/webapp/web/templates/freemarker/body/menupage/menupage.ftl -grants_two = This technique could be used to define pages without menu items, that get \ - their content from a freemarker template. An example would be the about page. -grants_text_three = This would create a page that would use about.ftl as the body. The page would be \ - accessed via /about and would override all servlet mappings in web.xml. diff --git a/webapp/src/main/webapp/themes/tenderfoot/i18n/images/select_locale_en_US.GIF b/webapp/src/main/webapp/themes/tenderfoot/i18n/images/select_locale_en_US.GIF deleted file mode 100644 index b42e9a41..00000000 Binary files a/webapp/src/main/webapp/themes/tenderfoot/i18n/images/select_locale_en_US.GIF and /dev/null differ diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl index a31182c2..4d32f3e7 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl +++ b/webapp/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl @@ -162,17 +162,17 @@ var exportQrCodeUrl = '${urls.base}/qrcode?uri=${individual.uri!}'; var baseUrl = '${urls.base}'; var i18nStrings = { - displayLess: '${i18n().display_less}', - displayMoreEllipsis: '${i18n().display_more_ellipsis}', - showMoreContent: '${i18n().show_more_content}', - verboseTurnOff: '${i18n().verbose_turn_off}', - researchAreaTooltipOne: '${i18n().research_area_tooltip_one}', - researchAreaTooltipTwo: '${i18n().research_area_tooltip_two}' + displayLess: '${i18n().display_less?js_string}', + displayMoreEllipsis: '${i18n().display_more_ellipsis?js_string}', + showMoreContent: '${i18n().show_more_content?js_string}', + verboseTurnOff: '${i18n().verbose_turn_off?js_string}', + researchAreaTooltipOne: '${i18n().research_area_tooltip_one?js_string}', + researchAreaTooltipTwo: '${i18n().research_area_tooltip_two?js_string}' }; var i18nStringsUriRdf = { - shareProfileUri: '${i18n().share_profile_uri}', - viewRDFProfile: '${i18n().view_profile_in_rdf}', - closeString: '${i18n().close}' + shareProfileUri: '${i18n().share_profile_uri?js_string}', + viewRDFProfile: '${i18n().view_profile_in_rdf?js_string}', + closeString: '${i18n().close?js_string}' }; diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl index 9f5ea590..e2aa1b1c 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl +++ b/webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl @@ -122,23 +122,23 @@ <@lh.listAcademicDepartments /> diff --git a/webapp/src/main/webapp/themes/wilma/i18n/all.properties b/webapp/src/main/webapp/themes/wilma/i18n/all.properties deleted file mode 100644 index e66f906a..00000000 --- a/webapp/src/main/webapp/themes/wilma/i18n/all.properties +++ /dev/null @@ -1,109 +0,0 @@ -menu_contactus = Contact Us -menu_welcomestart = Welcome -menu_copyright = copyright -menu_support = Support -menu_logout = Log out -menu_loginfull = Log in to manage this site -menu_login = Log in -menu_version = Version -menu_about = About -menu_termuse = Terms of Use -menu_powered = Powered by - -intro_title = Welcome to VIVO -intro_para1 = VIVO is a research-focused discovery tool that enables collaboration among scholars of all disciplines. -intro_para2 = Browse or search information on people, departments, courses, grants, and publications. -intro_searchvivo = Search VIVO -intro_filtersearch = Filter search - -identity_title = VIVO | connect share discover -identity_index = Index -identity_edit = Edit Page -identity_admin = Site Admin -identity_myprofile = My profile -identity_myaccount = My account -identity_user = user - -collection_capitalized = Collection -place_of_grant = Place of grant -email_address = Email Address - -# -# menupage templates ( /templates/freemarker/body/menupage ) -# -grants_text_one = This body is from the the template file \ - vivo/productMods/templates/freemarker/body/menupage/grants.ftl. \ - In the display model, the grants page has a display:requiresBodyTemplate \ - property that defines that the grants page overrides the default template. \ - The default template for these pages is at /vitro/webapp/web/templates/freemarker/body/menupage/menupage.ftl -grants_two = This technique could be used to define pages without menu items, that get \ - their content from a freemarker template. An example would be the about page. -grants_text_three = This would create a page that would use about.ftl as the body. The page would be \ - accessed via /about and would override all servlet mappings in web.xml. - -address_street_one = address street one -address_street_two = address street two -address_street_three = address street three -address_label = address label - -loading_website_image = Loading website image - -researchers_in = researchers in -view = view -grant_type = grant Type -grant_entry_for = grant entry for -regions = regions -grant_date = grant Date -map_states_string = states. -map_state_string = state. -unable_to_handle_grant_editing = This form is unable to handle the editing of this grant because it is associated with multiple grant individuals. -unable_to_handle_position_editing = This form is unable to handle the editing of this position because it is associated with multiple Position individuals. -currently_no_papers_for = Currently there are no {0} papers for -change_selection = change selection -view_all_departments = view all academic departments -first_name = First name -last_name = Last name -first_grant = First Grant -last_grant = Last Grant -currently_no_researchers = There are currently no researchers with a defined geographic focus. -reviewer_role = Reviewer Role -vivo_profile = VIVO profile -loading_data = loading data -select_award = Selected Award -grants_in_vivo = grants in VIVO -service_provider_role = Service Provider Role -view_all_faculty = view all faculty -no_grants_for = Currently there are no grants for -statewide_locations = state-wide locations. -faculty_who_are_members_of_org = Here are the faculty in the {0} department who are members of this organization. -indiv_foafperson_for = for -indiv_foafperson_return = return to -no_departments_found = No academic departments found. -leadership_role = Leadership Role -countries = countries -first_publication = First publication -last_publication = Last publication -research_area = individuals in the department with this research area -password = password -limit_search = limit search -placeholder_image = placeholder image -view_all_members_of_org = View all the members of this organization. -display_more = more -create_entry = Create Entry -attendee_capitalized = Attendee -no_faculty_found = No faculty members found. -create_capitalized = Create -to = to -enter_new_role_value = Please enter a new value in the Role field. -countries_and_regions = countries and regions. -province_or_region = Province or Region -full_name = Full name -researchers = researchers -years_participation_in = Years of Participation in -return_to_grant = Return to grant -profile_capitalized = Profile -organizer_role = Organizer Role -faculty_memberships = Faculty Memberships -edit_mailing_address = Edit Mailing Address -add_capitalized = Add - diff --git a/webapp/src/main/webapp/themes/wilma/i18n/images/select_locale_en_US.GIF b/webapp/src/main/webapp/themes/wilma/i18n/images/select_locale_en_US.GIF deleted file mode 100644 index b42e9a41..00000000 Binary files a/webapp/src/main/webapp/themes/wilma/i18n/images/select_locale_en_US.GIF and /dev/null differ diff --git a/webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl b/webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl index b115ab55..8dbf4623 100644 --- a/webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl +++ b/webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl @@ -165,17 +165,17 @@ var exportQrCodeUrl = '${urls.base}/qrcode?uri=${individual.uri!}'; var baseUrl = '${urls.base}'; var i18nStrings = { - displayLess: '${i18n().display_less}', - displayMoreEllipsis: '${i18n().display_more_ellipsis}', - showMoreContent: '${i18n().show_more_content}', - verboseTurnOff: '${i18n().verbose_turn_off}', - researchAreaTooltipOne: '${i18n().research_area_tooltip_one}', - researchAreaTooltipTwo: '${i18n().research_area_tooltip_two}' + displayLess: '${i18n().display_less?js_string}', + displayMoreEllipsis: '${i18n().display_more_ellipsis?js_string}', + showMoreContent: '${i18n().show_more_content?js_string}', + verboseTurnOff: '${i18n().verbose_turn_off?js_string}', + researchAreaTooltipOne: '${i18n().research_area_tooltip_one?js_string}', + researchAreaTooltipTwo: '${i18n().research_area_tooltip_two?js_string}' }; var i18nStringsUriRdf = { - shareProfileUri: '${i18n().share_profile_uri}', - viewRDFProfile: '${i18n().view_profile_in_rdf}', - closeString: '${i18n().close}' + shareProfileUri: '${i18n().share_profile_uri?js_string}', + viewRDFProfile: '${i18n().view_profile_in_rdf?js_string}', + closeString: '${i18n().close?js_string}' }; @@ -198,5 +198,5 @@ ${scripts.add('')} diff --git a/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl b/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl index ff55691a..8db75bb7 100644 --- a/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl +++ b/webapp/src/main/webapp/themes/wilma/templates/page-home.ftl @@ -87,23 +87,23 @@ <@lh.listAcademicDepartments />