diff options
Diffstat (limited to 'plugins/Live/templates')
| -rw-r--r-- | plugins/Live/templates/_actionsList.twig | 2 | ||||
| -rw-r--r-- | plugins/Live/templates/_dataTableViz_visitorLog.twig | 25 | ||||
| -rw-r--r-- | plugins/Live/templates/getSingleVisitSummary.twig | 4 | ||||
| -rw-r--r-- | plugins/Live/templates/getVisitList.twig | 2 | ||||
| -rw-r--r-- | plugins/Live/templates/getVisitorProfilePopup.twig | 7 | ||||
| -rw-r--r-- | plugins/Live/templates/index.twig | 4 |
6 files changed, 23 insertions, 21 deletions
diff --git a/plugins/Live/templates/_actionsList.twig b/plugins/Live/templates/_actionsList.twig index 8d8bc1572a..a36a9da66d 100644 --- a/plugins/Live/templates/_actionsList.twig +++ b/plugins/Live/templates/_actionsList.twig @@ -108,7 +108,7 @@ {% else %} <a href="{{ action.url }}" rel="noreferrer" target="_blank" class="{% if action.eventCategory|default(false) is empty %}action-list-url{# don't put URL on new line for events #}{% endif %} truncated-text-line" {% if overrideLinkStyle is not defined or overrideLinkStyle %}style="text-decoration:underline;"{% endif %}> - {{ action.url }} + {{ action.url|replace({'http://': '', 'https://': ''}) }} </a> {% endif %} {% endif %} diff --git a/plugins/Live/templates/_dataTableViz_visitorLog.twig b/plugins/Live/templates/_dataTableViz_visitorLog.twig index b9463c2439..a97c7e310a 100644 --- a/plugins/Live/templates/_dataTableViz_visitorLog.twig +++ b/plugins/Live/templates/_dataTableViz_visitorLog.twig @@ -159,7 +159,11 @@ GPS (lat/long): {{ visitor.getColumn('latitude') }},{{ visitor.getColumn('longit {% endif %} {% if visitor.getColumn('countryFlag') %} <span class="visitorLogIconWithDetails"> + <img src="{{ visitor.getColumn('countryFlag') }}"/> + {% if visitor.getColumn('city') %}{{ visitor.getColumn('city')|rawSafeDecoded }}{% endif -%} + {%- if visitor.getColumn('region') %}{% if visitor.getColumn('city') %}, {% endif %}{{ visitor.getColumn('region')|rawSafeDecoded }}{% endif %} + <ul class="details"> <li>{{ 'UserCountry_Country'|translate }}: {{ visitor.getColumn('country') }}</li> {% if visitor.getColumn('region') %}<li>{{ 'UserCountry_Region'|translate }}: {{ visitor.getColumn('region') }}</li>{% endif %} @@ -194,17 +198,18 @@ GPS (lat/long): {{ visitor.getColumn('latitude') }},{{ visitor.getColumn('longit <div class="col s12 m{% if displayVisitorsInOwnColumn %}7{% else %}8{% endif %} column {% if visitor.getColumn('visitConverted') and not isWidget %}highlightField{% endif %}"> {{ postEvent('Live.visitorLogViewBeforeActionsInfo', visitor) }} + + <strong> + {{ visitor.getColumn('actionDetails')|length }} + {% if visitor.getColumn('actionDetails')|length <= 1 %} + {{ 'General_Action'|translate }} + {% else %} + {{ 'General_Actions'|translate }} + {% endif %} + {% if visitor.getColumn('visitDuration') > 0 %}- {{ visitor.getColumn('visitDurationPretty')|raw }}{% endif %} + </strong> + <div class="visitor-log-page-list"> - <strong> - {{ visitor.getColumn('actionDetails')|length }} - {% if visitor.getColumn('actionDetails')|length <= 1 %} - {{ 'General_Action'|translate }} - {% else %} - {{ 'General_Actions'|translate }} - {% endif %} - {% if visitor.getColumn('visitDuration') > 0 %}- {{ visitor.getColumn('visitDurationPretty')|raw }}{% endif %} - </strong> - <br/> <ol class='visitorLog'> {% include "@Live/_actionsList.twig" with {'actionDetails': visitor.getColumn('actionDetails')} %} </ol> diff --git a/plugins/Live/templates/getSingleVisitSummary.twig b/plugins/Live/templates/getSingleVisitSummary.twig index 9ec0960ba8..c7af9a6c2c 100644 --- a/plugins/Live/templates/getSingleVisitSummary.twig +++ b/plugins/Live/templates/getSingleVisitSummary.twig @@ -19,8 +19,8 @@ {% if widgetizedLink is defined %}<a class="visitor-profile-widget-link" href="{{ widgetizedLink }}" target="_blank" title="{{ 'Widgetize_OpenInNewWindow'|translate }} - {{ 'Live_VisitorProfile'|translate }} {{ 'General_Id'|translate|upper }} {{ visitData.visitorId }}">{% endif %} <strong>{{ visitData.visitorId }}</strong> {% if widgetizedLink is defined %}</a>{% endif %} - <a class="visitor-profile-export" href="{{ exportLink }}" target="_blank" title="{{ 'General_ExportThisReport'|translate }}" style="visibility:hidden"> - <img src="plugins/Morpheus/images/export.png"/> + <a class="visitor-profile-export" href="{{ exportLink }}" target="_blank" title="{{ 'General_ExportThisReport'|translate }}"> + <span class="icon-export"></span> </a> </li> <li> diff --git a/plugins/Live/templates/getVisitList.twig b/plugins/Live/templates/getVisitList.twig index 18047bf3c2..9266afbcb6 100644 --- a/plugins/Live/templates/getVisitList.twig +++ b/plugins/Live/templates/getVisitList.twig @@ -6,7 +6,7 @@ {{ 'General_Visit'|translate }} #{{ startCounter }} {% if visitInfo.getColumn('visitDuration') != 0 %} - <span> - ({{ visitInfo.getColumn('visitDurationPretty')|raw }})</span> + <span> ({{ visitInfo.getColumn('visitDurationPretty')|raw }})</span> {% endif %} <span class="visitor-profile-date" title="{{ visitInfo.getColumn('serverDatePrettyFirstAction') }} {{ visitInfo.getColumn('serverTimePrettyFirstAction') }}"> {{ visitInfo.getColumn('serverDatePrettyFirstAction') }} {{ visitInfo.getColumn('serverTimePrettyFirstAction') }} diff --git a/plugins/Live/templates/getVisitorProfilePopup.twig b/plugins/Live/templates/getVisitorProfilePopup.twig index c41acd19a4..1a57eb6958 100644 --- a/plugins/Live/templates/getVisitorProfilePopup.twig +++ b/plugins/Live/templates/getVisitorProfilePopup.twig @@ -6,14 +6,14 @@ data-next-visitor="{{ visitorData.nextVisitorId }}" data-prev-visitor="{{ visitorData.previousVisitorId }}" tabindex="0"> - <a href class="visitor-profile-close"></a> + <a href class="visitor-profile-close" title="{{ 'General_Close'|translate }} "></a> <div class="visitor-profile-info"> <div> <div class="visitor-profile-overview"> <div class="visitor-profile-avatar"> <div> <div class="visitor-profile-image-frame"> - <img src="{{ visitorData.visitorAvatar|default("plugins/Live/images/unknown_avatar.jpg") }}" + <img src="{{ visitorData.visitorAvatar|default("plugins/Live/images/unknown_avatar.png") }}" alt="{{ visitorData.visitorDescription|default('') }}" title="{{ visitorData.visitorDescription|default('') }}" /> </div> @@ -144,9 +144,6 @@ </div> </div> <div class="visitor-profile-visits-info"> - <div class="visitor-profile-pages-visited"> - <h1>{{ 'Live_VisitedPages'|translate }}</h1> - </div> <div class="visitor-profile-visits-container"> <ol class="visitor-profile-visits"> {% include "@Live/getVisitList.twig" with {'visits': visitorData.lastVisits, 'startCounter': 1} %} diff --git a/plugins/Live/templates/index.twig b/plugins/Live/templates/index.twig index bf2ccbeedb..5112c85d10 100644 --- a/plugins/Live/templates/index.twig +++ b/plugins/Live/templates/index.twig @@ -39,10 +39,10 @@ {% spaceless %} <div class="visitsLiveFooter"> <a title="{{ 'Live_OnClickPause'|translate('Live_VisitorsInRealTime'|translate) }}" href="javascript:void(0);" onclick="onClickPause();"> - <img id="pauseImage" border="0" src="plugins/Live/images/pause.gif" /> + <img id="pauseImage" border="0" src="plugins/Live/images/pause.png" /> </a> <a title="{{ 'Live_OnClickStart'|translate('Live_VisitorsInRealTime'|translate) }}" href="javascript:void(0);" onclick="onClickPlay();"> - <img id="playImage" style="display: none;" border="0" src="plugins/Live/images/play.gif" /> + <img id="playImage" style="display: none;" border="0" src="plugins/Live/images/play.png" /> </a> {% if not disableLink %} |