diff --git a/productMods/images/individual/fullViewBubble.png b/productMods/images/individual/fullViewBubble.png deleted file mode 100644 index c42ce400..00000000 Binary files a/productMods/images/individual/fullViewBubble.png and /dev/null differ diff --git a/productMods/images/individual/quickViewBubble.png b/productMods/images/individual/quickViewBubble.png deleted file mode 100644 index 045b8b16..00000000 Binary files a/productMods/images/individual/quickViewBubble.png and /dev/null differ diff --git a/productMods/images/individual/researchAreaBubble.png b/productMods/images/individual/researchAreaBubble.png index f9358817..45414209 100644 Binary files a/productMods/images/individual/researchAreaBubble.png and b/productMods/images/individual/researchAreaBubble.png differ diff --git a/productMods/images/individual/toolTipBubble.png b/productMods/images/individual/toolTipBubble.png new file mode 100644 index 00000000..dfb88c96 Binary files /dev/null and b/productMods/images/individual/toolTipBubble.png differ diff --git a/productMods/js/individual/individualQtipBubble.js b/productMods/js/individual/individualQtipBubble.js index 5b56c814..e61cbe2e 100644 --- a/productMods/js/individual/individualQtipBubble.js +++ b/productMods/js/individual/individualQtipBubble.js @@ -2,14 +2,17 @@ $(document).ready(function(){ // This function creates and styles the "qTip" tooltip that displays the bubble text when the user hovers - // over the research area "group" icon. + // over the research area "group" icon. + + $.extend(this, i18nStrings); + $('#researchAreaIcon').each(function() { $(this).qtip( { content: { prerender: true, - text: ' ' + text: '
' + i18nStrings.researchAreaTooltipOne + '
' + i18nStrings.researchAreaTooltipTwo + '
' }, position: { corner: { @@ -35,6 +38,9 @@ $(document).ready(function(){ style: { padding: '0em', height: 56, + textAlign: 'center', + fontSize: '0.7em', + lineHeight: '15px', width: 180, border: 'none', background:'url(' + imagesPath + '/individual/researchAreaBubble.png) no-repeat' @@ -47,7 +53,7 @@ $(document).ready(function(){ $(this).qtip( { content: { - text: ' ' + text: '
' + i18nStrings.quickviewTooltip + '
' }, position: { corner: { @@ -74,9 +80,12 @@ $(document).ready(function(){ style: { padding: '0em', height: 56, + textAlign: 'center', + fontSize: '0.7em', + lineHeight: '15px', width: 140, border: 'none', - background: 'url(' + imagesPath + '/individual/quickViewBubble.png) no-repeat' + background: 'url(' + imagesPath + '/individual/toolTipBubble.png) no-repeat' } }); }); @@ -86,7 +95,7 @@ $(document).ready(function(){ $(this).qtip( { content: { - text: ' ' + text: '
' + i18nStrings.standardviewTooltipOne + '
' + i18nStrings.standardviewTooltipTwo + '
' }, position: { corner: { @@ -110,9 +119,12 @@ $(document).ready(function(){ style: { padding: '0em', height: 56, + textAlign: 'center', + fontSize: '0.7em', + lineHeight: '15px', width: 144, border: 'none', - background: 'url(' + imagesPath + '/individual/fullViewBubble.png) no-repeat' + background: 'url(' + imagesPath + '/individual/toolTipBubble.png) no-repeat' } }); }); diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl index 6e557d13..d3a63df8 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl @@ -158,7 +158,11 @@ var i18nStrings = { displayLess: '${i18n().display_less}', displayMoreEllipsis: '${i18n().display_more_ellipsis}', showMoreContent: '${i18n().show_more_content}', - verboseTurnOff: '${i18n().verbose_turn_off}' + verboseTurnOff: '${i18n().verbose_turn_off}', + standardviewTooltipOne: '${i18n().standardview_tooltip_one}', + standardviewTooltipTwo: '${i18n().standardview_tooltip_two}', + researchAreaTooltipOne: '${i18n().research_area_tooltip_one}', + researchAreaTooltipTwo: '${i18n().research_area_tooltip_two}' }; var i18nStringsUriRdf = { shareProfileUri: '${i18n().share_profile_uri}', diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl index 7a2e39e8..810250b5 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl @@ -205,7 +205,10 @@ var i18nStrings = { displayLess: '${i18n().display_less}', displayMoreEllipsis: '${i18n().display_more_ellipsis}', showMoreContent: '${i18n().show_more_content}', - verboseTurnOff: '${i18n().verbose_turn_off}' + verboseTurnOff: '${i18n().verbose_turn_off}', + quickviewTooltip: '${i18n().quickview_tooltip}', + researchAreaTooltipOne: '${i18n().research_area_tooltip_one}', + researchAreaTooltipTwo: '${i18n().research_area_tooltip_two}' }; var i18nStringsUriRdf = { shareProfileUri: '${i18n().share_profile_uri}', diff --git a/themes/wilma/i18n/all.properties b/themes/wilma/i18n/all.properties index 193ed895..baae9bef 100644 --- a/themes/wilma/i18n/all.properties +++ b/themes/wilma/i18n/all.properties @@ -812,4 +812,13 @@ map_being_refreshed_msg = is now being refreshed. The visualization will load as publication_pubs = publications (pubs.) percent_activity = % activity +# +# miscellaneous additions +# + limit_search = limit search +standardview_tooltip_one = Click to display the +standardview_tooltip_two = profile quick view. +research_area_tooltip_one = Click an area to view others +research_area_tooltip_two = with the same interest. +quickview_tooltip = Click to view the standard profile page. diff --git a/themes/wilma/templates/individual--foaf-person.ftl b/themes/wilma/templates/individual--foaf-person.ftl index bf3e512c..6e2161fb 100644 --- a/themes/wilma/templates/individual--foaf-person.ftl +++ b/themes/wilma/templates/individual--foaf-person.ftl @@ -122,6 +122,8 @@ 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}' }; var i18nStringsUriRdf = { shareProfileUri: '${i18n().share_profile_uri}',