diff options
author | Benaka Moorthi <benaka.moorthi@gmail.com> | 2013-09-28 15:56:46 +0400 |
---|---|---|
committer | Benaka Moorthi <benaka.moorthi@gmail.com> | 2013-09-28 15:56:46 +0400 |
commit | 2071fc412022fd8dd391776d0abeb4cdedd13eaa (patch) | |
tree | 2287a46f44b7db2ec311567a358b92ab6b0e1a96 | |
parent | 31f518a5d6d07cdc809e93ba5b837549bdc57821 (diff) |
Fix build and show keyword tooltip in visitor log.
-rw-r--r-- | plugins/Live/templates/_dataTableViz_visitorLog.twig | 5 | ||||
-rw-r--r-- | tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/plugins/Live/templates/_dataTableViz_visitorLog.twig b/plugins/Live/templates/_dataTableViz_visitorLog.twig index cd8f31ad75..aa94aa6af3 100644 --- a/plugins/Live/templates/_dataTableViz_visitorLog.twig +++ b/plugins/Live/templates/_dataTableViz_visitorLog.twig @@ -134,11 +134,12 @@ GPS (lat/long): {{ visitor.getColumn('latitude') }},{{ visitor.getColumn('longit {% endif %} {% if visitor.getColumn('referrerType') == 'search' %} {%- set keywordNotDefined = 'General_NotDefined'|translate('General_ColumnKeyword'|translate) -%} + {%- set showKeyword = visitor.getColumn('referrerKeyword') is not empty and visitor.getColumn('referrerKeyword') != keywordNotDefined %-} {% if visitor.getColumn('searchEngineIcon') %} <img src="{{ visitor.getColumn('searchEngineIcon') }}" alt="{{ visitor.getColumn('referrerName') }}"/> {% endif %} - {{ visitor.getColumn('referrerName') }} - {% if visitor.getColumn('referrerKeyword') is not empty and visitor.getColumn('referrerKeyword') != keywordNotDefined %}{{ 'Referers_Keywords'|translate }}: + <span {% if not showKeyword %}title="{{ keywordNotDefined }}"{% endif %}>{{ visitor.getColumn('referrerName') }}</span> + {% if showKeyword %}{{ 'Referers_Keywords'|translate }}: <br/> <a href="{{ visitor.getColumn('referrerUrl') }}" target="_blank" style="text-decoration:underline;"> "{{ visitor.getColumn('referrerKeyword') }}"</a> diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml index 243c983de7..f2da198c77 100644 --- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml @@ -31,12 +31,14 @@ <daysAgo>0</daysAgo> + <referrerType>direct</referrerType> <referralSummary>Direct Entry</referralSummary> </firstVisit> <lastVisit> <daysAgo>0</daysAgo> + <referrerType>direct</referrerType> <referralSummary>Direct Entry</referralSummary> </lastVisit> <visitsAggregated>2</visitsAggregated> |