From f613456b253f2a5261dd6825ef14a7aaf0661ea0 Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Tue, 12 Mar 2019 21:17:30 +0100 Subject: [PATCH 01/15] Pagination localisation clean-up (#14157) * Range start should be one-based, like the range end * Clean up pagination translation * Restore ScheduledReports translations * Update screenshots * Revert changes to non-English translations * Update screenshots * Update screenshot * Replace UsersManager_XtoYofN with General_Pagination * Only remove translation from en.json. * Off by one * Update screenshots * Fix off-by-one in range end * Update screenshots * Updated screenshot --- lang/en.json | 4 ++-- .../ActionsDataTable_auto_expand.png | 4 ++-- .../ActionsDataTable_column_sorted.png | 4 ++-- .../ActionsDataTable_exclude_low_population.png | 4 ++-- .../ActionsDataTable_flattened.png | 4 ++-- .../ActionsDataTable_initial.png | 4 ++-- .../ActionsDataTable_pageview_percentages.png | 4 ++-- .../ActionsDataTable_search.png | 4 ++-- .../ActionsDataTable_search_closed.png | 4 ++-- .../ActionsDataTable_search_visible.png | 2 +- ...ionsDataTable_segmented_visitor_log_hover.png | 4 ++-- .../ActionsDataTable_subtables_loaded.png | 4 ++-- .../ActionsDataTable_unflattened.png | 4 ++-- ...ionsDataTable_unique_pageview_percentages.png | 4 ++-- plugins/CoreHome/CoreHome.php | 2 +- plugins/CoreHome/javascripts/dataTable.js | 2 +- plugins/CoreHome/lang/en.json | 1 - .../expected-screenshots/DBStats_admin_page.png | 4 ++-- .../DashboardManager_removed.png | 4 ++-- .../Dashboard_loaded_token_auth.png | 4 ++-- .../expected-screenshots/Dashboard_removed.png | 4 ++-- .../Dashboard_widget_add_widget.png | 4 ++-- .../dashboard/dashboard-model.service.js | 16 ++++++++++------ .../angularjs/dashboard/dashboard.directive.html | 2 +- .../MultiSitesTest_all_websites.png | 4 ++-- ...SitesTest_all_websites_changed_sort_order.png | 4 ++-- .../MultiSitesTest_all_websites_page_1.png | 4 ++-- .../MultiSitesTest_all_websites_range.png | 4 ++-- .../MultiSitesTest_all_websites_search.png | 4 ++-- .../sites-manager-admin-sites-model.js | 4 ++-- .../expected-screenshots/SitesManager_loaded.png | 4 ++-- .../expected-screenshots/SitesManager_page_1.png | 4 ++-- .../SitesManager_page_1_again.png | 4 ++-- .../expected-screenshots/SitesManager_page_2.png | 4 ++-- .../expected-screenshots/SitesManager_search.png | 4 ++-- .../SitesManager_search_page_1.png | 4 ++-- plugins/UsersManager/UsersManager.php | 2 +- .../paged-users-list.component.html | 4 ++-- .../paged-users-list.component.js | 5 +++++ .../user-permissions-edit.component.html | 4 ++-- .../user-permissions-edit.component.js | 5 +++++ plugins/UsersManager/lang/en.json | 1 - ...Manager_admin_view_admin_edit_permissions.png | 4 ++-- .../UsersManager_admin_view_admin_load.png | 4 ++-- .../UsersManager_all_rows_in_search.png | 4 ++-- ...sersManager_all_rows_in_search_deselected.png | 4 ++-- .../UsersManager_all_rows_selected.png | 4 ++-- .../UsersManager_bulk_remove_access.png | 4 ++-- .../UsersManager_bulk_set_access.png | 4 ++-- .../UsersManager_delete_bulk_access.png | 4 ++-- .../UsersManager_delete_single.png | 4 ++-- .../UsersManager_filters.png | 4 ++-- .../expected-screenshots/UsersManager_load.png | 4 ++-- .../UsersManager_manage_users_back.png | 4 ++-- .../UsersManager_next_click.png | 4 ++-- ...ersManager_permissions_all_rows_in_search.png | 4 ++-- ...UsersManager_permissions_all_sites_access.png | 4 ++-- .../UsersManager_permissions_bulk_access_set.png | 4 ++-- .../UsersManager_permissions_edit.png | 4 ++-- .../UsersManager_permissions_next.png | 4 ++-- .../UsersManager_permissions_remove_access.png | 4 ++-- .../UsersManager_permissions_remove_single.png | 4 ++-- .../UsersManager_permissions_select_multiple.png | 4 ++-- .../UsersManager_previous.png | 4 ++-- .../UsersManager_role_for.png | 4 ++-- .../UsersManager_rows_selected.png | 4 ++-- .../GoalsTable_goals_table_abandoned_carts.png | 4 ++-- .../GoalsTable_goals_table_ecommerce.png | 4 ++-- .../GoalsTable_goals_table_ecommerce_view.png | 4 ++-- .../GoalsTable_goals_table_full.png | 4 ++-- .../GoalsTable_goals_table_single.png | 4 ++-- .../expected-screenshots/GoalsTable_initial.png | 4 ++-- .../MeasurableManager_add_measurable_view.png | 4 ++-- .../MeasurableManager_add_new_dialog.png | 4 ++-- .../MeasurableManager_loaded.png | 4 ++-- .../PivotByDimension_pivoted.png | 4 ++-- .../PivotByDimension_pivoted_columns_report.png | 4 ++-- tests/UI/expected-screenshots/Theme_home.png | 4 ++-- ...ntegrationTest_actions_content_name_piece.png | 4 ++-- .../UIIntegrationTest_actions_content_piece.png | 4 ++-- ...ntegrationTest_actions_content_piece_name.png | 4 ++-- .../UIIntegrationTest_actions_contents.png | 4 ++-- .../UIIntegrationTest_actions_downloads.png | 4 ++-- .../UIIntegrationTest_actions_entry_pages.png | 4 ++-- .../UIIntegrationTest_actions_exit_pages.png | 4 ++-- .../UIIntegrationTest_actions_outlinks.png | 4 ++-- .../UIIntegrationTest_actions_page_titles.png | 4 ++-- .../UIIntegrationTest_actions_pages.png | 4 ++-- ...ntegrationTest_actions_pages_tooltip_help.png | 4 ++-- .../UIIntegrationTest_actions_site_search.png | 4 ++-- .../UIIntegrationTest_admin_manage_websites.png | 4 ++-- .../UIIntegrationTest_dashboard1.png | 4 ++-- .../UIIntegrationTest_dashboard2.png | 4 ++-- .../UIIntegrationTest_dashboard3.png | 4 ++-- .../UIIntegrationTest_ecommerce_products.png | 4 ++-- .../UIIntegrationTest_events_overview.png | 4 ++-- .../UIIntegrationTest_exampleui_dataTables.png | 4 ++-- .../UIIntegrationTest_metric_tooltip.png | 4 ++-- .../UIIntegrationTest_referrers_allreferrers.png | 4 ++-- .../UIIntegrationTest_referrers_campaigns.png | 4 ++-- ...ionTest_referrers_search_engines_keywords.png | 4 ++-- .../UIIntegrationTest_referrers_websites.png | 4 ++-- .../UIIntegrationTest_visitors_custom_vars.png | 4 ++-- .../UIIntegrationTest_visitors_devices.png | 4 ++-- ...tegrationTest_visitors_locations_provider.png | 4 ++-- .../UIIntegrationTest_visitors_software.png | 4 ++-- .../UIIntegrationTest_widgetize_allwebsites.png | 4 ++-- .../ViewDataTableTest_0_initial.png | 4 ++-- .../ViewDataTableTest_10_change_limit.png | 4 ++-- .../ViewDataTableTest_11_flattened.png | 4 ++-- .../ViewDataTableTest_12_aggregate_shown.png | 4 ++-- .../ViewDataTableTest_13_make_hierarchical.png | 4 ++-- .../ViewDataTableTest_14_visits_percent.png | 4 ++-- .../ViewDataTableTest_15_search.png | 4 ++-- .../ViewDataTableTest_1_all_columns.png | 4 ++-- .../ViewDataTableTest_2_column_sorted_desc.png | 4 ++-- .../ViewDataTableTest_3_column_sorted_asc.png | 4 ++-- .../ViewDataTableTest_5_goals.png | 4 ++-- .../ViewDataTableTest_9_normal_table.png | 4 ++-- .../ViewDataTableTest_exclude_low_population.png | 4 ++-- .../ViewDataTableTest_limit_selector_open.png | 4 ++-- .../ViewDataTableTest_related_report_click.png | 4 ++-- .../ViewDataTableTest_subtables_loaded.png | 4 ++-- .../ViewDataTableTest_totals_row.png | 4 ++-- .../enable_framed_pages_embed_whole_app.png | 4 ++-- tests/angularjs/bootstrap.js | 2 +- 126 files changed, 256 insertions(+), 244 deletions(-) diff --git a/lang/en.json b/lang/en.json index 01354cd542b4..f1e0e44f40d4 100644 --- a/lang/en.json +++ b/lang/en.json @@ -327,8 +327,8 @@ "OverlayRowActionTooltipTitle": "Open Page Overlay", "Overview": "Overview", "Pages": "Pages", - "Pagination": "%1$s - %2$s of %3$s", - "PaginationWithoutTotal": "%1$s - %2$s", + "Pagination": "%1$s–%2$s of %3$s", + "PaginationWithoutTotal": "%1$s–%2$s", "ParameterMustIntegerBetween": "Parameter %1$s must be an integer value between %2$s and %3$s.", "Password": "Password", "Period": "Period", diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png index da5c3676a682..a063604c49e3 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e43a51c5063e88fc56c49d5f4a7357ffef238ca9d0d40e182c90db19cc50a1b -size 378815 +oid sha256:82cefcaa768d7009ddfb3a1fa8f3492d2798737e7b979f0cfcc1e750c4923af8 +size 378821 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png index e1ed542cc10c..1a2c412d0fcb 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32eae9bb7a068bef58a28cc8b1f4437fb2445a55695fa5ecbf6c8bba8a893f66 -size 353618 +oid sha256:15d7a5df9a692335f7a68daa65842fc730e34ac40ad3539076acacc2ca889b43 +size 353624 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png index 9b3fff4133f0..714efeac649c 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6794bc960ba114cdeffd4e2b408dddf98e86a023d7682f45ce006d0bb1ece52a -size 80938 +oid sha256:43148b5c8d4b70cb4f47b190d0293af6baa357136e0f57701eb9c38723e474f6 +size 80941 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png index 0723231dc0b2..548a9a073193 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:931cf07c23e2a960f01838c2848ac497cbd1bb8e93d6934ca927ee78359ead42 -size 484339 +oid sha256:8c033fb1ed5b621c6019a5fce9a1e65219ec6366a1bc047b06c7dfdfe3ec1aef +size 484413 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png index c0ae311a535b..7c0bff066ebe 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:348e275b404dc8d16f0ecd6f5654e6cebf645d76aec116a856b0d91fd5c36541 -size 353524 +oid sha256:f4f5d22d3279248e264bfb4c59702be2dcbed8ef7c945c5e3fecab5b72d202a8 +size 353530 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png index 04656d3dd3fb..bd3db806c3ac 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ae0431ecfae984f0f2be35b5adece38a58199f3f8111ed76e7a378300cf162f -size 72821 +oid sha256:db569203cbc5f9fccca60d7fe20050e1e370b13db270aa173f76f38032818fa6 +size 72822 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png index 545999a15367..754c98457455 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:571acab976f8815a511c3002f7566d2e97b27d2d7facf3db75a5b2b90660d7c9 -size 88948 +oid sha256:6b1be8a4126612707a1a8c9380893ba162a80ae414a2b7b6ab9548b9a1b3dcb3 +size 88955 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png index 8ebf91905a38..5380d7f84eca 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:373d959b10fcd5cf26909d7bb3273d35c8d9caa3a61def53cd2397f946c1d72b -size 64097 +oid sha256:13b7ecde8260edea084251c2b79afe01c2ce26bb4b281e9546061925a416cef0 +size 64099 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png index c78956a0c7ef..6d0551e5586d 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4d3a01b6e4efe4c47dfbf5dd39cb7853c5ecb9a062f572406a5c3f4bd043e3d +oid sha256:41620f57d099a01107196fb4915c946604857386236035e942b539eb5cfb532e size 64523 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png index 256c7241db32..de30e3417569 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6698dc11d1e82ffd0d285bf5a924df1b0f43a6864857d32bb09ba19ca8f29f79 -size 71025 +oid sha256:071f8104a21b1a72167bb51e9eb05a89ba9aa3449451fca9b3c01bf25ae3f01b +size 71024 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png index f665ae1d4c76..2a5718b16820 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d14ac9db64a10cb29e4ed6e2d0e696f3ec4bd28dd681fee7bffe0e6ad3e740ac -size 377593 +oid sha256:509685c0a6015074568d0b0f8bb63cb163aad296a667f502f19c0c9236dd5c1c +size 377599 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png index 8ebf91905a38..5380d7f84eca 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:373d959b10fcd5cf26909d7bb3273d35c8d9caa3a61def53cd2397f946c1d72b -size 64097 +oid sha256:13b7ecde8260edea084251c2b79afe01c2ce26bb4b281e9546061925a416cef0 +size 64099 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png index 68f5b116de61..d913b448b8ec 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d366013d8b53e44f187914d36e4c8c9b39e46f15cd3374fd9f194b71118df10 -size 73092 +oid sha256:b401f91fa287964a9d219d8e4c186b93e16585cc445d953d4675406cef6dfb5a +size 73094 diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php index f952b8508b20..79fac0940897 100644 --- a/plugins/CoreHome/CoreHome.php +++ b/plugins/CoreHome/CoreHome.php @@ -315,6 +315,7 @@ public function getClientSideTranslationKeys(&$translationKeys) $translationKeys[] = 'General_Hide'; $translationKeys[] = 'General_Save'; $translationKeys[] = 'General_Website'; + $translationKeys[] = 'General_Pagination'; $translationKeys[] = 'General_RowsToDisplay'; $translationKeys[] = 'Intl_Year_Short'; $translationKeys[] = 'General_MultiSitesSummary'; @@ -327,7 +328,6 @@ public function getClientSideTranslationKeys(&$translationKeys) $translationKeys[] = 'CoreHome_DataTableIncludeAggregateRows'; $translationKeys[] = 'CoreHome_DataTableExcludeAggregateRows'; $translationKeys[] = 'CoreHome_Default'; - $translationKeys[] = 'CoreHome_PageOf'; $translationKeys[] = 'CoreHome_FormatMetrics'; $translationKeys[] = 'CoreHome_ShowExportUrl'; $translationKeys[] = 'CoreHome_HideExportUrl'; diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js index 31d30dbae500..a657c853fcdb 100644 --- a/plugins/CoreHome/javascripts/dataTable.js +++ b/plugins/CoreHome/javascripts/dataTable.js @@ -941,7 +941,7 @@ $.extend(DataTable.prototype, UIControl.prototype, { // only show this string if there is some rows in the datatable if (totalRows != 0) { - var str = sprintf(_pk_translate('CoreHome_PageOf'), offset + '-' + offsetEndDisp, totalRows); + var str = sprintf(_pk_translate('General_Pagination'), offset, offsetEndDisp, totalRows); $(this).text(str); } else { $(this).hide(); diff --git a/plugins/CoreHome/lang/en.json b/plugins/CoreHome/lang/en.json index d1e6613199db..cd302097eb71 100644 --- a/plugins/CoreHome/lang/en.json +++ b/plugins/CoreHome/lang/en.json @@ -47,7 +47,6 @@ "Menu": "Menu", "NoPrivilegesAskPiwikAdmin": "You are logged in as '%1$s' but it seems you don't have any permission set in Matomo. %2$s Ask your Matomo administrator (click to email)%3$s to give you 'view' access to a website.", "OnlyForSuperUserAccess": "This widget is displayed in the default dashboard only to users having Super User access.", - "PageOf": "%1$s of %2$s", "PeriodRange": "Range", "ReportGeneratedOn": "Report generated on %s", "ReportGeneratedXAgo": "Report generated %s ago", diff --git a/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png b/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png index e98f6db10ab2..8206489358c8 100644 --- a/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png +++ b/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7364ea09c23f1ca0387e9983c18cf402b2046fbbad46019d8197ac1074fffde -size 233735 +oid sha256:df2c045ece25d4892202f685cffe5831b98e4c37474e92ff3243521a4030f30f +size 233737 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png index d345027ea4e0..0904afb99a25 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54a0117ba2d5d12255c16adcb36f606e981e19f634e66ff346c2592da3dde2a0 -size 451345 +oid sha256:8eef795ccd2928d1ece55fd5d1efe543107249bfae928fd1fdd4a53d19790fd9 +size 451403 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png index b5f2b4c59739..8562db968b80 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:acccf6a691df336135548824d794645f238a9e9fc302dd80479dc874e76e88e6 -size 653760 +oid sha256:98b2d43a636e15844d02456adb19416cc66f7c0c92e5361e41bda95ceca0d33e +size 653810 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png index e8fbd442c90c..1c29d0f30d75 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7bb8d40cf49ee4b77cef496f437003fc7d6de182798f335088b4f86cc887768 -size 653328 +oid sha256:2388da5bc654b90aa6c072a4309c5e5e9123a12a333de3be089884ec49229b45 +size 653374 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png index 93b17ad7222b..a06e635bf3ec 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18f27154250ee9e45dea15fc4175f7f2cefcc5950a04eb4d7680c4e4089ebdfc -size 200236 +oid sha256:a5d00ab29adb7a0f29fe6cd5931128c8f5a413f3bf66f37978d3ae1fa7ceee26 +size 200238 diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard-model.service.js b/plugins/MultiSites/angularjs/dashboard/dashboard-model.service.js index 0cc399c4643b..0254a15a08bc 100644 --- a/plugins/MultiSites/angularjs/dashboard/dashboard-model.service.js +++ b/plugins/MultiSites/angularjs/dashboard/dashboard-model.service.js @@ -28,8 +28,8 @@ updateWebsitesList: updateWebsitesList, getNumberOfFilteredSites: getNumberOfFilteredSites, getNumberOfPages: getNumberOfPages, - getCurrentPagingOffsetStart: getCurrentPagingOffsetStart, - getCurrentPagingOffsetEnd: getCurrentPagingOffsetEnd, + getPaginationLowerBound: getPaginationLowerBound, + getPaginationUpperBound: getPaginationUpperBound, previousPage: previousPage, nextPage: nextPage, searchSite: searchSite, @@ -86,12 +86,16 @@ return Math.ceil(getNumberOfFilteredSites() / model.pageSize - 1); } - function getCurrentPagingOffsetStart() { + function getCurrentPagingOffset() { return Math.ceil(model.currentPage * model.pageSize); } - function getCurrentPagingOffsetEnd() { - var end = getCurrentPagingOffsetStart() + parseInt(model.pageSize, 10); + function getPaginationLowerBound() { + return getCurrentPagingOffset() + 1; + } + + function getPaginationUpperBound() { + var end = getCurrentPagingOffset() + parseInt(model.pageSize, 10); var max = getNumberOfFilteredSites(); if (end > max) { end = max; @@ -145,7 +149,7 @@ hideMetricsDoc: '1', filter_sort_order: 'asc', filter_limit: model.pageSize, - filter_offset: getCurrentPagingOffsetStart(), + filter_offset: getCurrentPagingOffset(), showColumns: 'label,nb_visits,nb_pageviews,visits_evolution,pageviews_evolution,revenue_evolution,nb_actions,revenue' }; diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html index c4797985501f..2be78996d0c1 100644 --- a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html +++ b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html @@ -99,7 +99,7 @@ - {{ 'General_Pagination'|translate:model.getCurrentPagingOffsetStart():model.getCurrentPagingOffsetEnd():model.getNumberOfFilteredSites() }} + {{ 'General_Pagination'|translate:model.getPaginationLowerBound():model.getPaginationUpperBound():model.getNumberOfFilteredSites() }} diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png index c39b39ebb163..8ebf77051f0a 100644 --- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png +++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b111c55510c661bf8be2e293d18fda7360c5a80166c6d17539a00b39860be3fa -size 73257 +oid sha256:5d217c10905d35d772c83d89129896e08a05a899e95bfc6ec53672229d09957e +size 73126 diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png index a799c92ab42b..04a4a5cfffe8 100644 --- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png +++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d0b745ef8bcacd034893dcdee574c29e3071abeceb1aaa5c201581aed21213a -size 54967 +oid sha256:a51477dd72b89b98fb9906da608416bbbe857fc5af00b4094f0fbf004f07c859 +size 55078 diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png index c39b39ebb163..8ebf77051f0a 100644 --- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png +++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b111c55510c661bf8be2e293d18fda7360c5a80166c6d17539a00b39860be3fa -size 73257 +oid sha256:5d217c10905d35d772c83d89129896e08a05a899e95bfc6ec53672229d09957e +size 73126 diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png index 1601487c7b90..3861316bec0e 100644 --- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png +++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28aa076f0a9adf1c7169ede698318182088503811486eadb984750dff0235c59 -size 63526 +oid sha256:b49b59a09c20b070e2d9de66c0e6bc78b3e39bb8aefde61c9d9e60b8c87a011d +size 63396 diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png index d88b6a339576..7c06652bf5bd 100644 --- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png +++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb7f304ab8b22767693ad9107852ea51e85d49da4cdf9edabd319bef4ca63fc0 -size 54935 +oid sha256:0a25c546768a6c95ec1a4aa2507e2a52d40f390f591a02245de3b56e8cc63e20 +size 55046 diff --git a/plugins/SitesManager/angularjs/sites-manager/sites-manager-admin-sites-model.js b/plugins/SitesManager/angularjs/sites-manager/sites-manager-admin-sites-model.js index 628de72e736e..ce2c4aa24f3f 100644 --- a/plugins/SitesManager/angularjs/sites-manager/sites-manager-admin-sites-model.js +++ b/plugins/SitesManager/angularjs/sites-manager/sites-manager-admin-sites-model.js @@ -36,8 +36,8 @@ model.sites = sites; var numSites = sites.length; - model.offsetStart = model.currentPage * model.pageSize; - model.offsetEnd = model.offsetStart + numSites; + model.offsetStart = model.currentPage * model.pageSize + 1; + model.offsetEnd = model.offsetStart + numSites - 1; model.hasPrev = model.currentPage >= 1; model.hasNext = numSites === model.pageSize; } diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png index 54053b2caaf5..4ebca6449aa6 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6579c30c31a28357fc4d69f1bf3b5284fc5f9a9ba7d4c57e3df310a1b4954655 -size 180919 +oid sha256:b3497758d0c7c1284f1ae67f85c30c25af6d5208b73b4b27f98e1d4d811810f6 +size 180718 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png index 06378779f424..aad7c74fb230 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd57742a3a94d3ab4f5c47d78959ae84e34cb7e1e741fd968aa54210e908795b -size 186022 +oid sha256:36a8a43b3542fdeef8d4c238b9b28192b5fc1130fd979c05f5d7f91daa1a36af +size 185832 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png index 5f8482ff74c1..4ff88edcfcd3 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_1_again.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d6eb4a27612289f11bb30d323e4cd7b21db78ae5d1762377aea42e7aacd61c0 -size 186041 +oid sha256:b83a016f0f4d53242f02d0b077dbbda663780b460ae5d79c8cbe3639bb58c088 +size 185845 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png index bd3ce811382e..ed4963a61200 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_page_2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6b0c8468378d8261840ec6c7c2cf0438527529ddffd8cc50d8a57ddbdc8dcbc -size 188002 +oid sha256:b8805c0ee7c9c33b5ba5856e2fc2e960a365232965880e463af94214240d1afa +size 187799 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png index 9dee4412a4e3..e6d18043576f 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b294fdd184afee8fca634a9dd84cf5a533ca49ec2b52bff8c726f234001f8cd2 -size 178927 +oid sha256:e2d1cd3d110f616ec24900389d083ddaa00031769670d3455aa5626fbc6a57f2 +size 178750 diff --git a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search_page_1.png b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search_page_1.png index d9085aa12cd4..8507dadcf4a4 100644 --- a/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search_page_1.png +++ b/plugins/SitesManager/tests/UI/expected-screenshots/SitesManager_search_page_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61ad98f703804d44388847ef0acc631df1a8379167d9d1071196b9e114cfcba1 -size 184175 +oid sha256:1e00aee6453a3740e301c6aaee9b5ad5e2782dfc569d3de8b79813ab12fef397 +size 183881 diff --git a/plugins/UsersManager/UsersManager.php b/plugins/UsersManager/UsersManager.php index 2d2d93825156..c1d7405f1f68 100644 --- a/plugins/UsersManager/UsersManager.php +++ b/plugins/UsersManager/UsersManager.php @@ -221,6 +221,7 @@ public function getClientSideTranslationKeys(&$translationKeys) $translationKeys[] = "General_OrCancel"; $translationKeys[] = "General_Save"; $translationKeys[] = "General_Done"; + $translationKeys[] = "General_Pagination"; $translationKeys[] = "UsersManager_DeleteConfirm"; $translationKeys[] = "UsersManager_ConfirmGrantSuperUserAccess"; $translationKeys[] = "UsersManager_ConfirmProhibitOtherUsersSuperUserAccess"; @@ -272,7 +273,6 @@ public function getClientSideTranslationKeys(&$translationKeys) $translationKeys[] = 'UsersManager_UserSearch'; $translationKeys[] = 'UsersManager_DeleteUsers'; $translationKeys[] = 'UsersManager_FilterByAccess'; - $translationKeys[] = 'UsersManager_XtoYofN'; $translationKeys[] = 'UsersManager_Username'; $translationKeys[] = 'UsersManager_RoleFor'; $translationKeys[] = 'UsersManager_TheDisplayedUsersAreSelected'; diff --git a/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.html b/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.html index e35cfac6f6ee..3657a63d62d3 100644 --- a/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.html +++ b/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.html @@ -78,7 +78,7 @@
- {{ 'UsersManager_XtoYofN'|translate:$ctrl.searchParams.offset:$ctrl.getPaginationUpperBound():$ctrl.totalEntries }} + {{ 'General_Pagination'|translate:$ctrl.getPaginationLowerBound():$ctrl.getPaginationUpperBound():$ctrl.totalEntries }}
@@ -203,4 +203,4 @@

{{:: 'General_No'|translate }} - \ No newline at end of file + diff --git a/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.js b/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.js index c60b01ec6fa2..02c5c3425d5b 100644 --- a/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.js +++ b/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.js @@ -59,6 +59,7 @@ vm.changeUserRole = changeUserRole; vm.onRowSelected = onRowSelected; vm.deleteRequestedUsers = deleteRequestedUsers; + vm.getPaginationLowerBound = getPaginationLowerBound; vm.getPaginationUpperBound = getPaginationUpperBound; vm.showDeleteConfirm = showDeleteConfirm; vm.getAffectedUsersCount = getAffectedUsersCount; @@ -180,6 +181,10 @@ return result; } + function getPaginationLowerBound() { + return vm.searchParams.offset + 1; + } + function getPaginationUpperBound() { return Math.min(vm.searchParams.offset + vm.searchParams.limit, vm.totalEntries); } diff --git a/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.html b/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.html index 5295e4e18f5c..c50105247b18 100644 --- a/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.html +++ b/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.html @@ -86,7 +86,7 @@ - {{ 'UsersManager_XtoYofN'|translate:$ctrl.offset:$ctrl.getPaginationUpperBound():$ctrl.totalEntries }} + {{ 'General_Pagination'|translate:$ctrl.getPaginationLowerBound():$ctrl.getPaginationUpperBound():$ctrl.totalEntries }} @@ -215,4 +215,4 @@

{{ $ctrl. {{:: 'General_No'|translate }} - \ No newline at end of file + diff --git a/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.js b/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.js index 66065d072829..e1e4958c178b 100644 --- a/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.js +++ b/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.js @@ -58,6 +58,7 @@ vm.$onChanges = $onChanges; vm.onAllCheckboxChange = onAllCheckboxChange; vm.onRowSelected = onRowSelected; + vm.getPaginationLowerBound = getPaginationLowerBound; vm.getPaginationUpperBound = getPaginationUpperBound; vm.fetchAccess = fetchAccess; vm.gotoPreviousPage = gotoPreviousPage; @@ -180,6 +181,10 @@ vm.isAllCheckboxSelected = selectedRowKeyCount === vm.siteAccess.length; } + function getPaginationLowerBound() { + return vm.offset + 1; + } + function getPaginationUpperBound() { return Math.min(vm.offset + vm.limit, vm.totalEntries); } diff --git a/plugins/UsersManager/lang/en.json b/plugins/UsersManager/lang/en.json index 5c54a7d2382b..99d585aed145 100644 --- a/plugins/UsersManager/lang/en.json +++ b/plugins/UsersManager/lang/en.json @@ -114,7 +114,6 @@ "ClickToSelectAll": "Click to select all %1$s.", "AllWebsitesAreSelected": "All %1$s websites are selected.", "ClickToSelectDisplayedWebsites": "Click to select the %1$s displayed websites.", - "XtoYofN": "%1$s - %2$s of %3$s", "DeletePermConfirmSingle": "Are you sure you want to remove %1$s's access to %2$s?", "DeletePermConfirmMultiple": "Are you sure you want to remove %1$s's access the %2$s selected websites?", "ChangePermToSiteConfirmSingle": "Are you sure you want to change %1$s's role to %2$s to %3$s?", diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_edit_permissions.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_edit_permissions.png index da32d8a10ff9..fe64f5cf602d 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_edit_permissions.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_edit_permissions.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e53d73a510f1c7479aa0a61bc9a4401f3ada6412d4c5936a4f39f01fec0d6938 -size 80549 +oid sha256:1a992036679293e4a70c5a0f977a1324052b53b649d353fd65bfa25c3b8d1e53 +size 80540 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png index b6a0770cb06a..ca3ab57fc2bc 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_admin_load.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:446b4027bd42df96d170c568852063182fe21a853cc7f877a94b8f8dcf920182 -size 108447 +oid sha256:4aeb9086df4521c6bde46f4f344620a544404e13c41e23f9087138e842dbd52a +size 108344 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search.png index abc2f48332b4..05972ae1bef6 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c29133fe81c8ccce8086de231c6d3fbf96589d6c30d340e00cc997ca47d313b1 -size 161819 +oid sha256:b666c634e642ac44c50f4ea411f2124dc265bd747bb907ddd478726ea4260323 +size 161895 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search_deselected.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search_deselected.png index d46bdcfadbdd..69234ea5d14b 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search_deselected.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_in_search_deselected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:939e66b5c4cb95890a2dee58b0e55745af574cd904ae54d94f5241ca98d0634f -size 161818 +oid sha256:8a6cd5db35ac81eb7ecdb85f4336cac2608e01244c1caf01cf68a60cf628ab23 +size 161895 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_selected.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_selected.png index d46bdcfadbdd..69234ea5d14b 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_selected.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_all_rows_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:939e66b5c4cb95890a2dee58b0e55745af574cd904ae54d94f5241ca98d0634f -size 161818 +oid sha256:8a6cd5db35ac81eb7ecdb85f4336cac2608e01244c1caf01cf68a60cf628ab23 +size 161895 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_remove_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_remove_access.png index ec032e499fd5..8d5883c35b32 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_remove_access.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_remove_access.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ba88f9ed89a81b943a70da4ca19473fc20d898a5a18c9c4d1fc3a8e8fecfb80 -size 156814 +oid sha256:7b06a999abc1d82f7f05504982a2b98a3848a95e3a9477704a45d89629ba07ec +size 156863 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_set_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_set_access.png index 4c23537ad780..6573a7aa54bd 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_set_access.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_bulk_set_access.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b590350831bf72fa4085ab9754433dc69ee35a86231b17104da9b3b9ee328351 -size 142796 +oid sha256:ca7b1018f351cb40d46df3b622768c5bed3e1538fe99bd9e5a6497b49b9b8061 +size 142861 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_bulk_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_bulk_access.png index bbb6a1d12476..458a341bbfad 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_bulk_access.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_bulk_access.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ae28122fef76c910c64a13cab3ecab46cd823bbc7a2b0e8c857831fbe5aba65 -size 155379 +oid sha256:b9cec4b754e5849c8f9e1f19c78c5d0ae040aa043692d0a27a41ed0c745f0f9e +size 155289 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_single.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_single.png index 7ca8d9763cb2..54f19d267858 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_single.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_delete_single.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cbabd2e695a24daeb9d00d74755c5b7270ef5b40507b32d033284d2db3e4557 -size 142902 +oid sha256:d0ca416b08a3694ddefe3536e1d40eb0264bd77e214457023a9205719899dfae +size 142806 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_filters.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_filters.png index 34d59aa733b5..ae9354135f7b 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_filters.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_filters.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f4c0ec9766420ffa29e42a0585f3c23a69f8b57672ca9f1875a8e8ccbc1d700 -size 141469 +oid sha256:63bab18bcbecc3bf3dfddada93a6eb459f178bf0fdce4cf0c5e87e66af9b4c58 +size 141355 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_load.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_load.png index e0a90d3452e7..a42f2cd5c223 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_load.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_load.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1001a998713681241d9163f0f59371acdae0269b647106b79e7c98453d8f6ee1 -size 152550 +oid sha256:a93fe86c57e2fda781c1a643b06513a73e2c445d57746c072ef6200eca92eb35 +size 152489 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_manage_users_back.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_manage_users_back.png index 5c5f293f354d..66f8fae3ff3e 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_manage_users_back.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_manage_users_back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eda2d1c1092176cb3afb178d9e52b887b769a2b89b7df6fe45f8982f29b6f325 -size 149690 +oid sha256:e651f3c3ca488e4c7a2cb21c2967ec5cefe203b53854594cdd9a044b51b04a86 +size 149611 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_next_click.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_next_click.png index ecbe5cc1d2b4..e8bddcfbdd32 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_next_click.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_next_click.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e07b964a068d778560d0cc468e00101e59fa159303d3cb4fa9ee16ec451faab1 -size 154848 +oid sha256:73842631d4e8364fd12ed690456dcd5e5aa3f59bb6be0cf949b74fc0171d9483 +size 154849 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_rows_in_search.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_rows_in_search.png index 30b933ad7467..db504e90f4d1 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_rows_in_search.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_rows_in_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22b3a53cd7fec71d57faa1b335efbdc4a56c80bc0b01ff3897c2e83afd0a42b9 -size 99635 +oid sha256:9bf2b6803c3f8f854904525bb6b732ebb10c12337ebb4429a9dd443a1bea8d06 +size 99676 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_sites_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_sites_access.png index f844af5c8fa2..f7ebb1e16df4 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_sites_access.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_all_sites_access.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74b8da48bf60b49101242bf8f0568847a63cafc1327b162348c6569962815a79 -size 110156 +oid sha256:0f0178ad819f50c522695f6ee26f49f3d234e69d45c03926e53bc6ba931f5319 +size 110189 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png index c372f7056045..7bd52d8da71a 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:873ab7849c3ad5cf11702b7f09204e3e2a1a4e9350c0546e4c5ef8375ce7c47a -size 106499 +oid sha256:c3de312697133d2bd8f9ce29af03036d9a3fe232b8107a00801197c14c949595 +size 106504 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_edit.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_edit.png index 406b3c94c5f4..663c9724db2a 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_edit.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_edit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4879cc4a520db1072e5cc8665c0513d6e559dc961256550c2078ddac96da8eae -size 87826 +oid sha256:a60334be90dd50374bbff65d7ca85baf93d57b74e79d323dfaf3389705dd74b8 +size 87863 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_next.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_next.png index 2f1deb04373b..44f7cb381169 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_next.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_next.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d47601f5098fd7c909af44a5ae0e118afc4402e1d916b85ffbacbd58ffc0cdbb -size 90338 +oid sha256:63a85148040533f91e587ae827c16a83275dec92a938de1bddf0cedced2d002f +size 90296 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_access.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_access.png index ae50dd4d787d..bd062772c51e 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_access.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_access.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:46e7da989ac5e931445d4b5a305c123e2f820af08a7db0352e84724c4fb545d9 -size 104403 +oid sha256:f522c3fbd71c9818978d0443f06ef28b5a588ed9236471a11adf36784dbeb46f +size 104422 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_single.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_single.png index cc38a01a3c68..531ba20bce73 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_single.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_remove_single.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e20620c5f62d652fd392d797c73ca24aa885cd65e1852443b1f0b533bdb3a328 -size 89862 +oid sha256:e151f66a3a927c11fd61b08b7b85edc8c9b1aec3c4d690509dfd3132ba64278a +size 89869 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_multiple.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_multiple.png index c08db9fab7b1..3c29fc51c28a 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_multiple.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_select_multiple.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd6fcc234e579981a293655cd9dd32af5a4959725268dd2e24da89ad3f07ae20 -size 91907 +oid sha256:ec7d718ae1e01251c2f5560d1f024dad3d9df6ad911bfd54a4dc38fefa616eac +size 91915 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_previous.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_previous.png index 66e7a5bdf764..b9b8a52fdb43 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_previous.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_previous.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:015387b5883db92467c2556a4594172aef37e7d4cce879923487e6857553b4aa -size 142213 +oid sha256:757455c8b741db255bf771567455715bf62de8a05312dd12e58de807828aad5d +size 142269 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_role_for.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_role_for.png index 543f209d920d..6eb94b86a57d 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_role_for.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_role_for.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:268b8153adda52f709c91b9a494dacca4157b80a85bfdbf8f60d46b1bb1c796e -size 148372 +oid sha256:1f0ebed17464c2b5d95e76d539081f392bb3bda69fabc8839263b2f731f82a63 +size 148433 diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_rows_selected.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_rows_selected.png index cac10d7a7cd5..9c302af207b2 100644 --- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_rows_selected.png +++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_rows_selected.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77c1f32f5b2644f11b53b31c5cafa123655f4f75caa6cd26fb0b1582af4dfaab -size 149559 +oid sha256:7733b9179ceb89ded9320dc1b1308272bb6484566e7b16b3ac9ea05ad931dfdb +size 149628 diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_abandoned_carts.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_abandoned_carts.png index da9c3ded484b..38244f475748 100644 --- a/tests/UI/expected-screenshots/GoalsTable_goals_table_abandoned_carts.png +++ b/tests/UI/expected-screenshots/GoalsTable_goals_table_abandoned_carts.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:587f258e4c53b324b67cf14f7313854151124aa756a23ae5d4f28425a49ffcf2 -size 39433 +oid sha256:2f37c9c50388313cf36d815cff32edca2b21aa3ff96ace57c719cd9b4bf34ad2 +size 39431 diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce.png index e0d300c6dc74..a3f1eefcb29a 100644 --- a/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce.png +++ b/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d1cfdf492372c7508e95af3210fec6e3ebd563b60179a6b7c0ec110c214ee47 -size 57964 +oid sha256:61351315158c71e769d5f9717b60278010bf6f659dfcf12098d47f247dc02c92 +size 57944 diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce_view.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce_view.png index 4bf670532af2..08da6bf36128 100644 --- a/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce_view.png +++ b/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce_view.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0218985dd598a814b5f5a66c497a0485050524932a60bd0bbe079080d43c9538 -size 37580 +oid sha256:a2aa58855612edb89f48fbb6e456530666a5ebffa681979cf8c3816c22abb981 +size 37577 diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_full.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_full.png index c331b2326563..16b8dc6fc02d 100644 --- a/tests/UI/expected-screenshots/GoalsTable_goals_table_full.png +++ b/tests/UI/expected-screenshots/GoalsTable_goals_table_full.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b3ac8678d209fc6566b39c65eab67b47817b04b0b3c21122478fa958dd505df -size 92191 +oid sha256:2d04a2ce950821acae5e0c0997fbead2c2d04c1c0c848408d89ebe4d6cfcdca1 +size 92223 diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_single.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_single.png index 8c3e5d4081f7..10e8af33e208 100644 --- a/tests/UI/expected-screenshots/GoalsTable_goals_table_single.png +++ b/tests/UI/expected-screenshots/GoalsTable_goals_table_single.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:861d6bfa71bdb9a53ea3f48fdc009aa0170317e16f2b740635cd0c5014d2ed3d -size 65091 +oid sha256:482a1f33268af4ca6fda675cbd2dc978dc458408f6bcd995896ee3634b8affa6 +size 65069 diff --git a/tests/UI/expected-screenshots/GoalsTable_initial.png b/tests/UI/expected-screenshots/GoalsTable_initial.png index 4b29f448c217..ccf9eae6adc3 100644 --- a/tests/UI/expected-screenshots/GoalsTable_initial.png +++ b/tests/UI/expected-screenshots/GoalsTable_initial.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d6ec374311f2865309dda614786ab8b0691cbb4942786cb123799b5d7bbbbc9 -size 63501 +oid sha256:b4dafefd623904a1cfad1de27e313a51a49a673f7196ae7f3e89d21c1c86d9b6 +size 63477 diff --git a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png index 1e39df4db6e9..e28b04c6f8cf 100644 --- a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png +++ b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1056cfe72fa290cfa131242c66b15de97b3cb7900fd67791647ff844b242e459 -size 448364 +oid sha256:0edcf26b7e1c39b29fa26874a7ff989f3765343b7923327fd4dbd346b61c97cb +size 448201 diff --git a/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png b/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png index 3a200adcee1b..e8b6148bd6ca 100644 --- a/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png +++ b/tests/UI/expected-screenshots/MeasurableManager_add_new_dialog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:687cfbf1450d8ed0ca9ecb47e722b7344419b23953803d52327a2b77584e2fc5 -size 164928 +oid sha256:8857d42ec3cf82be7214ea4e781fde024e6bc1f3daf49e053639b809e923a6d0 +size 164839 diff --git a/tests/UI/expected-screenshots/MeasurableManager_loaded.png b/tests/UI/expected-screenshots/MeasurableManager_loaded.png index e0676aff9d65..da192b82f5fd 100644 --- a/tests/UI/expected-screenshots/MeasurableManager_loaded.png +++ b/tests/UI/expected-screenshots/MeasurableManager_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79b03f6eb5df9bb6165cef582f27dd14cb5d6f9904221800265045bafdf120c5 -size 183484 +oid sha256:2300d2fed5cbfd6be8abc17863cdacf46e66b231a071a82da027d6b75889c48b +size 183328 diff --git a/tests/UI/expected-screenshots/PivotByDimension_pivoted.png b/tests/UI/expected-screenshots/PivotByDimension_pivoted.png index b789fd22b6b1..663d05271771 100644 --- a/tests/UI/expected-screenshots/PivotByDimension_pivoted.png +++ b/tests/UI/expected-screenshots/PivotByDimension_pivoted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:51883804a895dd5195180db59940463bd270433ba5eee644d4b4e8be7aa9eb15 -size 63921 +oid sha256:8c3b01c917f94aed3b5ee66f97f3f547e8684c85e74cd6949093122816efeeb9 +size 63911 diff --git a/tests/UI/expected-screenshots/PivotByDimension_pivoted_columns_report.png b/tests/UI/expected-screenshots/PivotByDimension_pivoted_columns_report.png index 23fb8b923f53..17aa2bbdd61c 100644 --- a/tests/UI/expected-screenshots/PivotByDimension_pivoted_columns_report.png +++ b/tests/UI/expected-screenshots/PivotByDimension_pivoted_columns_report.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3aef1cd693364c37d536136fa6938493a3dc84c9e88f55174305411cd8da3566 -size 56526 +oid sha256:2792f43b90b7629c13ddadd83316ecc066c5379563f2cf37be96fdf01fcce34d +size 56537 diff --git a/tests/UI/expected-screenshots/Theme_home.png b/tests/UI/expected-screenshots/Theme_home.png index 6c6759fdfc35..bd9b16f21e70 100644 --- a/tests/UI/expected-screenshots/Theme_home.png +++ b/tests/UI/expected-screenshots/Theme_home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72aa683795d1c206ae88f94f30c808e72cf6eecd0e535eb659370780f475e915 -size 656542 +oid sha256:2f2a03520c21dda38ea56170a4227ea2d5dd0fba9f31101974e0648b8afe36ef +size 656233 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_name_piece.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_name_piece.png index 544bfa935589..c5b36fe2681d 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_name_piece.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_name_piece.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0bdc5988d4776d4e8063b0f439a9dadbc15534e418482a65f793d82ac9de4eee -size 46788 +oid sha256:b7fc18ec9bef1ede33fb6c10d7608ec45d040710cd04f91930b939892bfbf74f +size 46800 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece.png index 6293b9985faa..6cc356307c7b 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98dce660fea8c3c061aabceac89477bf736f13367931c6cce62f010404b755db -size 38110 +oid sha256:e269ff6211eff04fdabf714afc63d80fe909e72b4880500876f0c98630246be2 +size 38091 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece_name.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece_name.png index 62f059ea4b99..878558a92849 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece_name.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_content_piece_name.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dbdaa5cb578a9d04ad919c3719546eeaa14271798d1ee0dd536a5cfb2fedd6cb -size 51870 +oid sha256:6f7b2d58df8a7ccad27f08ea419c96e3be1afc8ceb33b4915a23c4223daa1e1a +size 51872 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_contents.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_contents.png index 51ee1387b5cf..00b839776a1c 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_contents.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_contents.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7bbef11c45dc433ce5ec5731a4fe02cb0999cf80c5a68bce343d4894387c70c4 -size 27053 +oid sha256:5d01312bcd516f479da7770fb51648cf7a573cc6970ec02804ca1a2953697f0b +size 27049 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_downloads.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_downloads.png index 4d8a98358f3f..9d3de379569c 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_downloads.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_downloads.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e2f584143a838ee0d5c79fcfcee7aaa294eeb778611b4599e3e38ffcedb1f6f -size 36273 +oid sha256:659b81e6860c40a4050c6859bf8615741c4cb51d731de99ff87686af4ae9a7d3 +size 36272 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_entry_pages.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_entry_pages.png index 0772496d7c79..0a5230d7c804 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_entry_pages.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_entry_pages.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6bbd1e42b10e7a024c57b396d5d1dd93e95fb8f83853025f19139c08da80ebed -size 188784 +oid sha256:6e367868294b3c641d9fb322efaa10ec9a897992ff5d094710e5e45624f3ce51 +size 188798 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_exit_pages.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_exit_pages.png index 2a4d2dfa05e9..ddb6bc68c979 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_exit_pages.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_exit_pages.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bce07cb89c01f7b8cb76a7a70ac0917d715480bd777fe496da0dca110b61984a -size 187724 +oid sha256:d53e4d8d6ae792f6c760818d49e3db2623c94aa9dee48e042c08e325d1a86fe7 +size 187736 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_outlinks.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_outlinks.png index 22d6e4731da0..772236abd3ed 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_outlinks.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_outlinks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a068b9226ce723806f9b1fc06d32544c58b3e828176d6fde0337e8a62a0a0a71 -size 40791 +oid sha256:2d4f9ba912b11bcdf1d8724debc46b7794e25304ebf037ec750893f67218d44a +size 40783 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_page_titles.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_page_titles.png index 3a43863650ab..7d70f2043c83 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_page_titles.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_page_titles.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ae6a30bf7bd8f2d12422a017a6011034e9d0aa003537e7905bf115ea2f9d6d2 -size 440526 +oid sha256:4cbc63df4a772265df5063c104c1a411dc8d3528c56b9b302f46855c282219ff +size 440537 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages.png index 12094fed5a39..006960a3c0ec 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7d1707cfe6883529d9a67f08422bdcabdc996770267a7181687255ad472a28d -size 320268 +oid sha256:705672affa6095de0fbb33ab7e5e503db5fbb0a08231957cd71f646d10d693fe +size 320260 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages_tooltip_help.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages_tooltip_help.png index 82eb781d359f..bc155c54ba3a 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages_tooltip_help.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_pages_tooltip_help.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d85947fc3902b94782647e94d863090794156fd337b15dafea13285742a287b -size 340544 +oid sha256:4e385aa71569ea9cf7911959506d72e7b289a32fdea1405bb2c40e3b9acfef92 +size 340534 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_actions_site_search.png b/tests/UI/expected-screenshots/UIIntegrationTest_actions_site_search.png index ff3fc1fd6e74..e9bcb7beb6a8 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_actions_site_search.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_actions_site_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6690227d1c3a9a619099f2401525968ed24f31ba558788c23f523226a89384af -size 101027 +oid sha256:e4730e97586a33a79bb02a0c3db2338f9f3b7955e332c7878409cc0154a824e1 +size 101106 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png index 45a6d94f3879..7e025adaf155 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_manage_websites.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db2c52576282de6ee1c36bbbca93c0fcca4b3f46b4569732863c809281ab2c48 -size 204004 +oid sha256:4e94da24208d2a51f73d7af8acf73f9fe5b1402a480fec96c18a3ae62001f5ad +size 203722 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png index 7b797941fec8..d478b6970051 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61696bef1357a367766976555bdc90db3be051f03c68e7097eae4fed80fc901a -size 602888 +oid sha256:ce9152942f597f46307475768575a6cbee4e05f08ebfc684e2c76a46f86317c0 +size 602883 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png index 5c2fbdb0990b..d9aa6401f963 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d9af30be707f87f5579c1066c0ed3ad935a2d991afe2a1c95d876643ad368b7 -size 1589017 +oid sha256:1ef15a493999b929e00665c7d3fcc1a9d1fe33815cd19e01c6f30a6ea5f20ee8 +size 1587956 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png index 6eddb9edf203..f50ef45357a4 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed0cc66e3683214a34ff2e27346d1351e748792149ddcf42f8241cad78805d02 -size 707560 +oid sha256:1ddccc11542e9addbcea3f2a819d85389167f86870b823304d43555a7be6bcba +size 707326 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_products.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_products.png index 441edfb026c7..a90e2fa2ff65 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_products.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_products.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5cbc9b055e0fd9a7a4b4e9988f4c47af751c1519f217a501cabf7c1a4408f7a5 -size 48649 +oid sha256:e238adb800bce9ece15ddb4bc8582798f10c212ff34e2b719b7163aa5b4f61c3 +size 48660 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png b/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png index 719d2fcdeac9..3fa769393dad 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_events_overview.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:813dfe189b299559d364e23fe340acc377d45054cc26cfc71a441910bb15a0d2 -size 86277 +oid sha256:1b0e84fbf3022f46b200e3c0727b056644bb9e187fb856d5f799201d3386b20d +size 86255 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_dataTables.png b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_dataTables.png index 4a9ec347b9ca..db33af1d2917 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_dataTables.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_exampleui_dataTables.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c8447a9bdaffdfd2940d0cc72d45d27a6d1c59d53ba13b38d33d1ef6c9f68b7 -size 37626 +oid sha256:900744442ad7baa1ae8a871515abe73132052a35558299c92509fbb037886c1f +size 37621 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png b/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png index 9c02538f723a..c6f43fe3ae37 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f0bd84d9dc2c50097c053318c03d0e2724d2579ea3a366da3223c8032ee5094 -size 167453 +oid sha256:af8141b2b4f3c1b579b84ecd10c7d804febd28d3893feaba117e33fd0602496f +size 167450 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_allreferrers.png b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_allreferrers.png index 31513daa7edd..64dcf7287492 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_allreferrers.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_allreferrers.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c8494fd6b71d3425bf02a60aed6266b7e60f97fa7b53f9c6fff84eacf195236 -size 147856 +oid sha256:9d9f4faa7f3ce6b3942baf82edc179d4faa232319a187c10ce90dbee009039c2 +size 147849 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_campaigns.png b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_campaigns.png index bdf1a609479c..c0c6ad3674fc 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_campaigns.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_campaigns.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:54aa524144cab6ae146a4385b9353cdba1e1dfee2045d6cec380b3dddc7a7dfc -size 70016 +oid sha256:28620728d3cf48a1b7f97d03330364b77a65ea7fbe0f2a93f62ffa5ee557d2cd +size 70012 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png index 1334761955c2..bdbfc1aafc85 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5363bbe165e598e64404a65a6058db15602391935d4d118190eaf3f95b0d097 -size 104053 +oid sha256:9146c737df4c7cc377240a1d49274daea56b60f10ff61340ac91b69730b7525a +size 104013 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_websites.png b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_websites.png index 69c9febc78dd..0862f381ad27 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_websites.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_websites.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23e25a534c833585f82b088a0f6b590b04d8aaab5be538686be2dea2140ddc53 -size 81126 +oid sha256:99bbe69edf1958d2114d3b7067102eadb4cc6dede862845f9d8358f5c5fc3eb4 +size 81128 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_custom_vars.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_custom_vars.png index b628d8be4a43..70a91dc19fbb 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_custom_vars.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_custom_vars.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8761a592b61bac22d84b4d181de550e05715b831e114694d68818b6cd411ac61 -size 61132 +oid sha256:cdb2aad124f15678238491a6cbb295b79f8743da30242a3ee50400221574573d +size 61135 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png index c85ccb1a7808..f275319a5011 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:113f96247d7d71664285d8c6fa96ecc7338a30b513de729d0d2fba8c9d95b6f4 -size 86677 +oid sha256:5fc2dd871e3b495a4fb344429f63e1fddf8f5f2aa126442a74dca3df0c356d03 +size 6343 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png index ec90887d9969..f3629f556b70 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_locations_provider.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94b587ccc9d32237f16dd2cb1f067620610daab504d84ed83c4e81cd2d7ec3ff -size 167508 +oid sha256:d310f82c3f3f0ebf88b1311c9dc8a7f8e336a4f9f7a720e24d57291c9be2ff2a +size 167674 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png index 8fa9fa981b96..e1b024a6c223 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:594d4546acfcca0b9348265e4ed9363b945e5285135acc237bb123c8577262da -size 159144 +oid sha256:a755537387f46a6d7d118109b4d8a6e7807699ab9ced8abe9d1fe3c0fc151b0b +size 158977 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_allwebsites.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_allwebsites.png index b4a2b12eef2e..ca6ca13b0f1b 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_allwebsites.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_allwebsites.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ca7cfc6474d8f51c5ae805944b8d2f2b39edbf5e44cd2a3ff93f733cbf1f6db -size 68931 +oid sha256:de0c39108b500540ae57030faf5669be036baf338bb85f3d89c95fe6651cfcba +size 68808 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_0_initial.png b/tests/UI/expected-screenshots/ViewDataTableTest_0_initial.png index aa41daa31188..1092e409607f 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_0_initial.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_0_initial.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71ce8975fdcef9ca8e41f0c37c02138b64088b3d3a8ed6641d33335c3fe3eb4e -size 44085 +oid sha256:0f89b9e6d9b3ca2f4082f9ee9305edffe8aa892a1ded86c09771cd13966bcb07 +size 44062 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_10_change_limit.png b/tests/UI/expected-screenshots/ViewDataTableTest_10_change_limit.png index 581088874098..2abaca18f895 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_10_change_limit.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_10_change_limit.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9728974ee61f2211046c3ec8c27dd254b91f12d5b92e126da68af02d8420f45a -size 58362 +oid sha256:545f87e903f9e66119bc2763a4debff6dde4e8a03b88cc7eb87171bd1b7c5907 +size 58438 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png b/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png index a581a8350647..35ed7314ccb4 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91ff5344541aee27e4066e16f9b76b5942520a3e4f1f6c1f1125aade11316acf -size 66506 +oid sha256:24026e46da3ed42945cd07bdabd340edbb4264ac67ed22d4d569b5686b319877 +size 66616 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png b/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png index 314377f4a249..c5d79bfd3506 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1749f4a51e382037cee4b1c35280ce7f6088947ab9fdd303142ff901e396a5d6 -size 70897 +oid sha256:91929906808cfa3ff745a9f6c7cf3d19caec45e4ba7f91fb6c5ab316b0b3d500 +size 70970 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_13_make_hierarchical.png b/tests/UI/expected-screenshots/ViewDataTableTest_13_make_hierarchical.png index 581088874098..2abaca18f895 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_13_make_hierarchical.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_13_make_hierarchical.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9728974ee61f2211046c3ec8c27dd254b91f12d5b92e126da68af02d8420f45a -size 58362 +oid sha256:545f87e903f9e66119bc2763a4debff6dde4e8a03b88cc7eb87171bd1b7c5907 +size 58438 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_14_visits_percent.png b/tests/UI/expected-screenshots/ViewDataTableTest_14_visits_percent.png index 23ee780a1b29..79857ccb8ec3 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_14_visits_percent.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_14_visits_percent.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ea3f1395d8d874821002319fa5b76f980b3bd76513d418e4e04c2e40be9ffa9 -size 65291 +oid sha256:572a0188b54828e44a78e6d959355ff9ff512c65261a7cbb87fd05efc09f969b +size 65369 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_15_search.png b/tests/UI/expected-screenshots/ViewDataTableTest_15_search.png index 33e41cf8827e..6667494b7347 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_15_search.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_15_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f82c227605a4824f81e36f5e769c3cbc397363b1aba87fbd39e8410dbe333ec -size 44220 +oid sha256:4b9c34684315ae6a933b4822468f6cc1f5a05ccf3e7d40550617c381665811f0 +size 44226 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_1_all_columns.png b/tests/UI/expected-screenshots/ViewDataTableTest_1_all_columns.png index 0532b607ef21..f4e8e5f2b912 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_1_all_columns.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_1_all_columns.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9eb506193bdd83b84cf7af3734f4dcf7141fdef063f25941e80026f201fd7f84 -size 54449 +oid sha256:6f534b41ac5c68bb08afed6d47a322a75d522e379b9ca2c4d0cc5eb27b87bb9c +size 54423 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_2_column_sorted_desc.png b/tests/UI/expected-screenshots/ViewDataTableTest_2_column_sorted_desc.png index 67966d503f9b..d0c4bae3527a 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_2_column_sorted_desc.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_2_column_sorted_desc.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49e58044be527579c1f6d5f7e46e0896c03697ed4ab8f8d205c7837ed3eb82f7 -size 60391 +oid sha256:690d0fdedf4580d1a8805bca27e5403c74309e48548b933d1ace6794d31890b8 +size 60364 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_3_column_sorted_asc.png b/tests/UI/expected-screenshots/ViewDataTableTest_3_column_sorted_asc.png index eea3e36e33fd..4d4bf5b1dbb8 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_3_column_sorted_asc.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_3_column_sorted_asc.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83b80157c952005f67a2bb11c9c0c804886861684e804542fd2bbafb211d0c9e -size 50687 +oid sha256:c00becd8a452c9dac546184df312130f54d3c0ebbf552f0d42d0eea1d0ae87c4 +size 50688 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_5_goals.png b/tests/UI/expected-screenshots/ViewDataTableTest_5_goals.png index 4b29f448c217..ccf9eae6adc3 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_5_goals.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_5_goals.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d6ec374311f2865309dda614786ab8b0691cbb4942786cb123799b5d7bbbbc9 -size 63501 +oid sha256:b4dafefd623904a1cfad1de27e313a51a49a673f7196ae7f3e89d21c1c86d9b6 +size 63477 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_9_normal_table.png b/tests/UI/expected-screenshots/ViewDataTableTest_9_normal_table.png index a101864a5ab3..0662b31df656 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_9_normal_table.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_9_normal_table.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dad09169b1d5e5c618b7d178c7fc894099663f2ed7a9307e084c0306aa164916 -size 83196 +oid sha256:5d4b594e837ed381ce418886f4b7586a34cb0972d5bdef42aefdd72ef025d5a0 +size 83118 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_exclude_low_population.png b/tests/UI/expected-screenshots/ViewDataTableTest_exclude_low_population.png index 84f88360bf9d..94ec97e3806d 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_exclude_low_population.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_exclude_low_population.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff6fa18687246cff640395b8c8edd3552659d038920543b9cf3b32b1668f8e76 -size 39570 +oid sha256:b7e67dff3aee4de684160ee724b0da7a1e837be2e7ee696bf550f28f32ba1c0e +size 39550 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_limit_selector_open.png b/tests/UI/expected-screenshots/ViewDataTableTest_limit_selector_open.png index 62be1a60cdc6..9dd6eefd9a58 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_limit_selector_open.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_limit_selector_open.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7fe33530bb06ab117dd67cb88b9eb98ba1c7ba764f249a938649ecabc515fc87 -size 87077 +oid sha256:2062c4275e9eb35757fcac44457deb47b0b8f2185569fbe9e35bc49c9cfef2d1 +size 86995 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png b/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png index cf6a10a7c79b..21299002c3be 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04711a71028bc7bdf74946c556cac7c031caed26ed517a5bf927fb221df32e7c -size 39559 +oid sha256:d85147d823f1e0236e8e2fe8686730993b1a3936a13ffd185bb6f2efc2f8186a +size 39594 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png b/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png index 8d4999bdb44c..c8f620dc90b6 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:705cd7f1cc76229c92c48372a83b2cdeca90d0d459f9e0ea985715386322a6ee -size 71113 +oid sha256:52ef79b8a5938ae9890016fd6acc4b9f4e349677aef65807c613c02d2fb5916c +size 71179 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_totals_row.png b/tests/UI/expected-screenshots/ViewDataTableTest_totals_row.png index ecca353ef79f..d0fbaab0429f 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_totals_row.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_totals_row.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a5d44aff828bc9f6de654a0974c7aef3d88f321f0e4437be7306398b19b88183 -size 45669 +oid sha256:03877be90f1dc487da181790e57b9c41b9bd7aa29499e905fc928ee922b7c0b1 +size 45652 diff --git a/tests/UI/expected-screenshots/enable_framed_pages_embed_whole_app.png b/tests/UI/expected-screenshots/enable_framed_pages_embed_whole_app.png index 7cfdf00f137c..c1c81108bffe 100644 --- a/tests/UI/expected-screenshots/enable_framed_pages_embed_whole_app.png +++ b/tests/UI/expected-screenshots/enable_framed_pages_embed_whole_app.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23799e852c985b0812101c30c647d8feb08078dcb28fafe8829f4e54ebd430ec -size 676522 +oid sha256:9fc1cddf78d5b15fc7f99903cf21ec2895df08aec5f6ed6fde803e854f2717ce +size 676580 diff --git a/tests/angularjs/bootstrap.js b/tests/angularjs/bootstrap.js index 8ae7d16beee8..dbd285eec120 100644 --- a/tests/angularjs/bootstrap.js +++ b/tests/angularjs/bootstrap.js @@ -21,7 +21,7 @@ piwik.hasSuperUserAccess = 1; piwik.config = {}; piwik.config = {"action_url_category_delimiter":"\/","action_title_category_delimiter":"\/","autocomplete_min_sites":"5","datatable_export_range_as_day":"rss"}; -var translations = {"CorePluginsAdmin_NoZipFileSelected":"Please select a ZIP file.","General_InvalidDateRange":"Invalid Date Range, Please Try Again","General_Loading":"Loading...","General_Show":"show","General_Hide":"hide","Intl_Year_Short":"yr","General_MultiSitesSummary":"All Websites","CoreHome_YouAreUsingTheLatestVersion":"You are using the latest version of Piwik!","CoreHome_IncludeRowsWithLowPopulation":"Rows with low population are hidden %s Show all rows","CoreHome_ExcludeRowsWithLowPopulation":"All rows are shown %s Exclude low population","CoreHome_DataTableIncludeAggregateRows":"Aggregate rows are hidden %s Show them","CoreHome_DataTableExcludeAggregateRows":"Aggregate rows are shown %s Hide them","CoreHome_Default":"default","CoreHome_PageOf":"%1$s of %2$s","CoreHome_FlattenDataTable":"The report is hierarchical %s Make it flat","CoreHome_UnFlattenDataTable":"The report is flat %s Make it hierarchical","CoreHome_ExternalHelp":"Help (opens in new tab)","SitesManager_NotFound":"No websites found for","Annotations_ViewAndAddAnnotations":"View and add annotations for %s...","General_RowEvolutionRowActionTooltipTitle":"Open Row Evolution","General_RowEvolutionRowActionTooltip":"See how the metrics for this row changed over time","Annotations_IconDesc":"View notes for this date range.","Annotations_IconDescHideNotes":"Hide notes for this date range.","Annotations_HideAnnotationsFor":"Hide annotations for %s...","General_LoadingPopover":"Loading %s...","General_LoadingPopoverFor":"Loading %s for","Intl_Month_Short_StandAlone_1":"Jan","Intl_Month_Short_StandAlone_2":"Feb","Intl_Month_Short_StandAlone_3":"Mar","Intl_Month_Short_StandAlone_4":"Apr","Intl_Month_Short_StandAlone_5":"May","Intl_Month_Short_StandAlone_6":"Jun","Intl_Month_Short_StandAlone_7":"Jul","Intl_Month_Short_StandAlone_8":"Aug","Intl_Month_Short_StandAlone_9":"Sep","Intl_Month_Short_StandAlone_10":"Oct","Intl_Month_Short_StandAlone_11":"Nov","Intl_Month_Short_StandAlone_12":"Dec","Intl_Month_Long_StandAlone_1":"January","Intl_Month_Long_StandAlone_2":"February","Intl_Month_Long_StandAlone_3":"March","Intl_Month_Long_StandAlone_4":"April","Intl_Month_Long_StandAlone_5":"May","Intl_Month_Long_StandAlone_6":"June","Intl_Month_Long_StandAlone_7":"July","Intl_Month_Long_StandAlone_8":"August","Intl_Month_Long_StandAlone_9":"September","Intl_Month_Long_StandAlone_10":"October","Intl_Month_Long_StandAlone_11":"November","Intl_Month_Long_StandAlone_12":"December","Intl_Day_Short_StandAlone_1":"Mon","Intl_Day_Short_StandAlone_2":"Tue","Intl_Day_Short_StandAlone_3":"Wed","Intl_Day_Short_StandAlone_4":"Thu","Intl_Day_Short_StandAlone_5":"Fri","Intl_Day_Short_StandAlone_6":"Sat","Intl_Day_Short_StandAlone_7":"Sun","Intl_Day_Long_StandAlone_1":"Monday","Intl_Day_Long_StandAlone_2":"Tuesday","Intl_Day_Long_StandAlone_3":"Wednesday","Intl_Day_Long_StandAlone_4":"Thursday","Intl_Day_Long_StandAlone_5":"Friday","Intl_Day_Long_StandAlone_6":"Saturday","Intl_Day_Long_StandAlone_7":"Sunday","Intl_Day_Min_StandAlone_1":"Mo","Intl_Day_Min_StandAlone_2":"Tu","Intl_Day_Min_StandAlone_3":"We","Intl_Day_Min_StandAlone_4":"Th","Intl_Day_Min_StandAlone_5":"Fr","Intl_Day_Min_StandAlone_6":"Sa","Intl_Day_Min_StandAlone_7":"Su","General_Search":"Search","General_MoreDetails":"More Details","General_Help":"Help","General_MetricsToPlot":"Metrics to plot","General_MetricToPlot":"Metric to plot","General_RecordsToPlot":"Records to plot","General_SaveImageOnYourComputer":"To save the image on your computer, right click on the image and select \"Save Image As...\"","General_ExportAsImage":"Export as Image","General_NoDataForGraph":"No data for this graph.","Widgetize_OpenInNewWindow":"Open in a new window","Dashboard_LoadingWidget":"Loading widget, please wait...","General_TransitionsRowActionTooltipTitle":"Open Transitions","General_TransitionsRowActionTooltip":"See what visitors did before and after viewing this page","Dashboard_AddPreviewedWidget":"Click to add widget to the dashboard","Dashboard_WidgetPreview":"Widget preview","Dashboard_Maximise":"Maximise","Dashboard_Minimise":"Minimise","Dashboard_WidgetNotFound":"Widget not found","Dashboard_DashboardCopied":"Current dashboard successfully copied to selected user.","General_Close":"Close","General_Refresh":"Refresh","General_Website":"Website","General_ColumnNbVisits":"Visits","General_ColumnPageviews":"Pageviews","General_ColumnRevenue":"Revenue","General_TotalVisitsPageviewsRevenue":"(Total: %s visits, %s pageviews, %s revenue)","General_EvolutionSummaryGeneric":"%1$s in %2$s compared to %3$s in %4$s. Evolution: %5$s","General_AllWebsitesDashboard":"All Websites dashboard","General_NVisits":"%s visits","MultiSites_Evolution":"Evolution","SitesManager_AddSite":"Add a new website","General_Next":"Next","General_Previous":"Previous","General_GoTo":"Go to %s","Dashboard_DashboardOf":"Dashboard of %s","Actions_SubmenuSitesearch":"Site Search","MultiSites_LoadingWebsites":"Loading websites","General_ErrorRequest":"Oops\u2026 problem during the request, please try again.","Goals_AddGoal":"Add Goal","Goals_UpdateGoal":"Update Goal","Goals_DeleteGoalConfirm":"Are you sure you want to delete the Goal %s?","UserCountry_FatalErrorDuringDownload":"A fatal error occurred while downloading this file. There might be something wrong with your internet connection, with the GeoIP database you downloaded or Piwik. Try downloading and installing it manually.","UserCountry_SetupAutomaticUpdatesOfGeoIP":"Setup automatic updates of GeoIP databases","General_Done":"Done","Feedback_ThankYou":"Thank you for helping us to make Piwik better!","Feedback_RateFeatureTitle":"Do you like the '%s' feature? Please rate and leave a comment","Feedback_RateFeatureThankYouTitle":"Thank you for rating '%s'!","Feedback_RateFeatureLeaveMessageLike":"We are glad you like it! Please let us know what you like the most or if you have a feature request.","Feedback_RateFeatureLeaveMessageDislike":"We are sorry to hear you don't like it! Please let us know how we can improve.","Feedback_SendFeedback":"Send Feedback","Feedback_RateFeatureSendFeedbackInformation":"Your Piwik platform will send us (the Piwik team) an email (including your email address) so we can get in contact with you if you have any question.","General_Ok":"Ok","General_OrCancel":"or %s Cancel %s","General_Save":"Save","UsersManager_DeleteConfirm":"Are you sure you want to delete the user %s?","UsersManager_ConfirmGrantSuperUserAccess":"Do you really want to grant '%s' Super User access? Warning: the user will have access to all websites and will be able to perform administrative tasks.","UsersManager_ConfirmProhibitOtherUsersSuperUserAccess":"Do you really want to remove Super User access from '%s'? The user will lose all permissions and access to all websites. Make sure to set permissions to needed websites afterwards if necessary.","UsersManager_ConfirmProhibitMySuperUserAccess":"%s, do you really want to remove your own Super User access? You will lose all permissions and access to all websites and will be logged out from Piwik.","SitesManager_OnlyOneSiteAtTime":"You can only edit one website at a time. Please Save or Cancel your current modifications to the website %s.","SitesManager_DeleteConfirm":"Are you sure you want to delete the website %s?","ScheduledReports_ReportSent":"Report sent","ScheduledReports_ReportUpdated":"Report updated","General_OverlayRowActionTooltipTitle":"Open Page Overlay","General_OverlayRowActionTooltip":"See analytics data directly on your website (opens new tab)","CustomAlerts_InvalidMetricValue":"Value must be numeric","Live_VisitorProfile":"Visitor profile","Live_NoMoreVisits":"There are no more visits for this visitor.","Live_ShowMap":"show map","Live_HideMap":"hide map","Live_PageRefreshed":"Number of times this page was viewed \/ refreshed in a row."}; +var translations = {"CorePluginsAdmin_NoZipFileSelected":"Please select a ZIP file.","General_InvalidDateRange":"Invalid Date Range, Please Try Again","General_Loading":"Loading...","General_Show":"show","General_Hide":"hide","Intl_Year_Short":"yr","General_MultiSitesSummary":"All Websites","CoreHome_YouAreUsingTheLatestVersion":"You are using the latest version of Piwik!","CoreHome_IncludeRowsWithLowPopulation":"Rows with low population are hidden %s Show all rows","CoreHome_ExcludeRowsWithLowPopulation":"All rows are shown %s Exclude low population","CoreHome_DataTableIncludeAggregateRows":"Aggregate rows are hidden %s Show them","CoreHome_DataTableExcludeAggregateRows":"Aggregate rows are shown %s Hide them","CoreHome_Default":"default","CoreHome_FlattenDataTable":"The report is hierarchical %s Make it flat","CoreHome_UnFlattenDataTable":"The report is flat %s Make it hierarchical","CoreHome_ExternalHelp":"Help (opens in new tab)","SitesManager_NotFound":"No websites found for","Annotations_ViewAndAddAnnotations":"View and add annotations for %s...","General_RowEvolutionRowActionTooltipTitle":"Open Row Evolution","General_RowEvolutionRowActionTooltip":"See how the metrics for this row changed over time","Annotations_IconDesc":"View notes for this date range.","Annotations_IconDescHideNotes":"Hide notes for this date range.","Annotations_HideAnnotationsFor":"Hide annotations for %s...","General_LoadingPopover":"Loading %s...","General_LoadingPopoverFor":"Loading %s for","Intl_Month_Short_StandAlone_1":"Jan","Intl_Month_Short_StandAlone_2":"Feb","Intl_Month_Short_StandAlone_3":"Mar","Intl_Month_Short_StandAlone_4":"Apr","Intl_Month_Short_StandAlone_5":"May","Intl_Month_Short_StandAlone_6":"Jun","Intl_Month_Short_StandAlone_7":"Jul","Intl_Month_Short_StandAlone_8":"Aug","Intl_Month_Short_StandAlone_9":"Sep","Intl_Month_Short_StandAlone_10":"Oct","Intl_Month_Short_StandAlone_11":"Nov","Intl_Month_Short_StandAlone_12":"Dec","Intl_Month_Long_StandAlone_1":"January","Intl_Month_Long_StandAlone_2":"February","Intl_Month_Long_StandAlone_3":"March","Intl_Month_Long_StandAlone_4":"April","Intl_Month_Long_StandAlone_5":"May","Intl_Month_Long_StandAlone_6":"June","Intl_Month_Long_StandAlone_7":"July","Intl_Month_Long_StandAlone_8":"August","Intl_Month_Long_StandAlone_9":"September","Intl_Month_Long_StandAlone_10":"October","Intl_Month_Long_StandAlone_11":"November","Intl_Month_Long_StandAlone_12":"December","Intl_Day_Short_StandAlone_1":"Mon","Intl_Day_Short_StandAlone_2":"Tue","Intl_Day_Short_StandAlone_3":"Wed","Intl_Day_Short_StandAlone_4":"Thu","Intl_Day_Short_StandAlone_5":"Fri","Intl_Day_Short_StandAlone_6":"Sat","Intl_Day_Short_StandAlone_7":"Sun","Intl_Day_Long_StandAlone_1":"Monday","Intl_Day_Long_StandAlone_2":"Tuesday","Intl_Day_Long_StandAlone_3":"Wednesday","Intl_Day_Long_StandAlone_4":"Thursday","Intl_Day_Long_StandAlone_5":"Friday","Intl_Day_Long_StandAlone_6":"Saturday","Intl_Day_Long_StandAlone_7":"Sunday","Intl_Day_Min_StandAlone_1":"Mo","Intl_Day_Min_StandAlone_2":"Tu","Intl_Day_Min_StandAlone_3":"We","Intl_Day_Min_StandAlone_4":"Th","Intl_Day_Min_StandAlone_5":"Fr","Intl_Day_Min_StandAlone_6":"Sa","Intl_Day_Min_StandAlone_7":"Su","General_Search":"Search","General_MoreDetails":"More Details","General_Help":"Help","General_MetricsToPlot":"Metrics to plot","General_MetricToPlot":"Metric to plot","General_RecordsToPlot":"Records to plot","General_SaveImageOnYourComputer":"To save the image on your computer, right click on the image and select \"Save Image As...\"","General_ExportAsImage":"Export as Image","General_NoDataForGraph":"No data for this graph.","Widgetize_OpenInNewWindow":"Open in a new window","Dashboard_LoadingWidget":"Loading widget, please wait...","General_TransitionsRowActionTooltipTitle":"Open Transitions","General_TransitionsRowActionTooltip":"See what visitors did before and after viewing this page","Dashboard_AddPreviewedWidget":"Click to add widget to the dashboard","Dashboard_WidgetPreview":"Widget preview","Dashboard_Maximise":"Maximise","Dashboard_Minimise":"Minimise","Dashboard_WidgetNotFound":"Widget not found","Dashboard_DashboardCopied":"Current dashboard successfully copied to selected user.","General_Close":"Close","General_Refresh":"Refresh","General_Website":"Website","General_Pagination":"%1$s–%2$s of %3$s","General_ColumnNbVisits":"Visits","General_ColumnPageviews":"Pageviews","General_ColumnRevenue":"Revenue","General_TotalVisitsPageviewsRevenue":"(Total: %s visits, %s pageviews, %s revenue)","General_EvolutionSummaryGeneric":"%1$s in %2$s compared to %3$s in %4$s. Evolution: %5$s","General_AllWebsitesDashboard":"All Websites dashboard","General_NVisits":"%s visits","MultiSites_Evolution":"Evolution","SitesManager_AddSite":"Add a new website","General_Next":"Next","General_Previous":"Previous","General_GoTo":"Go to %s","Dashboard_DashboardOf":"Dashboard of %s","Actions_SubmenuSitesearch":"Site Search","MultiSites_LoadingWebsites":"Loading websites","General_ErrorRequest":"Oops\u2026 problem during the request, please try again.","Goals_AddGoal":"Add Goal","Goals_UpdateGoal":"Update Goal","Goals_DeleteGoalConfirm":"Are you sure you want to delete the Goal %s?","UserCountry_FatalErrorDuringDownload":"A fatal error occurred while downloading this file. There might be something wrong with your internet connection, with the GeoIP database you downloaded or Piwik. Try downloading and installing it manually.","UserCountry_SetupAutomaticUpdatesOfGeoIP":"Setup automatic updates of GeoIP databases","General_Done":"Done","Feedback_ThankYou":"Thank you for helping us to make Piwik better!","Feedback_RateFeatureTitle":"Do you like the '%s' feature? Please rate and leave a comment","Feedback_RateFeatureThankYouTitle":"Thank you for rating '%s'!","Feedback_RateFeatureLeaveMessageLike":"We are glad you like it! Please let us know what you like the most or if you have a feature request.","Feedback_RateFeatureLeaveMessageDislike":"We are sorry to hear you don't like it! Please let us know how we can improve.","Feedback_SendFeedback":"Send Feedback","Feedback_RateFeatureSendFeedbackInformation":"Your Piwik platform will send us (the Piwik team) an email (including your email address) so we can get in contact with you if you have any question.","General_Ok":"Ok","General_OrCancel":"or %s Cancel %s","General_Save":"Save","UsersManager_DeleteConfirm":"Are you sure you want to delete the user %s?","UsersManager_ConfirmGrantSuperUserAccess":"Do you really want to grant '%s' Super User access? Warning: the user will have access to all websites and will be able to perform administrative tasks.","UsersManager_ConfirmProhibitOtherUsersSuperUserAccess":"Do you really want to remove Super User access from '%s'? The user will lose all permissions and access to all websites. Make sure to set permissions to needed websites afterwards if necessary.","UsersManager_ConfirmProhibitMySuperUserAccess":"%s, do you really want to remove your own Super User access? You will lose all permissions and access to all websites and will be logged out from Piwik.","SitesManager_OnlyOneSiteAtTime":"You can only edit one website at a time. Please Save or Cancel your current modifications to the website %s.","SitesManager_DeleteConfirm":"Are you sure you want to delete the website %s?","ScheduledReports_ReportSent":"Report sent","ScheduledReports_ReportUpdated":"Report updated","General_OverlayRowActionTooltipTitle":"Open Page Overlay","General_OverlayRowActionTooltip":"See analytics data directly on your website (opens new tab)","CustomAlerts_InvalidMetricValue":"Value must be numeric","Live_VisitorProfile":"Visitor profile","Live_NoMoreVisits":"There are no more visits for this visitor.","Live_ShowMap":"show map","Live_HideMap":"hide map","Live_PageRefreshed":"Number of times this page was viewed \/ refreshed in a row."}; if(typeof(piwik_translations) == 'undefined') { var piwik_translations = new Object; }for(var i in translations) { piwik_translations[i] = translations[i];} var piwikUsageTracking = { From 549578d0d34d15bfe4f1048225e29a2e5ad2fb4d Mon Sep 17 00:00:00 2001 From: Thomas Steur Date: Wed, 13 Mar 2019 09:32:28 +1300 Subject: [PATCH 02/15] =?UTF-8?q?New=20setting=20to=20disable=20Db=20versi?= =?UTF-8?q?on=20check,=20and=20do=20not=20show=20update=20scree=E2=80=A6n?= =?UTF-8?q?=20when=20auto=20update=20disabled=20(#14058)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * New setting to disable Db version check, and do not show update screen when auto update disabled * move it to DI --- config/global.php | 10 ++++++++++ core/FrontController.php | 4 ++++ plugins/CoreUpdater/CoreUpdater.php | 5 +++++ 3 files changed, 19 insertions(+) diff --git a/config/global.php b/config/global.php index 8833f4841bdf..b9eca9e9b0e6 100644 --- a/config/global.php +++ b/config/global.php @@ -79,6 +79,16 @@ 'observers.global' => array(), + /** + * By setting this option to false, the check that the DB schema version matches the version of the source code will be no longer performed. + * Thus it allows you to execute for example a newer version of Matomo with an older Matomo database version. Please note + * disabling this setting is not recommended because often an older DB version is not compatible with newer source code. + * If you disable this setting, make sure to execute the updates after updating the source code. The setting can be useful if + * you want to update Matomo without any outage when you know the current source code update will still run fine for a short time + * while in the background the database updates are running. + */ + 'EnableDbVersionCheck' => true, + 'fileintegrity.ignore' => DI\add(array( '*.htaccess', '*web.config', diff --git a/core/FrontController.php b/core/FrontController.php index 320239f45b16..a00e8c6f7d6e 100644 --- a/core/FrontController.php +++ b/core/FrontController.php @@ -626,6 +626,10 @@ private function throwIfPiwikVersionIsOlderThanDBSchema() return; } + if (!StaticContainer::get('EnableDbVersionCheck')) { + return; + } + $updater = new Updater(); $dbSchemaVersion = $updater->getCurrentComponentVersion('core'); diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php index 16b7d2d911c9..34f81fa77bce 100644 --- a/plugins/CoreUpdater/CoreUpdater.php +++ b/plugins/CoreUpdater/CoreUpdater.php @@ -14,6 +14,7 @@ use Piwik\Filesystem; use Piwik\FrontController; use Piwik\Piwik; +use Piwik\SettingsPiwik; use Piwik\UpdateCheck; use Piwik\Updater as PiwikCoreUpdater; use Piwik\Version; @@ -52,6 +53,10 @@ public static function getComponentUpdates(PiwikCoreUpdater $updater) public function dispatch() { + if (!SettingsPiwik::isAutoUpdateEnabled()) { + return; + } + $module = Common::getRequestVar('module', '', 'string'); $action = Common::getRequestVar('action', '', 'string'); From e26f5e7a359e990b4c4d726de85839e8923619ab Mon Sep 17 00:00:00 2001 From: diosmosis Date: Tue, 12 Mar 2019 16:16:41 -0700 Subject: [PATCH 03/15] =?UTF-8?q?Add=20diagnostic=20to=20check=20last=20ti?= =?UTF-8?q?me=20archiving=20was=20run=20successfully=20and=20=E2=80=A6=20(?= =?UTF-8?q?#13972)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add diagnostic to check last time archiving was run successfully and display notification if empty report and archiving has not been run recently. * Move cron archiving diagnostics next to each other. * Add new test for archiving not done in time check. * Remove TODO comment. --- .../Diagnostic/CronArchivingLastRunCheck.php | 104 ++++++++++++++++++ plugins/Diagnostics/Diagnostics.php | 35 ++++++ plugins/Diagnostics/config/config.php | 3 + plugins/Diagnostics/lang/en.json | 11 +- plugins/SegmentEditor/SegmentEditor.php | 6 + .../Integration/ReportRenderingTest.php | 36 ++++++ 6 files changed, 193 insertions(+), 2 deletions(-) create mode 100644 plugins/Diagnostics/Diagnostic/CronArchivingLastRunCheck.php create mode 100644 tests/PHPUnit/Integration/ReportRenderingTest.php diff --git a/plugins/Diagnostics/Diagnostic/CronArchivingLastRunCheck.php b/plugins/Diagnostics/Diagnostic/CronArchivingLastRunCheck.php new file mode 100644 index 000000000000..b5e47b62de5b --- /dev/null +++ b/plugins/Diagnostics/Diagnostic/CronArchivingLastRunCheck.php @@ -0,0 +1,104 @@ +translator = $translator; + } + + public function execute() + { + $label = $this->translator->translate('Diagnostics_CronArchivingLastRunCheck'); + $commandToRerun = '' . $this->getArchivingCommand() . ''; + $coreArchiveShort = 'core:archive'; + $mailto = 'MAILTO'; + + // check cron archiving has been enabled + $isBrowserTriggerDisabled = !Rules::isBrowserTriggerEnabled(); + if (!$isBrowserTriggerDisabled) { + $comment = $this->translator->translate('Diagnostics_BrowserTriggeredArchivingEnabled', [ + '', '']); + return [DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_WARNING, $comment)]; + } + + // check archiving has been run + $lastRunTime = (int)Option::get(CronArchive::OPTION_ARCHIVING_FINISHED_TS); + if (empty($lastRunTime)) { + $comment = $this->translator->translate('Diagnostics_CronArchivingHasNotRun') + . '

' . $this->translator->translate('Diagnostics_CronArchivingRunDetails', [$coreArchiveShort, $mailto, $commandToRerun]);; + return [DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_ERROR, $comment)]; + } + + $lastRunTimePretty = Date::factory($lastRunTime)->getLocalized(DateTimeFormatProvider::DATETIME_FORMAT_LONG); + + $diffTime = self::getTimeSinceLastSuccessfulRun($lastRunTime); + + $formatter = new Formatter(); + $diffTimePretty = $formatter->getPrettyTimeFromSeconds($diffTime); + + $errorComment = $this->translator->translate('Diagnostics_CronArchivingHasNotRunInAWhile', [$lastRunTimePretty, $diffTimePretty]) + . '

' . $this->translator->translate('Diagnostics_CronArchivingRunDetails', [$coreArchiveShort, $mailto, $commandToRerun]); + + // check archiving has been run recently + if ($diffTime > self::SECONDS_IN_DAY * 2) { + $result = DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_ERROR, $errorComment); + } else if ($diffTime > self::SECONDS_IN_DAY) { + $result = DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_WARNING, $errorComment); + } else { + $comment = $this->translator->translate('Diagnostics_CronArchivingRanSuccessfullyXAgo', $diffTimePretty); + $result = DiagnosticResult::singleResult($label, DiagnosticResult::STATUS_OK, $comment); + } + + return [$result]; + } + + private function getArchivingCommand() + { + $domain = Config::getHostname(); + return PIWIK_INCLUDE_PATH . ' --matomo-domain=' . $domain . ' core:archive'; + } + + public static function getTimeSinceLastSuccessfulRun($lastRunTime = null) + { + if (empty($lastRunTime)) { + $lastRunTime = (int)Option::get(CronArchive::OPTION_ARCHIVING_FINISHED_TS); + } + + if (empty($lastRunTime)) { + return null; + } + + $now = Date::now()->getTimestamp(); + $diffTime = $now - $lastRunTime; + + return $diffTime; + } +} diff --git a/plugins/Diagnostics/Diagnostics.php b/plugins/Diagnostics/Diagnostics.php index 9760be5b057c..e588af1fbe04 100644 --- a/plugins/Diagnostics/Diagnostics.php +++ b/plugins/Diagnostics/Diagnostics.php @@ -8,10 +8,17 @@ namespace Piwik\Plugins\Diagnostics; +use Piwik\ArchiveProcessor\Rules; +use Piwik\Notification; +use Piwik\Piwik; use Piwik\Plugin; +use Piwik\Plugins\Diagnostics\Diagnostic\CronArchivingLastRunCheck; +use Piwik\View; class Diagnostics extends Plugin { + const NO_DATA_ARCHIVING_NOT_RUN_NOTIFICATION_ID = 'DiagnosticsNoDataArchivingNotRun'; + /** * @see Piwik\Plugin::registerEvents */ @@ -19,6 +26,7 @@ public function registerEvents() { return array( 'AssetManager.getStylesheetFiles' => 'getStylesheetFiles', + 'Visualization.onNoData' => ['function' => 'onNoData', 'before' => true], ); } @@ -27,4 +35,31 @@ public function getStylesheetFiles(&$stylesheets) $stylesheets[] = "plugins/Diagnostics/stylesheets/configfile.less"; } + public function onNoData(View $dataTableView) + { + if (!Piwik::isUserHasSomeAdminAccess()) { + return; + } + + if (Rules::isBrowserTriggerEnabled()) { + return; + } + + $lastSuccessfulRun = CronArchivingLastRunCheck::getTimeSinceLastSuccessfulRun(); + if ($lastSuccessfulRun > CronArchivingLastRunCheck::SECONDS_IN_DAY) { + $content = Piwik::translate('Diagnostics_NoDataForReportArchivingNotRun', [ + '', + '', + ]); + + $notification = new Notification($content); + $notification->priority = Notification::PRIORITY_HIGH; + $notification->context = Notification::CONTEXT_INFO; + $notification->flags = Notification::FLAG_NO_CLEAR; + $notification->type = Notification::TYPE_TRANSIENT; + $notification->raw = true; + + $dataTableView->notifications[self::NO_DATA_ARCHIVING_NOT_RUN_NOTIFICATION_ID] = $notification; + } + } } diff --git a/plugins/Diagnostics/config/config.php b/plugins/Diagnostics/config/config.php index 0a7c51bf725a..b450de958a6e 100644 --- a/plugins/Diagnostics/config/config.php +++ b/plugins/Diagnostics/config/config.php @@ -1,5 +1,7 @@ array( @@ -23,6 +25,7 @@ DI\get('Piwik\Plugins\Diagnostics\Diagnostic\RecommendedFunctionsCheck'), DI\get('Piwik\Plugins\Diagnostics\Diagnostic\NfsDiskCheck'), DI\get('Piwik\Plugins\Diagnostics\Diagnostic\CronArchivingCheck'), + DI\get(CronArchivingLastRunCheck::class), DI\get('Piwik\Plugins\Diagnostics\Diagnostic\LoadDataInfileCheck'), Di\get('Piwik\Plugins\Diagnostics\Diagnostic\DbOverSSLCheck'), Di\get('Piwik\Plugins\Diagnostics\Diagnostic\DbMaxPacket'), diff --git a/plugins/Diagnostics/lang/en.json b/plugins/Diagnostics/lang/en.json index 5accb4c4306f..d228ab5c83a9 100644 --- a/plugins/Diagnostics/lang/en.json +++ b/plugins/Diagnostics/lang/en.json @@ -5,6 +5,13 @@ "MysqlMaxPacketSizeWarning": "It is recommended to configure a 'max_allowed_packet' size in your MySQL database of at least %1$s. Configured is currently %2$s.", "ConfigFileIntroduction": "Here you can view the Matomo configuration. If you are running Matomo in a load balanced environment the page might be different depending from which server this page is loaded. Rows with a different background color are changed config values that are specified for example in the %1$s file.", "HideUnchanged": "If you want to see only changed values you can %1$shide all unchanged values%2$s.", - "Sections": "Sections" + "Sections": "Sections", + "CronArchivingLastRunCheck": "Last Successful Archiving Completion", + "CronArchivingHasNotRun": "Archiving has not yet run successfully.", + "CronArchivingHasNotRunInAWhile": "Archiving last ran successfully on %1$s which is %2$s ago.", + "CronArchivingRunDetails": "Please check that you have setup a crontab calling the %1$s console command, and that you have configured a %2$s to receive errors by email if archiving fails. You can also try to run the console command to archive your reports manually: %3$s", + "CronArchivingRanSuccessfullyXAgo": "The archiving process completed successfully %1$s ago.", + "BrowserTriggeredArchivingEnabled": "For optimal performance and a speedy Matomo, it is highly recommended to set up a crontab to automatically archive your reports, and to disable browser triggering in the Matomo settings. %1$sLearn more.%2$s", + "NoDataForReportArchivingNotRun": "The archiving of your reports hasn't been executed recently, %1$slearn more about how to generate your reports.%2$s" } -} +} \ No newline at end of file diff --git a/plugins/SegmentEditor/SegmentEditor.php b/plugins/SegmentEditor/SegmentEditor.php index 7d7d7d1b8c5e..2e03343bd81f 100644 --- a/plugins/SegmentEditor/SegmentEditor.php +++ b/plugins/SegmentEditor/SegmentEditor.php @@ -17,6 +17,7 @@ use Piwik\Notification; use Piwik\Piwik; use Piwik\Plugins\CoreHome\SystemSummary; +use Piwik\Plugins\Diagnostics\Diagnostics; use Piwik\Segment; use Piwik\SettingsPiwik; use Piwik\SettingsServer; @@ -115,6 +116,11 @@ public function onNoArchiveData() public function onNoData(View $dataTableView) { + // if the archiving hasn't run in a while notification is up, don't display this one + if (isset($dataTableView->notifications[Diagnostics::NO_DATA_ARCHIVING_NOT_RUN_NOTIFICATION_ID])) { + return; + } + $segmentInfo = $this->getSegmentIfIsUnprocessed(); if (empty($segmentInfo)) { return; diff --git a/tests/PHPUnit/Integration/ReportRenderingTest.php b/tests/PHPUnit/Integration/ReportRenderingTest.php new file mode 100644 index 000000000000..9f24314abe8f --- /dev/null +++ b/tests/PHPUnit/Integration/ReportRenderingTest.php @@ -0,0 +1,36 @@ +dispatch('DevicesDetection', 'getBrand'); + + $this->assertContains('Diagnostics_NoDataForReportArchivingNotRun', $response); + } +} \ No newline at end of file From def74364a2d821d5dddaceece76c217547b99d14 Mon Sep 17 00:00:00 2001 From: diosmosis Date: Tue, 12 Mar 2019 17:13:57 -0700 Subject: [PATCH 04/15] Couple assorted changes (#13935) * Allow annotations API to accept multiple periods, so evolution graphs that use multiple periods work. * Remove warning when rows_to_display viewdatatable config property is left at its default value. * Allow individual cells in an html visualization to be styled (if the visualization is extended). * Remove unneeded TODO. * In series picker encode picked rows in case the labels have commas. * Must decode the rows value as well (as it is not handled by API, must be done in plugin). * Allow joins to specified through LogAggregator::queryConversionsByDimension(). * Add safety check to _idts processing: if visitor is unknown, ignore _idts value, since it is their first visit. * In the tracker when searching by visitor ID, search through entire log_visit table instead of just in the last 30 mins. * When tracking visitor days since first, do not round since this can result in inaccurate data when rounding up. Which can cause trouble when finding the start visit for a log. * Allow HtmlTable descendants to add any html attributes to cells. * Allow derived Visualizations to add custom parameters to API requests via a new RequestConfig method. * Tweak to TODO. * Add test for annotations API change & get to pass. * Apply more review feedback * Update INI config docs for window_look_back_for_visitor. * Only copy visitor properties if action is part of an existing visit. * Some more properties that should be copied over from known visitor even if new visit. * Fixing some tests. * update test * Fix CustomEventsTest test failures. * Fixing more tests. * update rest of tests * Fixing tests. * Update some test files. * Fix log statements. * To better handle out of order actions, add part of last_action_time check to visitor ID search. * Update tests. * Updating expected screenshots. * Fix ArchiveCronTest. * Throw exception if idorder not unique. * Only throw exception if idorder specified. * Fixing a couple tests. * Fix another test. --- config/global.ini.php | 6 +- core/DataAccess/LogAggregator.php | 4 +- core/Tracker/GoalManager.php | 9 + core/Tracker/Model.php | 17 +- core/Tracker/Request.php | 2 +- core/Tracker/VisitorRecognizer.php | 54 +- core/ViewDataTable/Request.php | 4 +- core/ViewDataTable/RequestConfig.php | 11 + ...ITest__Live.getLastVisitsDetails_range.xml | 58 +- ...ionServerHour__VisitsSummary.get_range.xml | 2 +- ...nServerMinute__VisitsSummary.get_range.xml | 4 +- ...st_actionType__VisitsSummary.get_range.xml | 4 +- ...ITest_actions__VisitsSummary.get_range.xml | 2 +- ...t_browserCode__VisitsSummary.get_range.xml | 2 +- ...browserEngine__VisitsSummary.get_range.xml | 4 +- ...rowserVersion__VisitsSummary.get_range.xml | 2 +- ...tAPITest_city__VisitsSummary.get_range.xml | 2 +- ...continentCode__VisitsSummary.get_range.xml | 2 +- ...t_countryCode__VisitsSummary.get_range.xml | 2 +- ...VariableName1__VisitsSummary.get_range.xml | 4 +- ...VariableName5__VisitsSummary.get_range.xml | 4 +- ...mVariableName__VisitsSummary.get_range.xml | 4 +- ...ablePageName2__VisitsSummary.get_range.xml | 2 +- ...ablePageName5__VisitsSummary.get_range.xml | 2 +- ...iablePageName__VisitsSummary.get_range.xml | 2 +- ...isit__API.getSuggestedValuesForSegment.xml | 1 - ...nceFirstVisit__VisitsSummary.get_range.xml | 16 +- ...t_deviceModel__VisitsSummary.get_range.xml | 4 +- ...st_deviceType__VisitsSummary.get_range.xml | 4 +- ...ntryPageTitle__VisitsSummary.get_range.xml | 2 +- ..._entryPageUrl__VisitsSummary.get_range.xml | 2 +- ...exitPageTitle__VisitsSummary.get_range.xml | 2 +- ...t_exitPageUrl__VisitsSummary.get_range.xml | 2 +- ..._interactions__VisitsSummary.get_range.xml | 2 +- ..._languageCode__VisitsSummary.get_range.xml | 2 +- ...Test_latitude__VisitsSummary.get_range.xml | 2 +- ...est_longitude__VisitsSummary.get_range.xml | 2 +- ...ingSystemCode__VisitsSummary.get_range.xml | 2 +- ...SystemVersion__VisitsSummary.get_range.xml | 2 +- ...est_pageTitle__VisitsSummary.get_range.xml | 2 +- ...ITest_pageUrl__VisitsSummary.get_range.xml | 2 +- ..._referrerType__VisitsSummary.get_range.xml | 2 +- ...st_regionCode__VisitsSummary.get_range.xml | 2 +- ...st_resolution__VisitsSummary.get_range.xml | 4 +- ...nvertedGoalId__VisitsSummary.get_range.xml | 4 +- ...isitConverted__VisitsSummary.get_range.xml | 4 +- ...st_visitCount__VisitsSummary.get_range.xml | 2 +- ...tion__API.getSuggestedValuesForSegment.xml | 1 + ...ommerceStatus__VisitsSummary.get_range.xml | 4 +- ...dServerMinute__VisitsSummary.get_range.xml | 2 +- ...ndServerMonth__VisitsSummary.get_range.xml | 4 +- ...ServerQuarter__VisitsSummary.get_range.xml | 4 +- ...dServerSecond__VisitsSummary.get_range.xml | 4 +- ...verWeekOfYear__VisitsSummary.get_range.xml | 2 +- ...isitLocalHour__VisitsSummary.get_range.xml | 4 +- ...artServerHour__VisitsSummary.get_range.xml | 2 +- ...tServerMinute__VisitsSummary.get_range.xml | 2 +- ...orId__API.getSuggestedValuesForSegment.xml | 8 - ...est_visitorId__VisitsSummary.get_range.xml | 12 +- ...t_visitorType__VisitsSummary.get_range.xml | 2 +- plugins/Annotations/API.php | 24 +- .../tests/System/AnnotationsTest.php | 4 + ...ultiplePeriod__Annotations.getAll_week.xml | 85 + .../tests/System/ArchiveCronTest.php | 4 +- ...st_noOptions__VisitFrequency.get_month.xml | 8 +- ...ptions__Live.getLastVisitsDetails_day.xml} | 28 +- ...tions__Live.getLastVisitsDetails_year.xml} | 272 +-- ...nt0_noOptions__VisitFrequency.get_day.xml} | 0 ...nt0_noOptions__VisitFrequency.get_year.xml | 12 + ...ent0_noOptions__VisitsSummary.get_day.xml} | 0 ...nt0_noOptions__VisitsSummary.get_year.xml} | 8 +- ...Options__Live.getLastVisitsDetails_day.xml | 1243 +++++++++++++ ...ptions__Live.getLastVisitsDetails_year.xml | 1620 +++++++++++++++++ ...ent1_noOptions__VisitFrequency.get_day.xml | 14 + ...t1_noOptions__VisitFrequency.get_year.xml} | 0 ...ment1_noOptions__VisitsSummary.get_day.xml | 14 + ...ent1_noOptions__VisitsSummary.get_year.xml | 12 + ...ing_noOptions__VisitsSummary.get_month.xml | 12 +- ...ding_noOptions__VisitsSummary.get_year.xml | 8 +- ...ved_noOptions__VisitsSummary.get_month.xml | 12 +- ...ived_noOptions__VisitsSummary.get_year.xml | 8 +- .../Columns/VisitorDaysSinceFirst.php | 5 + .../Tracker/VisitRequestProcessor.php | 4 + .../Visualizations/Graph.php | 2 +- .../Visualizations/HtmlTable.php | 13 + .../javascripts/seriesPicker.js | 4 +- .../templates/_dataTableViz_htmlTable.twig | 3 +- .../test___DevicesDetection.getBrand_day.xml | 2 +- .../test___DevicesDetection.getModel_day.xml | 4 +- .../test___DevicesDetection.getType_day.xml | 4 +- .../Commands/AnalyzeArchiveTableTest.php | 6 +- ...leLogTables_all__UserId.getUsers_month.xml | 4 +- ...LogTables_all__VisitsSummary.get_month.xml | 4 +- ...leLogTables_men__UserId.getUsers_month.xml | 4 +- ...LogTables_men__VisitsSummary.get_month.xml | 6 +- .../Columns/Metrics/GoalConversionRate.php | 2 +- ...s_oneConversionPerVisit__Goals.get_day.xml | 2 +- ...wAllGoalSpecificMetrics__Goals.get_day.xml | 10 +- ...etrics_requestedColumns__Goals.get_day.xml | 4 +- .../expected-screenshots/Live_visitor_log.png | 4 +- .../MultipleSitesMultipleVisitsFixture.php | 1 + ...mizeVisitInformation_allSitesAllDates.json | 2 +- ...ymizeVisitInformation_anonymizeUserId.json | 2 +- ...nonymizeVisitInformation_restrictDate.json | 2 +- ...onymizeVisitInformation_restrictSites.json | 2 +- plugins/Referrers/Controller.php | 1 + ...d__Referrers.getReferrerType_year.original | Bin 2864 -> 2864 bytes ...ary.get_autoArchiveSegmentPreprocessed.xml | 2 +- ...sSummary.get_customSegmentPreprocessed.xml | 2 +- .../PHPUnit/Fixtures/ManyVisitsWithGeoIP.php | 3 +- .../Fixtures/ThreeVisitsWithCustomEvents.php | 16 +- .../TwoSitesEcommerceOrderWithItems.php | 7 +- tests/PHPUnit/Framework/Fixture.php | 11 + .../DataAccess/LogAggregatorTest.php | 2 +- .../System/BackwardsCompatibility1XTest.php | 12 +- tests/PHPUnit/System/TrackerTest.php | 19 + ...ibility1XTest__Actions.getPageUrls_day.xml | 6 +- ...st__DevicesDetection.getOsVersions_day.xml | 2 +- ...lity1XTest__UserCountry.getCountry_day.xml | 2 +- .../test_CustomEvents__Goals.get_day.xml | 2 +- ...mEvents__Live.getLastVisitsDetails_day.xml | 92 +- ...vents__Live.getLastVisitsDetails_month.xml | 92 +- ...tLogs__Goals.getDaysToConversion_month.xml | 4 +- ...tLogs__Live.getLastVisitsDetails_range.xml | 12 +- ...iteId__Live.getLastVisitsDetails_range.xml | 16 +- ...hFixedSiteId__VisitFrequency.get_range.xml | 10 +- ...getNumberOfVisitsByDaysSinceLast_range.xml | 4 +- ...mit_1__Live.getLastVisitsDetails_month.xml | 2 +- ...mit_2__Live.getLastVisitsDetails_month.xml | 8 +- ...Visit__Live.getLastVisitsDetails_month.xml | 10 +- ...tDesc__Live.getLastVisitsDetails_month.xml | 10 +- ...eTest__Live.getLastVisitsDetails_month.xml | 16 +- ...WebsiteTest__UserCountry.getCity_month.xml | 14 +- ...teTest__UserCountry.getContinent_month.xml | 6 +- ...siteTest__UserCountry.getCountry_month.xml | 12 +- ...bsiteTest__UserCountry.getRegion_month.xml | 14 +- ...delowpop__UserCountry.getCountry_month.xml | 4 +- ...ontinent__UserCountry.getCountry_month.xml | 6 +- ...nt_lat_long__UserCountry.getCity_month.xml | 2 +- ...t_long__UserCountry.getContinent_month.xml | 2 +- ...lat_long__UserCountry.getCountry_month.xml | 2 +- ..._lat_long__UserCountry.getRegion_month.xml | 2 +- ...ment_region__UserCountry.getCity_month.xml | 2 +- ...region__UserCountry.getContinent_month.xml | 2 +- ...t_region__UserCountry.getCountry_month.xml | 2 +- ...nt_region__UserCountry.getRegion_month.xml | 2 +- ...Visits__Actions.getEntryPageTitles_day.xml | 4 +- ...woVisits__Actions.getEntryPageUrls_day.xml | 4 +- ...oVisits__Actions.getExitPageTitles_day.xml | 4 +- ...TwoVisits__Actions.getExitPageUrls_day.xml | 4 +- ...torTwoVisits__Actions.getPageTitle_day.xml | 2 +- ...orTwoVisits__Actions.getPageTitles_day.xml | 4 +- ...itorTwoVisits__Actions.getPageUrls_day.xml | 4 +- ...oVisits__DevicesDetection.getBrand_day.xml | 2 +- ...DevicesDetection.getBrowserEngines_day.xml | 2 +- ...evicesDetection.getBrowserFamilies_day.xml | 2 +- ...evicesDetection.getBrowserVersions_day.xml | 2 +- ...sits__DevicesDetection.getBrowsers_day.xml | 2 +- ...oVisits__DevicesDetection.getModel_day.xml | 2 +- ...ts__DevicesDetection.getOsFamilies_day.xml | 2 +- ...ts__DevicesDetection.getOsVersions_day.xml | 2 +- ...woVisits__DevicesDetection.getType_day.xml | 2 +- ...VisitorTwoVisits__Referrers.getAll_day.xml | 2 +- ...orTwoVisits__Referrers.getKeywords_day.xml | 4 +- ...oVisits__Referrers.getReferrerType_day.xml | 4 +- ...Visits__Referrers.getSearchEngines_day.xml | 4 +- ...isits__Resolution.getConfiguration_day.xml | 2 +- ...woVisits__Resolution.getResolution_day.xml | 2 +- ...itorTwoVisits__UserCountry.getCity_day.xml | 2 +- ...woVisits__UserCountry.getContinent_day.xml | 2 +- ...rTwoVisits__UserCountry.getCountry_day.xml | 2 +- ...orTwoVisits__UserCountry.getRegion_day.xml | 2 +- ...sits__UserLanguage.getLanguageCode_day.xml | 2 +- ...woVisits__UserLanguage.getLanguage_day.xml | 2 +- ...sitorTwoVisits__VisitFrequency.get_day.xml | 4 +- ...woVisits__VisitTime.getByDayOfWeek_day.xml | 2 +- ...me.getVisitInformationPerLocalTime_day.xml | 2 +- ...e.getVisitInformationPerServerTime_day.xml | 2 +- ...tsSummary.getSumVisitsLengthPretty_day.xml | 2 +- ...__VisitsSummary.getSumVisitsLength_day.xml | 2 +- ...isitorTwoVisits__VisitsSummary.get_day.xml | 2 +- ..._subtable__API.getProcessedReport_week.xml | 2 +- ...oVisits_bulk_json__API.getBulkRequest.json | 2 +- ...TwoVisits_bulk_xml__API.getBulkRequest.xml | 4 +- ...OneVisitorTwoVisits_csv__API.get_month.csv | Bin 1938 -> 1938 bytes ...deColumns___API.getProcessedReport_day.xml | 2 +- ...upport__Actions.getEntryPageTitles_day.xml | 4 +- ...eSupport__Actions.getEntryPageUrls_day.xml | 4 +- ...Support__Actions.getExitPageTitles_day.xml | 4 +- ...ieSupport__Actions.getExitPageUrls_day.xml | 4 +- ...ookieSupport__Actions.getPageTitle_day.xml | 2 +- ...okieSupport__Actions.getPageTitles_day.xml | 4 +- ...CookieSupport__Actions.getPageUrls_day.xml | 4 +- ...Support__DevicesDetection.getBrand_day.xml | 2 +- ...DevicesDetection.getBrowserEngines_day.xml | 2 +- ...evicesDetection.getBrowserFamilies_day.xml | 2 +- ...evicesDetection.getBrowserVersions_day.xml | 2 +- ...port__DevicesDetection.getBrowsers_day.xml | 2 +- ...Support__DevicesDetection.getModel_day.xml | 2 +- ...rt__DevicesDetection.getOsFamilies_day.xml | 2 +- ...rt__DevicesDetection.getOsVersions_day.xml | 2 +- ...eSupport__DevicesDetection.getType_day.xml | 2 +- ...Support__Live.getLastVisitsDetails_day.xml | 4 +- ...ithCookieSupport__Referrers.getAll_day.xml | 2 +- ...okieSupport__Referrers.getKeywords_day.xml | 4 +- ...Support__Referrers.getReferrerType_day.xml | 4 +- ...upport__Referrers.getSearchEngines_day.xml | 4 +- ...CookieSupport__UserCountry.getCity_day.xml | 2 +- ...eSupport__UserCountry.getContinent_day.xml | 2 +- ...kieSupport__UserCountry.getCountry_day.xml | 2 +- ...okieSupport__UserCountry.getRegion_day.xml | 2 +- ...hCookieSupport__VisitFrequency.get_day.xml | 4 +- ...eSupport__VisitTime.getByDayOfWeek_day.xml | 2 +- ...me.getVisitInformationPerLocalTime_day.xml | 2 +- ...e.getVisitInformationPerServerTime_day.xml | 2 +- ...tsSummary.getSumVisitsLengthPretty_day.xml | 2 +- ...__VisitsSummary.getSumVisitsLength_day.xml | 2 +- ...thCookieSupport__VisitsSummary.get_day.xml | 2 +- ...ecified__Live.getLastVisitsDetails_day.xml | 4 +- ...Site_lastN__API.getProcessedReport_day.xml | 20 +- ...ersions__Goals.getDaysToConversion_day.xml | 20 +- ...sions__Goals.getDaysToConversion_month.xml | 6 +- ...rsions__Goals.getDaysToConversion_week.xml | 10 +- ...rsions__Goals.getDaysToConversion_year.xml | 6 +- ...iteOne___Goals.getDaysToConversion_day.xml | 20 +- ...eOne___Goals.getDaysToConversion_month.xml | 6 +- ...teOne___Goals.getDaysToConversion_week.xml | 10 +- ...teOne___Goals.getDaysToConversion_year.xml | 6 +- ...VisitorId_segmentUserId__Goals.get_day.xml | 12 +- ...vExport__Live.getLastVisitsDetails_day.csv | Bin 9372 -> 9464 bytes ..._MetadataAndNormalAPI__Goals.get_range.xml | 2 +- ...tadataAndNormalAPI__Live.getLastVisits.xml | 4 +- ...alAPI__Live.getLastVisitsDetails_range.xml | 4 +- ...taAndNormalAPI__Live.getVisitorProfile.xml | 4 +- ...NormalAPI_pagesegment__Goals.get_range.xml | 2 +- ...malAPI_pagesegment__Live.getLastVisits.xml | 4 +- ...gment__Live.getLastVisitsDetails_range.xml | 4 +- ...PI_pagesegment__Live.getVisitorProfile.xml | 4 +- tests/PHPUnit/Unit/Tracker/RequestTest.php | 2 +- ...ationTest_admin_diagnostics_configfile.png | 4 +- 240 files changed, 3859 insertions(+), 727 deletions(-) create mode 100644 plugins/Annotations/tests/System/expected/test_annotations_multiplePeriod__Annotations.getAll_week.xml rename plugins/CoreConsole/tests/System/expected/{test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml => test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml} (98%) rename plugins/CoreConsole/tests/System/expected/{test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml => test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml} (92%) rename plugins/CoreConsole/tests/System/expected/{test_ArchiveCronTest_preArchivedSegment_noOptions__VisitFrequency.get_day.xml => test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitFrequency.get_day.xml} (100%) create mode 100644 plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitFrequency.get_year.xml rename plugins/CoreConsole/tests/System/expected/{test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_day.xml => test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitsSummary.get_day.xml} (100%) rename plugins/CoreConsole/tests/System/expected/{test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_year.xml => test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitsSummary.get_year.xml} (62%) create mode 100644 plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml create mode 100644 plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml create mode 100644 plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitFrequency.get_day.xml rename plugins/CoreConsole/tests/System/expected/{test_ArchiveCronTest_preArchivedSegment_noOptions__VisitFrequency.get_year.xml => test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitFrequency.get_year.xml} (100%) create mode 100644 plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitsSummary.get_day.xml create mode 100644 plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitsSummary.get_year.xml diff --git a/config/global.ini.php b/config/global.ini.php index da7aa8754460..11bc936dd8ab 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -744,10 +744,12 @@ ; `_paq.push(['setSessionCookieTimeout', timeoutInSeconds=1800])` visit_standard_length = 1800 -; The window to look back for a previous visit by this current visitor. Defaults to visit_standard_length. +; The amount of time in the past to match the current visitor to a known visitor via fingerprint. Defaults to visit_standard_length. ; If you are looking for higher accuracy of "returning visitors" metrics, you may set this value to 86400 or more. ; This is especially useful when you use the Tracking API where tracking Returning Visitors often depends on this setting. -; The value window_look_back_for_visitor is used only if it is set to greater than visit_standard_length +; The value window_look_back_for_visitor is used only if it is set to greater than visit_standard_length. +; Note: visitors with visitor IDs will be matched by visitor ID from any point in time, this is only for recognizing visitors +; by device fingerprint. window_look_back_for_visitor = 0 ; visitors that stay on the website and view only one page will be considered as time on site of 0 second diff --git a/core/DataAccess/LogAggregator.php b/core/DataAccess/LogAggregator.php index 1801fa207e45..0257d60e9391 100644 --- a/core/DataAccess/LogAggregator.php +++ b/core/DataAccess/LogAggregator.php @@ -805,7 +805,7 @@ protected function getActionsMetricFields() * clause. These can be aggregate expressions, eg, `SUM(somecol)`. * @return \Zend_Db_Statement */ - public function queryConversionsByDimension($dimensions = array(), $where = false, $additionalSelects = array()) + public function queryConversionsByDimension($dimensions = array(), $where = false, $additionalSelects = array(), $extraFrom = []) { $dimensions = array_merge(array(self::IDGOAL_FIELD), $dimensions); $tableName = self::LOG_CONVERSION_TABLE; @@ -813,7 +813,7 @@ public function queryConversionsByDimension($dimensions = array(), $where = fals $select = $this->getSelectStatement($dimensions, $tableName, $additionalSelects, $availableMetrics); - $from = array($tableName); + $from = array_merge([$tableName], $extraFrom); $where = $this->getWhereStatement($tableName, self::CONVERSION_DATETIME_FIELD, $where); $groupBy = $this->getGroupByStatement($dimensions, $tableName); $orderBy = false; diff --git a/core/Tracker/GoalManager.php b/core/Tracker/GoalManager.php index 42ea884cac85..0b5cca07866e 100644 --- a/core/Tracker/GoalManager.php +++ b/core/Tracker/GoalManager.php @@ -12,6 +12,7 @@ use Piwik\Common; use Piwik\Container\StaticContainer; use Piwik\Date; +use Piwik\Exception\InvalidRequestParameterException; use Piwik\Piwik; use Piwik\Plugin\Dimension\ConversionDimension; use Piwik\Plugin\Dimension\VisitDimension; @@ -741,7 +742,15 @@ protected function insertNewConversion($conversion, $visitInformation, Request $ $newGoalDebug['idvisitor'] = bin2hex($newGoalDebug['idvisitor']); Common::printDebug($newGoalDebug); + $idorder = $request->getParam('ec_id'); + $wasInserted = $this->getModel()->createConversion($conversion); + if (!$wasInserted + && !empty($idorder) + ) { + $idSite = $request->getIdSite(); + throw new InvalidRequestParameterException("Invalid non-unique idsite/idorder combination ($idSite, $idorder), conversion was not inserted."); + } return $wasInserted; } diff --git a/core/Tracker/Model.php b/core/Tracker/Model.php index 82aae3e46dde..16fc04fd9263 100644 --- a/core/Tracker/Model.php +++ b/core/Tracker/Model.php @@ -357,23 +357,26 @@ public function findVisitor($idSite, $configId, $idVisitor, $fieldsToRead, $shou // this page view to the wrong visitor, but this is better than creating artificial visits. // 2) there is a visitor ID and we trust it (config setting trust_visitors_cookies, OR it was set using &cid= in tracking API), // and in these cases, we force to look up this visitor id - $whereCommon = "visit_last_action_time >= ? AND visit_last_action_time <= ? AND idsite = ?"; - $bindSql = array( + $configIdWhere = "visit_last_action_time >= ? AND visit_last_action_time <= ? AND idsite = ?"; + $configIdbindSql = array( $timeLookBack, $timeLookAhead, $idSite ); + $visitorIdWhere = 'idsite = ? AND visit_last_action_time <= ?'; + $visitorIdbindSql = [$idSite, $timeLookAhead]; + if ($shouldMatchOneFieldOnly && $isVisitorIdToLookup) { - $visitRow = $this->findVisitorByVisitorId($idVisitor, $select, $from, $whereCommon, $bindSql); + $visitRow = $this->findVisitorByVisitorId($idVisitor, $select, $from, $visitorIdWhere, $visitorIdbindSql); } elseif ($shouldMatchOneFieldOnly) { - $visitRow = $this->findVisitorByConfigId($configId, $select, $from, $whereCommon, $bindSql); + $visitRow = $this->findVisitorByConfigId($configId, $select, $from, $configIdWhere, $configIdbindSql); } else { - $visitRow = $this->findVisitorByVisitorId($idVisitor, $select, $from, $whereCommon, $bindSql); + $visitRow = $this->findVisitorByVisitorId($idVisitor, $select, $from, $visitorIdWhere, $visitorIdbindSql); if (empty($visitRow)) { - $whereCommon .= ' AND user_id IS NULL '; - $visitRow = $this->findVisitorByConfigId($configId, $select, $from, $whereCommon, $bindSql); + $configIdWhere .= ' AND user_id IS NULL '; + $visitRow = $this->findVisitorByConfigId($configId, $select, $from, $configIdWhere, $configIdbindSql); } } diff --git a/core/Tracker/Request.php b/core/Tracker/Request.php index 9d3709e05a0b..5211d834f39f 100644 --- a/core/Tracker/Request.php +++ b/core/Tracker/Request.php @@ -237,7 +237,7 @@ public function getDaysSinceFirstVisit() $cookieFirstVisitTimestamp = $this->getCurrentTimestamp(); } - $daysSinceFirstVisit = round(($this->getCurrentTimestamp() - $cookieFirstVisitTimestamp) / 86400, $precision = 0); + $daysSinceFirstVisit = floor(($this->getCurrentTimestamp() - $cookieFirstVisitTimestamp) / 86400); if ($daysSinceFirstVisit < 0) { $daysSinceFirstVisit = 0; diff --git a/core/Tracker/VisitorRecognizer.php b/core/Tracker/VisitorRecognizer.php index 4b3be310a2a7..7e6db6b9b9fa 100644 --- a/core/Tracker/VisitorRecognizer.php +++ b/core/Tracker/VisitorRecognizer.php @@ -65,6 +65,11 @@ class VisitorRecognizer */ private $eventDispatcher; + /** + * @var array + */ + private $visitRow; + public function __construct($trustCookiesOnly, $visitStandardLength, $lookbackNSecondsCustom, $trackerAlwaysNewVisitor, Model $model, EventDispatcher $eventDispatcher) { @@ -96,12 +101,13 @@ public function findKnownVisitor($configId, VisitProperties $visitProperties, Re Common::printDebug("Visitor doesn't have the piwik cookie..."); } - $persistedVisitAttributes = $this->getVisitFieldsPersist(); + $persistedVisitAttributes = $this->getVisitorFieldsPersist(); $shouldMatchOneFieldOnly = $this->shouldLookupOneVisitorFieldOnly($isVisitorIdToLookup, $request); list($timeLookBack, $timeLookAhead) = $this->getWindowLookupThisVisit($request); $visitRow = $this->model->findVisitor($idSite, $configId, $idVisitor, $persistedVisitAttributes, $shouldMatchOneFieldOnly, $isVisitorIdToLookup, $timeLookBack, $timeLookAhead); + $this->visitRow = $visitRow; $isNewVisitForced = $request->getParam('new_visit'); $isNewVisitForced = !empty($isNewVisitForced); @@ -117,37 +123,15 @@ public function findKnownVisitor($configId, VisitProperties $visitProperties, Re && $visitRow && count($visitRow) > 0 ) { - - // These values will be used throughout the request - foreach ($persistedVisitAttributes as $field) { - $visitProperties->setProperty($field, $visitRow[$field]); - } - $visitProperties->setProperty('visit_last_action_time', strtotime($visitRow['visit_last_action_time'])); $visitProperties->setProperty('visit_first_action_time', strtotime($visitRow['visit_first_action_time'])); - - // Custom Variables copied from Visit in potential later conversion - if (!empty($numCustomVarsToRead)) { - for ($i = 1; $i <= $numCustomVarsToRead; $i++) { - if (isset($visitRow['custom_var_k' . $i]) - && strlen($visitRow['custom_var_k' . $i]) - ) { - $visitProperties->setProperty('custom_var_k' . $i, $visitRow['custom_var_k' . $i]); - } - if (isset($visitRow['custom_var_v' . $i]) - && strlen($visitRow['custom_var_v' . $i]) - ) { - $visitProperties->setProperty('custom_var_v' . $i, $visitRow['custom_var_v' . $i]); - } - } - } + $visitProperties->setProperty('idvisitor', $visitRow['idvisitor']); + $visitProperties->setProperty('user_id', $visitRow['user_id']); Common::printDebug("The visitor is known (idvisitor = " . bin2hex($visitProperties->getProperty('idvisitor')) . ", config_id = " . bin2hex($configId) . ", - idvisit = {$visitProperties->getProperty('idvisit')}, last action = " . date("r", $visitProperties->getProperty('visit_last_action_time')) . ", - first action = " . date("r", $visitProperties->getProperty('visit_first_action_time')) . ", - visit_goal_buyer' = " . $visitProperties->getProperty('visit_goal_buyer') . ")"); + first action = " . date("r", $visitProperties->getProperty('visit_first_action_time')) . ")"); return true; } else { @@ -157,6 +141,22 @@ public function findKnownVisitor($configId, VisitProperties $visitProperties, Re } } + public function updateVisitPropertiesFromLastVisitRow(VisitProperties $visitProperties) + { + // These values will be used throughout the request + foreach ($this->getVisitorFieldsPersist() as $field) { + if ($field == 'visit_last_action_time' || $field == 'visit_first_action_time') { + continue; + } + + $visitProperties->setProperty($field, $this->visitRow[$field]); + } + + Common::printDebug("The visit is part of an existing visit ( + idvisit = {$visitProperties->getProperty('idvisit')}, + visit_goal_buyer' = " . $visitProperties->getProperty('visit_goal_buyer') . ")"); + } + protected function shouldLookupOneVisitorFieldOnly($isVisitorIdToLookup, Request $request) { $isForcedUserIdMustMatch = (false !== $request->getForcedUserId()); @@ -212,7 +212,7 @@ protected function getWindowLookupThisVisit(Request $request) /** * @return array */ - private function getVisitFieldsPersist() + private function getVisitorFieldsPersist() { if (is_null($this->visitFieldsToSelect)) { $fields = array( diff --git a/core/ViewDataTable/Request.php b/core/ViewDataTable/Request.php index b25c01f24578..a870d70c67e0 100644 --- a/core/ViewDataTable/Request.php +++ b/core/ViewDataTable/Request.php @@ -60,7 +60,7 @@ public function getRequestArray() 'format' => 'original' ); - $toSetEventually = array( + $toSetEventually = array_merge(array( 'filter_limit', 'keep_totals_row', 'keep_summary_row', @@ -76,7 +76,7 @@ public function getRequestArray() 'pivotBy', 'pivotByColumn', 'pivotByColumnLimit' - ); + ), $this->requestConfig->getExtraParametersToSet()); foreach ($toSetEventually as $varToSet) { $value = $this->getDefaultOrCurrent($varToSet); diff --git a/core/ViewDataTable/RequestConfig.php b/core/ViewDataTable/RequestConfig.php index ecdaa794ab13..937624a35883 100644 --- a/core/ViewDataTable/RequestConfig.php +++ b/core/ViewDataTable/RequestConfig.php @@ -345,4 +345,15 @@ public function getApiMethodToRequest() return $method; } + + /** + * Override this method if you want to add custom request parameters to the API request based on ViewDataTable + * parameters. Return in the result the list of extra parameters. + * + * @return array eg, `['mycustomparam']` + */ + public function getExtraParametersToSet() + { + return []; + } } diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index 4417677fe203..c5ba5f3ce7cd 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -436,7 +436,7 @@ 5 none - 101 + 0 51 0 0s @@ -798,10 +798,10 @@ 5 none - 101 + 100 51 - 0 - 0s + 1 + 1s 0 1 1 @@ -1184,7 +1184,7 @@ 5 none - 101 + 0 51 0 0s @@ -1546,10 +1546,10 @@ 5 none - 101 + 100 51 - 0 - 0s + 1 + 1s 0 1 1 @@ -1932,7 +1932,7 @@ 5 none - 101 + 0 51 0 0s @@ -2497,10 +2497,10 @@ 5 none - 101 + 100 51 - 0 - 0s + 1 + 1s 0 1 1 @@ -2648,10 +2648,10 @@ 5 none - 101 + 100 51 - 0 - 0s + 1 + 1s 0 1 1 @@ -3261,7 +3261,7 @@ 5 none - 101 + 0 51 0 0s @@ -3412,7 +3412,7 @@ 5 none - 101 + 0 51 0 0s @@ -4399,10 +4399,10 @@ 5 none - 101 + 100 51 - 0 - 0s + 1 + 1s 0 1 1 @@ -4550,10 +4550,10 @@ 5 none - 101 + 100 51 - 0 - 0s + 1 + 1s 0 1 1 @@ -4701,10 +4701,10 @@ 5 none - 101 + 100 51 - 0 - 0s + 1 + 1s 0 1 1 @@ -4852,10 +4852,10 @@ 5 none - 101 + 100 51 - 0 - 0s + 1 + 1s 0 1 1 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionServerHour__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionServerHour__VisitsSummary.get_range.xml index 7ace3fcbe742..9857cf3bdd4b 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionServerHour__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionServerHour__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 18 18 18 - 0 + 8 1 100% 1 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionServerMinute__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionServerMinute__VisitsSummary.get_range.xml index f3bee672d683..c52a442d2fbe 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionServerMinute__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionServerMinute__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ 95 35 18 - 27557 + 27565 5 51% 2.7 - 787 + 788 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionType__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionType__VisitsSummary.get_range.xml index f3bee672d683..c52a442d2fbe 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionType__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actionType__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ 95 35 18 - 27557 + 27565 5 51% 2.7 - 787 + 788 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml index 7ace3fcbe742..9857cf3bdd4b 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_actions__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 18 18 18 - 0 + 8 1 100% 1 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml index e7e79a422298..28a968d9193a 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 55 20 10 - 16210 + 16215 5 50% 2.8 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml index c0631c362b44..4269cea13dfe 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ 12 5 3 - 3242 + 3243 5 60% 2.4 - 648 + 649 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml index 780ddda63ad8..bcea1c4ec4b2 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 50 18 9 - 14589 + 14593 5 50% 2.8 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml index 02d91d0e9cf7..b5a939a130cb 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_city__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 28 10 5 - 8105 + 8107 5 50% 2.8 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml index c8839b7ab56d..1dc5b7681dd6 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_continentCode__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 56 20 10 - 16210 + 16214 5 50% 2.8 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml index 02d91d0e9cf7..b5a939a130cb 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_countryCode__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 28 10 5 - 8105 + 8107 5 50% 2.8 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml index 275f332d1ed6..c8fba4a59bb3 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ 76 30 17 - 21073 + 21081 5 57% 2.5 - 702 + 703 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml index 275f332d1ed6..c8fba4a59bb3 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ 76 30 17 - 21073 + 21081 5 57% 2.5 - 702 + 703 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName__VisitsSummary.get_range.xml index 275f332d1ed6..c8fba4a59bb3 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariableName__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ 76 30 17 - 21073 + 21081 5 57% 2.5 - 702 + 703 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml index b72146a986ee..339a0f2a6283 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName2__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 17 17 17 - 0 + 8 1 100% 1 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml index b72146a986ee..339a0f2a6283 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName5__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 17 17 17 - 0 + 8 1 100% 1 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__VisitsSummary.get_range.xml index b72146a986ee..339a0f2a6283 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_customVariablePageName__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 17 17 17 - 0 + 8 1 100% 1 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__API.getSuggestedValuesForSegment.xml index 90545e08bf3d..27933cf67d69 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__API.getSuggestedValuesForSegment.xml @@ -1,5 +1,4 @@ 100 - 101 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml index eb20b7dcf914..3c23ae5e4b53 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ - 17 - 77 - 17 - 0 - 27557 + 25 + 85 + 25 + 8 + 27565 5 - 0% - 4.5 - 1621 + 32% + 3.4 + 1103 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceModel__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceModel__VisitsSummary.get_range.xml index 602805c28364..6e71b7139a28 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceModel__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceModel__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ 73 27 14 - 21073 + 21079 5 52% 2.7 - 780 + 781 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml index 602805c28364..6e71b7139a28 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ 73 27 14 - 21073 + 21079 5 52% 2.7 - 780 + 781 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_entryPageTitle__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_entryPageTitle__VisitsSummary.get_range.xml index b72146a986ee..339a0f2a6283 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_entryPageTitle__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_entryPageTitle__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 17 17 17 - 0 + 8 1 100% 1 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_entryPageUrl__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_entryPageUrl__VisitsSummary.get_range.xml index 7ace3fcbe742..9857cf3bdd4b 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_entryPageUrl__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_entryPageUrl__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 18 18 18 - 0 + 8 1 100% 1 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_exitPageTitle__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_exitPageTitle__VisitsSummary.get_range.xml index b72146a986ee..339a0f2a6283 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_exitPageTitle__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_exitPageTitle__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 17 17 17 - 0 + 8 1 100% 1 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_exitPageUrl__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_exitPageUrl__VisitsSummary.get_range.xml index 7ace3fcbe742..9857cf3bdd4b 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_exitPageUrl__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_exitPageUrl__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 18 18 18 - 0 + 8 1 100% 1 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_interactions__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_interactions__VisitsSummary.get_range.xml index 7c9bf3fd36c0..9140fa1a46d2 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_interactions__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_interactions__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 50 26 18 - 12968 + 12976 4 69% 1.9 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_languageCode__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_languageCode__VisitsSummary.get_range.xml index 3ce6d98183f6..6202c38a2fb8 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_languageCode__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_languageCode__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 74 28 15 - 21073 + 21079 5 54% 2.6 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml index 789c2c6fd12a..1583658083ee 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 16 6 3 - 4863 + 4865 5 50% 2.7 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_longitude__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_longitude__VisitsSummary.get_range.xml index 789c2c6fd12a..1583658083ee 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_longitude__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_longitude__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 16 6 3 - 4863 + 4865 5 50% 2.7 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml index a2651f3ccd5d..ef5b0960c050 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 68 25 13 - 19452 + 19457 5 52% 2.7 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml index abb563f02374..eaface92a5f3 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemVersion__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 51 19 10 - 14589 + 14593 5 53% 2.7 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_pageTitle__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_pageTitle__VisitsSummary.get_range.xml index b72146a986ee..339a0f2a6283 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_pageTitle__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_pageTitle__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 17 17 17 - 0 + 8 1 100% 1 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml index 7ace3fcbe742..9857cf3bdd4b 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 18 18 18 - 0 + 8 1 100% 1 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml index d21dc7e9e933..e0791e085c75 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 94 34 17 - 27557 + 27565 5 50% 2.8 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml index 789c2c6fd12a..1583658083ee 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 16 6 3 - 4863 + 4865 5 50% 2.7 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml index f3bee672d683..c52a442d2fbe 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_resolution__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ 95 35 18 - 27557 + 27565 5 51% 2.7 - 787 + 788 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml index f3bee672d683..c52a442d2fbe 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitConvertedGoalId__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ 95 35 18 - 27557 + 27565 5 51% 2.7 - 787 + 788 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml index f3bee672d683..c52a442d2fbe 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitConverted__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ 95 35 18 - 27557 + 27565 5 51% 2.7 - 787 + 788 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml index 1d724e8969b9..98f8df195a00 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitCount__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 90 30 13 - 27557 + 27565 5 43% 3 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml index 1d39a66637c4..095e2caff1ec 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitDuration__API.getSuggestedValuesForSegment.xml @@ -1,4 +1,5 @@ 1621 + 1 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml index f3bee672d683..c52a442d2fbe 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEcommerceStatus__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ 95 35 18 - 27557 + 27565 5 51% 2.7 - 787 + 788 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerMinute__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerMinute__VisitsSummary.get_range.xml index 7ace3fcbe742..9857cf3bdd4b 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerMinute__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerMinute__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 18 18 18 - 0 + 8 1 100% 1 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerMonth__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerMonth__VisitsSummary.get_range.xml index f3bee672d683..c52a442d2fbe 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerMonth__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerMonth__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ 95 35 18 - 27557 + 27565 5 51% 2.7 - 787 + 788 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerQuarter__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerQuarter__VisitsSummary.get_range.xml index f3bee672d683..c52a442d2fbe 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerQuarter__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerQuarter__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ 95 35 18 - 27557 + 27565 5 51% 2.7 - 787 + 788 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerSecond__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerSecond__VisitsSummary.get_range.xml index f3bee672d683..c52a442d2fbe 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerSecond__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerSecond__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ 95 35 18 - 27557 + 27565 5 51% 2.7 - 787 + 788 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerWeekOfYear__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerWeekOfYear__VisitsSummary.get_range.xml index 83f3ba2d8c2b..a5d671efdd94 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerWeekOfYear__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitEndServerWeekOfYear__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 83 30 15 - 24315 + 24322 5 50% 2.8 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml index f3bee672d683..c52a442d2fbe 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitLocalHour__VisitsSummary.get_range.xml @@ -4,9 +4,9 @@ 95 35 18 - 27557 + 27565 5 51% 2.7 - 787 + 788 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitStartServerHour__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitStartServerHour__VisitsSummary.get_range.xml index 7ace3fcbe742..9857cf3bdd4b 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitStartServerHour__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitStartServerHour__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 18 18 18 - 0 + 8 1 100% 1 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitStartServerMinute__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitStartServerMinute__VisitsSummary.get_range.xml index 7ace3fcbe742..9857cf3bdd4b 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitStartServerMinute__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitStartServerMinute__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 18 18 18 - 0 + 8 1 100% 1 diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml index 8f2deb63eef1..6d1659382f9f 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__API.getSuggestedValuesForSegment.xml @@ -1,21 +1,13 @@ 08f90c1a41715536 - 1587965fb4d4b5af 1bd69c7df3112fb9 - 2387337ba1e0b024 908c9a564a864265 - 9246444d94f081e3 - a4380923dd651c19 a9b7ba70783b617e aa68c75c4a77c87f b8c37e33defde51c - d0fb963ff976f9c3 - d7322ed717dedf1e - d806ca13ca3449af e93028bdc1aacdfb fba9d88164f3e2d9 fed33392d3a48aa1 - ffc58105bf6f8a91 e64bc481700c5d69 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml index 0e04d3f6d92d..f0c215da1acf 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorId__VisitsSummary.get_range.xml @@ -1,12 +1,12 @@ - 2 - 6 - 2 - 1 - 1621 + 4 + 11 + 4 + 2 + 3243 5 50% - 3 + 2.8 811 \ No newline at end of file diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml index 1d724e8969b9..98f8df195a00 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_visitorType__VisitsSummary.get_range.xml @@ -4,7 +4,7 @@ 90 30 13 - 27557 + 27565 5 43% 3 diff --git a/plugins/Annotations/API.php b/plugins/Annotations/API.php index 136b4ececdf2..9889ff7349ce 100644 --- a/plugins/Annotations/API.php +++ b/plugins/Annotations/API.php @@ -320,21 +320,21 @@ public static function getDateRangeForPeriod($date, $period, $lastN = false) return array(false, false); } - // if the range is just a normal period (or the period is a range in which case lastN is ignored) - if ($lastN === false - || $period == 'range' - ) { - if ($period == 'range') { - $oPeriod = new Range('day', $date); - } else { - $oPeriod = Period\Factory::build($period, Date::factory($date)); - } + $isMultiplePeriod = Range::isMultiplePeriod($date, $period); + // if the range is just a normal period (or the period is a range in which case lastN is ignored) + if ($period == 'range') { + $oPeriod = new Range('day', $date); + $startDate = $oPeriod->getDateStart(); + $endDate = $oPeriod->getDateEnd(); + } else if ($lastN == false && !$isMultiplePeriod) { + $oPeriod = Period\Factory::build($period, Date::factory($date)); $startDate = $oPeriod->getDateStart(); $endDate = $oPeriod->getDateEnd(); - } else // if the range includes the last N periods - { - list($date, $lastN) = EvolutionViz::getDateRangeAndLastN($period, $date, $lastN); + } else { // if the range includes the last N periods or is a multiple period + if (!$isMultiplePeriod) { + list($date, $lastN) = EvolutionViz::getDateRangeAndLastN($period, $date, $lastN); + } list($startDate, $endDate) = explode(',', $date); $startDate = Date::factory($startDate); diff --git a/plugins/Annotations/tests/System/AnnotationsTest.php b/plugins/Annotations/tests/System/AnnotationsTest.php index d385d3342668..ef0a477e89fa 100644 --- a/plugins/Annotations/tests/System/AnnotationsTest.php +++ b/plugins/Annotations/tests/System/AnnotationsTest.php @@ -51,6 +51,10 @@ public function getApiForTesting() 'periods' => array('week'), 'otherRequestParameters' => array('lastN' => 6), 'testSuffix' => '_lastN')), + array('Annotations.getAll', array('idSite' => $idSite1, + 'date' => '2012-01-26,2012-03-01', + 'periods' => array('week'), + 'testSuffix' => '_multiplePeriod')), array('Annotations.getAll', array('idSite' => $idSite1, 'date' => '2012-01-15,2012-02-15', 'periods' => array('range'), diff --git a/plugins/Annotations/tests/System/expected/test_annotations_multiplePeriod__Annotations.getAll_week.xml b/plugins/Annotations/tests/System/expected/test_annotations_multiplePeriod__Annotations.getAll_week.xml new file mode 100644 index 000000000000..d3aecc147b3f --- /dev/null +++ b/plugins/Annotations/tests/System/expected/test_annotations_multiplePeriod__Annotations.getAll_week.xml @@ -0,0 +1,85 @@ + + + + + 2012-01-26 + 16: Site 1 annotation for 2012-01-26 + 0 + superUserLogin + 16 + 1 + + + 2012-01-27 + 17: Site 1 annotation for 2012-01-27 + 0 + superUserLogin + 17 + 1 + + + 2012-02-02 + 18: Site 1 annotation for 2012-02-02 + 1 + superUserLogin + 18 + 1 + + + 2012-02-03 + 19: Site 1 annotation for 2012-02-03 + 0 + superUserLogin + 19 + 1 + + + 2012-02-09 + 20: Site 1 annotation for 2012-02-09 + 0 + superUserLogin + 20 + 1 + + + 2012-02-10 + 21: Site 1 annotation for 2012-02-10 + 1 + superUserLogin + 21 + 1 + + + 2012-02-16 + 22: Site 1 annotation for 2012-02-16 + 0 + superUserLogin + 22 + 1 + + + 2012-02-17 + 23: Site 1 annotation for 2012-02-17 + 0 + superUserLogin + 23 + 1 + + + 2012-02-23 + 24: Site 1 annotation for 2012-02-23 + 1 + superUserLogin + 24 + 1 + + + 2012-02-24 + 25: Site 1 annotation for 2012-02-24 + 0 + superUserLogin + 25 + 1 + + + \ No newline at end of file diff --git a/plugins/CoreConsole/tests/System/ArchiveCronTest.php b/plugins/CoreConsole/tests/System/ArchiveCronTest.php index 540842da2123..75d7658f9fe8 100644 --- a/plugins/CoreConsole/tests/System/ArchiveCronTest.php +++ b/plugins/CoreConsole/tests/System/ArchiveCronTest.php @@ -64,14 +64,14 @@ public function getApiForTesting() $segments = array(ManySitesImportedLogs::SEGMENT_PRE_ARCHIVED, ManySitesImportedLogs::SEGMENT_PRE_ARCHIVED_CONTAINS_ENCODED ); - foreach($segments as $segment) { + foreach($segments as $index => $segment) { // Test with a pre-processed segment $results[] = array(array('VisitsSummary.get', 'Live.getLastVisitsDetails', 'VisitFrequency.get'), array('idSite' => '1', 'date' => '2012-08-09', 'periods' => array('day', 'year'), 'segment' => $segment, - 'testSuffix' => '_preArchivedSegment', + 'testSuffix' => '_preArchivedSegment' . $index, 'otherRequestParameters' => array( 'hideColumns' => 'latitude,longitude' )) diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_noOptions__VisitFrequency.get_month.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_noOptions__VisitFrequency.get_month.xml index 3f55efcd0584..2ae3a02ea7ea 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_noOptions__VisitFrequency.get_month.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_noOptions__VisitFrequency.get_month.xml @@ -15,12 +15,12 @@ - 1 + 2 0 - 1 - 1 + 2 + 2 0 - 1 + 2 0 1 100% diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml similarity index 98% rename from plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml rename to plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml index 64370a2ffb40..5b6bd97c429d 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml @@ -3,7 +3,7 @@ 1 9 - 0.0.0.0 + 175.41.192.9 @@ -106,15 +106,15 @@ 0 0 0 - Unknown - unk - Unknown - xx - plugins/Morpheus/icons/dist/flags/xx.png + Asia + asi + Japan + jp + plugins/Morpheus/icons/dist/flags/jp.png - Unknown + Japan 21:00:42 21 0 @@ -127,7 +127,7 @@ 1 8 - 0.0.0.0 + 175.41.192.9 @@ -230,15 +230,15 @@ 0 0 0 - Unknown - unk - Unknown - xx - plugins/Morpheus/icons/dist/flags/xx.png + Asia + asi + Japan + jp + plugins/Morpheus/icons/dist/flags/jp.png - Unknown + Japan 20:56:45 20 0 diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml similarity index 92% rename from plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml rename to plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml index 5300e03f4f84..060f9cbe7978 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml @@ -633,6 +633,163 @@ + + 1 + 28 + 0.0.0.0 + + + + action + http://forum.piwik.org/register.php?0,approve=9a94a02145599 + Piwik Forums + 31 + + + 31 + 43 + 1 + Piwik Forums + http://forum.piwik.org/register.php?0,approve=9a94a02145599 + plugins/Morpheus/images/action.svg + + + + HTTP-code + 200 + + + 43 B + + + goal + all + 1 + 5 + 31 + + http://forum.piwik.org/register.php?0,approve=9a94a02145599 + plugins/Morpheus/images/goal.svg + Goal conversion + all ($ 5 revenue) + + + + 1 + USD + $ + + + + + Piwik test + + + + + + + + returning + plugins/Live/images/returningVisitor.png + 1 + plugins/Morpheus/images/goal.svg + 1 + none + + 0 + 0 + 0 + 0s + 0 + 1 + 1 + website + Websites + sn110w.snt110.mail.live.com + + + http://sn110w.snt110.mail.live.com/mail/InboxLight.aspx?n=184083971 + + + + + + Unknown + Desktop + plugins/Morpheus/icons/dist/devices/desktop.png + Unknown + Generic Desktop + Windows XP + Windows + plugins/Morpheus/icons/dist/os/WIN.png + WIN + XP + WebKit + WebKit (Safari, Chrome) + Chrome 11.0 + Chrome + plugins/Morpheus/icons/dist/browsers/CH.png + CH + 11.0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + Unknown + unk + Unknown + xx + plugins/Morpheus/icons/dist/flags/xx.png + + + + Unknown + 08:00:47 + 8 + 444 + + + Forum status + Anonymous + + + 1280x800 + cookie, director, flash, gears, java, pdf, windowsmedia + + + plugins/Morpheus/icons/dist/plugins/cookie.png + cookie + + + plugins/Morpheus/icons/dist/plugins/director.png + director + + + plugins/Morpheus/icons/dist/plugins/flash.png + flash + + + plugins/Morpheus/icons/dist/plugins/gears.png + gears + + + plugins/Morpheus/icons/dist/plugins/java.png + java + + + plugins/Morpheus/icons/dist/plugins/pdf.png + pdf + + + plugins/Morpheus/icons/dist/plugins/windowsmedia.png + windowsmedia + + + 1 25 @@ -1460,119 +1617,4 @@ - - 1 - 18 - 1.2.3.4 - - - - download - http://piwik.net/19.pdf - - 16 - - - 18 - 4324023 - - plugins/Morpheus/images/download.svg - Download - http://piwik.net/19.pdf - - - - HTTP-code - 200 - - - 4.1 M - - - 0 - USD - $ - - - - - Piwik test - - - - - - - - new - - 0 - - 1 - none - - 0 - 0 - 0 - 0s - 0 - 1 - 0 - direct - Direct Entry - - - - - - - - - - Unknown - Unknown - plugins/Morpheus/icons/dist/devices/unknown.png - Unknown - Unknown - Unknown - Unknown - plugins/Morpheus/icons/dist/os/UNK.png - UNK - UNK - - Unknown - Unknown - Unknown - plugins/Morpheus/icons/dist/browsers/UNK.png - UNK - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - Oceania - oce - Australia - au - plugins/Morpheus/icons/dist/flags/au.png - - - - Australia - 17:46:03 - 17 - 0 - - - Not-Bot - Apache-HttpClient/4.2.1 (java 1.5) - - - unknown - - - \ No newline at end of file diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitFrequency.get_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitFrequency.get_day.xml similarity index 100% rename from plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitFrequency.get_day.xml rename to plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitFrequency.get_day.xml diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitFrequency.get_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitFrequency.get_year.xml new file mode 100644 index 000000000000..05d0ce39534e --- /dev/null +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitFrequency.get_year.xml @@ -0,0 +1,12 @@ + + + 1 + 1 + 1 + 1 + 0 + 1 + 100% + 1 + 0 + \ No newline at end of file diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitsSummary.get_day.xml similarity index 100% rename from plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_day.xml rename to plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitsSummary.get_day.xml diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitsSummary.get_year.xml similarity index 62% rename from plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_year.xml rename to plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitsSummary.get_year.xml index 157967c9a3d4..5d42e5f7f4c1 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitsSummary.get_year.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitsSummary.get_year.xml @@ -1,9 +1,9 @@ - 33 - 45 - 31 - 30 + 34 + 46 + 32 + 31 359 10 91% diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml new file mode 100644 index 000000000000..5b6bd97c429d --- /dev/null +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml @@ -0,0 +1,1243 @@ + + + + 1 + 9 + 175.41.192.9 + + + + action + http://piwik.net/docs/manage-users/ + + 9 + + + 9 + 3574 + 1 + + <subtitle>http://piwik.net/docs/manage-users/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>9</goalPageId> + + <url>http://piwik.net/docs/manage-users/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion + all ($ 5 revenue) + + + + 1 + USD + $ + + + + + Piwik test + + + + + + + + new + + 1 + plugins/Morpheus/images/goal.svg + 1 + none + + 0 + 0 + 0 + 0s + 0 + 1 + 1 + direct + Direct Entry + + + + + + + + + + Unknown + Desktop + plugins/Morpheus/icons/dist/devices/desktop.png + Apple + Generic Desktop + Mac 10.8 + Mac + plugins/Morpheus/icons/dist/os/MAC.png + MAC + 10.8 + WebKit + WebKit (Safari, Chrome) + Chrome 19.0 + Chrome + plugins/Morpheus/icons/dist/browsers/CH.png + CH + 19.0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + Asia + asi + Japan + jp + plugins/Morpheus/icons/dist/flags/jp.png + + + + Japan + 21:00:42 + 21 + 0 + + + unknown + + + + + 1 + 8 + 175.41.192.9 + + + + action + http://piwik.net/docs/ + + 8 + + + 8 + 3574 + 1 + + <subtitle>http://piwik.net/docs/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>8</goalPageId> + + <url>http://piwik.net/docs/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion + all ($ 5 revenue) + + + + 1 + USD + $ + + + + + Piwik test + + + + + + + + new + + 1 + plugins/Morpheus/images/goal.svg + 1 + none + + 0 + 0 + 0 + 0s + 0 + 1 + 1 + direct + Direct Entry + + + + + + + + + + Unknown + Desktop + plugins/Morpheus/icons/dist/devices/desktop.png + Unknown + Generic Desktop + GNU/Linux + GNU/Linux + plugins/Morpheus/icons/dist/os/LIN.png + LIN + + Gecko + Gecko (Firefox) + Firefox 6.0 + Firefox + plugins/Morpheus/icons/dist/browsers/FF.png + FF + 6.0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + Asia + asi + Japan + jp + plugins/Morpheus/icons/dist/flags/jp.png + + + + Japan + 20:56:45 + 20 + 0 + + + unknown + + + + + 1 + 7 + 72.44.32.10 + + + + action + http://piwik.net/translations/ + + 7 + + + 7 + 3574 + 1 + + <subtitle>http://piwik.net/translations/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>7</goalPageId> + + <url>http://piwik.net/translations/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion + all ($ 5 revenue) + + + + 1 + USD + $ + + + + + Piwik test + + + + + + + + new + + 1 + plugins/Morpheus/images/goal.svg + 1 + none + + 0 + 0 + 0 + 0s + 0 + 1 + 1 + direct + Direct Entry + + + + + + + + + + Unknown + Desktop + plugins/Morpheus/icons/dist/devices/desktop.png + Unknown + Generic Desktop + GNU/Linux + GNU/Linux + plugins/Morpheus/icons/dist/os/LIN.png + LIN + + WebKit + WebKit (Safari, Chrome) + Chrome 19.0 + Chrome + plugins/Morpheus/icons/dist/browsers/CH.png + CH + 19.0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + North America + amn + United States + us + plugins/Morpheus/icons/dist/flags/us.png + Virginia + VA + Ashburn + Ashburn, Virginia, United States + 13:49:48 + 13 + 0 + + + unknown + + + + + 1 + 6 + 72.44.32.10 + + + + action + http://piwik.net/download/counter/ + + 6 + + + 6 + 3574 + 1 + + <subtitle>http://piwik.net/download/counter/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>6</goalPageId> + + <url>http://piwik.net/download/counter/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion + all ($ 5 revenue) + + + + 1 + USD + $ + + + + + Piwik test + + + + + + + + new + + 1 + plugins/Morpheus/images/goal.svg + 1 + none + + 0 + 0 + 0 + 0s + 0 + 1 + 1 + direct + Direct Entry + + + + + + + + + + Unknown + Desktop + plugins/Morpheus/icons/dist/devices/desktop.png + Unknown + Generic Desktop + GNU/Linux + GNU/Linux + plugins/Morpheus/icons/dist/os/LIN.png + LIN + + WebKit + WebKit (Safari, Chrome) + GNOME Web 2.30 + GNOME Web + plugins/Morpheus/icons/dist/browsers/EP.png + EP + 2.30 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + North America + amn + United States + us + plugins/Morpheus/icons/dist/flags/us.png + Virginia + VA + Ashburn + Ashburn, Virginia, United States + 13:48:20 + 13 + 0 + + + unknown + + + + + 1 + 5 + 72.44.32.10 + + + + action + http://piwik.net/ + + 5 + + + 5 + 3574 + 1 + + <subtitle>http://piwik.net/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>5</goalPageId> + + <url>http://piwik.net/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion + all ($ 5 revenue) + + + + 1 + USD + $ + + + + + Piwik test + + + + + + + + new + + 1 + plugins/Morpheus/images/goal.svg + 1 + none + + 0 + 0 + 0 + 0s + 0 + 1 + 1 + direct + Direct Entry + + + + + + + + + + Unknown + Desktop + plugins/Morpheus/icons/dist/devices/desktop.png + Unknown + Generic Desktop + Windows 7 + Windows + plugins/Morpheus/icons/dist/os/WIN.png + WIN + 7 + Trident + Trident (IE) + Internet Explorer 9.0 + Internet Explorer + plugins/Morpheus/icons/dist/browsers/IE.png + IE + 9.0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + North America + amn + United States + us + plugins/Morpheus/icons/dist/flags/us.png + Virginia + VA + Ashburn + Ashburn, Virginia, United States + 13:48:07 + 13 + 0 + + + unknown + + + + + 1 + 4 + 175.41.192.40 + + + + action + http://piwik.net/docs/manage-websites/ + + 4 + + + 4 + 3574 + 1 + + <subtitle>http://piwik.net/docs/manage-websites/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>4</goalPageId> + + <url>http://piwik.net/docs/manage-websites/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion + all ($ 5 revenue) + + + + 1 + USD + $ + + + + + Piwik test + + + + + + + + new + + 1 + plugins/Morpheus/images/goal.svg + 1 + none + + 0 + 0 + 0 + 0s + 0 + 1 + 1 + direct + Direct Entry + + + + + + + + + + Unknown + Desktop + plugins/Morpheus/icons/dist/devices/desktop.png + Unknown + Generic Desktop + GNU/Linux + GNU/Linux + plugins/Morpheus/icons/dist/os/LIN.png + LIN + + Gecko + Gecko (Firefox) + Firefox 6.0 + Firefox + plugins/Morpheus/icons/dist/browsers/FF.png + FF + 6.0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + Asia + asi + Japan + jp + plugins/Morpheus/icons/dist/flags/jp.png + + + + Japan + 08:12:03 + 8 + 0 + + + unknown + + + + + 1 + 3 + 175.41.192.40 + + + + action + http://piwik.net/blog/category/community/ + + 3 + + + 3 + 3574 + 1 + + <subtitle>http://piwik.net/blog/category/community/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>3</goalPageId> + + <url>http://piwik.net/blog/category/community/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion + all ($ 5 revenue) + + + + 1 + USD + $ + + + + + Piwik test + + + + + + + + new + + 1 + plugins/Morpheus/images/goal.svg + 1 + none + + 0 + 0 + 0 + 0s + 0 + 1 + 1 + direct + Direct Entry + + + + + + + + + + Unknown + Desktop + plugins/Morpheus/icons/dist/devices/desktop.png + Unknown + Generic Desktop + GNU/Linux + GNU/Linux + plugins/Morpheus/icons/dist/os/LIN.png + LIN + + WebKit + WebKit (Safari, Chrome) + GNOME Web 2.30 + GNOME Web + plugins/Morpheus/icons/dist/browsers/EP.png + EP + 2.30 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + Asia + asi + Japan + jp + plugins/Morpheus/icons/dist/flags/jp.png + + + + Japan + 08:11:56 + 8 + 0 + + + unknown + + + + + 1 + 2 + 175.41.192.40 + + + + action + http://piwik.net/faq/ + + 2 + + + 2 + 3574 + 1 + + <subtitle>http://piwik.net/faq/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>2</goalPageId> + + <url>http://piwik.net/faq/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion + all ($ 5 revenue) + + + + 1 + USD + $ + + + + + Piwik test + + + + + + + + new + + 1 + plugins/Morpheus/images/goal.svg + 1 + none + + 0 + 0 + 0 + 0s + 0 + 1 + 1 + direct + Direct Entry + + + + + + + + + + Unknown + Smartphone + plugins/Morpheus/icons/dist/devices/smartphone.png + HTC + Vision + Android 2.3 + Android + plugins/Morpheus/icons/dist/os/AND.png + AND + 2.3 + WebKit + WebKit (Safari, Chrome) + Android Browser + Android Browser + plugins/Morpheus/icons/dist/browsers/AN.png + AN + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + Asia + asi + Japan + jp + plugins/Morpheus/icons/dist/flags/jp.png + + + + Japan + 08:11:30 + 8 + 0 + + + unknown + + + + + 1 + 59 + 175.41.193.46 + + + + action + http://www.included4.com/blog/category/meta/ + + 57 + + + 81 + 3574 + 1 + + <subtitle>http://www.included4.com/blog/category/meta/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>81</goalPageId> + + <url>http://www.included4.com/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion + all ($ 5 revenue) + + + + 1 + USD + $ + + + + + Piwik test + + + + + + + + new + + 1 + plugins/Morpheus/images/goal.svg + 1 + none + + 0 + 0 + 0 + 0s + 0 + 1 + 1 + direct + Direct Entry + + + + + + + + + + Unknown + Desktop + plugins/Morpheus/icons/dist/devices/desktop.png + Apple + Generic Desktop + Mac 10.6 + Mac + plugins/Morpheus/icons/dist/os/MAC.png + MAC + 10.6 + WebKit + WebKit (Safari, Chrome) + RockMelt 0.9 + RockMelt + plugins/Morpheus/icons/dist/browsers/RM.png + RM + 0.9 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + Asia + asi + Japan + jp + plugins/Morpheus/icons/dist/flags/jp.png + + + + Japan + 08:10:39 + 8 + 0 + + + unknown + + + + + 1 + 61 + 175.41.191.46 + + + + action + http://www.included2.com/blog/category/meta/ + + 59 + + + 83 + 3574 + 1 + + <subtitle>http://www.included2.com/blog/category/meta/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>83</goalPageId> + + <url>http://www.included2.com/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion + all ($ 5 revenue) + + + + 1 + USD + $ + + + + + Piwik test + + + + + + + + new + + 1 + plugins/Morpheus/images/goal.svg + 1 + none + + 0 + 0 + 0 + 0s + 0 + 1 + 1 + direct + Direct Entry + + + + + + + + + + Unknown + Desktop + plugins/Morpheus/icons/dist/devices/desktop.png + Apple + Generic Desktop + Mac 10.6 + Mac + plugins/Morpheus/icons/dist/os/MAC.png + MAC + 10.6 + WebKit + WebKit (Safari, Chrome) + RockMelt 0.9 + RockMelt + plugins/Morpheus/icons/dist/browsers/RM.png + RM + 0.9 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + Asia + asi + Singapore + sg + plugins/Morpheus/icons/dist/flags/sg.png + + + + Singapore + 08:10:39 + 8 + 0 + + + unknown + + + + \ No newline at end of file diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml new file mode 100644 index 000000000000..060f9cbe7978 --- /dev/null +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml @@ -0,0 +1,1620 @@ + + + + 1 + 57 + 175.41.192.40 + + + + action + http://piwik.net/blog/category/meta/ + + 1 + + + 70 + + 0 + 0s + 123 + 0.12s + 1 + + <subtitle>http://piwik.net/blog/category/meta/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>70</goalPageId> + + <url>http://piwik.net/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion + all ($ 5 revenue) + + + + action + http://piwik.net/blog/category/meta/ + + 1 + + + 74 + + 0 + 0s + 120 + 0.12s + 5 + + <subtitle>http://piwik.net/blog/category/meta/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://piwik.net/blog/category/meta/</url> + <pageTitle /> + <pageIdAction>1</pageIdAction> + + + <pageId>78</pageId> + <bandwidth /> + <timeSpent>52</timeSpent> + <timeSpentPretty>52s</timeSpentPretty> + <generationTimeMilliseconds>23</generationTimeMilliseconds> + <generationTime>0.02s</generationTime> + <interactionPosition>9</interactionPosition> + <title /> + <subtitle>http://piwik.net/blog/category/meta/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://piwik.net/faq/</url> + <pageTitle /> + <pageIdAction>2</pageIdAction> + + + <pageId>71</pageId> + <bandwidth /> + <timeSpent>50</timeSpent> + <timeSpentPretty>50s</timeSpentPretty> + <generationTimeMilliseconds>234</generationTimeMilliseconds> + <generationTime>0.23s</generationTime> + <interactionPosition>2</interactionPosition> + <title /> + <subtitle>http://piwik.net/faq/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://piwik.net/faq/</url> + <pageTitle /> + <pageIdAction>2</pageIdAction> + + + <pageId>75</pageId> + <bandwidth /> + <timeSpent>49</timeSpent> + <timeSpentPretty>49s</timeSpentPretty> + <generationTimeMilliseconds>294</generationTimeMilliseconds> + <generationTime>0.29s</generationTime> + <interactionPosition>6</interactionPosition> + <title /> + <subtitle>http://piwik.net/faq/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://piwik.net/faq/</url> + <pageTitle /> + <pageIdAction>2</pageIdAction> + + + <pageId>79</pageId> + <bandwidth /> + <timeSpent>26</timeSpent> + <timeSpentPretty>26s</timeSpentPretty> + <generationTimeMilliseconds>237</generationTimeMilliseconds> + <generationTime>0.24s</generationTime> + <interactionPosition>10</interactionPosition> + <title /> + <subtitle>http://piwik.net/faq/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://piwik.net/blog/category/community/</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <pageId>72</pageId> + <bandwidth /> + <timeSpent>26</timeSpent> + <timeSpentPretty>26s</timeSpentPretty> + <generationTimeMilliseconds>1324</generationTimeMilliseconds> + <generationTime>1.32s</generationTime> + <interactionPosition>3</interactionPosition> + <title /> + <subtitle>http://piwik.net/blog/category/community/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://piwik.net/blog/category/community/</url> + <pageTitle /> + <pageIdAction>3</pageIdAction> + + + <pageId>76</pageId> + <bandwidth /> + <timeSpent>7</timeSpent> + <timeSpentPretty>7s</timeSpentPretty> + <generationTimeMilliseconds>624</generationTimeMilliseconds> + <generationTime>0.62s</generationTime> + <interactionPosition>7</interactionPosition> + <title /> + <subtitle>http://piwik.net/blog/category/community/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://piwik.net/docs/manage-websites/</url> + <pageTitle /> + <pageIdAction>4</pageIdAction> + + + <pageId>73</pageId> + <bandwidth /> + <timeSpent>8</timeSpent> + <timeSpentPretty>8s</timeSpentPretty> + <generationTimeMilliseconds>543</generationTimeMilliseconds> + <generationTime>0.54s</generationTime> + <interactionPosition>4</interactionPosition> + <title /> + <subtitle>http://piwik.net/docs/manage-websites/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + <row> + <type>action</type> + <url>http://piwik.net/docs/manage-websites/</url> + <pageTitle /> + <pageIdAction>4</pageIdAction> + + + <pageId>77</pageId> + <bandwidth /> + <generationTimeMilliseconds>343</generationTimeMilliseconds> + <generationTime>0.34s</generationTime> + <interactionPosition>8</interactionPosition> + <title /> + <subtitle>http://piwik.net/docs/manage-websites/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>0 M</bandwidth_pretty> + </row> + </actionDetails> + <goalConversions>1</goalConversions> + <siteCurrency>USD</siteCurrency> + <siteCurrencySymbol>$</siteCurrencySymbol> + + + + + <siteName>Piwik test</siteName> + + + + + + + <userId /> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.svg</visitConvertedIcon> + <visitCount>1</visitCount> + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> + <daysSinceFirstVisit>0</daysSinceFirstVisit> + <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> + <visitDuration>54</visitDuration> + <visitDurationPretty>54s</visitDurationPretty> + <searches>0</searches> + <actions>10</actions> + <interactions>10</interactions> + <referrerType>direct</referrerType> + <referrerTypeName>Direct Entry</referrerTypeName> + <referrerName /> + <referrerKeyword /> + <referrerKeywordPosition /> + <referrerUrl /> + <referrerSearchEngineUrl /> + <referrerSearchEngineIcon /> + <referrerSocialNetworkUrl /> + <referrerSocialNetworkIcon /> + <languageCode /> + <language>Unknown</language> + <deviceType>Unknown</deviceType> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> + <deviceBrand>Unknown</deviceBrand> + <deviceModel>Unknown</deviceModel> + <operatingSystem>Unknown</operatingSystem> + <operatingSystemName>Unknown</operatingSystemName> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> + <operatingSystemCode>UNK</operatingSystemCode> + <operatingSystemVersion>UNK</operatingSystemVersion> + <browserFamily /> + <browserFamilyDescription>Unknown</browserFamilyDescription> + <browser>Unknown</browser> + <browserName>Unknown</browserName> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> + <browserCode>UNK</browserCode> + <browserVersion /> + <totalEcommerceRevenue>0</totalEcommerceRevenue> + <totalEcommerceConversions>0</totalEcommerceConversions> + <totalEcommerceItems>0</totalEcommerceItems> + <totalAbandonedCartsRevenue>0</totalAbandonedCartsRevenue> + <totalAbandonedCarts>0</totalAbandonedCarts> + <totalAbandonedCartsItems>0</totalAbandonedCartsItems> + <events>0</events> + <continent>Asia</continent> + <continentCode>asi</continentCode> + <country>Japan</country> + <countryCode>jp</countryCode> + <countryFlag>plugins/Morpheus/icons/dist/flags/jp.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>Japan</location> + <visitLocalTime>08:10:38</visitLocalTime> + <visitLocalHour>8</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <customVariables> + </customVariables> + <resolution>unknown</resolution> + <plugins /> + <pluginsIcons /> + </row> + <row> + <idSite>1</idSite> + <idVisit>62</idVisit> + <visitIp>175.41.191.47</visitIp> + + <actionDetails> + <row> + <type>action</type> + <url>http://www.notdatefiltered.com/blog/category/meta/</url> + <pageTitle /> + <pageIdAction>60</pageIdAction> + + + <pageId>84</pageId> + <bandwidth>3574</bandwidth> + <interactionPosition>1</interactionPosition> + <title /> + <subtitle>http://www.notdatefiltered.com/blog/category/meta/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>84</goalPageId> + + <url>http://www.notdatefiltered.com/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion + all ($ 5 revenue) + + + + 1 + USD + $ + + + + + Piwik test + + + + + + + + new + + 1 + plugins/Morpheus/images/goal.svg + 1 + none + + 0 + 0 + 0 + 0s + 0 + 1 + 1 + direct + Direct Entry + + + + + + + + + + Unknown + Desktop + plugins/Morpheus/icons/dist/devices/desktop.png + Apple + Generic Desktop + Mac 10.6 + Mac + plugins/Morpheus/icons/dist/os/MAC.png + MAC + 10.6 + WebKit + WebKit (Safari, Chrome) + RockMelt 0.9 + RockMelt + plugins/Morpheus/icons/dist/browsers/RM.png + RM + 0.9 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + Asia + asi + Singapore + sg + plugins/Morpheus/icons/dist/flags/sg.png + + + + Singapore + 08:10:38 + 8 + 0 + + + unknown + + + + + 1 + 27 + 0.0.0.0 + + + + action + http://example.org/index.htm + incredible title! + 29 + + + 30 + 43 + 1 + incredible title! + http://example.org/index.htm + plugins/Morpheus/images/action.svg + + + + _pks + SKU2 + + + _pkn + PRODUCT name + + + _pkc + Electronics & Cameras + + + 43 B + + + goal + all + 1 + 5 + 30 + + http://example.org/index.htm + plugins/Morpheus/images/goal.svg + Goal conversion + all ($ 5 revenue) + + + + 1 + USD + $ + + + + + Piwik test + + + + + + + + new + + 1 + plugins/Morpheus/images/goal.svg + 1 + none + + 0 + 0 + 0 + 0s + 0 + 1 + 1 + website + Websites + piwik.org + + + http://piwik.org/contribute% + + + + + + Unknown + Desktop + plugins/Morpheus/icons/dist/devices/desktop.png + Unknown + Generic Desktop + Windows XP + Windows + plugins/Morpheus/icons/dist/os/WIN.png + WIN + XP + Trident + Trident (IE) + Internet Explorer 6.0 + Internet Explorer + plugins/Morpheus/icons/dist/browsers/IE.png + IE + 6.0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + Unknown + unk + Unknown + xx + plugins/Morpheus/icons/dist/flags/xx.png + + + + Unknown + 12:34:06 + 12 + 0 + + + VisitorType + NewLoggedOut + + + 1024x768 + cookie, flash, java + + + plugins/Morpheus/icons/dist/plugins/cookie.png + cookie + + + plugins/Morpheus/icons/dist/plugins/flash.png + flash + + + plugins/Morpheus/icons/dist/plugins/java.png + java + + + + + 1 + 28 + 0.0.0.0 + + + + action + http://forum.piwik.org/register.php?0,approve=9a94a02145599 + Piwik Forums + 31 + + + 31 + 43 + 1 + Piwik Forums + http://forum.piwik.org/register.php?0,approve=9a94a02145599 + plugins/Morpheus/images/action.svg + + + + HTTP-code + 200 + + + 43 B + + + goal + all + 1 + 5 + 31 + + http://forum.piwik.org/register.php?0,approve=9a94a02145599 + plugins/Morpheus/images/goal.svg + Goal conversion + all ($ 5 revenue) + + + + 1 + USD + $ + + + + + Piwik test + + + + + + + + returning + plugins/Live/images/returningVisitor.png + 1 + plugins/Morpheus/images/goal.svg + 1 + none + + 0 + 0 + 0 + 0s + 0 + 1 + 1 + website + Websites + sn110w.snt110.mail.live.com + + + http://sn110w.snt110.mail.live.com/mail/InboxLight.aspx?n=184083971 + + + + + + Unknown + Desktop + plugins/Morpheus/icons/dist/devices/desktop.png + Unknown + Generic Desktop + Windows XP + Windows + plugins/Morpheus/icons/dist/os/WIN.png + WIN + XP + WebKit + WebKit (Safari, Chrome) + Chrome 11.0 + Chrome + plugins/Morpheus/icons/dist/browsers/CH.png + CH + 11.0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + Unknown + unk + Unknown + xx + plugins/Morpheus/icons/dist/flags/xx.png + + + + Unknown + 08:00:47 + 8 + 444 + + + Forum status + Anonymous + + + 1280x800 + cookie, director, flash, gears, java, pdf, windowsmedia + + + plugins/Morpheus/icons/dist/plugins/cookie.png + cookie + + + plugins/Morpheus/icons/dist/plugins/director.png + director + + + plugins/Morpheus/icons/dist/plugins/flash.png + flash + + + plugins/Morpheus/icons/dist/plugins/gears.png + gears + + + plugins/Morpheus/icons/dist/plugins/java.png + java + + + plugins/Morpheus/icons/dist/plugins/pdf.png + pdf + + + plugins/Morpheus/icons/dist/plugins/windowsmedia.png + windowsmedia + + + + + 1 + 25 + 175.41.192.41 + + + + action + http://piwik.net/blog/category/meta/ + + 1 + + + 28 + 3574 + 1 + + <subtitle>http://piwik.net/blog/category/meta/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>28</goalPageId> + + <url>http://piwik.net/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion + all ($ 5 revenue) + + + + 1 + USD + $ + + + + + Piwik test + + + + + + + + new + + 1 + plugins/Morpheus/images/goal.svg + 1 + none + + 0 + 0 + 0 + 0s + 0 + 1 + 1 + direct + Direct Entry + + + + + + + + + + Unknown + Desktop + plugins/Morpheus/icons/dist/devices/desktop.png + Apple + Generic Desktop + Mac 10.6 + Mac + plugins/Morpheus/icons/dist/os/MAC.png + MAC + 10.6 + WebKit + WebKit (Safari, Chrome) + RockMelt 0.9 + RockMelt + plugins/Morpheus/icons/dist/browsers/RM.png + RM + 0.9 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + Asia + asi + Japan + jp + plugins/Morpheus/icons/dist/flags/jp.png + + + + Japan + 20:15:41 + 20 + 0 + + + Not-Bot + Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24 + + + unknown + + + + + 1 + 26 + ::ffff:123.45.67.89 + + + + action + http://piwik.net/blog/category/meta/ + + 1 + + + 29 + 3574 + 1 + + <subtitle>http://piwik.net/blog/category/meta/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>29</goalPageId> + + <url>http://piwik.net/blog/category/meta/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion + all ($ 5 revenue) + + + + 1 + USD + $ + + + + + Piwik test + + + + + + + + new + + 1 + plugins/Morpheus/images/goal.svg + 1 + none + + 0 + 0 + 0 + 0s + 0 + 1 + 1 + direct + Direct Entry + + + + + + + + + + Unknown + Desktop + plugins/Morpheus/icons/dist/devices/desktop.png + Apple + Generic Desktop + Mac 10.6 + Mac + plugins/Morpheus/icons/dist/os/MAC.png + MAC + 10.6 + WebKit + WebKit (Safari, Chrome) + RockMelt 0.9 + RockMelt + plugins/Morpheus/icons/dist/browsers/RM.png + RM + 0.9 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + Asia + asi + South Korea + kr + plugins/Morpheus/icons/dist/flags/kr.png + Seoul Teugbyeolsi + 11 + Seoul + Seoul, Seoul Teugbyeolsi, South Korea + 20:15:41 + 20 + 0 + + + Not-Bot + Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24 + + + unknown + + + + + 1 + 24 + 175.41.192.43 + + + + action + http://piwik.net/moved-permanently + 301/URL = http%3A%2F%2Fpiwik.net%2Fmoved-permanently + 25 + + + 26 + 3574 + 180 + 3 min 0s + 1 + 301/URL = http%3A%2F%2Fpiwik.net%2Fmoved-permanently + http://piwik.net/moved-permanently + plugins/Morpheus/images/action.svg + + + + HTTP-code + 301 + + + 3.5 K + + + goal + all + 1 + 5 + 26 + + http://piwik.net/moved-permanently + plugins/Morpheus/images/goal.svg + Goal conversion + all ($ 5 revenue) + + + + action + http://piwik.net/temp-redirect + 307/URL = http%3A%2F%2Fpiwik.net%2Ftemp-redirect + 27 + + + 27 + 3574 + 2 + 307/URL = http%3A%2F%2Fpiwik.net%2Ftemp-redirect + http://piwik.net/temp-redirect + plugins/Morpheus/images/action.svg + + + + HTTP-code + 307 + + + 3.5 K + + + 1 + USD + $ + + + + + Piwik test + + + + + + + + new + + 1 + plugins/Morpheus/images/goal.svg + 1 + none + + 0 + 0 + 182 + 3 min 2s + 0 + 2 + 2 + direct + Direct Entry + + + + + + + + + + Unknown + Desktop + plugins/Morpheus/icons/dist/devices/desktop.png + Apple + Generic Desktop + Mac 10.6 + Mac + plugins/Morpheus/icons/dist/os/MAC.png + MAC + 10.6 + WebKit + WebKit (Safari, Chrome) + RockMelt 0.9 + RockMelt + plugins/Morpheus/icons/dist/browsers/RM.png + RM + 0.9 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + Asia + asi + Japan + jp + plugins/Morpheus/icons/dist/flags/jp.png + + + + Japan + 19:12:40 + 19 + 0 + + + Not-Bot + Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24 + + + unknown + + + + + 1 + 23 + 175.41.192.42 + + + + download + http://piwik.net/thing.js + + 21 + + + 23 + 3574 + 61 + 1 min 1s + + plugins/Morpheus/images/download.svg + Download + http://piwik.net/thing.js + + + + HTTP-code + 200 + + + 3.5 K + + + download + http://piwik.net/thing.css + + 22 + + + 24 + 3574 + 61 + 1 min 1s + + plugins/Morpheus/images/download.svg + Download + http://piwik.net/thing.css + + + + HTTP-code + 200 + + + 3.5 K + + + download + http://piwik.net/other.png + + 23 + + + 25 + 3574 + + plugins/Morpheus/images/download.svg + Download + http://piwik.net/other.png + + + + HTTP-code + 200 + + + 3.5 K + + + 0 + USD + $ + + + + + Piwik test + + + + + + + + new + + 0 + + 1 + none + + 0 + 0 + 123 + 2 min 3s + 0 + 3 + 0 + direct + Direct Entry + + + + + + + + + + Unknown + Desktop + plugins/Morpheus/icons/dist/devices/desktop.png + Apple + Generic Desktop + Mac 10.6 + Mac + plugins/Morpheus/icons/dist/os/MAC.png + MAC + 10.6 + WebKit + WebKit (Safari, Chrome) + RockMelt 0.9 + RockMelt + plugins/Morpheus/icons/dist/browsers/RM.png + RM + 0.9 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + Asia + asi + Japan + jp + plugins/Morpheus/icons/dist/flags/jp.png + + + + Japan + 18:10:38 + 18 + 0 + + + Not-Bot + Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24 + + + unknown + + + + + 1 + 22 + 72.44.32.11 + + + + action + http://piwik.net/ + + 5 + + + 22 + 3574 + 1 + + <subtitle>http://piwik.net/</subtitle> + <icon>plugins/Morpheus/images/action.svg</icon> + + <customVariables> + <row> + <customVariablePageName1>HTTP-code</customVariablePageName1> + <customVariablePageValue1>200</customVariablePageValue1> + </row> + </customVariables> + <bandwidth_pretty>3.5 K</bandwidth_pretty> + </row> + <row> + <type>goal</type> + <goalName>all</goalName> + <goalId>1</goalId> + <revenue>5</revenue> + <goalPageId>22</goalPageId> + + <url>http://piwik.net/</url> + <icon>plugins/Morpheus/images/goal.svg</icon> + <title>Goal conversion + all ($ 5 revenue) + + + + 1 + USD + $ + + + + + Piwik test + + + + + + + + new + + 1 + plugins/Morpheus/images/goal.svg + 1 + none + + 0 + 0 + 0 + 0s + 0 + 1 + 1 + direct + Direct Entry + + + + + + + + + + Unknown + Unknown + plugins/Morpheus/icons/dist/devices/unknown.png + Unknown + Unknown + Bot + Bot + plugins/Morpheus/icons/dist/os/UNK.png + BOT + UNK + + Unknown + Unknown + Unknown + plugins/Morpheus/icons/dist/browsers/UNK.png + UNK + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + North America + amn + United States + us + plugins/Morpheus/icons/dist/flags/us.png + Virginia + VA + Ashburn + Ashburn, Virginia, United States + 17:48:08 + 17 + 0 + + + Bot + Googlebot/2.1 (+http://www.googlebot.com/bot.html) + + + unknown + + + + + 1 + 21 + 72.44.32.11 + + + + action + http://piwik.net/to-an-error + 500/URL = http%3A%2F%2Fpiwik.net%2Fto-an-error + 20 + + + 21 + 3574 + 1 + 500/URL = http%3A%2F%2Fpiwik.net%2Fto-an-error + http://piwik.net/to-an-error + plugins/Morpheus/images/action.svg + + + + HTTP-code + 500 + + + 3.5 K + + + goal + all + 1 + 5 + 21 + + http://piwik.net/to-an-error + plugins/Morpheus/images/goal.svg + Goal conversion + all ($ 5 revenue) + + + + 1 + USD + $ + + + + + Piwik test + + + + + + + + new + + 1 + plugins/Morpheus/images/goal.svg + 1 + none + + 0 + 0 + 0 + 0s + 0 + 1 + 1 + direct + Direct Entry + + + + + + + + + + Unknown + Desktop + plugins/Morpheus/icons/dist/devices/desktop.png + Unknown + Generic Desktop + Windows 7 + Windows + plugins/Morpheus/icons/dist/os/WIN.png + WIN + 7 + Trident + Trident (IE) + Internet Explorer 9.0 + Internet Explorer + plugins/Morpheus/icons/dist/browsers/IE.png + IE + 9.0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + North America + amn + United States + us + plugins/Morpheus/icons/dist/flags/us.png + Virginia + VA + Ashburn + Ashburn, Virginia, United States + 17:48:07 + 17 + 0 + + + Not-Bot + Mozilla/5.0 (compatible; MSIE 10.6; Windows NT 6.1; Trident/5.0; InfoPath.2; SLCC1; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; .NET CLR 2.0.50727) 3gpp-gba UNTRUSTED/1.0 + + + unknown + + + + \ No newline at end of file diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitFrequency.get_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitFrequency.get_day.xml new file mode 100644 index 000000000000..c41509991615 --- /dev/null +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitFrequency.get_day.xml @@ -0,0 +1,14 @@ + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + \ No newline at end of file diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitFrequency.get_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitFrequency.get_year.xml similarity index 100% rename from plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__VisitFrequency.get_year.xml rename to plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitFrequency.get_year.xml diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitsSummary.get_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitsSummary.get_day.xml new file mode 100644 index 000000000000..93a593f72a40 --- /dev/null +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitsSummary.get_day.xml @@ -0,0 +1,14 @@ + + + 11 + 0 + 11 + 11 + 11 + 11 + 0 + 1 + 100% + 1 + 0 + \ No newline at end of file diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitsSummary.get_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitsSummary.get_year.xml new file mode 100644 index 000000000000..5d42e5f7f4c1 --- /dev/null +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitsSummary.get_year.xml @@ -0,0 +1,12 @@ + + + 34 + 46 + 32 + 31 + 359 + 10 + 91% + 1.4 + 11 + \ No newline at end of file diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml index f52b09191996..0c309903aa46 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_month.xml @@ -1,17 +1,17 @@ - 32 + 33 1 - 32 - 35 - 30 - 30 + 33 + 36 + 31 + 31 305 3 94% 1.1 - 10 + 9 diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_year.xml index d35a916d0e19..52f8ea31e726 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_year.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchivedWithUrlEncoding_noOptions__VisitsSummary.get_year.xml @@ -1,10 +1,10 @@ - 33 - 45 - 31 - 30 + 34 + 46 + 32 + 31 359 10 91% diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml index f52b09191996..0c309903aa46 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_month.xml @@ -1,17 +1,17 @@ - 32 + 33 1 - 32 - 35 - 30 - 30 + 33 + 36 + 31 + 31 305 3 94% 1.1 - 10 + 9 diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_year.xml index d35a916d0e19..52f8ea31e726 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_year.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_segmentPreArchived_noOptions__VisitsSummary.get_year.xml @@ -1,10 +1,10 @@ - 33 - 45 - 31 - 30 + 34 + 46 + 32 + 31 359 10 91% diff --git a/plugins/CoreHome/Columns/VisitorDaysSinceFirst.php b/plugins/CoreHome/Columns/VisitorDaysSinceFirst.php index e0ce8fa5be79..736b19997911 100644 --- a/plugins/CoreHome/Columns/VisitorDaysSinceFirst.php +++ b/plugins/CoreHome/Columns/VisitorDaysSinceFirst.php @@ -29,6 +29,11 @@ class VisitorDaysSinceFirst extends VisitDimension */ public function onNewVisit(Request $request, Visitor $visitor, $action) { + // if the visitor is new, force days since first to 0, to ignore any potential bad values for _idts + if (!$visitor->isVisitorKnown()) { + return 0; + } + return $request->getDaysSinceFirstVisit(); } diff --git a/plugins/CoreHome/Tracker/VisitRequestProcessor.php b/plugins/CoreHome/Tracker/VisitRequestProcessor.php index c2a88e93d4eb..55d2938b7d22 100644 --- a/plugins/CoreHome/Tracker/VisitRequestProcessor.php +++ b/plugins/CoreHome/Tracker/VisitRequestProcessor.php @@ -112,6 +112,10 @@ public function processRequestParams(VisitProperties $visitProperties, Request $ $isNewVisit = $this->isVisitNew($visitProperties, $request); $request->setMetadata('CoreHome', 'isNewVisit', $isNewVisit); + if (!$isNewVisit) { // only copy over known visitor's information, if this is for an ongoing visit + $this->visitorRecognizer->updateVisitPropertiesFromLastVisitRow($visitProperties); + } + return false; } diff --git a/plugins/CoreVisualizations/Visualizations/Graph.php b/plugins/CoreVisualizations/Visualizations/Graph.php index 6cf4a2697a76..86cfd15787b5 100644 --- a/plugins/CoreVisualizations/Visualizations/Graph.php +++ b/plugins/CoreVisualizations/Visualizations/Graph.php @@ -103,7 +103,7 @@ public function isRowVisible($rowLabel) { $isVisible = true; if ('label' == $this->config->row_picker_match_rows_by) { - $isVisible = in_array($rowLabel, $this->config->rows_to_display); + $isVisible = in_array($rowLabel, $this->config->rows_to_display === false ? [] : $this->config->rows_to_display); } return $isVisible; diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable.php b/plugins/CoreVisualizations/Visualizations/HtmlTable.php index adcf8e2bda63..522eed6ae58d 100644 --- a/plugins/CoreVisualizations/Visualizations/HtmlTable.php +++ b/plugins/CoreVisualizations/Visualizations/HtmlTable.php @@ -10,6 +10,7 @@ use Piwik\API\Request as ApiRequest; use Piwik\Common; +use Piwik\DataTable\Row; use Piwik\Metrics; use Piwik\Period; use Piwik\Plugin\Visualization; @@ -104,4 +105,16 @@ protected function isPivoted() { return $this->requestConfig->pivotBy || Common::getRequestVar('pivotBy', ''); } + + /** + * Override to compute a custom cell HTML attributes (such as style). + * + * @param Row $row + * @param $column + * @return array Array of name => value pairs. + */ + public function getCellHtmlAttributes(Row $row, $column) + { + return null; + } } diff --git a/plugins/CoreVisualizations/javascripts/seriesPicker.js b/plugins/CoreVisualizations/javascripts/seriesPicker.js index 206ea750b444..7ed7c6ced7e9 100644 --- a/plugins/CoreVisualizations/javascripts/seriesPicker.js +++ b/plugins/CoreVisualizations/javascripts/seriesPicker.js @@ -91,7 +91,7 @@ + ' selected-rows="selectedRows"' + ' on-select="selectionChanged(columns, rows)"/>'; - this.domElem = $(seriesPicker); // TODO: don't know if this will work without a root scope + this.domElem = $(seriesPicker); $(this).trigger('placeSeriesPicker'); @@ -106,6 +106,8 @@ return; } + rows = rows.map(encodeURIComponent); + $(self).trigger('seriesPicked', [columns, rows]); // inform dashboard widget about changed parameters (to be restored on reload) diff --git a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig index 2d4a25e950b2..10c28ff40b00 100644 --- a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig +++ b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig @@ -38,7 +38,8 @@ class="{{ row.getMetadata('css_class') }} {% if rowHasSubtable %}subDataTable{% endif %}{% if shouldHighlightRow %} highlight{% endif %}{% if isSummaryRow %} summaryRow{% endif %}" {% if rowHasSubtable %}title="{{ 'CoreHome_ClickRowToExpandOrContract'|translate }}"{% endif %}> {% for column in properties.columns_to_display %} - + {% set cellAttributes = visualization.getCellHtmlAttributes(row, column) %} + {% include "@CoreHome/_dataTableCell.twig" with properties %} {% endfor %} diff --git a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml index de19b588f6d4..d6790fc1ae53 100644 --- a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml +++ b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getBrand_day.xml @@ -7,7 +7,7 @@ 2 0 1 - 0 + 6 4 diff --git a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml index b05ae7008741..6442db043739 100644 --- a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml +++ b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml @@ -7,7 +7,7 @@ 1 0 1 - 0 + 3 2 @@ -27,7 +27,7 @@ 1 0 1 - 0 + 3 2 diff --git a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml index bab8a9f0cf8a..069641e68997 100644 --- a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml +++ b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml @@ -7,7 +7,7 @@ 3 0 1 - 1084 + 1087 4 @@ -28,7 +28,7 @@ 3 0 2 - 721 + 724 2 diff --git a/plugins/Diagnostics/tests/Integration/Commands/AnalyzeArchiveTableTest.php b/plugins/Diagnostics/tests/Integration/Commands/AnalyzeArchiveTableTest.php index 1817a4d336fa..42833613dfc5 100644 --- a/plugins/Diagnostics/tests/Integration/Commands/AnalyzeArchiveTableTest.php +++ b/plugins/Diagnostics/tests/Integration/Commands/AnalyzeArchiveTableTest.php @@ -41,12 +41,12 @@ public function test_CommandOutput_IsAsExpected() +-------------------------------------------+------------+---------------+-------------+---------+-----------+----------------+-------------+-------------+ | Group | # Archives | # Invalidated | # Temporary | # Error | # Segment | # Numeric Rows | # Blob Rows | # Blob Data | +-------------------------------------------+------------+---------------+-------------+---------+-----------+----------------+-------------+-------------+ -| week[2010-03-01 - 2010-03-07] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 60 | 96 | %d | -| month[2010-03-01 - 2010-03-31] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 60 | 96 | %d | +| week[2010-03-01 - 2010-03-07] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 61 | 96 | %d | +| month[2010-03-01 - 2010-03-31] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 61 | 96 | %d | | day[2010-03-03 - 2010-03-03] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 0 | 0 | | | day[2010-03-04 - 2010-03-04] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 0 | 0 | | | day[2010-03-05 - 2010-03-05] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 0 | 0 | | -| day[2010-03-06 - 2010-03-06] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 60 | 72 | %d | +| day[2010-03-06 - 2010-03-06] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 61 | 72 | %d | | day[2010-03-07 - 2010-03-07] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 0 | 0 | | | day[2010-03-08 - 2010-03-08] idSite = 1 | 5 | 0 | 0 | 0 | 4 | 0 | 0 | | | week[2010-03-08 - 2010-03-14] idSite = 1 | 7 | 0 | 0 | 0 | 6 | 0 | 0 | | diff --git a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__UserId.getUsers_month.xml b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__UserId.getUsers_month.xml index 537029b08e7a..49a8e28d1d44 100644 --- a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__UserId.getUsers_month.xml +++ b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__UserId.getUsers_month.xml @@ -5,8 +5,8 @@ 45 70 3 - 25 - 25 + 24 + 26 0 11 11 diff --git a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__VisitsSummary.get_month.xml b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__VisitsSummary.get_month.xml index f22cfae43bbb..171c2ae454d2 100644 --- a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__VisitsSummary.get_month.xml +++ b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_all__VisitsSummary.get_month.xml @@ -5,8 +5,8 @@ 195 264 0 - 130 - 80 + 131 + 79 3 67% 1.4 diff --git a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__UserId.getUsers_month.xml b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__UserId.getUsers_month.xml index f88f48454a69..0be3977a33bd 100644 --- a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__UserId.getUsers_month.xml +++ b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__UserId.getUsers_month.xml @@ -5,8 +5,8 @@ 45 70 3 - 25 - 25 + 24 + 26 0 11 11 diff --git a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__VisitsSummary.get_month.xml b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__VisitsSummary.get_month.xml index 4e9a3bd8242d..97edda327c99 100644 --- a/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__VisitsSummary.get_month.xml +++ b/plugins/ExampleLogTables/tests/System/expected/test_ExampleLogTables_men__VisitsSummary.get_month.xml @@ -5,10 +5,10 @@ 57 88 0 - 32 - 31 + 33 + 30 3 - 56% + 58% 1.5 1 \ No newline at end of file diff --git a/plugins/Goals/Columns/Metrics/GoalConversionRate.php b/plugins/Goals/Columns/Metrics/GoalConversionRate.php index 9fb476044afc..f81d188248cc 100644 --- a/plugins/Goals/Columns/Metrics/GoalConversionRate.php +++ b/plugins/Goals/Columns/Metrics/GoalConversionRate.php @@ -52,7 +52,7 @@ public function format($value, Formatter $formatter) public function compute(Row $row) { $nbVisits = $this->getMetric($row, 'nb_visits'); - $conversions = $this->getMetric($row, Goals::makeGoalColumn($this->idGoal, 'nb_conversions')); + $conversions = $this->getMetric($row, Goals::makeGoalColumn($this->idGoal, 'nb_visits_converted')); return Piwik::getQuotientSafe($conversions, $nbVisits, GoalManager::REVENUE_PRECISION + 2); } diff --git a/plugins/Goals/tests/System/expected/test_trackGoals_oneConversionPerVisit__Goals.get_day.xml b/plugins/Goals/tests/System/expected/test_trackGoals_oneConversionPerVisit__Goals.get_day.xml index 2c07daa5b110..11192511004d 100644 --- a/plugins/Goals/tests/System/expected/test_trackGoals_oneConversionPerVisit__Goals.get_day.xml +++ b/plugins/Goals/tests/System/expected/test_trackGoals_oneConversionPerVisit__Goals.get_day.xml @@ -7,7 +7,7 @@ 3 2 1000 - 66.67% + 100% 0 0 0 diff --git a/plugins/Goals/tests/System/expected/test_trackGoals_oneConversionPerVisitshowAllGoalSpecificMetrics__Goals.get_day.xml b/plugins/Goals/tests/System/expected/test_trackGoals_oneConversionPerVisitshowAllGoalSpecificMetrics__Goals.get_day.xml index 61d25f1d4634..85320944d41f 100644 --- a/plugins/Goals/tests/System/expected/test_trackGoals_oneConversionPerVisitshowAllGoalSpecificMetrics__Goals.get_day.xml +++ b/plugins/Goals/tests/System/expected/test_trackGoals_oneConversionPerVisitshowAllGoalSpecificMetrics__Goals.get_day.xml @@ -13,7 +13,7 @@ 66.67% 33.33% 66.67% - 3 + 2 3 2 1000 @@ -23,10 +23,10 @@ 1 1 0 - 66.67% - 33.33% - 66.67% - 0 + 100% + 50% + 100% + 1 0 0 0 diff --git a/plugins/Goals/tests/System/expected/test_trackGoals_oneConversionPerVisitshowAllGoalSpecificMetrics_requestedColumns__Goals.get_day.xml b/plugins/Goals/tests/System/expected/test_trackGoals_oneConversionPerVisitshowAllGoalSpecificMetrics_requestedColumns__Goals.get_day.xml index a457e430c6fa..ffb10e4cc0d8 100644 --- a/plugins/Goals/tests/System/expected/test_trackGoals_oneConversionPerVisitshowAllGoalSpecificMetrics_requestedColumns__Goals.get_day.xml +++ b/plugins/Goals/tests/System/expected/test_trackGoals_oneConversionPerVisitshowAllGoalSpecificMetrics_requestedColumns__Goals.get_day.xml @@ -1,6 +1,6 @@ - 66.67% - 66.67% + 0% + 0% 0% \ No newline at end of file diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png index 60847a7c0935..de66647b677b 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bc3c513800c1574b598ac3a90e64de20a9df53b51b058ab63c106ff31299247 -size 401152 +oid sha256:aad3b53871687402544b5c57156ac0267d8a877d144b6f8bfb77e10d90a1d226 +size 406036 diff --git a/plugins/PrivacyManager/tests/Fixtures/MultipleSitesMultipleVisitsFixture.php b/plugins/PrivacyManager/tests/Fixtures/MultipleSitesMultipleVisitsFixture.php index bea167e3b288..e858b0cefe30 100644 --- a/plugins/PrivacyManager/tests/Fixtures/MultipleSitesMultipleVisitsFixture.php +++ b/plugins/PrivacyManager/tests/Fixtures/MultipleSitesMultipleVisitsFixture.php @@ -322,6 +322,7 @@ public function trackVisits($idSite, $numIterations) { for ($day = 0; $day < $numIterations; $day++) { // we track over several days to make sure we have some data to aggregate in week reports + // NOTE: some action times are out of order in visits on purpose if ($day > 0) { $this->trackingTime = Date::factory($this->dateTime)->addDay($day * 3)->getDatetime(); diff --git a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_allSitesAllDates.json b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_allSitesAllDates.json index b72d6b4b03c3..a2d3735a7427 100644 --- a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_allSitesAllDates.json +++ b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_allSitesAllDates.json @@ -11949,4 +11949,4 @@ "name": "My product 211" } ] -} +} \ No newline at end of file diff --git a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_anonymizeUserId.json b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_anonymizeUserId.json index 11f251897d43..60da4c0cf44e 100644 --- a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_anonymizeUserId.json +++ b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_anonymizeUserId.json @@ -4526,4 +4526,4 @@ "name": "My product 211" } ] -} +} \ No newline at end of file diff --git a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictDate.json b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictDate.json index 499ae92c7603..9280745a96e0 100644 --- a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictDate.json +++ b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictDate.json @@ -12398,4 +12398,4 @@ "name": "My product 211" } ] -} +} \ No newline at end of file diff --git a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictSites.json b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictSites.json index 640d1ad173c4..fee651760c16 100644 --- a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictSites.json +++ b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictSites.json @@ -12174,4 +12174,4 @@ "name": "My product 211" } ] -} +} \ No newline at end of file diff --git a/plugins/Referrers/Controller.php b/plugins/Referrers/Controller.php index 99eed03f2ca4..02be6bfac2b9 100644 --- a/plugins/Referrers/Controller.php +++ b/plugins/Referrers/Controller.php @@ -286,6 +286,7 @@ public function getEvolutionGraph($typeReferrer = false, array $columns = array( if ($visibleRows !== false) { // this happens when the row picker has been used $visibleRows = Piwik::getArrayFromApiParameter($visibleRows); + $visibleRows = array_map('urldecode', $visibleRows); // typeReferrer is redundant if rows are defined, so make sure it's not used $view->config->custom_parameters['typeReferrer'] = false; diff --git a/plugins/Referrers/tests/System/expected/test_phpSerialized__Referrers.getReferrerType_year.original b/plugins/Referrers/tests/System/expected/test_phpSerialized__Referrers.getReferrerType_year.original index 5952fe079ea49a33fae7b9457836b803b48d423b..6c9207ed0a40f2627e9f0a658a2ad9ca4f03e4d8 100644 GIT binary patch delta 27 fcmdlWwn1!z1QUyek*Vos8K#S1mf7ZyEcR>wZ9NB> delta 27 fcmdlWwn1!z1QUz7fq~&>8K#S1meJ;qEcR>wY#j%I diff --git a/plugins/SegmentEditor/tests/System/expected/test___VisitsSummary.get_autoArchiveSegmentPreprocessed.xml b/plugins/SegmentEditor/tests/System/expected/test___VisitsSummary.get_autoArchiveSegmentPreprocessed.xml index c8a2c198e873..8a30aedd0a13 100644 --- a/plugins/SegmentEditor/tests/System/expected/test___VisitsSummary.get_autoArchiveSegmentPreprocessed.xml +++ b/plugins/SegmentEditor/tests/System/expected/test___VisitsSummary.get_autoArchiveSegmentPreprocessed.xml @@ -6,7 +6,7 @@ 8 2 1 - 1621 + 1622 7 50% 4 diff --git a/plugins/SegmentEditor/tests/System/expected/test___VisitsSummary.get_customSegmentPreprocessed.xml b/plugins/SegmentEditor/tests/System/expected/test___VisitsSummary.get_customSegmentPreprocessed.xml index c8a2c198e873..8a30aedd0a13 100644 --- a/plugins/SegmentEditor/tests/System/expected/test___VisitsSummary.get_customSegmentPreprocessed.xml +++ b/plugins/SegmentEditor/tests/System/expected/test___VisitsSummary.get_customSegmentPreprocessed.xml @@ -6,7 +6,7 @@ 8 2 1 - 1621 + 1622 7 50% 4 diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php index d687709eb983..ce31f20bd076 100644 --- a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php +++ b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php @@ -118,7 +118,8 @@ private function trackVisits($visitorCount, $setIp = false, $useLocal = true, $d } $t->setTokenAuth(self::getTokenAuth()); for ($i = 0; $i != $visitorCount; ++$i) { - $t->setVisitorId( substr(md5($i + $calledCounter * 1000), 0, $t::LENGTH_VISITOR_ID)); + // NOTE: floor() is so some visits share the same visit ID + $t->setVisitorId( substr(md5(floor($i / 2) + $calledCounter * 1000), 0, $t::LENGTH_VISITOR_ID)); $userAgent = null; if ($setIp) { diff --git a/tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php b/tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php index c9c7576954a8..5a4e83fff397 100644 --- a/tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php +++ b/tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php @@ -167,6 +167,10 @@ protected function trackMovieWatchingIncludingInterval(PiwikTracker $vis) $this->setMovieEventCustomVar($vis); self::checkResponse($vis->doTrackEvent('Movie', 'play25%', 'Spirited Away (千と千尋の神隠し)')); + // trackEvent without a name + $this->moveTimeForward($vis, 150); + self::checkResponse($vis->doTrackEvent('Movie', 'Search')); + // taking 2+ hours break & resuming this epic moment of cinema $this->moveTimeForward($vis, 200); @@ -177,15 +181,8 @@ protected function trackMovieWatchingIncludingInterval(PiwikTracker $vis) $this->setMovieEventCustomVar($vis); self::checkResponse($vis->doTrackEvent('Movie', 'play75%', 'Spirited Away (千と千尋の神隠し)')); - // trackEvent without a name - $this->moveTimeForward($vis, 150); - self::checkResponse($vis->doTrackEvent('Movie', 'Search')); $this->moveTimeForward($vis, 251); self::checkResponse($vis->doTrackEvent('Movie', 'Search', 'Search query here')); - $this->moveTimeForward($vis, 352); - self::checkResponse($vis->doTrackEvent('Movie', 'Search')); - $this->moveTimeForward($vis, 453); - self::checkResponse($vis->doTrackEvent('Movie', 'Purchase')); $this->moveTimeForward($vis, 266); $this->setMovieEventCustomVar($vis); @@ -204,6 +201,11 @@ protected function trackMovieWatchingIncludingInterval(PiwikTracker $vis) $this->moveTimeForward($vis, 280); $this->setMovieEventCustomVar($vis); self::checkResponse($vis->doTrackEvent('event category ' . $append, 'event action '.$append, 'event name '.$append, 9.66)); + + $this->moveTimeForward($vis, 352); + self::checkResponse($vis->doTrackEvent('Movie', 'Search')); + $this->moveTimeForward($vis, 453); + self::checkResponse($vis->doTrackEvent('Movie', 'Purchase')); } private function setMusicEventCustomVar(PiwikTracker $vis) diff --git a/tests/PHPUnit/Fixtures/TwoSitesEcommerceOrderWithItems.php b/tests/PHPUnit/Fixtures/TwoSitesEcommerceOrderWithItems.php index ec1c2bc8f5fd..8454aeef8d33 100644 --- a/tests/PHPUnit/Fixtures/TwoSitesEcommerceOrderWithItems.php +++ b/tests/PHPUnit/Fixtures/TwoSitesEcommerceOrderWithItems.php @@ -144,7 +144,7 @@ protected function trackVisitsSite1($url, $orderId = '937nsjusu 3894', $orderId2 // we test that both the order, and the products, are not updated on subsequent "Receipt" views $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(2.2)->getDatetime()); $t->addEcommerceItem($sku = 'SKU2', $name = 'Canon SLR NOT!', $category = 'Electronics & Cameras NOT!', $price = 15000000000, $quantity = 10000); - self::checkResponse($t->doTrackEcommerceOrder($orderId2, $grandTotal = 20000000, $subTotal = 1500, $tax = 400, $shipping = 100, $discount = 0)); + self::checkTrackingFailureResponse($t->doTrackEcommerceOrder($orderId2, $grandTotal = 20000000, $subTotal = 1500, $tax = 400, $shipping = 100, $discount = 0)); // Leave with an opened cart // No category @@ -155,11 +155,11 @@ protected function trackVisitsSite1($url, $orderId = '937nsjusu 3894', $orderId2 // Record the same visit leaving twice an abandoned cart foreach (array(0, 5, 24) as $offsetHour) { $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour($offsetHour + 2.4)->getDatetime()); - // Also recording an order the day after + // Also recording an order the day after (purposefully using old order ID, it should be ignored by the tracker since it was used in a previous visit) if ($offsetHour >= 24) { $t->setDebugStringAppend("&_idvc=1"); $t->addEcommerceItem($sku = 'SKU2', $name = 'Canon SLR', $category = 'Electronics & Cameras', $price = 1500, $quantity = 1); - self::checkResponse($t->doTrackEcommerceOrder($orderId2, $grandTotal = 20000000, $subTotal = 1500, $tax = 400, $shipping = 100, $discount = 0)); + self::checkTrackingFailureResponse($t->doTrackEcommerceOrder($orderId2, $grandTotal = 20000000, $subTotal = 1500, $tax = 400, $shipping = 100, $discount = 0)); } // VIEW PRODUCT PAGES @@ -191,6 +191,7 @@ protected function trackVisitsSite1($url, $orderId = '937nsjusu 3894', $orderId2 // One more Ecommerce order, without any product in it, because we still track orders without products $t->setForceVisitDateTime(Date::factory($this->dateTime)->addHour(30.8)->getDatetime()); self::checkResponse($t->doTrackEcommerceOrder($orderId4, $grandTotal = 10000)); + return array($defaultInit, $t, $category, $price, $sku, $name, $quantity, $grandTotal, $orderId); } diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php index b75ae970a4ce..72e3151a51aa 100644 --- a/tests/PHPUnit/Framework/Fixture.php +++ b/tests/PHPUnit/Framework/Fixture.php @@ -642,6 +642,17 @@ public static function checkResponse($response) ); } + public static function checkTrackingFailureResponse($response) + { + $trans_gif_64 = "R0lGODlhAQABAIAAAAAAAAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=="; + $expectedResponse = base64_decode($trans_gif_64); + + self::assertContains($expectedResponse, $response); + self::assertContains('This resource is part of Matomo.', $response); + self::assertNotContains('Error', $response); + self::assertNotContains('Fatal', $response); + } + /** * Checks that the response from bulk tracking is a valid JSON * string. Will fail the test if JSON status is not success. diff --git a/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php b/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php index 40bb181feff7..0798bd5a850b 100644 --- a/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php +++ b/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php @@ -127,7 +127,7 @@ public function test_queryVisitsByDimension_withComplexDimensionSelect() 2 => '1', 3 => '1', 4 => '1', - 5 => '0', + 5 => '1', 6 => '1', 7 => '1', 39 => '0', diff --git a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php index 676be3e8753f..4d8836f13308 100644 --- a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php +++ b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php @@ -97,7 +97,11 @@ public function getApiForTesting() 'otherRequestParameters' => array( // when changing this, might also need to change the same line in OneVisitorTwoVisitsTest.php 'hideColumns' => 'nb_users,sum_bandwidth,nb_hits_with_bandwidth,min_bandwidth,max_bandwidth', - ) + ), + 'xmlFieldsToRemove' => [ + 'entry_sum_visit_length', + 'sum_visit_length', + ], ); /** @@ -162,7 +166,11 @@ public function getApiForTesting() // system settings such as enable_plugin_update_communication are enabled by default in newest version, // but ugpraded Piwik are not - 'CorePluginsAdmin.getSystemSettings' + 'CorePluginsAdmin.getSystemSettings', + + // visit length changes slightly with change to previous visitor detection in #13935 + 'VisitsSummary.getSumVisitsLength', + 'VisitsSummary.getSumVisitsLengthPretty', ); $apiNotToCall = array_merge($apiNotToCall, $reportsToCompareSeparately); diff --git a/tests/PHPUnit/System/TrackerTest.php b/tests/PHPUnit/System/TrackerTest.php index cc627d2cbf9f..560e284bf2a5 100644 --- a/tests/PHPUnit/System/TrackerTest.php +++ b/tests/PHPUnit/System/TrackerTest.php @@ -148,6 +148,25 @@ public function test_trackingEcommerceOrder_DoesNotFail_WhenNonArrayUsedWithEcom $this->assertEquals(0, count($this->getConversionItems())); } + public function test_trackingEcommerceOrder_FailsWhenNonUniqueOrderIsUsed() + { + $ecItems = array(array("\"scarysku&", "superscarymovie'", 'scary <> movies', 12.99, 1)); + + $urlToTest = $this->getEcommerceItemsUrl($ecItems); + + $response = $this->sendTrackingRequestByCurl($urlToTest); + Fixture::checkResponse($response); + + $this->assertEquals(1, $this->getCountOfConversions()); + $this->assertEquals(1, count($this->getConversionItems())); + + $response = $this->sendTrackingRequestByCurl($urlToTest); + $this->assertContains('This resource is part of Matomo.', $response); + + $this->assertEquals(1, $this->getCountOfConversions()); + $this->assertEquals(1, count($this->getConversionItems())); + } + public function test_trackingWithLangParameter_ForwardsLangParameter_ToDefaultLocationProvider() { LocationProvider::$providers = null; diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Actions.getPageUrls_day.xml index 4020d6e47796..eea13d15e3e3 100644 --- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__Actions.getPageUrls_day.xml @@ -51,7 +51,7 @@ 1 1 7 - 1621 + 0 0 180 @@ -72,7 +72,7 @@ 0.134 1 1 - 0 + 1 1 0 @@ -95,7 +95,7 @@ 1 1 1 - 0 + 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml index cc96799a612c..33dabc663766 100644 --- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml @@ -6,7 +6,7 @@ 2 8 7 - 1621 + 1 2 operatingSystemCode==WXP;operatingSystemVersion==XP diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserCountry.getCountry_day.xml index 9a80fd221e0a..fd8023e64288 100644 --- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__UserCountry.getCountry_day.xml @@ -6,7 +6,7 @@ 2 8 7 - 1621 + 1 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Goals.get_day.xml index fa1dba18f057..05cc959a7a22 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Goals.get_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Goals.get_day.xml @@ -7,7 +7,7 @@ 3 1 31 - 10% + 50% 0 0 0 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index 68318d12a8bf..4d4bc94359d8 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -8,11 +8,11 @@ event - http://example.org/movies - 16 + http://example.org/finishedMovie + 26 - 24 + 27 Movie Purchase @@ -39,8 +39,8 @@ - new - + returning + plugins/Live/images/returningVisitor.png 0 1 @@ -133,11 +133,11 @@ event - http://example.org/movies - 16 + http://example.org/finishedMovie + 26 - 23 + 26 Movie Search @@ -164,8 +164,8 @@ - new - + returning + plugins/Live/images/returningVisitor.png 0 1 @@ -252,7 +252,7 @@ 1 - 2 + 3 156.5.3.2 @@ -262,7 +262,7 @@ 16 - 19 + 20 Movie play50% @@ -282,7 +282,7 @@ 16 - 20 + 21 Movie play75% @@ -322,7 +322,7 @@ 16 - 25 + 23 Movie playEnd @@ -342,7 +342,7 @@ - 26 + 24 Movie rating @@ -360,10 +360,10 @@ event http://example.org/finishedMovie - 27 + 26 - 27 + 25 event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <--- event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <--- @@ -392,8 +392,8 @@ - new - + returning + plugins/Live/images/returningVisitor.png 0 1 @@ -480,7 +480,7 @@ 1 - 3 + 2 156.5.3.2 @@ -490,7 +490,7 @@ 16 - 21 + 19 Movie Search @@ -517,8 +517,8 @@ - new - + returning + plugins/Live/images/returningVisitor.png 0 1 @@ -1172,11 +1172,11 @@ event - http://example.org/movies - 16 + http://example.org/finishedMovie + 26 - 47 + 50 Movie Purchase @@ -1203,8 +1203,8 @@ - new - + returning + plugins/Live/images/returningVisitor.png 0 1 @@ -1293,11 +1293,11 @@ event - http://example.org/movies - 16 + http://example.org/finishedMovie + 26 - 46 + 49 Movie Search @@ -1324,8 +1324,8 @@ - new - + returning + plugins/Live/images/returningVisitor.png 0 1 @@ -1408,7 +1408,7 @@ 1 - 7 + 8 111.1.1.1 @@ -1418,7 +1418,7 @@ 16 - 42 + 43 Movie play50% @@ -1438,7 +1438,7 @@ 16 - 43 + 44 Movie play75% @@ -1478,7 +1478,7 @@ 16 - 48 + 46 Movie playEnd @@ -1498,7 +1498,7 @@ - 49 + 47 Movie rating @@ -1516,10 +1516,10 @@ event http://example.org/finishedMovie - 27 + 26 - 50 + 48 event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <--- event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <--- @@ -1548,8 +1548,8 @@ - new - + returning + plugins/Live/images/returningVisitor.png 0 1 @@ -1632,7 +1632,7 @@ 1 - 8 + 7 111.1.1.1 @@ -1642,7 +1642,7 @@ 16 - 44 + 42 Movie Search @@ -1669,8 +1669,8 @@ - new - + returning + plugins/Live/images/returningVisitor.png 0 1 diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index 7098adfbda1d..ecc87ee6072e 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -8,11 +8,11 @@ event - http://example.org/movies - 16 + http://example.org/finishedMovie + 26 - 70 + 73 Movie Purchase @@ -39,8 +39,8 @@ - new - + returning + plugins/Live/images/returningVisitor.png 0 1 @@ -129,11 +129,11 @@ event - http://example.org/movies - 16 + http://example.org/finishedMovie + 26 - 69 + 72 Movie Search @@ -160,8 +160,8 @@ - new - + returning + plugins/Live/images/returningVisitor.png 0 1 @@ -244,7 +244,7 @@ 1 - 12 + 13 111.1.1.2 @@ -254,7 +254,7 @@ 16 - 65 + 66 Movie play50% @@ -274,7 +274,7 @@ 16 - 66 + 67 Movie play75% @@ -314,7 +314,7 @@ 16 - 71 + 69 Movie playEnd @@ -334,7 +334,7 @@ - 72 + 70 Movie rating @@ -352,10 +352,10 @@ event http://example.org/finishedMovie - 27 + 26 - 73 + 71 event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <--- event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <--- @@ -384,8 +384,8 @@ - new - + returning + plugins/Live/images/returningVisitor.png 0 1 @@ -468,7 +468,7 @@ 1 - 13 + 12 111.1.1.2 @@ -478,7 +478,7 @@ 16 - 67 + 65 Movie Search @@ -505,8 +505,8 @@ - new - + returning + plugins/Live/images/returningVisitor.png 0 1 @@ -1021,11 +1021,11 @@ event - http://example.org/movies - 16 + http://example.org/finishedMovie + 26 - 24 + 27 Movie Purchase @@ -1052,8 +1052,8 @@ - new - + returning + plugins/Live/images/returningVisitor.png 0 1 @@ -1146,11 +1146,11 @@ event - http://example.org/movies - 16 + http://example.org/finishedMovie + 26 - 23 + 26 Movie Search @@ -1177,8 +1177,8 @@ - new - + returning + plugins/Live/images/returningVisitor.png 0 1 @@ -1265,7 +1265,7 @@ 1 - 2 + 3 156.5.3.2 @@ -1275,7 +1275,7 @@ 16 - 19 + 20 Movie play50% @@ -1295,7 +1295,7 @@ 16 - 20 + 21 Movie play75% @@ -1335,7 +1335,7 @@ 16 - 25 + 23 Movie playEnd @@ -1355,7 +1355,7 @@ - 26 + 24 Movie rating @@ -1373,10 +1373,10 @@ event http://example.org/finishedMovie - 27 + 26 - 27 + 25 event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <--- event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <--- @@ -1405,8 +1405,8 @@ - new - + returning + plugins/Live/images/returningVisitor.png 0 1 @@ -1493,7 +1493,7 @@ 1 - 3 + 2 156.5.3.2 @@ -1503,7 +1503,7 @@ 16 - 21 + 19 Movie Search @@ -1530,8 +1530,8 @@ - new - + returning + plugins/Live/images/returningVisitor.png 0 1 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml index 06417e5f2aad..b0b23db829b8 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Goals.getDaysToConversion_month.xml @@ -2,7 +2,7 @@ - 39 + 40 @@ -54,6 +54,6 @@ - 1 + 0 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index 9c34c291945b..a55cc90e3db5 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -237,7 +237,7 @@ 2 none - 181 + 0 0 81 1 min 21s @@ -552,7 +552,7 @@ 7 none - 17 + 0 0 34 34s @@ -1002,7 +1002,7 @@ 4 none - 3 + 0 0 0 0s @@ -1292,7 +1292,7 @@ 5 none - 1 + 0 0 0 0s @@ -1648,7 +1648,7 @@ 5 none - 30 + 0 0 0 0s @@ -3627,7 +3627,7 @@ 1 none - 444 + 0 0 0 0s diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml index 986f453cf930..fc239aed9731 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml @@ -211,7 +211,7 @@ 2 none - 181 + 0 0 80 1 min 20s @@ -500,7 +500,7 @@ 7 none - 17 + 0 0 33 33s @@ -924,7 +924,7 @@ 4 none - 3 + 0 0 0 0s @@ -1188,7 +1188,7 @@ 5 none - 1 + 0 0 0 0s @@ -1518,7 +1518,7 @@ 5 none - 30 + 0 0 0 0s @@ -1797,8 +1797,8 @@ - new - + returning + plugins/Live/images/returningVisitor.png 0 1 @@ -1934,7 +1934,7 @@ 1 none - 444 + 0 0 0 0s diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__VisitFrequency.get_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__VisitFrequency.get_range.xml index 31c9d4b1b5c1..dcc17319f575 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__VisitFrequency.get_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__VisitFrequency.get_range.xml @@ -1,12 +1,12 @@ - 10 - 12 + 11 + 13 0 - 8 + 9 113 2 - 80% + 82% 1.2 - 11 + 10 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml index ab2c50f4cf68..90ace52b948e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml @@ -2,12 +2,12 @@ - 5 + 4 visitorType==new - 3 + 4 daysSinceLastVisit==0 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml index 6c319576b333..68b2d497aacc 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml @@ -303,7 +303,7 @@ 5 none - 101 + 0 51 0 0s diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml index 778e59292c32..10f07ddf04b9 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml @@ -68,10 +68,10 @@ 5 none - 101 + 100 51 - 0 - 0s + 1 + 1s 0 1 1 @@ -454,7 +454,7 @@ 5 none - 101 + 0 51 0 0s diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml index 5c196770429a..4bd684c32050 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml @@ -436,7 +436,7 @@ 5 none - 101 + 0 51 0 0s @@ -798,10 +798,10 @@ 5 none - 101 + 100 51 - 0 - 0s + 1 + 1s 0 1 1 @@ -1184,7 +1184,7 @@ 5 none - 101 + 0 51 0 0s diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml index 5c196770429a..4bd684c32050 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml @@ -436,7 +436,7 @@ 5 none - 101 + 0 51 0 0s @@ -798,10 +798,10 @@ 5 none - 101 + 100 51 - 0 - 0s + 1 + 1s 0 1 1 @@ -1184,7 +1184,7 @@ 5 none - 101 + 0 51 0 0s diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index 5f3ce1e11ba6..1f1215728392 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -436,7 +436,7 @@ 5 none - 101 + 0 51 0 0s @@ -798,10 +798,10 @@ 5 none - 101 + 100 51 - 0 - 0s + 1 + 1s 0 1 1 @@ -1184,7 +1184,7 @@ 5 none - 101 + 0 51 0 0s @@ -1546,10 +1546,10 @@ 5 none - 101 + 100 51 - 0 - 0s + 1 + 1s 0 1 1 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml index f20ee4b5253c..96d29e8c4d9d 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml @@ -5,7 +5,7 @@ 8 23 5 - 6484 + 6485 4 @@ -36,7 +36,7 @@ 6 16 5 - 4863 + 4865 3 @@ -166,7 +166,7 @@ 2 5 4 - 1621 + 1622 1 @@ -199,7 +199,7 @@ 2 5 4 - 1621 + 1622 1 @@ -230,7 +230,7 @@ 2 5 4 - 1621 + 1622 1 @@ -261,7 +261,7 @@ 2 5 4 - 1621 + 1622 1 @@ -323,7 +323,7 @@ 2 5 4 - 1621 + 1622 1 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml index 0569de72bda5..9fedfcc0e7b3 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml @@ -5,7 +5,7 @@ 20 56 5 - 16210 + 16214 10 @@ -30,7 +30,7 @@ 9 23 5 - 6484 + 6486 5 @@ -55,7 +55,7 @@ 4 10 4 - 3242 + 3244 2 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml index c4558671c169..82b63f81f94a 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml @@ -5,7 +5,7 @@ 10 28 5 - 8105 + 8107 5 @@ -33,7 +33,7 @@ 6 16 5 - 4863 + 4865 3 @@ -61,7 +61,7 @@ 4 11 5 - 3242 + 3243 2 @@ -117,7 +117,7 @@ 2 5 4 - 1621 + 1622 1 @@ -173,7 +173,7 @@ 2 5 4 - 1621 + 1622 1 @@ -229,7 +229,7 @@ 2 5 4 - 1621 + 1622 1 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml index 2faf49e7c222..21989c4589b1 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml @@ -5,7 +5,7 @@ 8 23 5 - 6484 + 6485 4 @@ -34,7 +34,7 @@ 6 16 5 - 4863 + 4865 3 @@ -64,7 +64,7 @@ 6 17 5 - 4863 + 4864 3 @@ -94,7 +94,7 @@ 4 11 5 - 3242 + 3243 2 @@ -154,7 +154,7 @@ 2 5 4 - 1621 + 1622 1 @@ -214,7 +214,7 @@ 2 5 4 - 1621 + 1622 1 @@ -244,7 +244,7 @@ 2 5 4 - 1621 + 1622 1 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_getCountry_with_filter_excludelowpop__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_getCountry_with_filter_excludelowpop__UserCountry.getCountry_month.xml index 32819809460c..cc33379e4b8a 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_getCountry_with_filter_excludelowpop__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_getCountry_with_filter_excludelowpop__UserCountry.getCountry_month.xml @@ -5,7 +5,7 @@ 10 28 5 - 8105 + 8107 5 @@ -33,7 +33,7 @@ 6 16 5 - 4863 + 4865 3 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml index 48db8ab5dbcf..d8bc26728d64 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml @@ -5,7 +5,7 @@ 10 28 5 - 8105 + 8107 5 @@ -33,7 +33,7 @@ 4 11 5 - 3242 + 3243 2 @@ -117,7 +117,7 @@ 2 5 4 - 1621 + 1622 1 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml index cb1ce9b492b2..1d4c53af8cf4 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml @@ -5,7 +5,7 @@ 6 16 5 - 4863 + 4865 3 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml index 0fa12f42c6e0..f9e2d43c8af8 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml @@ -5,7 +5,7 @@ 6 16 5 - 4863 + 4865 3 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml index 5c1e0ee7b7bf..fc45fd1b28b7 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml @@ -5,7 +5,7 @@ 6 16 5 - 4863 + 4865 3 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml index 5b6c579fd902..491375f7c497 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml @@ -5,7 +5,7 @@ 6 16 5 - 4863 + 4865 3 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml index 3ac9b4ac0809..abd0c8000d03 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml @@ -38,7 +38,7 @@ 2 5 4 - 1621 + 1622 1 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml index e0af0dd2f03e..16e1d8654a54 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml @@ -5,7 +5,7 @@ 6 17 5 - 4863 + 4864 3 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml index 4b743fcad0e2..6720719693e0 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml @@ -5,7 +5,7 @@ 6 17 5 - 4863 + 4864 3 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml index 92d58fd6709d..910d8e57a38d 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml @@ -5,7 +5,7 @@ 6 17 5 - 4863 + 4864 3 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageTitles_day.xml index fb8bff196a1b..53c16b144e02 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageTitles_day.xml @@ -11,7 +11,7 @@ 0.134 1 1 - 0 + 1 1 1 0 @@ -34,7 +34,7 @@ 1 1 1 - 0 + 1 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml index 84fa59f5ba49..2c76f8f5edba 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getEntryPageUrls_day.xml @@ -34,7 +34,7 @@ 0.134 1 1 - 0 + 1 1 1 0 @@ -57,7 +57,7 @@ 1 1 1 - 0 + 1 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageTitles_day.xml index 1213b053e9b6..c90f6ed41188 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageTitles_day.xml @@ -11,7 +11,7 @@ 0.134 1 1 - 0 + 1 1 1 0 @@ -34,7 +34,7 @@ 1 1 1 - 0 + 1 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml index bfa6bf705412..6b5125d418fd 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getExitPageUrls_day.xml @@ -31,7 +31,7 @@ 0.134 1 1 - 0 + 1 1 1 0 @@ -54,7 +54,7 @@ 1 1 1 - 0 + 1 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitle_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitle_day.xml index 22dba00ee336..2bba7ca57f09 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitle_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitle_day.xml @@ -13,7 +13,7 @@ 1 1 1 - 0 + 1 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml index cacb4e2af623..e1d4019187d4 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageTitles_day.xml @@ -11,7 +11,7 @@ 0.134 1 1 - 0 + 1 1 1 0 @@ -34,7 +34,7 @@ 1 1 1 - 0 + 1 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml index 85575f281522..0349f2d4aea7 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Actions.getPageUrls_day.xml @@ -72,7 +72,7 @@ 0.134 1 1 - 0 + 1 1 1 0 @@ -95,7 +95,7 @@ 1 1 1 - 0 + 1 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml index 68eb0c2cb1ae..eade44823176 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrand_day.xml @@ -6,7 +6,7 @@ 2 8 7 - 1621 + 1622 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml index 5b118e92d70a..25b7e8001f4f 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserEngines_day.xml @@ -6,7 +6,7 @@ 2 8 7 - 1621 + 1622 1 2 browserEngine==Gecko diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml index fdae1ac533f3..3134a830bd37 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml @@ -6,7 +6,7 @@ 2 8 7 - 1621 + 1622 1 2 plugins/Morpheus/icons/dist/browsers/FF.png diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml index dc67261f58a7..d46e2e94ee1c 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml @@ -6,7 +6,7 @@ 2 8 7 - 1621 + 1622 1 2 browserCode==FF;browserVersion==3.6 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml index 3c5c78e32f43..a07764bd2f63 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml @@ -6,7 +6,7 @@ 2 8 7 - 1621 + 1622 1 2 plugins/Morpheus/icons/dist/browsers/FF.png diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml index cf258224550e..cc79e1c5564d 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml @@ -6,7 +6,7 @@ 2 8 7 - 1621 + 1622 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml index e97badfc7a62..6a02ad5741b1 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml @@ -6,7 +6,7 @@ 2 8 7 - 1621 + 1622 1 2 plugins/Morpheus/icons/dist/os/WIN.png diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml index 24cf680d07b0..3a614ec88e61 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml @@ -6,7 +6,7 @@ 2 8 7 - 1621 + 1622 1 2 operatingSystemCode==WIN;operatingSystemVersion==XP diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml index 80be0570eb1e..994ae6f78071 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getType_day.xml @@ -6,7 +6,7 @@ 2 8 7 - 1621 + 1622 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml index 71fa45b399e5..d4a8ca8cd49a 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getAll_day.xml @@ -6,7 +6,7 @@ 1 1 1 - 0 + 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml index 58e9ba46bb11..4ffc46cba81d 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getKeywords_day.xml @@ -6,7 +6,7 @@ 1 1 1 - 0 + 1 1 @@ -25,7 +25,7 @@ 1 1 1 - 0 + 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml index fd2de0737385..54375ecc6b4e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getReferrerType_day.xml @@ -6,7 +6,7 @@ 1 1 1 - 0 + 1 1 @@ -25,7 +25,7 @@ 1 1 1 - 0 + 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml index 822ff82c398f..f8ff217d2399 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml @@ -6,7 +6,7 @@ 1 1 1 - 0 + 1 1 @@ -27,7 +27,7 @@ 1 1 1 - 0 + 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getConfiguration_day.xml index 318d2a33750e..853619166efc 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getConfiguration_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getConfiguration_day.xml @@ -6,7 +6,7 @@ 2 8 7 - 1621 + 1622 1 2 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml index 28af23e62d1d..0cebc949c9f2 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml @@ -6,7 +6,7 @@ 2 8 7 - 1621 + 1622 1 2 resolution==1024x768 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml index c0135236f8f2..3de8b0ec74f6 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml @@ -6,7 +6,7 @@ 2 8 7 - 1621 + 1622 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getContinent_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getContinent_day.xml index 280b7fd6fcda..b844d3722c43 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getContinent_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getContinent_day.xml @@ -6,7 +6,7 @@ 2 8 7 - 1621 + 1622 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml index 9a80fd221e0a..4f2064602fe0 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml @@ -6,7 +6,7 @@ 2 8 7 - 1621 + 1622 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml index be4c941999e8..516b5894ccdc 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml @@ -6,7 +6,7 @@ 2 8 7 - 1621 + 1622 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserLanguage.getLanguageCode_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserLanguage.getLanguageCode_day.xml index 6fb957f0f48f..93b6d80e40ee 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserLanguage.getLanguageCode_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserLanguage.getLanguageCode_day.xml @@ -6,7 +6,7 @@ 2 8 7 - 1621 + 1622 1 2 languageCode==fr diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserLanguage.getLanguage_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserLanguage.getLanguage_day.xml index bab68538ab1a..dc685f6a60b6 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserLanguage.getLanguage_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserLanguage.getLanguage_day.xml @@ -6,7 +6,7 @@ 2 8 7 - 1621 + 1622 1 2 languageCode==fr,languageCode=@fr- diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitFrequency.get_day.xml index eb4e37fdf707..d54302bd2e6a 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitFrequency.get_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitFrequency.get_day.xml @@ -5,9 +5,9 @@ 1 1 1 - 0 + 1 1 100% 1 - 0 + 1 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getByDayOfWeek_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getByDayOfWeek_day.xml index e715309206aa..2f80dd12d831 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getByDayOfWeek_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getByDayOfWeek_day.xml @@ -30,7 +30,7 @@ 2 1 8 - 1621 + 1622 1 2 6 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml index a35c24e46c25..bb6af8f12eba 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerLocalTime_day.xml @@ -138,7 +138,7 @@ 2 8 7 - 1621 + 1622 1 2 visitLocalHour==12 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml index 3a3139f24dcd..ebfe22b5952d 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitTime.getVisitInformationPerServerTime_day.xml @@ -146,7 +146,7 @@ 1 1 1 - 0 + 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLengthPretty_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLengthPretty_day.xml index c7ce53bdef20..92d0dcada9de 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLengthPretty_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLengthPretty_day.xml @@ -1,2 +1,2 @@ -27 min 1s \ No newline at end of file +27 min 2s \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLength_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLength_day.xml index f7692644ac2c..46e68040e9d7 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLength_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLength_day.xml @@ -1,2 +1,2 @@ -1621 \ No newline at end of file +1622 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml index 40498bf45d73..25d4229e22b1 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.get_day.xml @@ -5,7 +5,7 @@ 8 2 1 - 1621 + 1622 7 50% 4 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml index d071ca063657..4d1d70dd2ba2 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__subtable__API.getProcessedReport_week.xml @@ -74,7 +74,7 @@ 1 2 8 - 1621 + 1622 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json index d83bc11f1847..fd1dd5f53a4d 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_json__API.getBulkRequest.json @@ -1 +1 @@ -[{"2010-03-06":{"nb_uniq_visitors":1,"nb_users":0,"nb_visits":2,"nb_actions":8,"nb_visits_converted":2,"bounce_count":1,"sum_visit_length":1621,"max_actions":7,"bounce_rate":"50%","nb_actions_per_visit":4,"avg_time_on_site":811},"2010-03-07":[]},{"2010-03-06":{"nb_uniq_visitors":1,"nb_users":0,"nb_visits":2,"nb_actions":8,"nb_visits_converted":2,"bounce_count":1,"sum_visit_length":1621,"max_actions":7,"bounce_rate":"50%","nb_actions_per_visit":4,"avg_time_on_site":811},"2010-03-07":[]},[{"label":"0-10s","nb_visits":"1","segment":"visitDuration>=0;visitDuration<=10"},{"label":"11-30s","nb_visits":"0","segment":"visitDuration>=11;visitDuration<=30"},{"label":"31-60s","nb_visits":"0","segment":"visitDuration>=31;visitDuration<=60"},{"label":"1-2 min","nb_visits":"0","segment":"visitDuration>=60;visitDuration<=120"},{"label":"2-4 min","nb_visits":"0","segment":"visitDuration>=120;visitDuration<=240"},{"label":"4-7 min","nb_visits":"0","segment":"visitDuration>=240;visitDuration<=420"},{"label":"7-10 min","nb_visits":"0","segment":"visitDuration>=420;visitDuration<=600"},{"label":"10-15 min","nb_visits":"0","segment":"visitDuration>=600;visitDuration<=900"},{"label":"15-30 min","nb_visits":"1","segment":"visitDuration>=900;visitDuration<=1800"},{"label":"30+ min","nb_visits":"0","segment":"visitDuration>=1801"}]] \ No newline at end of file +[{"2010-03-06":{"nb_uniq_visitors":1,"nb_users":0,"nb_visits":2,"nb_actions":8,"nb_visits_converted":2,"bounce_count":1,"sum_visit_length":1622,"max_actions":7,"bounce_rate":"50%","nb_actions_per_visit":4,"avg_time_on_site":811},"2010-03-07":[]},{"2010-03-06":{"nb_uniq_visitors":1,"nb_users":0,"nb_visits":2,"nb_actions":8,"nb_visits_converted":2,"bounce_count":1,"sum_visit_length":1622,"max_actions":7,"bounce_rate":"50%","nb_actions_per_visit":4,"avg_time_on_site":811},"2010-03-07":[]},[{"label":"0-10s","nb_visits":"1","segment":"visitDuration>=0;visitDuration<=10"},{"label":"11-30s","nb_visits":"0","segment":"visitDuration>=11;visitDuration<=30"},{"label":"31-60s","nb_visits":"0","segment":"visitDuration>=31;visitDuration<=60"},{"label":"1-2 min","nb_visits":"0","segment":"visitDuration>=60;visitDuration<=120"},{"label":"2-4 min","nb_visits":"0","segment":"visitDuration>=120;visitDuration<=240"},{"label":"4-7 min","nb_visits":"0","segment":"visitDuration>=240;visitDuration<=420"},{"label":"7-10 min","nb_visits":"0","segment":"visitDuration>=420;visitDuration<=600"},{"label":"10-15 min","nb_visits":"0","segment":"visitDuration>=600;visitDuration<=900"},{"label":"15-30 min","nb_visits":"1","segment":"visitDuration>=900;visitDuration<=1800"},{"label":"30+ min","nb_visits":"0","segment":"visitDuration>=1801"}]] \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml index 5dec81a951c8..fae1cfbd60c2 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_bulk_xml__API.getBulkRequest.xml @@ -8,7 +8,7 @@ 8 2 1 - 1621 + 1622 7 50% 4 @@ -25,7 +25,7 @@ 8 2 1 - 1621 + 1622 7 50% 4 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_csv__API.get_month.csv index 2ff47c1417552ee7bf5a3f260bebbc19751c26e7..334234d98c26921b128471ae90f4f89093031a1a 100644 GIT binary patch delta 19 bcmbQlKZ$?C12#sZ$q(6784V}1vv&gkLU;xV delta 19 bcmbQlKZ$?C12#s($q(6784V`0vv&gkLTCmD diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml index 1114c6bf1cee..8e97cd40bc4e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml @@ -79,7 +79,7 @@ 0 0 8 - 1621 + 1622 1 2 3 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageTitles_day.xml index 6a4f62e81156..057c97be8bbb 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageTitles_day.xml @@ -14,7 +14,7 @@ 1 1 - 0 + 1 1 1 0 @@ -40,7 +40,7 @@ 1 1 1 - 0 + 1 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml index 3edb37d4ef66..2efebb9d834a 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getEntryPageUrls_day.xml @@ -40,7 +40,7 @@ 1 1 - 0 + 1 1 1 0 @@ -66,7 +66,7 @@ 1 1 1 - 0 + 1 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageTitles_day.xml index 3a3385fde5d3..a7e541a5162d 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageTitles_day.xml @@ -14,7 +14,7 @@ 1 1 - 0 + 1 1 1 0 @@ -40,7 +40,7 @@ 1 1 1 - 0 + 1 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml index e03b77270439..25f48ca674ef 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getExitPageUrls_day.xml @@ -38,7 +38,7 @@ 1 1 - 0 + 1 1 1 0 @@ -64,7 +64,7 @@ 1 1 1 - 0 + 1 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitle_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitle_day.xml index 1052f04a2888..cace1f264009 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitle_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitle_day.xml @@ -16,7 +16,7 @@ 1 1 1 - 0 + 1 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml index b786ac89d080..e536f2a0e4e8 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageTitles_day.xml @@ -14,7 +14,7 @@ 1 1 - 0 + 1 1 1 0 @@ -40,7 +40,7 @@ 1 1 1 - 0 + 1 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml index 0dd1d7bc9633..a580726e4272 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Actions.getPageUrls_day.xml @@ -85,7 +85,7 @@ 1 1 - 0 + 1 1 1 0 @@ -111,7 +111,7 @@ 1 1 1 - 0 + 1 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml index 8c9d60e70108..3eb73dbae5ba 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrand_day.xml @@ -7,7 +7,7 @@ 9 0 8 - 1621 + 1622 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserEngines_day.xml index 14c3dc0d5237..a35b1c484ccc 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserEngines_day.xml @@ -7,7 +7,7 @@ 9 0 8 - 1621 + 1622 1 2 browserEngine==Gecko diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml index 70be9097820c..37b45aa307bb 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml @@ -7,7 +7,7 @@ 9 0 8 - 1621 + 1622 1 2 plugins/Morpheus/icons/dist/browsers/FF.png diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml index 741d8d0537a7..ff8eae17fe7a 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml @@ -7,7 +7,7 @@ 9 0 8 - 1621 + 1622 1 2 browserCode==FF;browserVersion==3.6 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml index 743078e0262e..ce0cfc0c057b 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml @@ -7,7 +7,7 @@ 9 0 8 - 1621 + 1622 1 2 plugins/Morpheus/icons/dist/browsers/FF.png diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml index 4cbaeef25653..eeeeec726a8f 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml @@ -7,7 +7,7 @@ 9 0 8 - 1621 + 1622 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml index 55011bb7df29..5683c4ef195c 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml @@ -7,7 +7,7 @@ 9 0 8 - 1621 + 1622 1 2 plugins/Morpheus/icons/dist/os/WIN.png diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml index c80d98672ca4..d57f0c947d27 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml @@ -7,7 +7,7 @@ 9 0 8 - 1621 + 1622 1 2 operatingSystemCode==WIN;operatingSystemVersion==XP diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml index fc8095c42a44..f8ec1d8996aa 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getType_day.xml @@ -7,7 +7,7 @@ 9 0 8 - 1621 + 1622 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index 48ec7c911b32..8432da89a8a9 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml @@ -62,8 +62,8 @@ 0 0 - 0 - 0s + 1 + 1s 0 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml index 1a2fcfb27851..b529af5997b2 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getAll_day.xml @@ -7,7 +7,7 @@ 1 0 1 - 0 + 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml index 0776d8038e0d..c8e175d51e85 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getKeywords_day.xml @@ -7,7 +7,7 @@ 1 0 1 - 0 + 1 1 @@ -27,7 +27,7 @@ 1 0 1 - 0 + 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml index e4b6ce2e005b..85a5c52e65d4 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getReferrerType_day.xml @@ -7,7 +7,7 @@ 1 0 1 - 0 + 1 1 @@ -27,7 +27,7 @@ 1 0 1 - 0 + 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml index db567687381d..17eb6ecefb81 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml @@ -7,7 +7,7 @@ 1 0 1 - 0 + 1 1 @@ -29,7 +29,7 @@ 1 0 1 - 0 + 1 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml index 7a36771e5eba..a9cfb9555621 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml @@ -7,7 +7,7 @@ 9 0 8 - 1621 + 1622 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml index dd647ae66e63..0f2eb2dc8219 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getContinent_day.xml @@ -7,7 +7,7 @@ 9 0 8 - 1621 + 1622 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml index 45bb6b9f1817..dab87109ed2c 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml @@ -7,7 +7,7 @@ 9 0 8 - 1621 + 1622 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml index d1663e0ee4e5..6dd3ae3aa4d7 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml @@ -7,7 +7,7 @@ 9 0 8 - 1621 + 1622 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml index 3633fe591455..8cddd44053b7 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitFrequency.get_day.xml @@ -6,9 +6,9 @@ 1 1 1 - 0 + 1 1 100% 1 - 0 + 1 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getByDayOfWeek_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getByDayOfWeek_day.xml index 16a8a552ba0d..3f6963bc4a12 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getByDayOfWeek_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getByDayOfWeek_day.xml @@ -31,7 +31,7 @@ 1 9 0 - 1621 + 1622 1 2 6 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml index dfc1858282d9..336aedbb821a 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerLocalTime_day.xml @@ -151,7 +151,7 @@ 9 0 8 - 1621 + 1622 1 2 visitLocalHour==12 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml index d1041d26310d..0a4a3ac8bb7c 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitTime.getVisitInformationPerServerTime_day.xml @@ -159,7 +159,7 @@ 1 0 1 - 0 + 1 1 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLengthPretty_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLengthPretty_day.xml index c7ce53bdef20..92d0dcada9de 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLengthPretty_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLengthPretty_day.xml @@ -1,2 +1,2 @@ -27 min 1s \ No newline at end of file +27 min 2s \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLength_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLength_day.xml index f7692644ac2c..46e68040e9d7 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLength_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLength_day.xml @@ -1,2 +1,2 @@ -1621 \ No newline at end of file +1622 \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml index 9f63db28ef1c..3166abe1930f 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.get_day.xml @@ -6,7 +6,7 @@ 9 2 1 - 1621 + 1622 8 50% 4.5 diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml index c4e0e6f502f8..f506073cc84a 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml @@ -38,8 +38,8 @@ - new - + returning + plugins/Live/images/returningVisitor.png 0 1 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__API.getProcessedReport_day.xml index 97ab84ae2fc1..a3a0d914f661 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_Goals.getDaysToConversion_firstSite_lastN__API.getProcessedReport_day.xml @@ -109,12 +109,12 @@ - 0 + 2 $ 0 - 2 + 0 $ 0 @@ -186,12 +186,12 @@ - 0 + 2 $ 0 - 2 + 0 $ 0 @@ -263,12 +263,12 @@ - 0 + 2 $ 0 - 2 + 0 $ 0 @@ -340,12 +340,12 @@ - 0 + 1 $ 0 - 1 + 0 $ 0 @@ -417,12 +417,12 @@ - 0 + 1 $ 0 - 1 + 0 $ 0 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_day.xml index c12a5b867edd..2401b3cdce03 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_day.xml @@ -67,11 +67,11 @@ - 0 + 2 - 2 + 0 @@ -129,11 +129,11 @@ - 0 + 2 - 2 + 0 @@ -191,11 +191,11 @@ - 0 + 2 - 2 + 0 @@ -253,11 +253,11 @@ - 0 + 1 - 1 + 0 @@ -315,11 +315,11 @@ - 0 + 1 - 1 + 0 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_month.xml index 79e8e6807812..cf112fa670c7 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_month.xml @@ -8,7 +8,7 @@ - 0 + 2 @@ -20,7 +20,7 @@ - 2 + 1 @@ -36,7 +36,7 @@ - 3 + 2 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_week.xml index 1c68c1e0fb51..05c2f167beb0 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_week.xml @@ -66,7 +66,7 @@ - 0 + 2 @@ -78,7 +78,7 @@ - 2 + 1 @@ -90,7 +90,7 @@ - 1 + 0 @@ -148,11 +148,11 @@ - 0 + 1 - 3 + 2 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_year.xml index 722b21fb9381..6e34ed36389d 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__Goals.getDaysToConversion_year.xml @@ -8,7 +8,7 @@ - 0 + 2 @@ -20,7 +20,7 @@ - 2 + 1 @@ -36,7 +36,7 @@ - 3 + 2 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_day.xml index 4bd8b6ee0244..a5ea4f432606 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_day.xml @@ -66,11 +66,11 @@ - 0 + 2 - 2 + 0 @@ -128,11 +128,11 @@ - 0 + 2 - 2 + 0 @@ -190,11 +190,11 @@ - 0 + 2 - 2 + 0 @@ -252,11 +252,11 @@ - 0 + 1 - 1 + 0 @@ -314,11 +314,11 @@ - 0 + 1 - 1 + 0 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_month.xml index 0ca4a8164c41..49b21175e99f 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_month.xml @@ -7,7 +7,7 @@ - 0 + 2 @@ -19,7 +19,7 @@ - 2 + 1 @@ -35,7 +35,7 @@ - 3 + 2 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_week.xml index c7fca7df71fb..4cdb238c9310 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_week.xml @@ -65,7 +65,7 @@ - 0 + 2 @@ -77,7 +77,7 @@ - 2 + 1 @@ -89,7 +89,7 @@ - 1 + 0 @@ -147,11 +147,11 @@ - 0 + 1 - 3 + 2 diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_year.xml index 0d681eaadd03..f07d1e4c63bf 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___Goals.getDaysToConversion_year.xml @@ -7,7 +7,7 @@ - 0 + 2 @@ -19,7 +19,7 @@ - 2 + 1 @@ -35,7 +35,7 @@ - 3 + 2 diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml index c61ad5dc7045..01fd8ff974a9 100644 --- a/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml +++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId_segmentUserId__Goals.get_day.xml @@ -4,12 +4,12 @@ 1 0 50% - 1 - 1 + 0 + 0 0 - 50% - 0 - 0 + 0% + 1 + 1 0 - 0% + 100% \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv index 48b3245b437bec9defed7029a2e6b80af1540a2f..d72489946a4b2027496a4b0377a9e30386981a5c 100644 GIT binary patch delta 98 zcmbQ^`NMNV7>{5PLn=cFLn%WMLmopW5T{RO_0!7Bm0= delta 20 bcmez2ImdHD7!P|MLn=c#gU;riJoXX*PP7Jv diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Goals.get_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Goals.get_range.xml index 2c07daa5b110..11192511004d 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Goals.get_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Goals.get_range.xml @@ -7,7 +7,7 @@ 3 2 1000 - 66.67% + 100% 0 0 0 diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml index 73505be9bc17..7bd2d55282b3 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml @@ -29,8 +29,8 @@ Piwik test - new - + returning + plugins/Live/images/returningVisitor.png 0 1 diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index 73505be9bc17..7bd2d55282b3 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml @@ -29,8 +29,8 @@ Piwik test - new - + returning + plugins/Live/images/returningVisitor.png 0 1 diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml index 1d630481edf8..831a453214c1 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml @@ -62,8 +62,8 @@ - new - + returning + plugins/Live/images/returningVisitor.png 0 1 diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Goals.get_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Goals.get_range.xml index 2c07daa5b110..11192511004d 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Goals.get_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Goals.get_range.xml @@ -7,7 +7,7 @@ 3 2 1000 - 66.67% + 100% 0 0 0 diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml index 73505be9bc17..7bd2d55282b3 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml @@ -29,8 +29,8 @@ Piwik test - new - + returning + plugins/Live/images/returningVisitor.png 0 1 diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml index 73505be9bc17..7bd2d55282b3 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml @@ -29,8 +29,8 @@ Piwik test - new - + returning + plugins/Live/images/returningVisitor.png 0 1 diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml index 1d630481edf8..831a453214c1 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml @@ -62,8 +62,8 @@ - new - + returning + plugins/Live/images/returningVisitor.png 0 1 diff --git a/tests/PHPUnit/Unit/Tracker/RequestTest.php b/tests/PHPUnit/Unit/Tracker/RequestTest.php index a5554eff0791..38494a420fa9 100644 --- a/tests/PHPUnit/Unit/Tracker/RequestTest.php +++ b/tests/PHPUnit/Unit/Tracker/RequestTest.php @@ -162,7 +162,7 @@ public function test_getDaysSinceFirstVisit_TodayMinusHalfDay() { $request = $this->buildRequest(array('_idts' => '' . ($this->time - 43200))); $request->setIsAuthenticated(); - $this->assertEquals(1.0, $request->getDaysSinceFirstVisit()); + $this->assertEquals(0.0, $request->getDaysSinceFirstVisit()); } public function test_getDaysSinceFirstVisit_Yesterday() diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png index 418ca12bd59e..3b34ac300411 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:85f5c529c045728879f1681c383154136f8bb32bfc5e79ffcd88fce4920411a8 -size 4234964 +oid sha256:9f717f3cfd19c8f2167ca973f21c5026073b2b6750f0612e639c8269c1b1170d +size 4246372 From 7393e13b1cd8deda984037192d3d9c13e3cd67aa Mon Sep 17 00:00:00 2001 From: Thomas Steur Date: Wed, 13 Mar 2019 14:16:30 +1300 Subject: [PATCH 05/15] When dispatch is disabled via a constant, it should not be dispatched (#14034) * When dispatch is disabled via a constant, it should not be dispatched Eg when Matomo is not installed, it would still dispatch the request in https://github.com/matomo-org/matomo/blob/3.8.1-b1/plugins/Installation/Installation.php#L111 even when `PIWIK_ENABLE_DISPATCH` is disabled. Will set it to WIP for now as I'm not sure if we want to have this actually merged or not. * Update Installation.php * Use correct exception class * throw exception if one is given * adding a test * fix tests * trying to fix test --- .../Kernel/EnvironmentValidator.php | 2 +- plugins/Installation/Installation.php | 7 ++++++- plugins/Installation/tests/System/APITest.php | 7 +++++++ .../PHPUnit/proxy/nodispatchnotinstalled.php | 20 +++++++++++++++++++ 4 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 tests/PHPUnit/proxy/nodispatchnotinstalled.php diff --git a/core/Application/Kernel/EnvironmentValidator.php b/core/Application/Kernel/EnvironmentValidator.php index 862593a108dc..5efed4b666ec 100644 --- a/core/Application/Kernel/EnvironmentValidator.php +++ b/core/Application/Kernel/EnvironmentValidator.php @@ -77,7 +77,7 @@ private function checkConfigFileExists($path, $startInstaller = false) $message = $this->getSpecificMessageWhetherFileExistsOrNot($path); - $exception = new \Exception($message); + $exception = new NotYetInstalledException($message); if ($startInstaller) { $this->startInstallation($exception); diff --git a/plugins/Installation/Installation.php b/plugins/Installation/Installation.php index aa4ff1c6dfa3..a1d29643437a 100644 --- a/plugins/Installation/Installation.php +++ b/plugins/Installation/Installation.php @@ -107,8 +107,13 @@ public function dispatch($exception = null) $action = Common::getRequestVar('action', 'welcome', 'string'); - if ($this->isAllowedAction($action)) { + if ($this->isAllowedAction($action) && (!defined('PIWIK_ENABLE_DISPATCH') || PIWIK_ENABLE_DISPATCH)) { echo FrontController::getInstance()->dispatch('Installation', $action, array($message)); + } elseif (defined('PIWIK_ENABLE_DISPATCH') && !PIWIK_ENABLE_DISPATCH) { + if ($exception && $exception instanceof \Exception) { + throw $exception; + } + return; } else { Piwik::exitWithErrorMessage($this->getMessageToInviteUserToInstallPiwik($message)); } diff --git a/plugins/Installation/tests/System/APITest.php b/plugins/Installation/tests/System/APITest.php index d8ae5523c8a0..887e5e17ba9b 100644 --- a/plugins/Installation/tests/System/APITest.php +++ b/plugins/Installation/tests/System/APITest.php @@ -61,6 +61,13 @@ public function test_shouldReturnValidApiResponse_IfWrongDbInfo_formatJSON() $this->assertContains('Access denied', $data); } + public function test_shouldReturnEmptyResultWhenNotInstalledAndDispatchIsDisabled() + { + $url = Fixture::getTestRootUrl() . 'nodispatchnotinstalled.php'; + $response = $this->sendHttpRequest($url); + $this->assertSame('', $response['data']); + } + private function getUrl() { return Fixture::getRootUrl() . 'tests/PHPUnit/proxy/index.php?module=API&method=API.getPiwikVersion'; diff --git a/tests/PHPUnit/proxy/nodispatchnotinstalled.php b/tests/PHPUnit/proxy/nodispatchnotinstalled.php new file mode 100644 index 000000000000..f4fabeecf1b8 --- /dev/null +++ b/tests/PHPUnit/proxy/nodispatchnotinstalled.php @@ -0,0 +1,20 @@ +configFileLocal = PIWIK_INCLUDE_PATH . "tmp/test.config.ini.php"; +$testEnvironment->save(); + +Environment::setGlobalEnvironmentManipulator(new TestingEnvironmentManipulator($testEnvironment)); + +include PIWIK_INCLUDE_PATH . '/index.php'; \ No newline at end of file From 285f28470d5e8eacf0b6238c03be47f6673e4e24 Mon Sep 17 00:00:00 2001 From: diosmosis Date: Wed, 13 Mar 2019 20:51:38 -0700 Subject: [PATCH 06/15] Do not run cron archiving last run check if matomo is not installed. (#14202) --- plugins/Diagnostics/Diagnostic/CronArchivingLastRunCheck.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/Diagnostics/Diagnostic/CronArchivingLastRunCheck.php b/plugins/Diagnostics/Diagnostic/CronArchivingLastRunCheck.php index b5e47b62de5b..0ec276258899 100644 --- a/plugins/Diagnostics/Diagnostic/CronArchivingLastRunCheck.php +++ b/plugins/Diagnostics/Diagnostic/CronArchivingLastRunCheck.php @@ -15,6 +15,7 @@ use Piwik\Metrics\Formatter; use Piwik\Option; use Piwik\Plugins\Intl\DateTimeFormatProvider; +use Piwik\SettingsPiwik; use Piwik\Translation\Translator; /** @@ -36,6 +37,10 @@ public function __construct(Translator $translator) public function execute() { + if (!SettingsPiwik::isMatomoInstalled()) { + return []; + } + $label = $this->translator->translate('Diagnostics_CronArchivingLastRunCheck'); $commandToRerun = '' . $this->getArchivingCommand() . ''; $coreArchiveShort = 'core:archive'; From 8f77ece35b3058251c4450b6d15f3d73df8bd825 Mon Sep 17 00:00:00 2001 From: Stefan Giehl Date: Thu, 14 Mar 2019 20:26:26 +0100 Subject: [PATCH 07/15] Show device type and model in realtime map tooltip (#14204) * Realtime map improvements * updates ui file --- plugins/UserCountryMap/javascripts/realtime-map.js | 12 +++++++----- .../UIIntegrationTest_visitors_realtime_map.png | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/plugins/UserCountryMap/javascripts/realtime-map.js b/plugins/UserCountryMap/javascripts/realtime-map.js index 37431da68b48..6bd2dfe0f6cb 100644 --- a/plugins/UserCountryMap/javascripts/realtime-map.js +++ b/plugins/UserCountryMap/javascripts/realtime-map.js @@ -141,7 +141,7 @@ filter_limit: maxVisits, showColumns: ['latitude', 'longitude', 'actions', 'lastActionTimestamp', 'visitLocalTime', 'city', 'country', 'countryCode', 'referrerType', 'referrerName', - 'referrerTypeName', 'browserIcon', 'operatingSystemIcon', + 'referrerTypeName', 'browserIcon', 'operatingSystemIcon', 'deviceType', 'deviceModel', 'countryFlag', 'idVisit', 'actionDetails', 'continentCode', 'actions', 'searches', 'goalConversions', 'visitorId', 'userId'].join(','), minTimestamp: firstRun ? 0 : lastTimestamp @@ -212,18 +212,20 @@ var ds = new Date().getTime() / 1000 - r.lastActionTimestamp, ad = r.actionDetails, ico = function (src) { return ' '; }; - return '

' + (r.city ? r.city + ' / ' : '') + r.country + '

' + + return '

' + (r.city ? $('').text(r.city).html() + ' / ' : '') + $('').text(r.country).html() + '

' + // icons ico(r.countryFlag) + ico(r.browserIcon) + ico(r.operatingSystemIcon) + '
' + + // device type, model, brand + r.deviceType + ' (' + r.deviceModel + ')
' + // User ID - (r.userId ? _pk_translate('General_UserId') + ': ' + r.userId + '
' : '') + + (r.userId ? _pk_translate('General_UserId') + ': ' + $('').text(r.userId).html() + '
' : '') + // last action - (ad && ad.length && ad[ad.length - 1].pageTitle ? '' + ad[ad.length - 1].pageTitle + '
' : '') + + (ad && ad.length && ad[ad.length - 1].pageTitle ? '' + $('').text(ad[ad.length - 1].pageTitle).html() + '
' : '') + // time of visit '
' + relativeTime(ds) + '
' + // either from or direct (r.referrerType == "direct" ? r.referrerTypeName : - _.from + ': ' + r.referrerName) + '
' + + _.from + ': ' + $('').text(r.referrerName).html()) + '
' + // local time '' + _.local_time + ': ' + r.visitLocalTime + '
' + // goals, if available diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png index a46983301ab2..fe753bfd1464 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f49f00003da7d2a94ce181a1b0724dcd336f989152798ca3c367b921cf6cf39 -size 112446 +oid sha256:525e387bf59440a8a015dca0d0a573e6003f6516c6f476b24d4efc976a593f6a +size 114885 From 00d15def20e9654d5855326012099a0c8654e3cb Mon Sep 17 00:00:00 2001 From: Thomas Steur Date: Fri, 15 Mar 2019 08:29:01 +1300 Subject: [PATCH 08/15] Ignore config files placed in misc folder in fileintegrity check (#14203) Follow up from https://github.com/matomo-org/matomo/pull/13999 where we allowed to place config files in misc/user directory. These need to be ignored in the file check --- config/global.php | 1 + 1 file changed, 1 insertion(+) diff --git a/config/global.php b/config/global.php index b9eca9e9b0e6..eba7b5269de9 100644 --- a/config/global.php +++ b/config/global.php @@ -111,6 +111,7 @@ 'misc/user/*png', 'misc/user/*svg', 'misc/user/*js', + 'misc/user/*/config.ini.php', 'misc/package', 'misc/package/WebAppGallery/*.xml', 'misc/package/WebAppGallery/install.sql', From 6d39aaaf57a710c0f8314a2165d295ffc054868f Mon Sep 17 00:00:00 2001 From: Stefan Giehl Date: Thu, 14 Mar 2019 20:30:25 +0100 Subject: [PATCH 09/15] Revert icon changes and add new property iconSVG instead (#14199) * Revert icon changes and add new property iconSVG instead * update test files --- ...ITest__Live.getLastVisitsDetails_range.xml | 441 ++- plugins/Actions/VisitorDetails.php | 24 +- ...ontents__Live.getLastVisitsDetails_day.xml | 78 +- ...tents__Live.getLastVisitsDetails_month.xml | 78 +- ...onMatch__Live.getLastVisitsDetails_day.xml | 78 +- ...etMatch__Live.getLastVisitsDetails_day.xml | 78 +- ...ceMatch__Live.getLastVisitsDetails_day.xml | 78 +- ...Options__Live.getLastVisitsDetails_day.xml | 60 +- ...ptions__Live.getLastVisitsDetails_year.xml | 93 +- ...temTest__Live.getLastVisitsDetails_day.xml | 6 +- ...Ordered__Live.getLastVisitsDetails_day.xml | 18 +- ...thItems__Live.getLastVisitsDetails_day.xml | 54 +- plugins/Events/VisitorDetails.php | 3 +- plugins/Live/templates/_actionCommon.twig | 6 +- plugins/Live/templates/_actionEcommerce.twig | 2 +- plugins/Live/templates/_actionGoal.twig | 2 +- .../Live/templates/getLastVisitsStart.twig | 12 +- .../test___Live.getVisitorProfile.xml | 30 +- ...llSites__Live.getLastVisitsDetails_day.xml | 6 +- ...st_higherLimit__Live.getVisitorProfile.xml | 60 +- ..._maxVisitLimit__Live.getVisitorProfile.xml | 30 +- ...tiSites__Live.getLastVisitsDetails_day.xml | 6 +- ...lSites__Live.getLastVisitsDetails_year.xml | 2730 +++++++++++------ ...mEvents__Live.getLastVisitsDetails_day.xml | 162 +- ...vents__Live.getLastVisitsDetails_month.xml | 162 +- ...tLogs__Live.getLastVisitsDetails_range.xml | 387 ++- ...iteId__Live.getLastVisitsDetails_range.xml | 63 +- ...mit_1__Live.getLastVisitsDetails_month.xml | 45 +- ...mit_2__Live.getLastVisitsDetails_month.xml | 33 +- ...Visit__Live.getLastVisitsDetails_month.xml | 84 +- ...tDesc__Live.getLastVisitsDetails_month.xml | 84 +- ...eTest__Live.getLastVisitsDetails_month.xml | 129 +- ...Support__Live.getLastVisitsDetails_day.xml | 33 +- ...ecified__Live.getLastVisitsDetails_day.xml | 9 +- ...eDays__Live.getLastVisitsDetails_month.xml | 9 +- ...torId__Live.getLastVisitsDetails_month.xml | 42 +- ...tf8mb4__Live.getLastVisitsDetails_year.xml | 6 +- ...tadataAndNormalAPI__Live.getLastVisits.xml | 24 +- ...alAPI__Live.getLastVisitsDetails_range.xml | 24 +- ...taAndNormalAPI__Live.getVisitorProfile.xml | 9 +- ...malAPI_pagesegment__Live.getLastVisits.xml | 24 +- ...gment__Live.getLastVisitsDetails_range.xml | 24 +- ...PI_pagesegment__Live.getVisitorProfile.xml | 9 +- 43 files changed, 3553 insertions(+), 1782 deletions(-) diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index c5ba5f3ce7cd..5accd78890f1 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -18,7 +18,8 @@ 1 It's pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -30,7 +31,8 @@ 95 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -153,7 +155,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -165,7 +168,8 @@ 46 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -182,7 +186,8 @@ 3 min 0s Bring on the party 2 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search Bring on the party @@ -202,7 +207,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -219,7 +225,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file8.zip @@ -237,7 +244,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/8.html @@ -255,7 +263,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat8', Action: "Action8" Name8 @@ -386,7 +395,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -408,7 +418,8 @@ 45 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -539,7 +550,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -551,7 +563,8 @@ 41 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -564,7 +577,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -581,7 +595,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file7.zip @@ -599,7 +614,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/7.html @@ -617,7 +633,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat7', Action: "Action7" Name7 @@ -748,7 +765,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -770,7 +788,8 @@ 40 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -901,7 +920,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -913,7 +933,8 @@ 35 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -930,7 +951,8 @@ 3 min 0s Bring on the party 2 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search Bring on the party @@ -950,7 +972,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -967,7 +990,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file6.zip @@ -985,7 +1009,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/6.html @@ -1003,7 +1028,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat6', Action: "Action6" Name6 @@ -1134,7 +1160,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -1156,7 +1183,8 @@ 34 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -1287,7 +1315,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1299,7 +1328,8 @@ 30 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -1312,7 +1342,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -1329,7 +1360,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file5.zip @@ -1347,7 +1379,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/5.html @@ -1365,7 +1398,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat5', Action: "Action5" Name5 @@ -1496,7 +1530,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -1518,7 +1553,8 @@ 29 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -1649,7 +1685,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1661,7 +1698,8 @@ 24 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -1678,7 +1716,8 @@ 3 min 0s Bring on the party 2 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search Bring on the party @@ -1698,7 +1737,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -1715,7 +1755,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file4.zip @@ -1733,7 +1774,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/4.html @@ -1751,7 +1793,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat4', Action: "Action4" Name4 @@ -1882,7 +1925,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -1904,7 +1948,8 @@ 23 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -2035,7 +2080,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -2047,7 +2093,8 @@ 19 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -2060,7 +2107,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -2077,7 +2125,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file3.zip @@ -2095,7 +2144,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/3.html @@ -2113,7 +2163,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat3', Action: "Action3" Name3 @@ -2246,7 +2297,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -2258,7 +2310,8 @@ 80 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -2271,7 +2324,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -2288,7 +2342,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file3.zip @@ -2306,7 +2361,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/3.html @@ -2324,7 +2380,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat3', Action: "Action3" Name3 @@ -2447,7 +2504,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -2469,7 +2527,8 @@ 18 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -2598,7 +2657,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -2620,7 +2680,8 @@ 79 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -2751,7 +2812,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -2763,7 +2825,8 @@ 13 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -2780,7 +2843,8 @@ 3 min 0s Bring on the party 2 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search Bring on the party @@ -2800,7 +2864,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -2817,7 +2882,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file2.zip @@ -2835,7 +2901,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/2.html @@ -2853,7 +2920,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat2', Action: "Action2" Name2 @@ -2986,7 +3054,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -2998,7 +3067,8 @@ 74 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -3015,7 +3085,8 @@ 3 min 0s Bring on the party 2 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search Bring on the party @@ -3035,7 +3106,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -3052,7 +3124,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file2.zip @@ -3070,7 +3143,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/2.html @@ -3088,7 +3162,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat2', Action: "Action2" Name2 @@ -3211,7 +3286,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -3233,7 +3309,8 @@ 12 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -3362,7 +3439,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -3384,7 +3462,8 @@ 73 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -3515,7 +3594,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -3527,7 +3607,8 @@ 8 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -3540,7 +3621,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -3557,7 +3639,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file1.zip @@ -3575,7 +3658,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/1.html @@ -3593,7 +3677,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat1', Action: "Action1" Name1 @@ -3726,7 +3811,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -3738,7 +3824,8 @@ 58 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -3751,7 +3838,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -3768,7 +3856,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file1.zip @@ -3786,7 +3875,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/1.html @@ -3804,7 +3894,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat1', Action: "Action1" Name1 @@ -3937,7 +4028,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -3949,7 +4041,8 @@ 69 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -3962,7 +4055,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -3979,7 +4073,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file1.zip @@ -3997,7 +4092,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/1.html @@ -4015,7 +4111,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat1', Action: "Action1" Name1 @@ -4140,7 +4237,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -4152,7 +4250,8 @@ 91 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -4165,7 +4264,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -4182,7 +4282,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file1.zip @@ -4200,7 +4301,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/1.html @@ -4218,7 +4320,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat1', Action: "Action1" Name1 @@ -4349,7 +4452,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -4371,7 +4475,8 @@ 7 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -4500,7 +4605,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -4522,7 +4628,8 @@ 57 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -4651,7 +4758,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -4673,7 +4781,8 @@ 68 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -4802,7 +4911,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -4824,7 +4934,8 @@ 90 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -4955,7 +5066,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -4967,7 +5079,8 @@ 2 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -4984,7 +5097,8 @@ 3 min 0s Bring on the party 2 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search Bring on the party @@ -5004,7 +5118,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -5021,7 +5136,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file0.zip @@ -5039,7 +5155,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/0.html @@ -5057,7 +5174,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat0', Action: "Action0" Name0 @@ -5190,7 +5308,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -5202,7 +5321,8 @@ 52 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -5219,7 +5339,8 @@ 3 min 0s Bring on the party 2 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search Bring on the party @@ -5239,7 +5360,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -5256,7 +5378,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file0.zip @@ -5274,7 +5397,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/0.html @@ -5292,7 +5416,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat0', Action: "Action0" Name0 @@ -5425,7 +5550,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -5437,7 +5563,8 @@ 63 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -5454,7 +5581,8 @@ 3 min 0s Bring on the party 2 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search Bring on the party @@ -5474,7 +5602,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -5491,7 +5620,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file0.zip @@ -5509,7 +5639,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/0.html @@ -5527,7 +5658,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat0', Action: "Action0" Name0 @@ -5652,7 +5784,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -5664,7 +5797,8 @@ 85 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -5681,7 +5815,8 @@ 3 min 0s Bring on the party 2 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search Bring on the party @@ -5701,7 +5836,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -5718,7 +5854,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file0.zip @@ -5736,7 +5873,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/0.html @@ -5754,7 +5892,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat0', Action: "Action0" Name0 @@ -5885,7 +6024,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -5907,7 +6047,8 @@ 1 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -6036,7 +6177,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -6058,7 +6200,8 @@ 51 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -6187,7 +6330,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -6209,7 +6353,8 @@ 62 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -6338,7 +6483,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -6360,7 +6506,8 @@ 84 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) diff --git a/plugins/Actions/VisitorDetails.php b/plugins/Actions/VisitorDetails.php index c7bddf285248..86d869207416 100644 --- a/plugins/Actions/VisitorDetails.php +++ b/plugins/Actions/VisitorDetails.php @@ -147,7 +147,8 @@ public function extendActionDetails(&$action, $nextAction, $visitorDetails) switch ($action['type']) { case 'goal': - $action['icon'] = 'plugins/Morpheus/images/goal.svg'; + $action['icon'] = 'plugins/Morpheus/images/goal.png'; + $action['iconSVG'] = 'plugins/Morpheus/images/goal.svg'; $action['title'] = Piwik::translate('Goals_GoalConversion'); $action['subtitle'] = $action['goalName']; if (!empty($action['revenue'])) { @@ -156,7 +157,8 @@ public function extendActionDetails(&$action, $nextAction, $visitorDetails) break; case Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER: case Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART: - $action['icon'] = 'plugins/Morpheus/images/' . $action['type'] . '.svg'; + $action['icon'] = 'plugins/Morpheus/images/' . $action['type'] . '.png'; + $action['iconSVG'] = 'plugins/Morpheus/images/' . $action['type'] . '.svg'; if ($action['type'] == Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER) { $action['title'] = Piwik::translate('CoreHome_VisitStatusOrdered') . ' (' . $action['orderId'] . ')'; } else { @@ -169,10 +171,12 @@ public function extendActionDetails(&$action, $nextAction, $visitorDetails) break; case Action::TYPE_CONTENT: if (!empty($action['contentInteraction'])) { - $action['icon'] = 'plugins/Morpheus/images/contentinteraction.svg'; + $action['icon'] = 'plugins/Morpheus/images/contentinteraction.png'; + $action['iconSVG'] = 'plugins/Morpheus/images/contentinteraction.svg'; $action['title'] = Piwik::translate('Contents_ContentInteraction') . ' (' . $action['contentInteraction'] . ')'; } else { - $action['icon'] = 'plugins/Morpheus/images/contentimpression.svg'; + $action['icon'] = 'plugins/Morpheus/images/contentimpression.png'; + $action['iconSVG'] = 'plugins/Morpheus/images/contentimpression.svg'; $action['title'] = Piwik::translate('Contents_ContentImpression'); } @@ -183,19 +187,22 @@ public function extendActionDetails(&$action, $nextAction, $visitorDetails) break; case Action::TYPE_DOWNLOAD: $action['type'] = 'download'; - $action['icon'] = 'plugins/Morpheus/images/download.svg'; + $action['icon'] = 'plugins/Morpheus/images/download.png'; + $action['iconSVG'] = 'plugins/Morpheus/images/download.svg'; $action['title'] = Piwik::translate('General_Download'); $action['subtitle'] = $action['url']; break; case Action::TYPE_OUTLINK: $action['type'] = 'outlink'; - $action['icon'] = 'plugins/Morpheus/images/link.svg'; + $action['icon'] = 'plugins/Morpheus/images/link.png'; + $action['iconSVG'] = 'plugins/Morpheus/images/link.svg'; $action['title'] = Piwik::translate('General_Outlink'); $action['subtitle'] = $action['url']; break; case Action::TYPE_SITE_SEARCH: $action['type'] = 'search'; - $action['icon'] = 'plugins/Morpheus/images/search.svg'; + $action['icon'] = 'plugins/Morpheus/images/search.png'; + $action['iconSVG'] = 'plugins/Morpheus/images/search.svg'; $action['title'] = Piwik::translate('Actions_SubmenuSitesearch'); $action['subtitle'] = $action['siteSearchKeyword']; break; @@ -207,7 +214,8 @@ public function extendActionDetails(&$action, $nextAction, $visitorDetails) $action['subtitle'] = $action['url']; } $action['type'] = 'action'; - $action['icon'] = 'plugins/Morpheus/images/action.svg'; + $action['icon'] = ''; + $action['iconSVG'] = 'plugins/Morpheus/images/action.svg'; break; } diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml index 9a211ae6c6c4..7d32ba87bf28 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml @@ -22,7 +22,8 @@ 1 Ads http://www.example.org/page - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -41,7 +42,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - Unknown @@ -62,7 +64,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd @@ -83,7 +86,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - /path/ad.jpg @@ -104,7 +108,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - /path/ad2.jpg @@ -125,7 +130,8 @@ submit 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (submit) ImageAd - /path/ad.jpg @@ -146,7 +152,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click to download Piwik now @@ -167,7 +174,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click NOW @@ -188,7 +196,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Text Ad - Click to download Piwik now @@ -209,7 +218,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Text Ad - Click NOW @@ -230,7 +240,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click to download Piwik now @@ -251,7 +262,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Video Ad - movie.mov @@ -272,7 +284,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Video Ad - movie.mov @@ -398,7 +411,8 @@ 1 Ads http://www.example.org/page - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -417,7 +431,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - Unknown @@ -438,7 +453,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd @@ -459,7 +475,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - /path/ad.jpg @@ -480,7 +497,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - /path/ad2.jpg @@ -501,7 +519,8 @@ submit 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (submit) ImageAd - /path/ad.jpg @@ -522,7 +541,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click to download Piwik now @@ -543,7 +563,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click NOW @@ -564,7 +585,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Text Ad - Click to download Piwik now @@ -585,7 +607,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Text Ad - Click NOW @@ -606,7 +629,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click to download Piwik now @@ -627,7 +651,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Video Ad - movie.mov @@ -648,7 +673,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Video Ad - movie.mov diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml index 9a211ae6c6c4..7d32ba87bf28 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml @@ -22,7 +22,8 @@ 1 Ads http://www.example.org/page - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -41,7 +42,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - Unknown @@ -62,7 +64,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd @@ -83,7 +86,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - /path/ad.jpg @@ -104,7 +108,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - /path/ad2.jpg @@ -125,7 +130,8 @@ submit 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (submit) ImageAd - /path/ad.jpg @@ -146,7 +152,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click to download Piwik now @@ -167,7 +174,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click NOW @@ -188,7 +196,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Text Ad - Click to download Piwik now @@ -209,7 +218,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Text Ad - Click NOW @@ -230,7 +240,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click to download Piwik now @@ -251,7 +262,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Video Ad - movie.mov @@ -272,7 +284,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Video Ad - movie.mov @@ -398,7 +411,8 @@ 1 Ads http://www.example.org/page - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -417,7 +431,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - Unknown @@ -438,7 +453,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd @@ -459,7 +475,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - /path/ad.jpg @@ -480,7 +497,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - /path/ad2.jpg @@ -501,7 +519,8 @@ submit 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (submit) ImageAd - /path/ad.jpg @@ -522,7 +541,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click to download Piwik now @@ -543,7 +563,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click NOW @@ -564,7 +585,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Text Ad - Click to download Piwik now @@ -585,7 +607,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Text Ad - Click NOW @@ -606,7 +629,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click to download Piwik now @@ -627,7 +651,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Video Ad - movie.mov @@ -648,7 +673,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Video Ad - movie.mov diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml index 9a211ae6c6c4..7d32ba87bf28 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml @@ -22,7 +22,8 @@ 1 Ads http://www.example.org/page - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -41,7 +42,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - Unknown @@ -62,7 +64,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd @@ -83,7 +86,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - /path/ad.jpg @@ -104,7 +108,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - /path/ad2.jpg @@ -125,7 +130,8 @@ submit 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (submit) ImageAd - /path/ad.jpg @@ -146,7 +152,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click to download Piwik now @@ -167,7 +174,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click NOW @@ -188,7 +196,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Text Ad - Click to download Piwik now @@ -209,7 +218,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Text Ad - Click NOW @@ -230,7 +240,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click to download Piwik now @@ -251,7 +262,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Video Ad - movie.mov @@ -272,7 +284,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Video Ad - movie.mov @@ -398,7 +411,8 @@ 1 Ads http://www.example.org/page - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -417,7 +431,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - Unknown @@ -438,7 +453,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd @@ -459,7 +475,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - /path/ad.jpg @@ -480,7 +497,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - /path/ad2.jpg @@ -501,7 +519,8 @@ submit 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (submit) ImageAd - /path/ad.jpg @@ -522,7 +541,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click to download Piwik now @@ -543,7 +563,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click NOW @@ -564,7 +585,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Text Ad - Click to download Piwik now @@ -585,7 +607,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Text Ad - Click NOW @@ -606,7 +629,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click to download Piwik now @@ -627,7 +651,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Video Ad - movie.mov @@ -648,7 +673,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Video Ad - movie.mov diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml index 9a211ae6c6c4..7d32ba87bf28 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml @@ -22,7 +22,8 @@ 1 Ads http://www.example.org/page - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -41,7 +42,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - Unknown @@ -62,7 +64,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd @@ -83,7 +86,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - /path/ad.jpg @@ -104,7 +108,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - /path/ad2.jpg @@ -125,7 +130,8 @@ submit 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (submit) ImageAd - /path/ad.jpg @@ -146,7 +152,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click to download Piwik now @@ -167,7 +174,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click NOW @@ -188,7 +196,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Text Ad - Click to download Piwik now @@ -209,7 +218,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Text Ad - Click NOW @@ -230,7 +240,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click to download Piwik now @@ -251,7 +262,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Video Ad - movie.mov @@ -272,7 +284,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Video Ad - movie.mov @@ -398,7 +411,8 @@ 1 Ads http://www.example.org/page - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -417,7 +431,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - Unknown @@ -438,7 +453,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd @@ -459,7 +475,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - /path/ad.jpg @@ -480,7 +497,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - /path/ad2.jpg @@ -501,7 +519,8 @@ submit 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (submit) ImageAd - /path/ad.jpg @@ -522,7 +541,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click to download Piwik now @@ -543,7 +563,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click NOW @@ -564,7 +585,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Text Ad - Click to download Piwik now @@ -585,7 +607,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Text Ad - Click NOW @@ -606,7 +629,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click to download Piwik now @@ -627,7 +651,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Video Ad - movie.mov @@ -648,7 +673,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Video Ad - movie.mov diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml index 9a211ae6c6c4..7d32ba87bf28 100644 --- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml @@ -22,7 +22,8 @@ 1 Ads http://www.example.org/page - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -41,7 +42,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - Unknown @@ -62,7 +64,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd @@ -83,7 +86,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - /path/ad.jpg @@ -104,7 +108,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - /path/ad2.jpg @@ -125,7 +130,8 @@ submit 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (submit) ImageAd - /path/ad.jpg @@ -146,7 +152,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click to download Piwik now @@ -167,7 +174,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click NOW @@ -188,7 +196,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Text Ad - Click to download Piwik now @@ -209,7 +218,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Text Ad - Click NOW @@ -230,7 +240,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click to download Piwik now @@ -251,7 +262,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Video Ad - movie.mov @@ -272,7 +284,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Video Ad - movie.mov @@ -398,7 +411,8 @@ 1 Ads http://www.example.org/page - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -417,7 +431,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - Unknown @@ -438,7 +453,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd @@ -459,7 +475,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - /path/ad.jpg @@ -480,7 +497,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression ImageAd - /path/ad2.jpg @@ -501,7 +519,8 @@ submit 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (submit) ImageAd - /path/ad.jpg @@ -522,7 +541,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click to download Piwik now @@ -543,7 +563,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click NOW @@ -564,7 +585,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Text Ad - Click to download Piwik now @@ -585,7 +607,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Text Ad - Click NOW @@ -606,7 +629,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Text Ad - Click to download Piwik now @@ -627,7 +651,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Video Ad - movie.mov @@ -648,7 +673,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Video Ad - movie.mov diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml index 5b6bd97c429d..6fe346e7121b 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml @@ -18,7 +18,8 @@ 1 <subtitle>http://piwik.net/docs/manage-users/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -36,7 +37,8 @@ <goalPageId>9</goalPageId> <url>http://piwik.net/docs/manage-users/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -142,7 +144,8 @@ 1 <subtitle>http://piwik.net/docs/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -160,7 +163,8 @@ <goalPageId>8</goalPageId> <url>http://piwik.net/docs/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -266,7 +270,8 @@ 1 <subtitle>http://piwik.net/translations/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -284,7 +289,8 @@ <goalPageId>7</goalPageId> <url>http://piwik.net/translations/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -390,7 +396,8 @@ 1 <subtitle>http://piwik.net/download/counter/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -408,7 +415,8 @@ <goalPageId>6</goalPageId> <url>http://piwik.net/download/counter/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -514,7 +522,8 @@ 1 <subtitle>http://piwik.net/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -532,7 +541,8 @@ <goalPageId>5</goalPageId> <url>http://piwik.net/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -638,7 +648,8 @@ 1 <subtitle>http://piwik.net/docs/manage-websites/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -656,7 +667,8 @@ <goalPageId>4</goalPageId> <url>http://piwik.net/docs/manage-websites/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -762,7 +774,8 @@ 1 <subtitle>http://piwik.net/blog/category/community/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -780,7 +793,8 @@ <goalPageId>3</goalPageId> <url>http://piwik.net/blog/category/community/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -886,7 +900,8 @@ 1 <subtitle>http://piwik.net/faq/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -904,7 +919,8 @@ <goalPageId>2</goalPageId> <url>http://piwik.net/faq/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -1010,7 +1026,8 @@ 1 <subtitle>http://www.included4.com/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -1028,7 +1045,8 @@ <goalPageId>81</goalPageId> <url>http://www.included4.com/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -1134,7 +1152,8 @@ 1 <subtitle>http://www.included2.com/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -1152,7 +1171,8 @@ <goalPageId>83</goalPageId> <url>http://www.included2.com/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml index 060f9cbe7978..8444674964a6 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml @@ -22,7 +22,8 @@ 1 <subtitle>http://piwik.net/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -40,7 +41,8 @@ <goalPageId>70</goalPageId> <url>http://piwik.net/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -61,7 +63,8 @@ 5 <subtitle>http://piwik.net/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -87,7 +90,8 @@ <interactionPosition>9</interactionPosition> <title /> <subtitle>http://piwik.net/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -113,7 +117,8 @@ <interactionPosition>2</interactionPosition> <title /> <subtitle>http://piwik.net/faq/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -139,7 +144,8 @@ <interactionPosition>6</interactionPosition> <title /> <subtitle>http://piwik.net/faq/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -165,7 +171,8 @@ <interactionPosition>10</interactionPosition> <title /> <subtitle>http://piwik.net/faq/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -191,7 +198,8 @@ <interactionPosition>3</interactionPosition> <title /> <subtitle>http://piwik.net/blog/category/community/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -217,7 +225,8 @@ <interactionPosition>7</interactionPosition> <title /> <subtitle>http://piwik.net/blog/category/community/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -243,7 +252,8 @@ <interactionPosition>4</interactionPosition> <title /> <subtitle>http://piwik.net/docs/manage-websites/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -267,7 +277,8 @@ <interactionPosition>8</interactionPosition> <title /> <subtitle>http://piwik.net/docs/manage-websites/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -378,7 +389,8 @@ <interactionPosition>1</interactionPosition> <title /> <subtitle>http://www.notdatefiltered.com/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -396,7 +408,8 @@ <goalPageId>84</goalPageId> <url>http://www.notdatefiltered.com/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -502,7 +515,8 @@ 1 incredible title! http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -528,7 +542,8 @@ 30 http://example.org/index.htm - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -651,7 +666,8 @@ 1 Piwik Forums http://forum.piwik.org/register.php?0,approve=9a94a02145599 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -669,7 +685,8 @@ 31 http://forum.piwik.org/register.php?0,approve=9a94a02145599 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -808,7 +825,8 @@ 1 <subtitle>http://piwik.net/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -826,7 +844,8 @@ <goalPageId>28</goalPageId> <url>http://piwik.net/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -936,7 +955,8 @@ 1 <subtitle>http://piwik.net/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -954,7 +974,8 @@ <goalPageId>29</goalPageId> <url>http://piwik.net/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -1066,7 +1087,8 @@ 1 301/URL = http%3A%2F%2Fpiwik.net%2Fmoved-permanently http://piwik.net/moved-permanently - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -1084,7 +1106,8 @@ 26 http://piwik.net/moved-permanently - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -1101,7 +1124,8 @@ 2 307/URL = http%3A%2F%2Fpiwik.net%2Ftemp-redirect http://piwik.net/temp-redirect - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -1216,7 +1240,8 @@ 61 1 min 1s - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://piwik.net/thing.js @@ -1240,7 +1265,8 @@ 61 1 min 1s - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://piwik.net/thing.css @@ -1262,7 +1288,8 @@ 25 3574 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://piwik.net/other.png @@ -1379,7 +1406,8 @@ 1 <subtitle>http://piwik.net/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -1397,7 +1425,8 @@ <goalPageId>22</goalPageId> <url>http://piwik.net/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -1507,7 +1536,8 @@ 1 500/URL = http%3A%2F%2Fpiwik.net%2Fto-an-error http://piwik.net/to-an-error - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -1525,7 +1555,8 @@ 21 http://piwik.net/to-an-error - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) diff --git a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml index 519011ee9617..c89b2f5a7a60 100644 --- a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml +++ b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml @@ -14,7 +14,8 @@ http://localhost - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion triggered js @@ -31,7 +32,8 @@ 1 Profile page http://localhost - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml index 0655339b339a..de7c88194442 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml @@ -25,7 +25,8 @@ 2 - plugins/Morpheus/images/ecommerceOrder.svg + plugins/Morpheus/images/ecommerceOrder.png + plugins/Morpheus/images/ecommerceOrder.svg Ordered (666) $ 240 revenue - 2 items: TRIPOD - bought day after) @@ -42,7 +43,8 @@ - plugins/Morpheus/images/ecommerceOrder.svg + plugins/Morpheus/images/ecommerceOrder.png + plugins/Morpheus/images/ecommerceOrder.svg Ordered (777) $ 10000 revenue - 0 items: ) @@ -177,7 +179,8 @@ 1 View product left in cart http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -213,7 +216,8 @@ 2 View product left in cart http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -249,7 +253,8 @@ 3 View product left in cart http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -295,7 +300,8 @@ 2 - plugins/Morpheus/images/ecommerceAbandonedCart.svg + plugins/Morpheus/images/ecommerceAbandonedCart.png + plugins/Morpheus/images/ecommerceAbandonedCart.svg Abandoned Cart $ 2510.11 revenue - 4 items: PRODUCT THREE LEFT in cart, PRODUCT ONE LEFT in cart, PRODUCT TWO LEFT in cart) diff --git a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml index b276f6e95cd7..00a931e29d22 100644 --- a/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/plugins/Ecommerce/tests/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -20,7 +20,8 @@ 1 View product left in cart http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -56,7 +57,8 @@ 2 View product left in cart http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -92,7 +94,8 @@ 3 View product left in cart http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -138,7 +141,8 @@ 2 - plugins/Morpheus/images/ecommerceAbandonedCart.svg + plugins/Morpheus/images/ecommerceAbandonedCart.png + plugins/Morpheus/images/ecommerceAbandonedCart.svg Abandoned Cart $ 2510.11 revenue - 4 items: PRODUCT THREE LEFT in cart, PRODUCT ONE LEFT in cart, PRODUCT TWO LEFT in cart) @@ -273,7 +277,8 @@ 1 Looking at Electronics & Cameras page with a page level custom variable http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -297,7 +302,8 @@ 2 Looking at Electronics & Cameras page again http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -321,7 +327,8 @@ 3 Looking at product page http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -369,7 +376,8 @@ 6 - plugins/Morpheus/images/ecommerceOrder.svg + plugins/Morpheus/images/ecommerceOrder.png + plugins/Morpheus/images/ecommerceOrder.svg Ordered (937nsjusu 3894) $ 1111.11 revenue - 8 items: PRODUCT name, PRODUCT name BIS) @@ -400,7 +408,8 @@ 1 - plugins/Morpheus/images/ecommerceOrder.svg + plugins/Morpheus/images/ecommerceOrder.png + plugins/Morpheus/images/ecommerceOrder.svg Ordered (1037nsjusu4s3894) $ 2000 revenue - 2 items: PRODUCT name, Canon SLR) @@ -419,7 +428,8 @@ 4 View product left in cart http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -455,7 +465,8 @@ 5 View product left in cart http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -491,7 +502,8 @@ 6 View product left in cart http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -537,7 +549,8 @@ 2 - plugins/Morpheus/images/ecommerceAbandonedCart.svg + plugins/Morpheus/images/ecommerceAbandonedCart.png + plugins/Morpheus/images/ecommerceAbandonedCart.svg Abandoned Cart $ 2510.11 revenue - 4 items: PRODUCT THREE LEFT in cart, PRODUCT ONE LEFT in cart, PRODUCT TWO LEFT in cart) @@ -672,7 +685,8 @@ 1 incredible title! http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -702,7 +716,8 @@ 1 http://example.org/index.htm - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion title match, triggered ONCE ($ 10 revenue) @@ -721,7 +736,8 @@ 2 Another Product page http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -757,7 +773,8 @@ 3 Another Product page with no category http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -791,7 +808,8 @@ 4 Another Product page with multiple categories http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg diff --git a/plugins/Events/VisitorDetails.php b/plugins/Events/VisitorDetails.php index 7c62a9c18485..7f9af081efb8 100644 --- a/plugins/Events/VisitorDetails.php +++ b/plugins/Events/VisitorDetails.php @@ -21,7 +21,8 @@ public function extendActionDetails(&$action, $nextAction, $visitorDetails) { if (!empty($action['eventType'])) { $action['type'] = 'event'; - $action['icon'] = 'plugins/Morpheus/images/event.svg'; + $action['icon'] = 'plugins/Morpheus/images/event.png'; + $action['iconSVG'] = 'plugins/Morpheus/images/event.svg'; $action['title'] = Piwik::translate('Events_Event'); $action['subtitle'] = Piwik::translate('Event_Category') . ': "' . $action['eventCategory'] . "'"; diff --git a/plugins/Live/templates/_actionCommon.twig b/plugins/Live/templates/_actionCommon.twig index 548c1b44c701..a697485a0ea9 100644 --- a/plugins/Live/templates/_actionCommon.twig +++ b/plugins/Live/templates/_actionCommon.twig @@ -7,14 +7,14 @@ {% endif %} {% if action.siteSearchKeyword is defined %} {% if action.type == 'search' %} - {% endif %} {{ action.siteSearchKeyword|rawSafeDecoded }} {% endif %} {% if action.url is not empty %} - {% if action.icon is not empty %} - + {% if action.iconSVG|default(action.icon) is not empty %} + {% endif %} {% if action.type == 'action' and action.pageTitle|default(false) is not empty %}

{% endif %} {% if action.url|trim|lower starts with 'javascript:' or diff --git a/plugins/Live/templates/_actionEcommerce.twig b/plugins/Live/templates/_actionEcommerce.twig index a4b985810542..fc914503d4b6 100644 --- a/plugins/Live/templates/_actionEcommerce.twig +++ b/plugins/Live/templates/_actionEcommerce.twig @@ -2,7 +2,7 @@ title="{{ postEvent('Live.renderActionTooltip', action, visitInfo) }}">

{# Ecommerce Abandoned Cart / Ecommerce Order #} - + {% if action.type == 'ecommerceOrder' %} {{ 'Goals_EcommerceOrder'|translate }} ({{ action.orderId }}) diff --git a/plugins/Live/templates/_actionGoal.twig b/plugins/Live/templates/_actionGoal.twig index dadfc566e84b..30c06299dc22 100644 --- a/plugins/Live/templates/_actionGoal.twig +++ b/plugins/Live/templates/_actionGoal.twig @@ -2,7 +2,7 @@ title="{{ postEvent('Live.renderActionTooltip', action, visitInfo) }}">
{# Goal conversion #} - + {{ action.goalName }} {% if action.revenue > 0 %}, {{ 'General_ColumnRevenue'|translate }}: {{ action.revenue|money(visitInfo.idSite)|raw }} diff --git a/plugins/Live/templates/getLastVisitsStart.twig b/plugins/Live/templates/getLastVisitsStart.twig index adf24ce9c3fa..04969679f3ea 100644 --- a/plugins/Live/templates/getLastVisitsStart.twig +++ b/plugins/Live/templates/getLastVisitsStart.twig @@ -61,7 +61,7 @@ {%- endif %} {% endset %} - + {% if action.type == 'ecommerceOrder' %} {{ 'General_ColumnRevenue'|translate }}: {{ action.revenue|money(idSite)|raw }} {% endif %} @@ -82,19 +82,19 @@ {{ action.serverTimePretty }} {% if action.timeSpentPretty is defined %}{{ 'General_TimeOnPage'|translate }}: {{ action.timeSpentPretty|raw }}{% endif %} {%- endset %} - + {% elseif action.type == 'outlink' or action.type == 'download' %} - {% elseif action.type == 'search' %} - {% elseif action.eventCategory|default(false) is not empty %} - {% elseif action.type == 'goal' or action.type == constant('Piwik\\Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER') or action.type == constant('Piwik\\Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART') %} - {% endif %} {% if action.url is defined and action.url is not empty %} diff --git a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml index 670e0ee816fa..9d3f2557549e 100644 --- a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml +++ b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml @@ -38,7 +38,8 @@ 1 incredible title 0 http://example.org/my/dir/page2 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -158,7 +159,8 @@ 1 incredible title 2 http://example.org/my/dir/page1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -278,7 +280,8 @@ 1 incredible title 1 http://example.org/my/dir/page0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -398,7 +401,8 @@ 1 incredible title 0 http://example.org/my/dir/page3 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -518,7 +522,8 @@ 1 incredible title 2 http://example.org/my/dir/page2 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -638,7 +643,8 @@ 1 incredible title 1 http://example.org/my/dir/page1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -758,7 +764,8 @@ 1 incredible title 0 http://example.org/my/dir/page0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -878,7 +885,8 @@ 1 incredible title 2 http://example.org/my/dir/page3 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -998,7 +1006,8 @@ 1 incredible title 1 http://example.org/my/dir/page2 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1118,7 +1127,8 @@ 1 incredible title 0 http://example.org/my/dir/page1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M diff --git a/plugins/Live/tests/System/expected/test_allSites__Live.getLastVisitsDetails_day.xml b/plugins/Live/tests/System/expected/test_allSites__Live.getLastVisitsDetails_day.xml index 1c99aeb48fbb..9fa47144a6b4 100644 --- a/plugins/Live/tests/System/expected/test_allSites__Live.getLastVisitsDetails_day.xml +++ b/plugins/Live/tests/System/expected/test_allSites__Live.getLastVisitsDetails_day.xml @@ -18,7 +18,8 @@ 1 incredible title http://example.org/foo/dir/page - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -138,7 +139,8 @@ 1 incredible title 0 http://example.org/my/dir/page0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M diff --git a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml index 3ad81fa19a9a..5368d0509dd6 100644 --- a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml +++ b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml @@ -38,7 +38,8 @@ 1 incredible title 0 http://example.org/my/dir/page2 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -158,7 +159,8 @@ 1 incredible title 2 http://example.org/my/dir/page1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -278,7 +280,8 @@ 1 incredible title 1 http://example.org/my/dir/page0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -398,7 +401,8 @@ 1 incredible title 0 http://example.org/my/dir/page3 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -518,7 +522,8 @@ 1 incredible title 2 http://example.org/my/dir/page2 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -638,7 +643,8 @@ 1 incredible title 1 http://example.org/my/dir/page1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -758,7 +764,8 @@ 1 incredible title 0 http://example.org/my/dir/page0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -878,7 +885,8 @@ 1 incredible title 2 http://example.org/my/dir/page3 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -998,7 +1006,8 @@ 1 incredible title 1 http://example.org/my/dir/page2 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1118,7 +1127,8 @@ 1 incredible title 0 http://example.org/my/dir/page1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1238,7 +1248,8 @@ 1 incredible title 2 http://example.org/my/dir/page0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1358,7 +1369,8 @@ 1 incredible title 1 http://example.org/my/dir/page3 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1478,7 +1490,8 @@ 1 incredible title 0 http://example.org/my/dir/page2 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1598,7 +1611,8 @@ 1 incredible title 2 http://example.org/my/dir/page1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1718,7 +1732,8 @@ 1 incredible title 1 http://example.org/my/dir/page0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1838,7 +1853,8 @@ 1 incredible title 0 http://example.org/my/dir/page3 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1958,7 +1974,8 @@ 1 incredible title 2 http://example.org/my/dir/page2 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -2078,7 +2095,8 @@ 1 incredible title 1 http://example.org/my/dir/page1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -2198,7 +2216,8 @@ 1 incredible title 0 http://example.org/my/dir/page0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -2318,7 +2337,8 @@ 1 incredible title 2 http://example.org/my/dir/page3 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M diff --git a/plugins/Live/tests/System/expected/test_maxVisitLimit__Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test_maxVisitLimit__Live.getVisitorProfile.xml index 573c3f4b3517..9e7801b3070d 100644 --- a/plugins/Live/tests/System/expected/test_maxVisitLimit__Live.getVisitorProfile.xml +++ b/plugins/Live/tests/System/expected/test_maxVisitLimit__Live.getVisitorProfile.xml @@ -38,7 +38,8 @@ 1 incredible title 0 http://example.org/my/dir/page2 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -158,7 +159,8 @@ 1 incredible title 2 http://example.org/my/dir/page1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -278,7 +280,8 @@ 1 incredible title 1 http://example.org/my/dir/page0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -398,7 +401,8 @@ 1 incredible title 0 http://example.org/my/dir/page3 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -518,7 +522,8 @@ 1 incredible title 2 http://example.org/my/dir/page2 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -638,7 +643,8 @@ 1 incredible title 1 http://example.org/my/dir/page1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -758,7 +764,8 @@ 1 incredible title 0 http://example.org/my/dir/page0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -878,7 +885,8 @@ 1 incredible title 2 http://example.org/my/dir/page3 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -998,7 +1006,8 @@ 1 incredible title 1 http://example.org/my/dir/page2 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1118,7 +1127,8 @@ 1 incredible title 0 http://example.org/my/dir/page1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M diff --git a/plugins/Live/tests/System/expected/test_multiSites__Live.getLastVisitsDetails_day.xml b/plugins/Live/tests/System/expected/test_multiSites__Live.getLastVisitsDetails_day.xml index 1c99aeb48fbb..9fa47144a6b4 100644 --- a/plugins/Live/tests/System/expected/test_multiSites__Live.getLastVisitsDetails_day.xml +++ b/plugins/Live/tests/System/expected/test_multiSites__Live.getLastVisitsDetails_day.xml @@ -18,7 +18,8 @@ 1 incredible title http://example.org/foo/dir/page - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -138,7 +139,8 @@ 1 incredible title 0 http://example.org/my/dir/page0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M diff --git a/plugins/PrivacyManager/tests/System/expected/test_allSites__Live.getLastVisitsDetails_year.xml b/plugins/PrivacyManager/tests/System/expected/test_allSites__Live.getLastVisitsDetails_year.xml index cbeb98a0d803..febade1279af 100644 --- a/plugins/PrivacyManager/tests/System/expected/test_allSites__Live.getLastVisitsDetails_year.xml +++ b/plugins/PrivacyManager/tests/System/expected/test_allSites__Live.getLastVisitsDetails_year.xml @@ -14,7 +14,8 @@ http://www.helloworld.com/hello/world200 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -35,7 +36,8 @@ 1 Hello World http://www.helloworld.com/hello/world200 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -55,7 +57,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world200/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -75,7 +78,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world200/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -91,7 +95,8 @@ 545 0.55s 4 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search mobile @@ -122,7 +127,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - /path/product1.jpg @@ -143,7 +149,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - Buy Product 1 Now! @@ -164,7 +171,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 2 - /path/product2.jpg @@ -185,7 +193,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 3 - Product 3 on sale @@ -206,7 +215,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 4 - Unknown @@ -227,7 +237,8 @@ click 4 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Product 3 - Product 3 on sale @@ -248,7 +259,8 @@ hover 4 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (hover) /path/product1.jpg - http://product1.example.com @@ -370,7 +382,8 @@ http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -391,7 +404,8 @@ 1 Hello World http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -409,7 +423,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world202/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -529,7 +544,8 @@ http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -548,7 +564,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -566,7 +583,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -582,7 +600,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -702,7 +721,8 @@ http://www.helloworld.com/hello/world205 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -723,7 +743,8 @@ 1 Hello World http://www.helloworld.com/hello/world205 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -741,7 +762,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world205/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -861,7 +883,8 @@ http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -882,7 +905,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -902,7 +926,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -920,7 +945,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1046,7 +1072,8 @@ 1 Hello World http://www.helloworld.com/hello/world208 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1062,7 +1089,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world208/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1182,7 +1210,8 @@ http://www.helloworld.com/hello/world209 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -1201,7 +1230,8 @@ 1 Hello World http://www.helloworld.com/hello/world209 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1219,7 +1249,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world209/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1235,7 +1266,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world209/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1351,7 +1383,8 @@ http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -1372,7 +1405,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1390,7 +1424,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1510,7 +1545,8 @@ http://www.helloworld.com/hello/world200 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -1531,7 +1567,8 @@ 1 Hello World http://www.helloworld.com/hello/world200 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1551,7 +1588,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world200/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1571,7 +1609,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world200/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1587,7 +1626,8 @@ 545 0.55s 4 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search mobile @@ -1618,7 +1658,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - /path/product1.jpg @@ -1639,7 +1680,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - Buy Product 1 Now! @@ -1660,7 +1702,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 2 - /path/product2.jpg @@ -1681,7 +1724,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 3 - Product 3 on sale @@ -1702,7 +1746,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 4 - Unknown @@ -1723,7 +1768,8 @@ click 4 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Product 3 - Product 3 on sale @@ -1744,7 +1790,8 @@ hover 4 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (hover) /path/product1.jpg - http://product1.example.com @@ -1866,7 +1913,8 @@ http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -1887,7 +1935,8 @@ 1 Hello World http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1905,7 +1954,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world202/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -2025,7 +2075,8 @@ http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -2044,7 +2095,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -2062,7 +2114,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -2078,7 +2131,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -2198,7 +2252,8 @@ http://www.helloworld.com/hello/world205 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -2219,7 +2274,8 @@ 1 Hello World http://www.helloworld.com/hello/world205 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -2237,7 +2293,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world205/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -2357,7 +2414,8 @@ http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -2378,7 +2436,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -2398,7 +2457,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -2416,7 +2476,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -2542,7 +2603,8 @@ 1 Hello World http://www.helloworld.com/hello/world208 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -2558,7 +2620,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world208/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -2678,7 +2741,8 @@ http://www.helloworld.com/hello/world209 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -2697,7 +2761,8 @@ 1 Hello World http://www.helloworld.com/hello/world209 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -2715,7 +2780,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world209/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -2731,7 +2797,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world209/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -2847,7 +2914,8 @@ http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -2868,7 +2936,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -2886,7 +2955,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -3006,7 +3076,8 @@ http://www.helloworld.com/hello/world200 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -3027,7 +3098,8 @@ 1 Hello World http://www.helloworld.com/hello/world200 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -3047,7 +3119,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world200/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -3067,7 +3140,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world200/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -3083,7 +3157,8 @@ 545 0.55s 4 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search mobile @@ -3114,7 +3189,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - /path/product1.jpg @@ -3135,7 +3211,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - Buy Product 1 Now! @@ -3156,7 +3233,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 2 - /path/product2.jpg @@ -3177,7 +3255,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 3 - Product 3 on sale @@ -3198,7 +3277,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 4 - Unknown @@ -3219,7 +3299,8 @@ click 4 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Product 3 - Product 3 on sale @@ -3240,7 +3321,8 @@ hover 4 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (hover) /path/product1.jpg - http://product1.example.com @@ -3362,7 +3444,8 @@ http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -3383,7 +3466,8 @@ 1 Hello World http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -3401,7 +3485,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world202/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -3521,7 +3606,8 @@ http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -3540,7 +3626,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -3558,7 +3645,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -3574,7 +3662,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -3694,7 +3783,8 @@ http://www.helloworld.com/hello/world205 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -3715,7 +3805,8 @@ 1 Hello World http://www.helloworld.com/hello/world205 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -3733,7 +3824,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world205/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -3853,7 +3945,8 @@ http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -3874,7 +3967,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -3894,7 +3988,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -3912,7 +4007,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -4038,7 +4134,8 @@ 1 Hello World http://www.helloworld.com/hello/world208 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -4054,7 +4151,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world208/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -4174,7 +4272,8 @@ http://www.helloworld.com/hello/world209 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -4193,7 +4292,8 @@ 1 Hello World http://www.helloworld.com/hello/world209 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -4211,7 +4311,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world209/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -4227,7 +4328,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world209/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -4343,7 +4445,8 @@ http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -4364,7 +4467,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -4382,7 +4486,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -4502,7 +4607,8 @@ http://www.helloworld.com/hello/world201 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -4521,7 +4627,8 @@ 1 Hello World http://www.helloworld.com/hello/world201 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -4641,7 +4748,8 @@ http://www.helloworld.com/hello/world204 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -4662,7 +4770,8 @@ 1 Hello World http://www.helloworld.com/hello/world204 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -4681,7 +4790,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - /path/product1.jpg @@ -4702,7 +4812,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - Buy Product 1 Now! @@ -4723,7 +4834,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 2 - /path/product2.jpg @@ -4744,7 +4856,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 3 - Product 3 on sale @@ -4765,7 +4878,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 4 - Unknown @@ -4786,7 +4900,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Product 3 - Product 3 on sale @@ -4807,7 +4922,8 @@ hover 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (hover) /path/product1.jpg - http://product1.example.com @@ -4827,7 +4943,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -4848,7 +4965,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -4869,7 +4987,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -4890,7 +5009,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -4908,7 +5028,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -5035,7 +5156,8 @@ 1 Hello World http://www.helloworld.com/hello/world207 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -5155,7 +5277,8 @@ http://www.helloworld.com/hello/world210 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -5176,7 +5299,8 @@ 1 Hello World http://www.helloworld.com/hello/world210 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -5194,7 +5318,8 @@ 1030 1.03s 2 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search analytics @@ -5220,7 +5345,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -5241,7 +5367,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -5262,7 +5389,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -5283,7 +5411,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -5301,7 +5430,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -5422,7 +5552,8 @@ http://www.helloworld.com/hello/world201 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -5441,7 +5572,8 @@ 1 Hello World http://www.helloworld.com/hello/world201 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -5561,7 +5693,8 @@ http://www.helloworld.com/hello/world204 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -5580,7 +5713,8 @@ 1 Hello World http://www.helloworld.com/hello/world204 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -5599,7 +5733,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - /path/product1.jpg @@ -5620,7 +5755,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - Buy Product 1 Now! @@ -5641,7 +5777,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 2 - /path/product2.jpg @@ -5662,7 +5799,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 3 - Product 3 on sale @@ -5683,7 +5821,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 4 - Unknown @@ -5704,7 +5843,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Product 3 - Product 3 on sale @@ -5725,7 +5865,8 @@ hover 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (hover) /path/product1.jpg - http://product1.example.com @@ -5745,7 +5886,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -5766,7 +5908,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -5787,7 +5930,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -5808,7 +5952,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -5828,7 +5973,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -5955,7 +6101,8 @@ 1 Hello World http://www.helloworld.com/hello/world207 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -6075,7 +6222,8 @@ http://www.helloworld.com/hello/world210 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -6096,7 +6244,8 @@ 1 Hello World http://www.helloworld.com/hello/world210 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -6114,7 +6263,8 @@ 1030 1.03s 2 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search analytics @@ -6140,7 +6290,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -6161,7 +6312,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -6182,7 +6334,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -6203,7 +6356,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -6221,7 +6375,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -6342,7 +6497,8 @@ http://www.helloworld.com/hello/world201 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -6361,7 +6517,8 @@ 1 Hello World http://www.helloworld.com/hello/world201 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -6481,7 +6638,8 @@ http://www.helloworld.com/hello/world204 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -6502,7 +6660,8 @@ 1 Hello World http://www.helloworld.com/hello/world204 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -6521,7 +6680,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - /path/product1.jpg @@ -6542,7 +6702,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - Buy Product 1 Now! @@ -6563,7 +6724,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 2 - /path/product2.jpg @@ -6584,7 +6746,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 3 - Product 3 on sale @@ -6605,7 +6768,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 4 - Unknown @@ -6626,7 +6790,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Product 3 - Product 3 on sale @@ -6647,7 +6812,8 @@ hover 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (hover) /path/product1.jpg - http://product1.example.com @@ -6667,7 +6833,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -6688,7 +6855,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -6709,7 +6877,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -6730,7 +6899,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -6748,7 +6918,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -6875,7 +7046,8 @@ 1 Hello World http://www.helloworld.com/hello/world207 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -6995,7 +7167,8 @@ http://www.helloworld.com/hello/world210 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -7016,7 +7189,8 @@ 1 Hello World http://www.helloworld.com/hello/world210 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -7034,7 +7208,8 @@ 1030 1.03s 2 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search analytics @@ -7060,7 +7235,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -7081,7 +7257,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -7102,7 +7279,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -7123,7 +7301,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -7141,7 +7320,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -7268,7 +7448,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -7286,7 +7467,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -7302,7 +7484,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -7430,7 +7613,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -7448,7 +7632,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -7574,7 +7759,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -7592,7 +7778,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -7608,7 +7795,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -7736,7 +7924,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -7759,7 +7948,8 @@ 1 - plugins/Morpheus/images/ecommerceOrder.svg + plugins/Morpheus/images/ecommerceOrder.png + plugins/Morpheus/images/ecommerceOrder.svg Ordered (211) $ 240.54 revenue - 1 items: My product 211) @@ -7778,7 +7968,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -7904,7 +8095,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -7922,7 +8114,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -7938,7 +8131,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -8066,7 +8260,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -8089,7 +8284,8 @@ 1 - plugins/Morpheus/images/ecommerceOrder.svg + plugins/Morpheus/images/ecommerceOrder.png + plugins/Morpheus/images/ecommerceOrder.svg Ordered (211) $ 240.54 revenue - 1 items: My product 211) @@ -8108,7 +8304,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -8236,7 +8433,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -8256,7 +8454,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -8274,7 +8473,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -8400,7 +8600,8 @@ 1 Hello World http://www.helloworld.com/hello/world209 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -8418,7 +8619,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world209/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -8434,7 +8636,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world209/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -8558,7 +8761,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -8578,7 +8782,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -8596,7 +8801,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -8722,7 +8928,8 @@ 1 Hello World http://www.helloworld.com/hello/world209 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -8740,7 +8947,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world209/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -8756,7 +8964,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world209/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -8880,7 +9089,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -8900,7 +9110,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -8918,7 +9129,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -9044,7 +9256,8 @@ 1 Hello World http://www.helloworld.com/hello/world209 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -9062,7 +9275,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world209/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -9078,7 +9292,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world209/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -9202,7 +9417,8 @@ 1 Hello World http://www.helloworld.com/hello/world201 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -9220,7 +9436,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -9241,7 +9458,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -9262,7 +9480,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -9283,7 +9502,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -9301,7 +9521,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -9430,7 +9651,8 @@ 1 Hello World http://www.helloworld.com/hello/world201 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -9448,7 +9670,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -9469,7 +9692,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -9490,7 +9714,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -9511,7 +9736,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -9529,7 +9755,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -9658,7 +9885,8 @@ 1 Hello World http://www.helloworld.com/hello/world201 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -9676,7 +9904,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -9697,7 +9926,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -9718,7 +9948,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -9739,7 +9970,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -9757,7 +9989,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -9884,7 +10117,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -9902,7 +10136,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -9918,7 +10153,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -10046,7 +10282,8 @@ 1 Hello World http://www.helloworld.com/hello/world205 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -10066,7 +10303,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world205/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -10082,7 +10320,8 @@ 585 0.59s 3 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search ecommerce @@ -10222,7 +10461,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -10242,7 +10482,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -10260,7 +10501,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -10386,7 +10628,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -10404,7 +10647,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -10420,7 +10664,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -10548,7 +10793,8 @@ 1 Hello World http://www.helloworld.com/hello/world205 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -10571,7 +10817,8 @@ 1 - plugins/Morpheus/images/ecommerceOrder.svg + plugins/Morpheus/images/ecommerceOrder.png + plugins/Morpheus/images/ecommerceOrder.svg Ordered (205) $ 233.70 revenue - 1 items: My product 205) @@ -10592,7 +10839,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world205/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -10608,7 +10856,8 @@ 585 0.59s 3 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search ecommerce @@ -10748,7 +10997,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -10768,7 +11018,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -10786,7 +11037,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -10912,7 +11164,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -10930,7 +11183,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -10946,7 +11200,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -11074,7 +11329,8 @@ 1 Hello World http://www.helloworld.com/hello/world205 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -11097,7 +11353,8 @@ 1 - plugins/Morpheus/images/ecommerceOrder.svg + plugins/Morpheus/images/ecommerceOrder.png + plugins/Morpheus/images/ecommerceOrder.svg Ordered (205) $ 233.70 revenue - 1 items: My product 205) @@ -11118,7 +11375,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world205/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -11134,7 +11392,8 @@ 585 0.59s 3 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search ecommerce @@ -11274,7 +11533,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -11294,7 +11554,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -11312,7 +11573,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -11440,7 +11702,8 @@ 1 Hello World http://www.helloworld.com/hello/world207 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -11458,7 +11721,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -11479,7 +11743,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -11500,7 +11765,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -11521,7 +11787,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -11539,7 +11806,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -11668,7 +11936,8 @@ 1 Hello World http://www.helloworld.com/hello/world207 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -11686,7 +11955,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -11707,7 +11977,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -11728,7 +11999,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -11749,7 +12021,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -11767,7 +12040,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -11896,7 +12170,8 @@ 1 Hello World http://www.helloworld.com/hello/world207 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -11914,7 +12189,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -11935,7 +12211,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -11956,7 +12233,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -11977,7 +12255,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -11995,7 +12274,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -12124,7 +12404,8 @@ 1 Hello World http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -12142,7 +12423,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world202/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -12270,7 +12552,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -12288,7 +12571,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -12416,7 +12700,8 @@ 1 Hello World http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -12434,7 +12719,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world202/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -12562,7 +12848,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -12580,7 +12867,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -12708,7 +12996,8 @@ 1 Hello World http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -12726,7 +13015,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world202/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -12854,7 +13144,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -12872,7 +13163,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -13000,7 +13292,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -13020,7 +13313,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -13038,7 +13332,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -13166,7 +13461,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -13186,7 +13482,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -13204,7 +13501,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -13332,7 +13630,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -13352,7 +13651,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -13370,7 +13670,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -13496,7 +13797,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -13514,7 +13816,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -13530,7 +13833,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -13656,7 +13960,8 @@ 1 Hello World http://www.helloworld.com/hello/world208 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -13674,7 +13979,8 @@ 1 - plugins/Morpheus/images/ecommerceAbandonedCart.svg + plugins/Morpheus/images/ecommerceAbandonedCart.png + plugins/Morpheus/images/ecommerceAbandonedCart.svg Abandoned Cart $ 50 revenue - 1 items: My product 208) @@ -13691,7 +13997,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world208/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -13710,7 +14017,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - /path/product1.jpg @@ -13731,7 +14039,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - Buy Product 1 Now! @@ -13752,7 +14061,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 2 - /path/product2.jpg @@ -13773,7 +14083,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 3 - Product 3 on sale @@ -13794,7 +14105,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 4 - Unknown @@ -13815,7 +14127,8 @@ click 2 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Product 3 - Product 3 on sale @@ -13836,7 +14149,8 @@ hover 2 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (hover) /path/product1.jpg - http://product1.example.com @@ -13964,7 +14278,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -13982,7 +14297,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -13998,7 +14314,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -14124,7 +14441,8 @@ 1 Hello World http://www.helloworld.com/hello/world208 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -14142,7 +14460,8 @@ 1 - plugins/Morpheus/images/ecommerceAbandonedCart.svg + plugins/Morpheus/images/ecommerceAbandonedCart.png + plugins/Morpheus/images/ecommerceAbandonedCart.svg Abandoned Cart $ 50 revenue - 1 items: My product 208) @@ -14159,7 +14478,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world208/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -14178,7 +14498,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - /path/product1.jpg @@ -14199,7 +14520,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - Buy Product 1 Now! @@ -14220,7 +14542,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 2 - /path/product2.jpg @@ -14241,7 +14564,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 3 - Product 3 on sale @@ -14262,7 +14586,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 4 - Unknown @@ -14283,7 +14608,8 @@ click 2 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Product 3 - Product 3 on sale @@ -14304,7 +14630,8 @@ hover 2 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (hover) /path/product1.jpg - http://product1.example.com @@ -14432,7 +14759,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -14450,7 +14778,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -14466,7 +14795,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -14592,7 +14922,8 @@ 1 Hello World http://www.helloworld.com/hello/world208 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -14610,7 +14941,8 @@ 1 - plugins/Morpheus/images/ecommerceAbandonedCart.svg + plugins/Morpheus/images/ecommerceAbandonedCart.png + plugins/Morpheus/images/ecommerceAbandonedCart.svg Abandoned Cart $ 50 revenue - 1 items: My product 208) @@ -14627,7 +14959,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world208/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -14646,7 +14979,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - /path/product1.jpg @@ -14667,7 +15001,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - Buy Product 1 Now! @@ -14688,7 +15023,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 2 - /path/product2.jpg @@ -14709,7 +15045,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 3 - Product 3 on sale @@ -14730,7 +15067,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 4 - Unknown @@ -14751,7 +15089,8 @@ click 2 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Product 3 - Product 3 on sale @@ -14772,7 +15111,8 @@ hover 2 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (hover) /path/product1.jpg - http://product1.example.com @@ -14894,7 +15234,8 @@ http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -14915,7 +15256,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -14933,7 +15275,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -15053,7 +15396,8 @@ http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -15074,7 +15418,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -15092,7 +15437,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -15212,7 +15558,8 @@ http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -15233,7 +15580,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -15251,7 +15599,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -15377,7 +15726,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -15395,7 +15745,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -15411,7 +15762,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -15531,7 +15883,8 @@ http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -15552,7 +15905,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -15570,7 +15924,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -15696,7 +16051,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -15714,7 +16070,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -15730,7 +16087,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -15850,7 +16208,8 @@ http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -15871,7 +16230,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -15889,7 +16249,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -16015,7 +16376,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -16033,7 +16395,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -16049,7 +16412,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -16169,7 +16533,8 @@ http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -16190,7 +16555,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -16208,7 +16574,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -16334,7 +16701,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -16352,7 +16720,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -16368,7 +16737,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -16494,7 +16864,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -16512,7 +16883,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -16528,7 +16900,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -16654,7 +17027,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -16672,7 +17046,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -16688,7 +17063,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -16816,7 +17192,8 @@ 1 Hello World http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -16834,7 +17211,8 @@ 1 - plugins/Morpheus/images/ecommerceAbandonedCart.svg + plugins/Morpheus/images/ecommerceAbandonedCart.png + plugins/Morpheus/images/ecommerceAbandonedCart.svg Abandoned Cart $ 50 revenue - 1 items: My product 202) @@ -16853,7 +17231,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world202/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -16979,7 +17358,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -16997,7 +17377,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -17013,7 +17394,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -17141,7 +17523,8 @@ 1 Hello World http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -17159,7 +17542,8 @@ 1 - plugins/Morpheus/images/ecommerceAbandonedCart.svg + plugins/Morpheus/images/ecommerceAbandonedCart.png + plugins/Morpheus/images/ecommerceAbandonedCart.svg Abandoned Cart $ 50 revenue - 1 items: My product 202) @@ -17178,7 +17562,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world202/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -17304,7 +17689,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -17322,7 +17708,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -17338,7 +17725,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -17466,7 +17854,8 @@ 1 Hello World http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -17484,7 +17873,8 @@ 1 - plugins/Morpheus/images/ecommerceAbandonedCart.svg + plugins/Morpheus/images/ecommerceAbandonedCart.png + plugins/Morpheus/images/ecommerceAbandonedCart.svg Abandoned Cart $ 50 revenue - 1 items: My product 202) @@ -17503,7 +17893,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world202/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -17629,7 +18020,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -17647,7 +18039,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -17663,7 +18056,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -17783,7 +18177,8 @@ http://www.helloworld.com/hello/world200 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -17804,7 +18199,8 @@ 1 Hello World http://www.helloworld.com/hello/world200 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -17824,7 +18220,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world200/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -17844,7 +18241,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world200/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -17860,7 +18258,8 @@ 545 0.55s 4 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search mobile @@ -17891,7 +18290,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - /path/product1.jpg @@ -17912,7 +18312,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - Buy Product 1 Now! @@ -17933,7 +18334,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 2 - /path/product2.jpg @@ -17954,7 +18356,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 3 - Product 3 on sale @@ -17975,7 +18378,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 4 - Unknown @@ -17996,7 +18400,8 @@ click 4 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Product 3 - Product 3 on sale @@ -18017,7 +18422,8 @@ hover 4 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (hover) /path/product1.jpg - http://product1.example.com @@ -18139,7 +18545,8 @@ http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -18160,7 +18567,8 @@ 1 Hello World http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -18178,7 +18586,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world202/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -18298,7 +18707,8 @@ http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -18317,7 +18727,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -18335,7 +18746,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -18351,7 +18763,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -18471,7 +18884,8 @@ http://www.helloworld.com/hello/world205 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -18492,7 +18906,8 @@ 1 Hello World http://www.helloworld.com/hello/world205 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -18510,7 +18925,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world205/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -18630,7 +19046,8 @@ http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -18651,7 +19068,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -18671,7 +19089,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -18689,7 +19108,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -18815,7 +19235,8 @@ 1 Hello World http://www.helloworld.com/hello/world208 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -18831,7 +19252,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world208/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -18951,7 +19373,8 @@ http://www.helloworld.com/hello/world209 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -18970,7 +19393,8 @@ 1 Hello World http://www.helloworld.com/hello/world209 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -18988,7 +19412,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world209/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -19004,7 +19429,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world209/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -19120,7 +19546,8 @@ http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -19141,7 +19568,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -19159,7 +19587,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -19279,7 +19708,8 @@ http://www.helloworld.com/hello/world201 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -19298,7 +19728,8 @@ 1 Hello World http://www.helloworld.com/hello/world201 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -19418,7 +19849,8 @@ http://www.helloworld.com/hello/world204 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -19439,7 +19871,8 @@ 1 Hello World http://www.helloworld.com/hello/world204 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -19458,7 +19891,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - /path/product1.jpg @@ -19479,7 +19913,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - Buy Product 1 Now! @@ -19500,7 +19935,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 2 - /path/product2.jpg @@ -19521,7 +19957,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 3 - Product 3 on sale @@ -19542,7 +19979,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 4 - Unknown @@ -19563,7 +20001,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Product 3 - Product 3 on sale @@ -19584,7 +20023,8 @@ hover 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (hover) /path/product1.jpg - http://product1.example.com @@ -19604,7 +20044,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -19625,7 +20066,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -19646,7 +20088,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -19667,7 +20110,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -19685,7 +20129,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -19812,7 +20257,8 @@ 1 Hello World http://www.helloworld.com/hello/world207 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -19932,7 +20378,8 @@ http://www.helloworld.com/hello/world210 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -19953,7 +20400,8 @@ 1 Hello World http://www.helloworld.com/hello/world210 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -19971,7 +20419,8 @@ 1030 1.03s 2 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search analytics @@ -19997,7 +20446,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -20018,7 +20468,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -20039,7 +20490,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -20060,7 +20512,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -20078,7 +20531,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -20205,7 +20659,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -20223,7 +20678,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -20239,7 +20695,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -20367,7 +20824,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -20385,7 +20843,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -20513,7 +20972,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -20533,7 +20993,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -20551,7 +21012,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -20677,7 +21139,8 @@ 1 Hello World http://www.helloworld.com/hello/world209 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -20695,7 +21158,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world209/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -20711,7 +21175,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world209/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -20835,7 +21300,8 @@ 1 Hello World http://www.helloworld.com/hello/world201 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -20853,7 +21319,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -20874,7 +21341,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -20895,7 +21363,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -20916,7 +21385,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -20934,7 +21404,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -21061,7 +21532,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -21079,7 +21551,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -21095,7 +21568,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -21223,7 +21697,8 @@ 1 Hello World http://www.helloworld.com/hello/world205 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -21243,7 +21718,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world205/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -21259,7 +21735,8 @@ 585 0.59s 3 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search ecommerce @@ -21399,7 +21876,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -21419,7 +21897,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -21437,7 +21916,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -21565,7 +22045,8 @@ 1 Hello World http://www.helloworld.com/hello/world207 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -21583,7 +22064,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -21604,7 +22086,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -21625,7 +22108,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -21646,7 +22130,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -21664,7 +22149,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -21793,7 +22279,8 @@ 1 Hello World http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -21811,7 +22298,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world202/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -21939,7 +22427,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -21957,7 +22446,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -22085,7 +22575,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -22105,7 +22596,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -22123,7 +22615,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -22249,7 +22742,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -22267,7 +22761,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -22283,7 +22778,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -22409,7 +22905,8 @@ 1 Hello World http://www.helloworld.com/hello/world208 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -22427,7 +22924,8 @@ 1 - plugins/Morpheus/images/ecommerceAbandonedCart.svg + plugins/Morpheus/images/ecommerceAbandonedCart.png + plugins/Morpheus/images/ecommerceAbandonedCart.svg Abandoned Cart $ 50 revenue - 1 items: My product 208) @@ -22444,7 +22942,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world208/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -22463,7 +22962,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - /path/product1.jpg @@ -22484,7 +22984,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - Buy Product 1 Now! @@ -22505,7 +23006,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 2 - /path/product2.jpg @@ -22526,7 +23028,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 3 - Product 3 on sale @@ -22547,7 +23050,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 4 - Unknown @@ -22568,7 +23072,8 @@ click 2 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Product 3 - Product 3 on sale @@ -22589,7 +23094,8 @@ hover 2 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (hover) /path/product1.jpg - http://product1.example.com @@ -22711,7 +23217,8 @@ http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -22732,7 +23239,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -22750,7 +23258,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -22876,7 +23385,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -22894,7 +23404,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -22910,7 +23421,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -23030,7 +23542,8 @@ http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -23051,7 +23564,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -23069,7 +23583,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -23195,7 +23710,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -23213,7 +23729,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -23229,7 +23746,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -23357,7 +23875,8 @@ 1 Hello World http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -23375,7 +23894,8 @@ 1 - plugins/Morpheus/images/ecommerceAbandonedCart.svg + plugins/Morpheus/images/ecommerceAbandonedCart.png + plugins/Morpheus/images/ecommerceAbandonedCart.svg Abandoned Cart $ 50 revenue - 1 items: My product 202) @@ -23394,7 +23914,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world202/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -23520,7 +24041,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -23538,7 +24060,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -23554,7 +24077,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -23674,7 +24198,8 @@ http://www.helloworld.com/hello/world200 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -23695,7 +24220,8 @@ 1 Hello World http://www.helloworld.com/hello/world200 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -23715,7 +24241,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world200/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -23735,7 +24262,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world200/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -23751,7 +24279,8 @@ 545 0.55s 4 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search mobile @@ -23782,7 +24311,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - /path/product1.jpg @@ -23803,7 +24333,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - Buy Product 1 Now! @@ -23824,7 +24355,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 2 - /path/product2.jpg @@ -23845,7 +24377,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 3 - Product 3 on sale @@ -23866,7 +24399,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 4 - Unknown @@ -23887,7 +24421,8 @@ click 4 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Product 3 - Product 3 on sale @@ -23908,7 +24443,8 @@ hover 4 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (hover) /path/product1.jpg - http://product1.example.com @@ -24030,7 +24566,8 @@ http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -24051,7 +24588,8 @@ 1 Hello World http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -24069,7 +24607,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world202/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -24189,7 +24728,8 @@ http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -24208,7 +24748,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -24226,7 +24767,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -24242,7 +24784,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -24362,7 +24905,8 @@ http://www.helloworld.com/hello/world205 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -24383,7 +24927,8 @@ 1 Hello World http://www.helloworld.com/hello/world205 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -24401,7 +24946,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world205/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -24521,7 +25067,8 @@ http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -24542,7 +25089,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -24562,7 +25110,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -24580,7 +25129,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -24706,7 +25256,8 @@ 1 Hello World http://www.helloworld.com/hello/world208 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -24722,7 +25273,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world208/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -24842,7 +25394,8 @@ http://www.helloworld.com/hello/world209 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -24861,7 +25414,8 @@ 1 Hello World http://www.helloworld.com/hello/world209 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -24879,7 +25433,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world209/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -24895,7 +25450,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world209/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -25011,7 +25567,8 @@ http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -25032,7 +25589,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -25050,7 +25608,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -25170,7 +25729,8 @@ http://www.helloworld.com/hello/world200 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -25191,7 +25751,8 @@ 1 Hello World http://www.helloworld.com/hello/world200 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -25211,7 +25772,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world200/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -25231,7 +25793,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world200/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -25247,7 +25810,8 @@ 545 0.55s 4 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search mobile @@ -25278,7 +25842,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - /path/product1.jpg @@ -25299,7 +25864,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - Buy Product 1 Now! @@ -25320,7 +25886,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 2 - /path/product2.jpg @@ -25341,7 +25908,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 3 - Product 3 on sale @@ -25362,7 +25930,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 4 - Unknown @@ -25383,7 +25952,8 @@ click 4 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Product 3 - Product 3 on sale @@ -25404,7 +25974,8 @@ hover 4 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (hover) /path/product1.jpg - http://product1.example.com @@ -25526,7 +26097,8 @@ http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -25547,7 +26119,8 @@ 1 Hello World http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -25565,7 +26138,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world202/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -25685,7 +26259,8 @@ http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -25704,7 +26279,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -25722,7 +26298,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -25738,7 +26315,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -25858,7 +26436,8 @@ http://www.helloworld.com/hello/world205 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -25879,7 +26458,8 @@ 1 Hello World http://www.helloworld.com/hello/world205 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -25897,7 +26477,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world205/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -26017,7 +26598,8 @@ http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -26038,7 +26620,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -26058,7 +26641,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -26076,7 +26660,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -26202,7 +26787,8 @@ 1 Hello World http://www.helloworld.com/hello/world208 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -26218,7 +26804,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world208/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -26338,7 +26925,8 @@ http://www.helloworld.com/hello/world209 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -26357,7 +26945,8 @@ 1 Hello World http://www.helloworld.com/hello/world209 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -26375,7 +26964,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world209/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -26391,7 +26981,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world209/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -26507,7 +27098,8 @@ http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -26528,7 +27120,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -26546,7 +27139,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -26666,7 +27260,8 @@ http://www.helloworld.com/hello/world201 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -26685,7 +27280,8 @@ 1 Hello World http://www.helloworld.com/hello/world201 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -26805,7 +27401,8 @@ http://www.helloworld.com/hello/world204 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -26826,7 +27423,8 @@ 1 Hello World http://www.helloworld.com/hello/world204 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -26845,7 +27443,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - /path/product1.jpg @@ -26866,7 +27465,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - Buy Product 1 Now! @@ -26887,7 +27487,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 2 - /path/product2.jpg @@ -26908,7 +27509,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 3 - Product 3 on sale @@ -26929,7 +27531,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 4 - Unknown @@ -26950,7 +27553,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Product 3 - Product 3 on sale @@ -26971,7 +27575,8 @@ hover 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (hover) /path/product1.jpg - http://product1.example.com @@ -26991,7 +27596,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -27012,7 +27618,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -27033,7 +27640,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -27054,7 +27662,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -27072,7 +27681,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -27199,7 +27809,8 @@ 1 Hello World http://www.helloworld.com/hello/world207 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -27319,7 +27930,8 @@ http://www.helloworld.com/hello/world210 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -27340,7 +27952,8 @@ 1 Hello World http://www.helloworld.com/hello/world210 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -27358,7 +27971,8 @@ 1030 1.03s 2 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search analytics @@ -27384,7 +27998,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -27405,7 +28020,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -27426,7 +28042,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -27447,7 +28064,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -27465,7 +28083,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -27586,7 +28205,8 @@ http://www.helloworld.com/hello/world201 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -27605,7 +28225,8 @@ 1 Hello World http://www.helloworld.com/hello/world201 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -27725,7 +28346,8 @@ http://www.helloworld.com/hello/world204 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -27746,7 +28368,8 @@ 1 Hello World http://www.helloworld.com/hello/world204 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -27765,7 +28388,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - /path/product1.jpg @@ -27786,7 +28410,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - Buy Product 1 Now! @@ -27807,7 +28432,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 2 - /path/product2.jpg @@ -27828,7 +28454,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 3 - Product 3 on sale @@ -27849,7 +28476,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 4 - Unknown @@ -27870,7 +28498,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Product 3 - Product 3 on sale @@ -27891,7 +28520,8 @@ hover 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (hover) /path/product1.jpg - http://product1.example.com @@ -27911,7 +28541,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -27932,7 +28563,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -27953,7 +28585,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -27974,7 +28607,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -27992,7 +28626,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -28119,7 +28754,8 @@ 1 Hello World http://www.helloworld.com/hello/world207 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -28239,7 +28875,8 @@ http://www.helloworld.com/hello/world210 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -28260,7 +28897,8 @@ 1 Hello World http://www.helloworld.com/hello/world210 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -28278,7 +28916,8 @@ 1030 1.03s 2 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search analytics @@ -28304,7 +28943,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -28325,7 +28965,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -28346,7 +28987,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -28367,7 +29009,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -28385,7 +29028,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -28512,7 +29156,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -28530,7 +29175,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -28546,7 +29192,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -28674,7 +29321,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -28692,7 +29340,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -28818,7 +29467,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -28836,7 +29486,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -28852,7 +29503,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -28980,7 +29632,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -28998,7 +29651,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -29126,7 +29780,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -29146,7 +29801,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -29164,7 +29820,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -29290,7 +29947,8 @@ 1 Hello World http://www.helloworld.com/hello/world209 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -29308,7 +29966,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world209/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -29324,7 +29983,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world209/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -29448,7 +30108,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -29468,7 +30129,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -29486,7 +30148,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -29612,7 +30275,8 @@ 1 Hello World http://www.helloworld.com/hello/world209 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -29630,7 +30294,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world209/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -29646,7 +30311,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world209/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -29770,7 +30436,8 @@ 1 Hello World http://www.helloworld.com/hello/world201 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -29788,7 +30455,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -29809,7 +30477,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -29830,7 +30499,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -29851,7 +30521,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -29869,7 +30540,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -29998,7 +30670,8 @@ 1 Hello World http://www.helloworld.com/hello/world201 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -30016,7 +30689,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -30037,7 +30711,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -30058,7 +30733,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -30079,7 +30755,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -30097,7 +30774,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -30224,7 +30902,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -30242,7 +30921,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -30258,7 +30938,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -30386,7 +31067,8 @@ 1 Hello World http://www.helloworld.com/hello/world205 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -30406,7 +31088,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world205/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -30422,7 +31105,8 @@ 585 0.59s 3 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search ecommerce @@ -30562,7 +31246,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -30582,7 +31267,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -30600,7 +31286,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -30726,7 +31413,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -30744,7 +31432,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -30760,7 +31449,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -30888,7 +31578,8 @@ 1 Hello World http://www.helloworld.com/hello/world205 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -30908,7 +31599,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world205/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -30924,7 +31616,8 @@ 585 0.59s 3 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search ecommerce @@ -31064,7 +31757,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -31082,7 +31776,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -31102,7 +31797,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -31230,7 +31926,8 @@ 1 Hello World http://www.helloworld.com/hello/world207 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -31248,7 +31945,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -31269,7 +31967,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -31290,7 +31989,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -31311,7 +32011,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -31329,7 +32030,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -31458,7 +32160,8 @@ 1 Hello World http://www.helloworld.com/hello/world207 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -31476,7 +32179,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -31497,7 +32201,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -31518,7 +32223,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -31539,7 +32245,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -31557,7 +32264,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -31686,7 +32394,8 @@ 1 Hello World http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -31704,7 +32413,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world202/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -31832,7 +32542,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -31850,7 +32561,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -31978,7 +32690,8 @@ 1 Hello World http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -31996,7 +32709,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world202/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -32124,7 +32838,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -32142,7 +32857,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -32270,7 +32986,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -32290,7 +33007,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -32308,7 +33026,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -32436,7 +33155,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -32456,7 +33176,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -32474,7 +33195,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -32600,7 +33322,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -32618,7 +33341,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -32634,7 +33358,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -32760,7 +33485,8 @@ 1 Hello World http://www.helloworld.com/hello/world208 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -32778,7 +33504,8 @@ 1 - plugins/Morpheus/images/ecommerceAbandonedCart.svg + plugins/Morpheus/images/ecommerceAbandonedCart.png + plugins/Morpheus/images/ecommerceAbandonedCart.svg Abandoned Cart $ 50 revenue - 1 items: My product 208) @@ -32795,7 +33522,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world208/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -32814,7 +33542,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - /path/product1.jpg @@ -32835,7 +33564,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - Buy Product 1 Now! @@ -32856,7 +33586,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 2 - /path/product2.jpg @@ -32877,7 +33608,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 3 - Product 3 on sale @@ -32898,7 +33630,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 4 - Unknown @@ -32919,7 +33652,8 @@ click 2 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Product 3 - Product 3 on sale @@ -32940,7 +33674,8 @@ hover 2 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (hover) /path/product1.jpg - http://product1.example.com @@ -33068,7 +33803,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -33086,7 +33822,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -33102,7 +33839,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -33228,7 +33966,8 @@ 1 Hello World http://www.helloworld.com/hello/world208 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -33246,7 +33985,8 @@ 1 - plugins/Morpheus/images/ecommerceAbandonedCart.svg + plugins/Morpheus/images/ecommerceAbandonedCart.png + plugins/Morpheus/images/ecommerceAbandonedCart.svg Abandoned Cart $ 50 revenue - 1 items: My product 208) @@ -33263,7 +34003,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world208/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -33282,7 +34023,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - /path/product1.jpg @@ -33303,7 +34045,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - Buy Product 1 Now! @@ -33324,7 +34067,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 2 - /path/product2.jpg @@ -33345,7 +34089,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 3 - Product 3 on sale @@ -33366,7 +34111,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 4 - Unknown @@ -33387,7 +34133,8 @@ click 2 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Product 3 - Product 3 on sale @@ -33408,7 +34155,8 @@ hover 2 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (hover) /path/product1.jpg - http://product1.example.com @@ -33530,7 +34278,8 @@ http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -33551,7 +34300,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -33569,7 +34319,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -33689,7 +34440,8 @@ http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -33710,7 +34462,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -33728,7 +34481,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -33854,7 +34608,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -33872,7 +34627,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -33888,7 +34644,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -34008,7 +34765,8 @@ http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -34029,7 +34787,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -34047,7 +34806,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -34173,7 +34933,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -34191,7 +34952,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -34207,7 +34969,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -34327,7 +35090,8 @@ http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -34348,7 +35112,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -34366,7 +35131,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -34492,7 +35258,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -34510,7 +35277,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -34526,7 +35294,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -34652,7 +35421,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -34670,7 +35440,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -34686,7 +35457,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -34814,7 +35586,8 @@ 1 Hello World http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -34832,7 +35605,8 @@ 1 - plugins/Morpheus/images/ecommerceAbandonedCart.svg + plugins/Morpheus/images/ecommerceAbandonedCart.png + plugins/Morpheus/images/ecommerceAbandonedCart.svg Abandoned Cart $ 50 revenue - 1 items: My product 202) @@ -34851,7 +35625,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world202/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -34977,7 +35752,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -34995,7 +35771,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -35011,7 +35788,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -35139,7 +35917,8 @@ 1 Hello World http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -35157,7 +35936,8 @@ 1 - plugins/Morpheus/images/ecommerceAbandonedCart.svg + plugins/Morpheus/images/ecommerceAbandonedCart.png + plugins/Morpheus/images/ecommerceAbandonedCart.svg Abandoned Cart $ 50 revenue - 1 items: My product 202) @@ -35176,7 +35956,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world202/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -35302,7 +36083,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -35320,7 +36102,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -35336,7 +36119,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -35456,7 +36240,8 @@ http://www.helloworld.com/hello/world200 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -35477,7 +36262,8 @@ 1 Hello World http://www.helloworld.com/hello/world200 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -35497,7 +36283,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world200/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -35517,7 +36304,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world200/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -35533,7 +36321,8 @@ 545 0.55s 4 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search mobile @@ -35564,7 +36353,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - /path/product1.jpg @@ -35585,7 +36375,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - Buy Product 1 Now! @@ -35606,7 +36397,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 2 - /path/product2.jpg @@ -35627,7 +36419,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 3 - Product 3 on sale @@ -35648,7 +36441,8 @@ 4 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 4 - Unknown @@ -35669,7 +36463,8 @@ click 4 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Product 3 - Product 3 on sale @@ -35690,7 +36485,8 @@ hover 4 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (hover) /path/product1.jpg - http://product1.example.com @@ -35812,7 +36608,8 @@ http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -35833,7 +36630,8 @@ 1 Hello World http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -35851,7 +36649,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world202/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -35971,7 +36770,8 @@ http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -35990,7 +36790,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -36008,7 +36809,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -36024,7 +36826,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -36144,7 +36947,8 @@ http://www.helloworld.com/hello/world205 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -36165,7 +36969,8 @@ 1 Hello World http://www.helloworld.com/hello/world205 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -36183,7 +36988,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world205/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -36303,7 +37109,8 @@ http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -36324,7 +37131,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -36344,7 +37152,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -36362,7 +37171,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -36488,7 +37298,8 @@ 1 Hello World http://www.helloworld.com/hello/world208 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -36504,7 +37315,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world208/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -36624,7 +37436,8 @@ http://www.helloworld.com/hello/world209 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -36643,7 +37456,8 @@ 1 Hello World http://www.helloworld.com/hello/world209 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -36661,7 +37475,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world209/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -36677,7 +37492,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world209/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -36793,7 +37609,8 @@ http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -36814,7 +37631,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -36832,7 +37650,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -36952,7 +37771,8 @@ http://www.helloworld.com/hello/world201 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -36971,7 +37791,8 @@ 1 Hello World http://www.helloworld.com/hello/world201 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -37091,7 +37912,8 @@ http://www.helloworld.com/hello/world204 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -37112,7 +37934,8 @@ 1 Hello World http://www.helloworld.com/hello/world204 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -37131,7 +37954,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - /path/product1.jpg @@ -37152,7 +37976,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - Buy Product 1 Now! @@ -37173,7 +37998,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 2 - /path/product2.jpg @@ -37194,7 +38020,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 3 - Product 3 on sale @@ -37215,7 +38042,8 @@ 1 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 4 - Unknown @@ -37236,7 +38064,8 @@ click 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Product 3 - Product 3 on sale @@ -37257,7 +38086,8 @@ hover 1 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (hover) /path/product1.jpg - http://product1.example.com @@ -37277,7 +38107,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -37298,7 +38129,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -37319,7 +38151,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -37340,7 +38173,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -37358,7 +38192,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -37485,7 +38320,8 @@ 1 Hello World http://www.helloworld.com/hello/world207 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -37605,7 +38441,8 @@ http://www.helloworld.com/hello/world210 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -37626,7 +38463,8 @@ 1 Hello World http://www.helloworld.com/hello/world210 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -37644,7 +38482,8 @@ 1030 1.03s 2 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search analytics @@ -37670,7 +38509,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -37691,7 +38531,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -37712,7 +38553,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -37733,7 +38575,8 @@ 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -37751,7 +38594,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -37878,7 +38722,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -37896,7 +38741,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -37912,7 +38758,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -38040,7 +38887,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -38063,7 +38911,8 @@ 1 - plugins/Morpheus/images/ecommerceOrder.svg + plugins/Morpheus/images/ecommerceOrder.png + plugins/Morpheus/images/ecommerceOrder.svg Ordered (211) $ 240.54 revenue - 1 items: My product 211) @@ -38082,7 +38931,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -38210,7 +39060,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -38230,7 +39081,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -38248,7 +39100,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -38374,7 +39227,8 @@ 1 Hello World http://www.helloworld.com/hello/world209 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -38392,7 +39246,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world209/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -38408,7 +39263,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world209/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -38532,7 +39388,8 @@ 1 Hello World http://www.helloworld.com/hello/world201 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -38550,7 +39407,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -38571,7 +39429,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -38592,7 +39451,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -38613,7 +39473,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -38631,7 +39492,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -38758,7 +39620,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -38776,7 +39639,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -38792,7 +39656,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -38920,7 +39785,8 @@ 1 Hello World http://www.helloworld.com/hello/world205 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -38943,7 +39809,8 @@ 1 - plugins/Morpheus/images/ecommerceOrder.svg + plugins/Morpheus/images/ecommerceOrder.png + plugins/Morpheus/images/ecommerceOrder.svg Ordered (205) $ 233.70 revenue - 1 items: My product 205) @@ -38964,7 +39831,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world205/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -38980,7 +39848,8 @@ 585 0.59s 3 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search ecommerce @@ -39120,7 +39989,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -39140,7 +40010,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -39158,7 +40029,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -39286,7 +40158,8 @@ 1 Hello World http://www.helloworld.com/hello/world207 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -39304,7 +40177,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" Test Name @@ -39325,7 +40199,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" My Sound @@ -39346,7 +40221,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "stop" My Sound @@ -39367,7 +40243,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "resume" Another Sound @@ -39385,7 +40262,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Sound', Action: "play" 0 M @@ -39514,7 +40392,8 @@ 1 Hello World http://www.helloworld.com/hello/world202 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -39532,7 +40411,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world202/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -39660,7 +40540,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -39678,7 +40559,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -39806,7 +40688,8 @@ 1 Hello World http://www.helloworld.com/hello/world206 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -39826,7 +40709,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world206/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -39844,7 +40728,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world206/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -39970,7 +40855,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -39988,7 +40874,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -40004,7 +40891,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -40130,7 +41018,8 @@ 1 Hello World http://www.helloworld.com/hello/world208 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -40148,7 +41037,8 @@ 1 - plugins/Morpheus/images/ecommerceAbandonedCart.svg + plugins/Morpheus/images/ecommerceAbandonedCart.png + plugins/Morpheus/images/ecommerceAbandonedCart.svg Abandoned Cart $ 50 revenue - 1 items: My product 208) @@ -40165,7 +41055,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world208/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -40184,7 +41075,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - /path/product1.jpg @@ -40205,7 +41097,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 1 - Buy Product 1 Now! @@ -40226,7 +41119,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 2 - /path/product2.jpg @@ -40247,7 +41141,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 3 - Product 3 on sale @@ -40268,7 +41163,8 @@ 2 - plugins/Morpheus/images/contentimpression.svg + plugins/Morpheus/images/contentimpression.png + plugins/Morpheus/images/contentimpression.svg Content Impression Product 4 - Unknown @@ -40289,7 +41185,8 @@ click 2 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (click) Product 3 - Product 3 on sale @@ -40310,7 +41207,8 @@ hover 2 - plugins/Morpheus/images/contentinteraction.svg + plugins/Morpheus/images/contentinteraction.png + plugins/Morpheus/images/contentinteraction.svg Content Interaction (hover) /path/product1.jpg - http://product1.example.com @@ -40432,7 +41330,8 @@ http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 1 @@ -40453,7 +41352,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -40471,7 +41371,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -40597,7 +41498,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -40615,7 +41517,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -40631,7 +41534,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -40751,7 +41655,8 @@ http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion Goal 2 @@ -40772,7 +41677,8 @@ 1 Hello World http://www.helloworld.com/hello/world211 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -40790,7 +41696,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world211/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -40916,7 +41823,8 @@ 1 Hello World http://www.helloworld.com/hello/world203 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -40934,7 +41842,8 @@ 2 Hello World 0 http://www.helloworld.com/hello/world203/0 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -40950,7 +41859,8 @@ 3 Hello World 1 http://www.helloworld.com/hello/world203/1 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index 4d4bc94359d8..435ccee9b818 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -18,7 +18,8 @@ - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "Purchase" 0 M @@ -143,7 +144,8 @@ - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "Search" 0 M @@ -270,7 +272,8 @@ 22 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "play50%" Spirited Away (千と千尋の神隠し) @@ -290,7 +293,8 @@ 7 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "play75%" Spirited Away (千と千尋の神隠し) @@ -310,7 +314,8 @@ 15 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "Search" Search query here @@ -330,7 +335,8 @@ 2 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "playEnd" Spirited Away (千と千尋の神隠し) @@ -350,7 +356,8 @@ 12 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "rating" Spirited Away (千と千尋の神隠し) @@ -369,7 +376,8 @@ - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---', Action: "event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---" event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <--- @@ -496,7 +504,8 @@ - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "Search" 0 M @@ -625,7 +634,8 @@ 1 Welcome! http://example.org/webradio - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -637,7 +647,8 @@ 1 http://example.org/webradio - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion triggered js @@ -656,7 +667,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "play" La fiancée de l'eau @@ -683,7 +695,8 @@ 1 Event Event_Category: "CategoryTriggersGoal here', Action: "This is an event without a URL" - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg 0 M @@ -695,7 +708,8 @@ 9 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion event matching ($ 8 revenue) @@ -714,7 +728,8 @@ 1 min 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "play25%" La fiancée de l'eau @@ -741,7 +756,8 @@ 1 Event Event_Category: "CategoryTriggersGoal here', Action: "This is an event without a URL" - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg 23 0 M @@ -754,7 +770,8 @@ 10 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion event matching ($ 23 revenue) @@ -773,7 +790,8 @@ 1 min 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "play50%" La fiancée de l'eau @@ -800,7 +818,8 @@ 1 Event Event_Category: "CategoryTriggersGoal here', Action: "This is an event without a URL" - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg 0 0 M @@ -813,7 +832,8 @@ 11 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion event matching @@ -832,7 +852,8 @@ 30s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "play75%" La fiancée de l'eau @@ -858,7 +879,8 @@ 30s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "playEnd" La fiancée de l'eau @@ -884,7 +906,8 @@ 1s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "rating" La fiancée de l'eau @@ -911,7 +934,8 @@ 27 min 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "rating" La fiancée de l'eau @@ -940,7 +964,8 @@ 2 Movie Theater http://example.org/movies - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -958,7 +983,8 @@ 2 min 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "playTrailer" Princess Mononoke (もののけ姫) @@ -978,7 +1004,8 @@ 2 min 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "playTrailer" Ponyo (崖の上のポニョ) @@ -998,7 +1025,8 @@ 1 min 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "playTrailer" Spirited Away (千と千尋の神隠し) @@ -1018,7 +1046,8 @@ 2 min 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "clickBuyNow" Spirited Away (千と千尋の神隠し) @@ -1038,7 +1067,8 @@ 22 min 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "playStart" Spirited Away (千と千尋の神隠し) @@ -1056,7 +1086,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "play25%" Spirited Away (千と千尋の神隠し) @@ -1182,7 +1213,8 @@ - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "Purchase" 0 M @@ -1303,7 +1335,8 @@ - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "Search" 0 M @@ -1426,7 +1459,8 @@ 22 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "play50%" Spirited Away (千と千尋の神隠し) @@ -1446,7 +1480,8 @@ 7 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "play75%" Spirited Away (千と千尋の神隠し) @@ -1466,7 +1501,8 @@ 15 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "Search" Search query here @@ -1486,7 +1522,8 @@ 2 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "playEnd" Spirited Away (千と千尋の神隠し) @@ -1506,7 +1543,8 @@ 12 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "rating" Spirited Away (千と千尋の神隠し) @@ -1525,7 +1563,8 @@ - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---', Action: "event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---" event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <--- @@ -1648,7 +1687,8 @@ - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "Search" 0 M @@ -1771,7 +1811,8 @@ 1 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "play" La fiancée de l'eau @@ -1797,7 +1838,8 @@ 1 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "play25%" La fiancée de l'eau @@ -1823,7 +1865,8 @@ 1 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "play50%" La fiancée de l'eau @@ -1849,7 +1892,8 @@ 30s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "play75%" La fiancée de l'eau @@ -1875,7 +1919,8 @@ 30s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "playEnd" La fiancée de l'eau @@ -1901,7 +1946,8 @@ 1s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "rating" La fiancée de l'eau @@ -1928,7 +1974,8 @@ 24 min 59s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "rating" La fiancée de l'eau @@ -1957,7 +2004,8 @@ 1 Movie Theater http://example.org/movies - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1975,7 +2023,8 @@ 2 min 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "playTrailer" Princess Mononoke (もののけ姫) @@ -1995,7 +2044,8 @@ 2 min 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "playTrailer" Ponyo (崖の上のポニョ) @@ -2015,7 +2065,8 @@ 1 min 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "playTrailer" Spirited Away (千と千尋の神隠し) @@ -2035,7 +2086,8 @@ 2 min 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "clickBuyNow" Spirited Away (千と千尋の神隠し) @@ -2055,7 +2107,8 @@ 22 min 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "playStart" Spirited Away (千と千尋の神隠し) @@ -2073,7 +2126,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "play25%" Spirited Away (千と千尋の神隠し) diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index ecc87ee6072e..4ce0888ecaad 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -18,7 +18,8 @@ - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "Purchase" 0 M @@ -139,7 +140,8 @@ - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "Search" 0 M @@ -262,7 +264,8 @@ 22 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "play50%" Spirited Away (千と千尋の神隠し) @@ -282,7 +285,8 @@ 7 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "play75%" Spirited Away (千と千尋の神隠し) @@ -302,7 +306,8 @@ 15 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "Search" Search query here @@ -322,7 +327,8 @@ 2 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "playEnd" Spirited Away (千と千尋の神隠し) @@ -342,7 +348,8 @@ 12 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "rating" Spirited Away (千と千尋の神隠し) @@ -361,7 +368,8 @@ - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---', Action: "event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---" event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <--- @@ -484,7 +492,8 @@ - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "Search" 0 M @@ -607,7 +616,8 @@ 1 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "play" La fiancée de l'eau @@ -633,7 +643,8 @@ 1 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "play25%" La fiancée de l'eau @@ -659,7 +670,8 @@ 1 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "play50%" La fiancée de l'eau @@ -685,7 +697,8 @@ 30s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "play75%" La fiancée de l'eau @@ -711,7 +724,8 @@ 30s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "playEnd" La fiancée de l'eau @@ -737,7 +751,8 @@ 1s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "rating" La fiancée de l'eau @@ -764,7 +779,8 @@ 24 min 59s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "rating" La fiancée de l'eau @@ -793,7 +809,8 @@ 1 Movie Theater http://example.org/movies - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -811,7 +828,8 @@ 2 min 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "playTrailer" Princess Mononoke (もののけ姫) @@ -831,7 +849,8 @@ 2 min 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "playTrailer" Ponyo (崖の上のポニョ) @@ -851,7 +870,8 @@ 1 min 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "playTrailer" Spirited Away (千と千尋の神隠し) @@ -871,7 +891,8 @@ 2 min 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "clickBuyNow" Spirited Away (千と千尋の神隠し) @@ -891,7 +912,8 @@ 22 min 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "playStart" Spirited Away (千と千尋の神隠し) @@ -909,7 +931,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "play25%" Spirited Away (千と千尋の神隠し) @@ -1031,7 +1054,8 @@ - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "Purchase" 0 M @@ -1156,7 +1180,8 @@ - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "Search" 0 M @@ -1283,7 +1308,8 @@ 22 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "play50%" Spirited Away (千と千尋の神隠し) @@ -1303,7 +1329,8 @@ 7 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "play75%" Spirited Away (千と千尋の神隠し) @@ -1323,7 +1350,8 @@ 15 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "Search" Search query here @@ -1343,7 +1371,8 @@ 2 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "playEnd" Spirited Away (千と千尋の神隠し) @@ -1363,7 +1392,8 @@ 12 min 0s - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "rating" Spirited Away (千と千尋の神隠し) @@ -1382,7 +1412,8 @@ - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---', Action: "event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <---" event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---> SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED <--- @@ -1509,7 +1540,8 @@ - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "Search" 0 M @@ -1638,7 +1670,8 @@ 1 Welcome! http://example.org/webradio - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1650,7 +1683,8 @@ 1 http://example.org/webradio - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion triggered js @@ -1669,7 +1703,8 @@ 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "play" La fiancée de l'eau @@ -1696,7 +1731,8 @@ 1 Event Event_Category: "CategoryTriggersGoal here', Action: "This is an event without a URL" - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg 0 M @@ -1708,7 +1744,8 @@ 9 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion event matching ($ 8 revenue) @@ -1727,7 +1764,8 @@ 1 min 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "play25%" La fiancée de l'eau @@ -1754,7 +1792,8 @@ 1 Event Event_Category: "CategoryTriggersGoal here', Action: "This is an event without a URL" - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg 23 0 M @@ -1767,7 +1806,8 @@ 10 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion event matching ($ 23 revenue) @@ -1786,7 +1826,8 @@ 1 min 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "play50%" La fiancée de l'eau @@ -1813,7 +1854,8 @@ 1 Event Event_Category: "CategoryTriggersGoal here', Action: "This is an event without a URL" - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg 0 0 M @@ -1826,7 +1868,8 @@ 11 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion event matching @@ -1845,7 +1888,8 @@ 30s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "play75%" La fiancée de l'eau @@ -1871,7 +1915,8 @@ 30s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "playEnd" La fiancée de l'eau @@ -1897,7 +1942,8 @@ 1s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "rating" La fiancée de l'eau @@ -1924,7 +1970,8 @@ 27 min 0s 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Music', Action: "rating" La fiancée de l'eau @@ -1953,7 +2000,8 @@ 2 Movie Theater http://example.org/movies - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1971,7 +2019,8 @@ 2 min 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "playTrailer" Princess Mononoke (もののけ姫) @@ -1991,7 +2040,8 @@ 2 min 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "playTrailer" Ponyo (崖の上のポニョ) @@ -2011,7 +2061,8 @@ 1 min 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "playTrailer" Spirited Away (千と千尋の神隠し) @@ -2031,7 +2082,8 @@ 2 min 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "clickBuyNow" Spirited Away (千と千尋の神隠し) @@ -2051,7 +2103,8 @@ 22 min 0s 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "playStart" Spirited Away (千と千尋の神隠し) @@ -2069,7 +2122,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Movie', Action: "play25%" Spirited Away (千と千尋の神隠し) diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index a55cc90e3db5..050fadec5797 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -20,7 +20,8 @@ 1 Liberate Web Analytics - Analytics - Piwik http://piwik.org/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -38,7 +39,8 @@ 49 http://piwik.org/ - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -169,7 +171,8 @@ 1 Changelog Archive - Analytics - Piwik http://piwik.org/changelog/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -187,7 +190,8 @@ 40 http://piwik.org/changelog/ - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -204,7 +208,8 @@ 2 Contact the Piwik team - Analytics - Piwik http://piwik.org/contact/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -323,7 +328,8 @@ 1 demo.piwik.org/Piwik Forums - Piwik › Web Analytics Reports http://demo.piwik.org/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -341,7 +347,8 @@ 47 http://demo.piwik.org/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -484,7 +491,8 @@ 1 Liberate Web Analytics - Analytics - Piwik http://piwik.org/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -502,7 +510,8 @@ 44 http://piwik.org/ - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -519,7 +528,8 @@ 2 What is Piwik? - Analytics - Piwik http://piwik.org/what-is-piwisk/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -655,7 +665,8 @@ 45 43 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://demo.piwik.org/ @@ -797,7 +808,8 @@ 1 Integrate Piwik into your Rails Application - Analytics - Piwik http://piwik.org/blog/2012/10/integrate-piwik-into-your-rails-application/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -815,7 +827,8 @@ 43 http://piwik.org/blog/2012/10/integrate-piwik-into-your-rails-application/ - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -956,7 +969,8 @@ 1 Log Analytics - Analytics - Piwik http://piwik.org/log-analytics/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -974,7 +988,8 @@ 42 https://piwik.org/log-analytics/ - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -1105,7 +1120,8 @@ 1 Piwik 2.1 — Massive Performance and Reliability Improvements - Analytics - Piwik http://piwik.org/blog/2014/03/piwik-2-1-massive-performance-reliability-improvements/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -1123,7 +1139,8 @@ 41 http://piwik.org/blog/2014/03/piwik-2-1-massive-performance-reliability-improvements/ - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -1246,7 +1263,8 @@ 1 Log Analytics - Analytics - Piwik http://piwik.org/log-analytics/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -1264,7 +1282,8 @@ 39 http://piwik.org/log-analytics/ - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -1409,7 +1428,8 @@ 1 Liberate Web Analytics - Analytics - Piwik http://piwik.org/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -1427,7 +1447,8 @@ 35 http://piwik.org/ - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -1448,7 +1469,8 @@ 2 Download - Analytics - Piwik http://piwik.org/download/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -1468,7 +1490,8 @@ 38 43 2 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://builds.piwik.org/latest.zip @@ -1602,7 +1625,8 @@ 1 Hello Installing Piwik - Analytics - Piwik http://piwik.org/docs/installation/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -1620,7 +1644,8 @@ 36 http://piwik.org/docs/installation/ - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -1755,7 +1780,8 @@ 1 Liberate Web Analytics - Analytics - Piwik http://piwik.org/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -1773,7 +1799,8 @@ 34 http://piwik.org/ - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -1910,7 +1937,8 @@ 1 <subtitle>http://piwik.net/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -1928,7 +1956,8 @@ <goalPageId>70</goalPageId> <url>http://piwik.net/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -1949,7 +1978,8 @@ 5 <subtitle>http://piwik.net/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -1975,7 +2005,8 @@ <interactionPosition>9</interactionPosition> <title /> <subtitle>http://piwik.net/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -2001,7 +2032,8 @@ <interactionPosition>2</interactionPosition> <title /> <subtitle>http://piwik.net/faq/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -2027,7 +2059,8 @@ <interactionPosition>6</interactionPosition> <title /> <subtitle>http://piwik.net/faq/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -2053,7 +2086,8 @@ <interactionPosition>10</interactionPosition> <title /> <subtitle>http://piwik.net/faq/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -2079,7 +2113,8 @@ <interactionPosition>3</interactionPosition> <title /> <subtitle>http://piwik.net/blog/category/community/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -2105,7 +2140,8 @@ <interactionPosition>7</interactionPosition> <title /> <subtitle>http://piwik.net/blog/category/community/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -2131,7 +2167,8 @@ <interactionPosition>4</interactionPosition> <title /> <subtitle>http://piwik.net/docs/manage-websites/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -2155,7 +2192,8 @@ <interactionPosition>8</interactionPosition> <title /> <subtitle>http://piwik.net/docs/manage-websites/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -2270,7 +2308,8 @@ <interactionPosition>1</interactionPosition> <title /> <subtitle>http://piwik.net/view/my/file.html</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -2288,7 +2327,8 @@ <goalPageId>86</goalPageId> <url>http://piwik.net/view/my/file.html</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -2396,7 +2436,8 @@ 1 <subtitle>http://www.notdatefiltered.com/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -2414,7 +2455,8 @@ <goalPageId>99</goalPageId> <url>http://www.notdatefiltered.com/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -2524,7 +2566,8 @@ 1 302/URL = http%3A%2F%2Fpiwik.net%2FCitrix%2FXenApp%2FWan%2Fauth%2Flogin.jsp http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -2542,7 +2585,8 @@ 84 http://piwik.net/Citrix/XenApp/Wan/auth/login.jsp - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -2559,7 +2603,8 @@ 2 <subtitle>http://piwik.net/Citrix/XenApp/Wan/auth/silentDetection.jsp</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -2674,7 +2719,8 @@ <interactionPosition>1</interactionPosition> <title /> <subtitle>http://hello.example.com/hello/from/another/world/6,681965</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -2700,7 +2746,8 @@ <goalPageId>94</goalPageId> <url>http://hello.example.com/hello/from/another/world/6,681965</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -2816,7 +2863,8 @@ 1 <subtitle>http://xzy.example.com/Products/theProduct</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -2834,7 +2882,8 @@ <goalPageId>80</goalPageId> <url>http://xzy.example.com/Products/theProduct</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -2853,7 +2902,8 @@ 2 301/URL = http%3A%2F%2Fexample.hello.com%2FTopic%2Fhw43061 http://example.hello.com/Topic/hw43061 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -2877,7 +2927,8 @@ 3 <subtitle>http://xzy.example.com/Products/theProduct</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -3004,7 +3055,8 @@ <interactionPosition>1</interactionPosition> <title>404/URL = http%3A%2F%2Fhello.example.com%2Fhello%2Fworld%2F6%2C681965 http://hello.example.com/hello/world/6,681965 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -3022,7 +3074,8 @@ 82 http://hello.example.com/hello/world/6,681965 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -3134,7 +3187,8 @@ 2 404/URL = http%3A%2F%2Fhello.example.com%2Fhello%2Fworld%2F6%2C681965 http://hello.example.com/hello/world/6,681965 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -3166,7 +3220,8 @@ 1 <subtitle>http://hello.example.com/hello/from/another/world/6,681965</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -3184,7 +3239,8 @@ <goalPageId>83</goalPageId> <url>http://hello.example.com/hello/from/another/world/6,681965</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -3292,7 +3348,8 @@ 1 301/URL = http%3A%2F%2Fexample.hello.com%2FTopic%2Fhw43061 http://example.hello.com/Topic/hw43061 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -3318,7 +3375,8 @@ 92 http://example.hello.com/Topic/hw43061 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -3430,7 +3488,8 @@ 1 incredible title! http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -3456,7 +3515,8 @@ 30 http://example.org/index.htm - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -3581,7 +3641,8 @@ 1 Piwik Forums http://forum.piwik.org/register.php?0,approve=9a94a02145599 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -3599,7 +3660,8 @@ 31 http://forum.piwik.org/register.php?0,approve=9a94a02145599 - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -3742,7 +3804,8 @@ 1 <subtitle>http://piwik.net/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -3760,7 +3823,8 @@ <goalPageId>89</goalPageId> <url>http://piwik.net/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -3870,7 +3934,8 @@ 1 <subtitle>http://piwik.net/api/fútbol-user-agent</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -3888,7 +3953,8 @@ <goalPageId>90</goalPageId> <url>http://piwik.net/api/fútbol-user-agent</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -3996,7 +4062,8 @@ 3914 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "cloudfront_rtmp', Action: "play" myvideo @@ -4111,7 +4178,8 @@ 2014 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "cloudfront_rtmp', Action: "connect" @@ -4225,7 +4293,8 @@ 1 <subtitle>http://piwik.net/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -4243,7 +4312,8 @@ <goalPageId>28</goalPageId> <url>http://piwik.net/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -4355,7 +4425,8 @@ 1 <subtitle>http://piwik.net/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -4373,7 +4444,8 @@ <goalPageId>29</goalPageId> <url>http://piwik.net/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -4487,7 +4559,8 @@ 1 301/URL = http%3A%2F%2Fpiwik.net%2Fmoved-permanently http://piwik.net/moved-permanently - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -4505,7 +4578,8 @@ 26 http://piwik.net/moved-permanently - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -4522,7 +4596,8 @@ 2 307/URL = http%3A%2F%2Fpiwik.net%2Ftemp-redirect http://piwik.net/temp-redirect - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -4639,7 +4714,8 @@ 61 1 min 1s - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://piwik.net/thing.js @@ -4663,7 +4739,8 @@ 61 1 min 1s - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://piwik.net/thing.css @@ -4685,7 +4762,8 @@ 25 3574 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://piwik.net/other.png @@ -4804,7 +4882,8 @@ 1 <subtitle>http://piwik.net/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -4822,7 +4901,8 @@ <goalPageId>22</goalPageId> <url>http://piwik.net/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -4934,7 +5014,8 @@ 1 500/URL = http%3A%2F%2Fpiwik.net%2Fto-an-error http://piwik.net/to-an-error - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -4952,7 +5033,8 @@ 21 http://piwik.net/to-an-error - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -5062,7 +5144,8 @@ 18 4324023 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://piwik.net/19.pdf @@ -5181,7 +5264,8 @@ 1 404/URL = http%3A%2F%2Fpiwik.net%2Fthis%2Fis%2Fnot%2Fthe%2Fpage%2Fi%2Fam%2Flooking%2Ffor%2F http://piwik.net/this/is/not/the/page/i/am/looking/for/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -5199,7 +5283,8 @@ 20 http://piwik.net/this/is/not/the/page/i/am/looking/for/ - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -5311,7 +5396,8 @@ 1 <subtitle>http://piwik.net/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -5329,7 +5415,8 @@ <goalPageId>19</goalPageId> <url>http://piwik.net/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -5441,7 +5528,8 @@ 1 <subtitle>http://piwik.net/hosting/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -5459,7 +5547,8 @@ <goalPageId>17</goalPageId> <url>http://piwik.net/hosting/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -5567,7 +5656,8 @@ 1 <subtitle>http://piwik.net/faq/how-to-install/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -5585,7 +5675,8 @@ <goalPageId>16</goalPageId> <url>http://piwik.net/faq/how-to-install/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -5693,7 +5784,8 @@ 1 <subtitle>http://piwik.net/blog/2012/08/survey-your-opinion-matters/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -5711,7 +5803,8 @@ <goalPageId>15</goalPageId> <url>http://piwik.net/blog/2012/08/survey-your-opinion-matters/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -5819,7 +5912,8 @@ 1 <subtitle>http://piwik.net/intranet-analytics/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -5837,7 +5931,8 @@ <goalPageId>14</goalPageId> <url>http://piwik.net/intranet-analytics/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -5945,7 +6040,8 @@ 1 <subtitle>http://piwik.net/docs/manage-websites/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -5963,7 +6059,8 @@ <goalPageId>13</goalPageId> <url>http://piwik.net/docs/manage-websites/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -6071,7 +6168,8 @@ 1 <subtitle>http://piwik.net/faq/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -6089,7 +6187,8 @@ <goalPageId>12</goalPageId> <url>http://piwik.net/faq/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -6197,7 +6296,8 @@ 1 <subtitle>http://piwik.net/faq/how-to/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -6215,7 +6315,8 @@ <goalPageId>11</goalPageId> <url>http://piwik.net/faq/how-to/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -6323,7 +6424,8 @@ 1 <subtitle>http://piwik.net/newsletter/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -6341,7 +6443,8 @@ <goalPageId>10</goalPageId> <url>http://piwik.net/newsletter/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -6449,7 +6552,8 @@ 1 <subtitle>http://included3.com/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -6467,7 +6571,8 @@ <goalPageId>95</goalPageId> <url>http://included3.com/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -6575,7 +6680,8 @@ 1 <subtitle>http://included1.com/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -6593,7 +6699,8 @@ <goalPageId>97</goalPageId> <url>http://included1.com/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -6701,7 +6808,8 @@ 1 <subtitle>http://piwik.net/docs/manage-users/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -6719,7 +6827,8 @@ <goalPageId>9</goalPageId> <url>http://piwik.net/docs/manage-users/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -6827,7 +6936,8 @@ 1 <subtitle>http://piwik.net/docs/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -6845,7 +6955,8 @@ <goalPageId>8</goalPageId> <url>http://piwik.net/docs/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -6953,7 +7064,8 @@ 1 <subtitle>http://piwik.net/translations/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -6971,7 +7083,8 @@ <goalPageId>7</goalPageId> <url>http://piwik.net/translations/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -7079,7 +7192,8 @@ 1 <subtitle>http://piwik.net/download/counter/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -7097,7 +7211,8 @@ <goalPageId>6</goalPageId> <url>http://piwik.net/download/counter/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -7205,7 +7320,8 @@ 1 <subtitle>http://piwik.net/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -7223,7 +7339,8 @@ <goalPageId>5</goalPageId> <url>http://piwik.net/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -7331,7 +7448,8 @@ 1 <subtitle>http://piwik.net/docs/manage-websites/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -7349,7 +7467,8 @@ <goalPageId>4</goalPageId> <url>http://piwik.net/docs/manage-websites/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -7457,7 +7576,8 @@ 1 <subtitle>http://piwik.net/blog/category/community/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -7475,7 +7595,8 @@ <goalPageId>3</goalPageId> <url>http://piwik.net/blog/category/community/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -7583,7 +7704,8 @@ 1 <subtitle>http://piwik.net/faq/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -7601,7 +7723,8 @@ <goalPageId>2</goalPageId> <url>http://piwik.net/faq/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -7709,7 +7832,8 @@ 1 <subtitle>http://www.included4.com/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -7727,7 +7851,8 @@ <goalPageId>96</goalPageId> <url>http://www.included4.com/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -7835,7 +7960,8 @@ 1 <subtitle>http://www.included2.com/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -7853,7 +7979,8 @@ <goalPageId>98</goalPageId> <url>http://www.included2.com/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) @@ -7961,7 +8088,8 @@ 1 <subtitle>http://piwik.net/blog/category/meta/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <customVariables> <row> @@ -7979,7 +8107,8 @@ <goalPageId>1</goalPageId> <url>http://piwik.net/blog/category/meta/</url> - <icon>plugins/Morpheus/images/goal.svg</icon> + <icon>plugins/Morpheus/images/goal.png</icon> + <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion all ($ 5 revenue) diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml index fc239aed9731..bfb5ede5de2a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml @@ -20,7 +20,8 @@ 1 Liberate Web Analytics - Analytics - Piwik http://piwik.org/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -156,7 +157,8 @@ 1 Changelog Archive - Analytics - Piwik http://piwik.org/changelog/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -178,7 +180,8 @@ 2 Contact the Piwik team - Analytics - Piwik http://piwik.org/contact/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -297,7 +300,8 @@ 1 demo.piwik.org/Piwik Forums - Piwik › Web Analytics Reports http://demo.piwik.org/index.php?module=CoreHome&action=index&date=yesterday&period=day&idSite=7 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -445,7 +449,8 @@ 1 Liberate Web Analytics - Analytics - Piwik http://piwik.org/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -467,7 +472,8 @@ 2 What is Piwik? - Analytics - Piwik http://piwik.org/what-is-piwisk/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -603,7 +609,8 @@ 65 43 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://demo.piwik.org/ @@ -745,7 +752,8 @@ 1 Integrate Piwik into your Rails Application - Analytics - Piwik http://piwik.org/blog/2012/10/integrate-piwik-into-your-rails-application/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -891,7 +899,8 @@ 1 Log Analytics - Analytics - Piwik http://piwik.org/log-analytics/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -1027,7 +1036,8 @@ 1 Piwik 2.1 — Massive Performance and Reliability Improvements - Analytics - Piwik http://piwik.org/blog/2014/03/piwik-2-1-massive-performance-reliability-improvements/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -1155,7 +1165,8 @@ 1 Log Analytics - Analytics - Piwik http://piwik.org/log-analytics/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -1305,7 +1316,8 @@ 1 Liberate Web Analytics - Analytics - Piwik http://piwik.org/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -1331,7 +1343,8 @@ 2 Download - Analytics - Piwik http://piwik.org/download/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -1351,7 +1364,8 @@ 58 43 2 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://builds.piwik.org/latest.zip @@ -1485,7 +1499,8 @@ 1 Hello Installing Piwik - Analytics - Piwik http://piwik.org/docs/installation/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -1625,7 +1640,8 @@ 1 Liberate Web Analytics - Analytics - Piwik http://piwik.org/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -1763,7 +1779,8 @@ 1 incredible title! http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -1901,7 +1918,8 @@ 1 Piwik Forums http://forum.piwik.org/register.php?0,approve=9a94a02145599 - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -2049,7 +2067,8 @@ 1 Looking at Electronics & Cameras page with a page level custom variable http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -2073,7 +2092,8 @@ 2 Another Product page with no category http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -2099,7 +2119,8 @@ 3 Looking at Electronics & Cameras page with a page level custom variable http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml index 68b2d497aacc..39dfd793ef43 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml @@ -20,7 +20,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -32,7 +33,8 @@ 46 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -49,7 +51,8 @@ 3 min 0s Bring on the party 2 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search Bring on the party @@ -69,7 +72,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -86,7 +90,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file8.zip @@ -104,7 +109,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/8.html @@ -122,7 +128,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat8', Action: "Action8" Name8 @@ -253,7 +260,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -275,7 +283,8 @@ 45 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -406,7 +415,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -418,7 +428,8 @@ 41 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -431,7 +442,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -448,7 +460,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file7.zip @@ -466,7 +479,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/7.html @@ -484,7 +498,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat7', Action: "Action7" Name7 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml index 10f07ddf04b9..7f687b6e36b5 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml @@ -18,7 +18,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -40,7 +41,8 @@ 40 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -171,7 +173,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -183,7 +186,8 @@ 35 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -200,7 +204,8 @@ 3 min 0s Bring on the party 2 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search Bring on the party @@ -220,7 +225,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -237,7 +243,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file6.zip @@ -255,7 +262,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/6.html @@ -273,7 +281,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat6', Action: "Action6" Name6 @@ -404,7 +413,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -426,7 +436,8 @@ 34 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml index 4bd684c32050..ffa2c8547203 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml @@ -18,7 +18,8 @@ 1 It's pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -30,7 +31,8 @@ 95 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -153,7 +155,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -165,7 +168,8 @@ 46 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -182,7 +186,8 @@ 3 min 0s Bring on the party 2 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search Bring on the party @@ -202,7 +207,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -219,7 +225,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file8.zip @@ -237,7 +244,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/8.html @@ -255,7 +263,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat8', Action: "Action8" Name8 @@ -386,7 +395,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -408,7 +418,8 @@ 45 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -539,7 +550,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -551,7 +563,8 @@ 41 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -564,7 +577,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -581,7 +595,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file7.zip @@ -599,7 +614,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/7.html @@ -617,7 +633,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat7', Action: "Action7" Name7 @@ -748,7 +765,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -770,7 +788,8 @@ 40 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -901,7 +920,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -913,7 +933,8 @@ 35 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -930,7 +951,8 @@ 3 min 0s Bring on the party 2 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search Bring on the party @@ -950,7 +972,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -967,7 +990,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file6.zip @@ -985,7 +1009,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/6.html @@ -1003,7 +1028,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat6', Action: "Action6" Name6 @@ -1134,7 +1160,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -1156,7 +1183,8 @@ 34 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml index 4bd684c32050..ffa2c8547203 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml @@ -18,7 +18,8 @@ 1 It's pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -30,7 +31,8 @@ 95 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -153,7 +155,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -165,7 +168,8 @@ 46 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -182,7 +186,8 @@ 3 min 0s Bring on the party 2 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search Bring on the party @@ -202,7 +207,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -219,7 +225,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file8.zip @@ -237,7 +244,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/8.html @@ -255,7 +263,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat8', Action: "Action8" Name8 @@ -386,7 +395,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -408,7 +418,8 @@ 45 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -539,7 +550,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -551,7 +563,8 @@ 41 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -564,7 +577,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -581,7 +595,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file7.zip @@ -599,7 +614,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/7.html @@ -617,7 +633,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat7', Action: "Action7" Name7 @@ -748,7 +765,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -770,7 +788,8 @@ 40 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -901,7 +920,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -913,7 +933,8 @@ 35 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -930,7 +951,8 @@ 3 min 0s Bring on the party 2 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search Bring on the party @@ -950,7 +972,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -967,7 +990,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file6.zip @@ -985,7 +1009,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/6.html @@ -1003,7 +1028,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat6', Action: "Action6" Name6 @@ -1134,7 +1160,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -1156,7 +1183,8 @@ 34 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index 1f1215728392..04a0bbc3eb28 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -18,7 +18,8 @@ 1 It's pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -30,7 +31,8 @@ 95 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -153,7 +155,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -165,7 +168,8 @@ 46 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -182,7 +186,8 @@ 3 min 0s Bring on the party 2 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search Bring on the party @@ -202,7 +207,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -219,7 +225,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file8.zip @@ -237,7 +244,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/8.html @@ -255,7 +263,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat8', Action: "Action8" Name8 @@ -386,7 +395,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -408,7 +418,8 @@ 45 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -539,7 +550,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -551,7 +563,8 @@ 41 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -564,7 +577,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -581,7 +595,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file7.zip @@ -599,7 +614,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/7.html @@ -617,7 +633,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat7', Action: "Action7" Name7 @@ -748,7 +765,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -770,7 +788,8 @@ 40 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -901,7 +920,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -913,7 +933,8 @@ 35 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -930,7 +951,8 @@ 3 min 0s Bring on the party 2 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search Bring on the party @@ -950,7 +972,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -967,7 +990,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file6.zip @@ -985,7 +1009,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/6.html @@ -1003,7 +1028,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat6', Action: "Action6" Name6 @@ -1134,7 +1160,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -1156,7 +1183,8 @@ 34 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -1287,7 +1315,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1299,7 +1328,8 @@ 30 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -1312,7 +1342,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -1329,7 +1360,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file5.zip @@ -1347,7 +1379,8 @@ 180 3 min 0s 1 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/5.html @@ -1365,7 +1398,8 @@ 1 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat5', Action: "Action5" Name5 @@ -1496,7 +1530,8 @@ 1 It's <script> pitch black... http://piwik.net/grue/lair - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -1518,7 +1553,8 @@ 29 http://piwik.net/grue/lair - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -1649,7 +1685,8 @@ 1 Space Quest XII http://piwik.net/space/quest/iv - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -1661,7 +1698,8 @@ 24 http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion all ($ 5 revenue) @@ -1678,7 +1716,8 @@ 3 min 0s Bring on the party 2 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search Bring on the party @@ -1698,7 +1737,8 @@ http://piwik.net/space/quest/iv - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion two ($ 5 revenue) @@ -1715,7 +1755,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://example.org/path/file4.zip @@ -1733,7 +1774,8 @@ 180 3 min 0s 2 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://example-outlink.org/4.html @@ -1751,7 +1793,8 @@ 2 - plugins/Morpheus/images/event.svg + plugins/Morpheus/images/event.png + plugins/Morpheus/images/event.svg Event Event_Category: "Cat4', Action: "Action4" Name4 diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index 8432da89a8a9..f3ebb7bcc007 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml @@ -20,7 +20,8 @@ 1 Checkout/Purchasing... http://example.org/store/purchase.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -32,7 +33,8 @@ 9 http://example.org/store/purchase.htm - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion matching purchase.htm ($ 1 revenue) @@ -157,7 +159,8 @@ 1 incredible title! http://example.org/index.htm?parameter=Should display - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -177,7 +180,8 @@ 2 Second page view - should be registered as URL http://example.org/ - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -193,7 +197,8 @@ 360 6 min 0s 2 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink https://outlinks.org/#!outlink-with-fragment-<script> @@ -211,7 +216,8 @@ 72 1 min 12s 2 - plugins/Morpheus/images/download.svg + plugins/Morpheus/images/download.png + plugins/Morpheus/images/download.svg Download http://piwik.org/path/again/latest.zip @@ -229,7 +235,8 @@ 108 1 min 48s 2 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://outlinks.org/other_outlink#fragment&pk_campaign=Open%20partnership @@ -247,7 +254,8 @@ 72 1 min 12s 2 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://dev.piwik.org/svn @@ -261,7 +269,8 @@ http://example.org/ - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion triggered js ($ 42 revenue) @@ -280,7 +289,8 @@ 812 0.81s 3 - plugins/Morpheus/images/search.svg + plugins/Morpheus/images/search.png + plugins/Morpheus/images/search.svg Site Search Banks Own The World @@ -300,7 +310,8 @@ 4 Looking at homepage after site search... http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml index f506073cc84a..ac12048f0dad 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml @@ -18,7 +18,8 @@ 1 <subtitle>http://example.org/this%20is%20cool!?filter=<script>alert(1);</script>{"place":{"place":"0c5b2444-70a0-4932-980c-b4dc0d3f02b5"}}</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <bandwidth_pretty>0 M</bandwidth_pretty> </row> @@ -140,7 +141,8 @@ <interactionPosition>1</interactionPosition> <title>incredible title! (Page URL contains a HTML entity) http://example.org/this%20is%20cool!?filter=<script>alert(1);</script>{"place":{"place":"0c5b2444-70a0-4932-980c-b4dc0d3f02b5"}} - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -152,7 +154,8 @@ http://example.org/this%20is%20cool!?filter=<script>alert(1);</script>{"place":{"place":"0c5b2444-70a0-4932-980c-b4dc0d3f02b5"}} - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Conversion de l'objectif triggered js ($US 42 revenu) diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml index bd775cab5115..25e232dedbb0 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml @@ -17,7 +17,8 @@ 1 <subtitle>http://piwik.net/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <timestamp>1365328800</timestamp> <customVariables> <row> @@ -129,7 +130,8 @@ <interactionPosition>1</interactionPosition> <title /> <subtitle>http://piwik.net/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <timestamp>1365246000</timestamp> <customVariables> <row> @@ -241,7 +243,8 @@ <interactionPosition>1</interactionPosition> <title /> <subtitle>http://piwik.net/</subtitle> - <icon>plugins/Morpheus/images/action.svg</icon> + <icon /> + <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> <timestamp>1365163200</timestamp> <customVariables> <row> diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml index 9d32ec23d0f0..b37f70150c84 100644 --- a/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml @@ -16,7 +16,8 @@ <interactionPosition>1</interactionPosition> <title>incredible title! http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 1267874553 0 M @@ -43,7 +44,8 @@ 1 incredible title! http://example.org/index2.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 1267874733 0 M @@ -59,7 +61,8 @@ 2 incredible title! http://example.org/index3.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 1267874913 0 M @@ -86,7 +89,8 @@ 1 no User Id set but it should appear in email@example.com! http://example.org/no-user-id-set-but-should-appear-in-user-id-visit - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 1267881393 0 M @@ -104,7 +108,8 @@ 2 incredible title! http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 1267881753 0 M @@ -120,7 +125,8 @@ 3 second page http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 1267882113 0 M @@ -145,7 +151,8 @@ 1 a new user id was set -> new visit http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 1267882473 0 M @@ -170,7 +177,8 @@ 1 pageview - should not be tracked by our user id but in a new visit http://example.org/home - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 1267892913 0 M @@ -197,7 +205,8 @@ 1 same user id was set -> this is the same unique user http://example.org/home - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 1267892553 0 M @@ -215,7 +224,8 @@ 2 second pageview - by this user id http://example.org/home - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 1267892913 0 M @@ -227,7 +237,8 @@ Mar 6, 2010 16:34:33 http://example.org/home - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion triggered js 1267893273 @@ -246,7 +257,8 @@ 1 - plugins/Morpheus/images/ecommerceAbandonedCart.svg + plugins/Morpheus/images/ecommerceAbandonedCart.png + plugins/Morpheus/images/ecommerceAbandonedCart.svg Abandoned Cart $ 10000000000 revenue - 1 items: My secret spy tech) 1267893633 @@ -272,7 +284,8 @@ 1 Page view by email@example.com http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 1268565753 0 M @@ -297,7 +310,8 @@ 1 A page view by new-user-id@one-weeklater http://example.org/index.htm - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 1268567193 0 M diff --git a/tests/PHPUnit/System/expected/test_Utf8mb4__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_Utf8mb4__Live.getLastVisitsDetails_year.xml index b2097fb8c1bc..fd57fc16d001 100644 --- a/tests/PHPUnit/System/expected/test_Utf8mb4__Live.getLastVisitsDetails_year.xml +++ b/tests/PHPUnit/System/expected/test_Utf8mb4__Live.getLastVisitsDetails_year.xml @@ -20,7 +20,8 @@ 1 - plugins/Morpheus/images/ecommerceAbandonedCart.svg + plugins/Morpheus/images/ecommerceAbandonedCart.png + plugins/Morpheus/images/ecommerceAbandonedCart.svg Abandoned Cart $ 100 revenue - 1 items: name �) @@ -37,7 +38,8 @@ 1 incredible � http://example.org/foo/�.html - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml index 7bd2d55282b3..c7b7c2dafe25 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml @@ -16,7 +16,8 @@ 5 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://test.com @@ -133,7 +134,8 @@ http://example.org/homepage - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion triggered js ($ 1000 revenue) @@ -150,7 +152,8 @@ 1 Homepage http://example.org/homepage - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -265,7 +268,8 @@ http://example.org/homepage - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion second goal @@ -284,7 +288,8 @@ 1 Homepage http://example.org/homepage - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -296,7 +301,8 @@ http://example.org/user/profile - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion triggered js @@ -315,7 +321,8 @@ 2 Profile page http://example.org/user/profile - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -341,7 +348,8 @@ 3 Profile page for user *_)% http://example.org/user/profile - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index 7bd2d55282b3..c7b7c2dafe25 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml @@ -16,7 +16,8 @@ 5 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://test.com @@ -133,7 +134,8 @@ http://example.org/homepage - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion triggered js ($ 1000 revenue) @@ -150,7 +152,8 @@ 1 Homepage http://example.org/homepage - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -265,7 +268,8 @@ http://example.org/homepage - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion second goal @@ -284,7 +288,8 @@ 1 Homepage http://example.org/homepage - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -296,7 +301,8 @@ http://example.org/user/profile - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion triggered js @@ -315,7 +321,8 @@ 2 Profile page http://example.org/user/profile - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -341,7 +348,8 @@ 3 Profile page for user *_)% http://example.org/user/profile - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml index 831a453214c1..7c2ffa57584c 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml @@ -40,7 +40,8 @@ 5 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://test.com @@ -166,7 +167,8 @@ http://example.org/homepage - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion triggered js ($ 1000 revenue) @@ -183,7 +185,8 @@ 1 Homepage http://example.org/homepage - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml index 7bd2d55282b3..c7b7c2dafe25 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml @@ -16,7 +16,8 @@ 5 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://test.com @@ -133,7 +134,8 @@ http://example.org/homepage - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion triggered js ($ 1000 revenue) @@ -150,7 +152,8 @@ 1 Homepage http://example.org/homepage - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -265,7 +268,8 @@ http://example.org/homepage - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion second goal @@ -284,7 +288,8 @@ 1 Homepage http://example.org/homepage - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -296,7 +301,8 @@ http://example.org/user/profile - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion triggered js @@ -315,7 +321,8 @@ 2 Profile page http://example.org/user/profile - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -341,7 +348,8 @@ 3 Profile page for user *_)% http://example.org/user/profile - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml index 7bd2d55282b3..c7b7c2dafe25 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml @@ -16,7 +16,8 @@ 5 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://test.com @@ -133,7 +134,8 @@ http://example.org/homepage - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion triggered js ($ 1000 revenue) @@ -150,7 +152,8 @@ 1 Homepage http://example.org/homepage - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -265,7 +268,8 @@ http://example.org/homepage - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion second goal @@ -284,7 +288,8 @@ 1 Homepage http://example.org/homepage - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M @@ -296,7 +301,8 @@ http://example.org/user/profile - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion triggered js @@ -315,7 +321,8 @@ 2 Profile page http://example.org/user/profile - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg @@ -341,7 +348,8 @@ 3 Profile page for user *_)% http://example.org/user/profile - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml index 831a453214c1..7c2ffa57584c 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml @@ -40,7 +40,8 @@ 5 - plugins/Morpheus/images/link.svg + plugins/Morpheus/images/link.png + plugins/Morpheus/images/link.svg Outlink http://test.com @@ -166,7 +167,8 @@ http://example.org/homepage - plugins/Morpheus/images/goal.svg + plugins/Morpheus/images/goal.png + plugins/Morpheus/images/goal.svg Goal conversion triggered js ($ 1000 revenue) @@ -183,7 +185,8 @@ 1 Homepage http://example.org/homepage - plugins/Morpheus/images/action.svg + + plugins/Morpheus/images/action.svg 0 M From d7c932710e690d87ea62c3ec94ae65fa5bd05b05 Mon Sep 17 00:00:00 2001 From: Matthieu Aubry Date: Fri, 15 Mar 2019 10:24:13 +1300 Subject: [PATCH 10/15] Rename piwik to matomo in a few INI settings for consistency (#14187) * Rename piwik to matomo in a few INI settings for consistency Just updated the website FAQs to mention matomo.log instead of piwik.log so thought we should do the same in Matomo * add to changelog as it may be breaking * Update expected screenshot. * Update screenshot. --- CHANGELOG.md | 1 + config/global.ini.php | 8 ++++---- .../UIIntegrationTest_admin_diagnostics_configfile.png | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7aa6afa707e2..e6def5b37ad7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ The Product Changelog at **[matomo.org/changelog](https://matomo.org/changelog)* ### Breaking Changes * `Referrers.getKeywordsForPageUrl` and `Referrers.getKeywordsForPageTitle` APIs have been deprecated and will be removed in Matomo 4.0.0 +* By default, Matomo [application logs](https://matomo.org/faq/troubleshooting/faq_115/) will now be logged in `tmp/logs/matomo.log` instead of `tmp/logs/piwik.log`. This log file path can be edited in your config/config.ini.php in the INI setting `logger_file_path`. ### New Features * It is now possible to use monolog's FingersCrossedHandler which buffers all logs and logs all of them in case of warning or error. diff --git a/config/global.ini.php b/config/global.ini.php index 11bc936dd8ab..669345d71c97 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -49,8 +49,8 @@ host = localhost username = "@USERNAME@" password = -dbname = piwik_tests -tables_prefix = piwiktests_ +dbname = matomo_tests +tables_prefix = matomotests_ port = 3306 adapter = PDO\MYSQL type = InnoDB @@ -102,7 +102,7 @@ ; log_level_file = ; if configured to log in a file, log entries will be made to this file -logger_file_path = tmp/logs/piwik.log +logger_file_path = tmp/logs/matomo.log [Cache] ; available backends are 'file', 'array', 'null', 'redis', 'chained' @@ -442,7 +442,7 @@ enable_framed_settings = 0 ; language cookie name for session -language_cookie_name = piwik_lang +language_cookie_name = matomo_lang ; standard email address displayed when sending emails noreply_email_address = "noreply@{DOMAIN}" diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png index 3b34ac300411..0efbf332fe54 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f717f3cfd19c8f2167ca973f21c5026073b2b6750f0612e639c8269c1b1170d -size 4246372 +oid sha256:890b778fd4846e9b8b06d389958f0d1157f41006c26de5714ecf20bef7e43cbf +size 4246791 From 6395855aa7f3813cc7f413a18d31505ea26ba32a Mon Sep 17 00:00:00 2001 From: Thomas Steur Date: Fri, 15 Mar 2019 11:24:36 +1300 Subject: [PATCH 11/15] Support multiple plugin paths (#14051) * do not hard code plugins directory * remove method that is not needed for now * use plugins directory in more places * some work on supporting multiple plugin directories * use more unique name * couple fixes * and another fix * sort plugins * adjust languagesmanager * adjust more usages * Update Manager.php * adding a plugin to test * more tests * make sure plugin resources can be located in custom directory * adding more tests * rewrite image paths * handle more cases * add tests * make sure to load plugin * trying to fix test * trying it this way * load plugin * fix ui test? * testing if tests succeed this way * another test * load custom dir plugin * load plugin in ui fixture * change the update statement * remove update script * delete column * fix ui test * make it work for tests * fix some tests * Fix merge. --- CHANGELOG.md | 3 +- core/API/Proxy.php | 2 +- core/AssetManager/UIAsset/OnDiskUIAsset.php | 19 +- core/AssetManager/UIAssetFetcher.php | 33 +++- .../UIAssetMerger/StylesheetUIAssetMerger.php | 36 +++- core/Columns/Updater.php | 10 +- core/Container/ContainerFactory.php | 4 +- core/Plugin.php | 9 +- core/Plugin/ArchivedMetric.php | 5 + core/Plugin/Manager.php | 180 ++++++++++++++++-- core/Plugin/MetadataLoader.php | 2 +- core/Theme.php | 12 +- core/Twig.php | 28 ++- core/Updater.php | 14 +- core/bootstrap.php | 2 + .../Commands/GenerateAngularComponent.php | 3 +- .../Commands/GenerateAngularDirective.php | 3 +- plugins/CoreConsole/Commands/GenerateApi.php | 3 +- .../CoreConsole/Commands/GenerateArchiver.php | 3 +- .../CoreConsole/Commands/GenerateCommand.php | 3 +- .../Commands/GenerateController.php | 3 +- .../Commands/GenerateDimension.php | 3 +- plugins/CoreConsole/Commands/GenerateMenu.php | 3 +- .../CoreConsole/Commands/GeneratePlugin.php | 4 +- .../Commands/GeneratePluginBase.php | 34 ++-- .../CoreConsole/Commands/GenerateReport.php | 2 +- .../Commands/GenerateScheduledTask.php | 3 +- .../CoreConsole/Commands/GenerateSettings.php | 3 +- plugins/CoreConsole/Commands/GenerateTest.php | 3 +- .../CoreConsole/Commands/GenerateUpdate.php | 2 +- .../Commands/GenerateVisualizationPlugin.php | 3 +- .../CoreConsole/Commands/GenerateWidget.php | 3 +- plugins/CorePluginsAdmin/Controller.php | 3 +- plugins/CorePluginsAdmin/PluginInstaller.php | 7 +- plugins/ExampleTheme/ExampleTheme.php | 5 +- plugins/LanguagesManager/API.php | 22 ++- .../Commands/PluginsWithTranslations.php | 9 +- plugins/LanguagesManager/Commands/Update.php | 19 +- .../TranslationWriter/Writer.php | 2 +- tests/PHPUnit/Fixtures/UITestFixture.php | 4 + tests/PHPUnit/bootstrap.php | 7 + tests/PHPUnit/phpunit.xml.dist | 8 + tests/PHPUnit/proxy/includes.php | 7 + ...IntegrationTest_admin_settings_general.png | 4 +- .../UIIntegrationTest_customdirplugin.png | 3 + ...UIIntegrationTest_fatal_error_safemode.png | 4 +- tests/UI/specs/UIIntegration_spec.js | 8 + .../CustomDirPlugin/.gitignore | 1 + .../custompluginsdir/CustomDirPlugin/API.php | 22 +++ .../CustomDirPlugin/Controller.php | 23 +++ .../CustomDirPlugin/CustomClass.php | 15 ++ .../CustomDirPlugin/CustomDirPlugin.php | 47 +++++ .../CustomDirPlugin/SystemSettings.php | 34 ++++ .../CustomDirPlugin/config/config.php | 4 + .../CustomDirPlugin/images/ok.png | Bin 0 -> 626 bytes .../CustomDirPlugin/lang/en.json | 5 + .../CustomDirPlugin/plugin.json | 29 +++ .../CustomDirPlugin/stylesheets/import.less | 3 + .../CustomDirPlugin/stylesheets/test.less | 15 ++ .../CustomDirPlugin/templates/index.twig | 27 +++ .../Fixtures/SimpleFixtureTrackFewVisits.php | 35 ++++ .../tests/Integration/SystemSettingsTest.php | 49 +++++ .../CustomDirPlugin/tests/System/APITest.php | 44 +++++ .../System/expected/test___API.get_day.xml | 44 +++++ .../expected/test___Goals.getItemsSku_day.xml | 12 ++ .../tests/Unit/CustomClassTest.php | 35 ++++ .../custompluginsdir/javascripts/test.js | 1 + 67 files changed, 887 insertions(+), 110 deletions(-) create mode 100644 tests/UI/expected-screenshots/UIIntegrationTest_customdirplugin.png create mode 100644 tests/resources/custompluginsdir/CustomDirPlugin/.gitignore create mode 100644 tests/resources/custompluginsdir/CustomDirPlugin/API.php create mode 100644 tests/resources/custompluginsdir/CustomDirPlugin/Controller.php create mode 100644 tests/resources/custompluginsdir/CustomDirPlugin/CustomClass.php create mode 100644 tests/resources/custompluginsdir/CustomDirPlugin/CustomDirPlugin.php create mode 100644 tests/resources/custompluginsdir/CustomDirPlugin/SystemSettings.php create mode 100644 tests/resources/custompluginsdir/CustomDirPlugin/config/config.php create mode 100644 tests/resources/custompluginsdir/CustomDirPlugin/images/ok.png create mode 100644 tests/resources/custompluginsdir/CustomDirPlugin/lang/en.json create mode 100644 tests/resources/custompluginsdir/CustomDirPlugin/plugin.json create mode 100644 tests/resources/custompluginsdir/CustomDirPlugin/stylesheets/import.less create mode 100644 tests/resources/custompluginsdir/CustomDirPlugin/stylesheets/test.less create mode 100644 tests/resources/custompluginsdir/CustomDirPlugin/templates/index.twig create mode 100644 tests/resources/custompluginsdir/CustomDirPlugin/tests/Fixtures/SimpleFixtureTrackFewVisits.php create mode 100644 tests/resources/custompluginsdir/CustomDirPlugin/tests/Integration/SystemSettingsTest.php create mode 100644 tests/resources/custompluginsdir/CustomDirPlugin/tests/System/APITest.php create mode 100644 tests/resources/custompluginsdir/CustomDirPlugin/tests/System/expected/test___API.get_day.xml create mode 100644 tests/resources/custompluginsdir/CustomDirPlugin/tests/System/expected/test___Goals.getItemsSku_day.xml create mode 100644 tests/resources/custompluginsdir/CustomDirPlugin/tests/Unit/CustomClassTest.php create mode 100644 tests/resources/custompluginsdir/javascripts/test.js diff --git a/CHANGELOG.md b/CHANGELOG.md index e6def5b37ad7..aae2491c48c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,14 +7,15 @@ The Product Changelog at **[matomo.org/changelog](https://matomo.org/changelog)* ## Matomo 3.9.0 ### Breaking Changes - * `Referrers.getKeywordsForPageUrl` and `Referrers.getKeywordsForPageTitle` APIs have been deprecated and will be removed in Matomo 4.0.0 * By default, Matomo [application logs](https://matomo.org/faq/troubleshooting/faq_115/) will now be logged in `tmp/logs/matomo.log` instead of `tmp/logs/piwik.log`. This log file path can be edited in your config/config.ini.php in the INI setting `logger_file_path`. ### New Features +* It is now possible to locate plugins in a custom directory by setting an environment variable `MATOMO_PLUGIN_DIRS` or a `$GLOBALS['MATOMO_PLUGIN_DIRS']` variable in `$MATOMO_ROOT/bootstrap.php`. * It is now possible to use monolog's FingersCrossedHandler which buffers all logs and logs all of them in case of warning or error. ### New APIs +* New API methods `Piwik\Plugin\Manager::getPluginsDirectories()` and `Piwik\Plugin\Manager::getPluginDirectory($pluginName)` have been added as it is now possible to locate Matomo plugins in different directories and it should be no longer assumed a plugin is located in the "/plugins" directory. * A new tracker method `disableQueueRequest` has been added to disable queued requests which may be useful when logs are imported. * The event `LanguageManager.getAvailableLanguages` has been deprecated. Use `LanguagesManager.getAvailableLanguages` instead. diff --git a/core/API/Proxy.php b/core/API/Proxy.php index 1f2ca5a59d94..833e9053722c 100644 --- a/core/API/Proxy.php +++ b/core/API/Proxy.php @@ -442,7 +442,7 @@ private function getRequestParametersArray($requiredParameters, $parametersReque private function includeApiFile($fileName) { $module = self::getModuleNameFromClassName($fileName); - $path = Manager::getPluginsDirectory() . $module . '/API.php'; + $path = Manager::getPluginDirectory($module) . '/API.php'; if (is_readable($path)) { require_once $path; // prefixed by PIWIK_INCLUDE_PATH diff --git a/core/AssetManager/UIAsset/OnDiskUIAsset.php b/core/AssetManager/UIAsset/OnDiskUIAsset.php index cbd702a691d7..48557480e02f 100644 --- a/core/AssetManager/UIAsset/OnDiskUIAsset.php +++ b/core/AssetManager/UIAsset/OnDiskUIAsset.php @@ -10,6 +10,7 @@ use Exception; use Piwik\AssetManager\UIAsset; +use Piwik\Common; use Piwik\Filesystem; class OnDiskUIAsset extends UIAsset @@ -24,14 +25,27 @@ class OnDiskUIAsset extends UIAsset */ private $relativeLocation; + /** + * @var string + */ + private $relativeRootDir; + /** * @param string $baseDirectory * @param string $fileLocation */ - public function __construct($baseDirectory, $fileLocation) + public function __construct($baseDirectory, $fileLocation, $relativeRootDir = '') { $this->baseDirectory = $baseDirectory; $this->relativeLocation = $fileLocation; + + if (!empty($relativeRootDir) + && is_string($relativeRootDir) + && !Common::stringEndsWith($relativeRootDir, '/')) { + $relativeRootDir .= '/'; + } + + $this->relativeRootDir = $relativeRootDir; } public function getAbsoluteLocation() @@ -41,6 +55,9 @@ public function getAbsoluteLocation() public function getRelativeLocation() { + if (isset($this->relativeRootDir)) { + return $this->relativeRootDir . $this->relativeLocation; + } return $this->relativeLocation; } diff --git a/core/AssetManager/UIAssetFetcher.php b/core/AssetManager/UIAssetFetcher.php index 0b8e9b3a55a0..c9086b0e7133 100644 --- a/core/AssetManager/UIAssetFetcher.php +++ b/core/AssetManager/UIAssetFetcher.php @@ -9,6 +9,7 @@ namespace Piwik\AssetManager; use Piwik\AssetManager\UIAsset\OnDiskUIAsset; +use Piwik\Plugin\Manager; use Piwik\Theme; abstract class UIAssetFetcher @@ -89,9 +90,39 @@ private function initCatalog() private function populateCatalog() { + $pluginBaseDir = Manager::getPluginsDirectory(); + $pluginWebDirectories = Manager::getAlternativeWebRootDirectories(); + $matomoRootDir = $this->getBaseDirectory(); + foreach ($this->fileLocations as $fileLocation) { + $fileAbsolute = $matomoRootDir . '/' . $fileLocation; + $newUIAsset = new OnDiskUIAsset($this->getBaseDirectory(), $fileLocation); - $this->catalog->addUIAsset($newUIAsset); + if ($newUIAsset->exists()) { + $this->catalog->addUIAsset($newUIAsset); + continue; + } + + $found = false; + + if (strpos($fileAbsolute, $pluginBaseDir) === 0) { + // we iterate over all custom plugin directories only for plugin files, not libs files (not needed there) + foreach ($pluginWebDirectories as $pluginDirectory => $relative) { + $fileTest = str_replace($pluginBaseDir, $pluginDirectory, $fileAbsolute); + $newFileRelative = str_replace($pluginDirectory, '', $fileTest); + $testAsset = new OnDiskUIAsset($pluginDirectory, $newFileRelative, $relative); + if ($testAsset->exists()) { + $this->catalog->addUIAsset($testAsset); + $found = true; + break; + } + } + } + + if (!$found) { + // we add it anyway so it'll trigger an error about the missing file + $this->catalog->addUIAsset($newUIAsset); + } } } diff --git a/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php b/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php index a485a513c9ba..b3cebc88410f 100644 --- a/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php +++ b/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php @@ -15,6 +15,7 @@ use Piwik\Common; use Piwik\Exception\StylesheetLessCompileException; use Piwik\Piwik; +use Piwik\Plugin\Manager; class StylesheetUIAssetMerger extends UIAssetMerger { @@ -191,8 +192,9 @@ private function rewriteCssImportPaths($content, $pathsRewriter) private function getCssPathsRewriter($uiAsset) { $baseDirectory = dirname($uiAsset->getRelativeLocation()); + $webDirs = Manager::getAlternativeWebRootDirectories(); - return function ($matches) use ($baseDirectory) { + return function ($matches) use ($baseDirectory, $webDirs) { $absolutePath = PIWIK_DOCUMENT_ROOT . "/$baseDirectory/" . $matches[2]; // Allow to import extension less file @@ -201,13 +203,39 @@ private function getCssPathsRewriter($uiAsset) } // Prevent from rewriting full path - $absolutePath = realpath($absolutePath); - if ($absolutePath) { + $absolutePathReal = realpath($absolutePath); + if ($absolutePathReal) { $relativePath = $baseDirectory . "/" . $matches[2]; $relativePath = str_replace('\\', '/', $relativePath); $publicPath = $matches[1] . $relativePath; } else { - $publicPath = $matches[1] . $matches[2]; + foreach ($webDirs as $absPath => $relativePath) { + if (strpos($baseDirectory, $relativePath) === 0) { + if (strpos($matches[2], '.') === 0) { + // eg ../images/ok.png + $fileRelative = $baseDirectory . '/' . $matches[2]; + $fileAbsolute = $absPath . str_replace($relativePath, '', $fileRelative); + if (file_exists($fileAbsolute)) { + return $matches[1] . $fileRelative; + } + } elseif (strpos($matches[2], 'plugins/') === 0) { + // eg plugins/Foo/images/ok.png + $fileRelative = substr($matches[2], strlen('plugins/')); + $fileAbsolute = $absPath . $fileRelative; + if (file_exists($fileAbsolute)) { + return $matches[1] . $relativePath . $fileRelative; + } + } elseif ($matches[1] === '@import "') { + $fileRelative = $baseDirectory . '/' . $matches[2]; + $fileAbsolute = $absPath . str_replace($relativePath, '', $fileRelative); + if (file_exists($fileAbsolute)) { + return $matches[1] . $baseDirectory . '/' . $matches[2]; + } + } + } + } + + $publicPath = $matches[1] . $matches[2]; } return $publicPath; diff --git a/core/Columns/Updater.php b/core/Columns/Updater.php index 1c750753ccd5..fa41a19d9eb8 100644 --- a/core/Columns/Updater.php +++ b/core/Columns/Updater.php @@ -342,11 +342,13 @@ public function onNoUpdateAvailable($versionsThatWereChecked) private static function getCurrentDimensionFileChanges() { - $files = Filesystem::globr(Manager::getPluginsDirectory() . '*/Columns', '*.php'); - $times = array(); - foreach ($files as $file) { - $times[$file] = filemtime($file); + foreach (Manager::getPluginsDirectories() as $pluginsDir) { + $files = Filesystem::globr($pluginsDir . '*/Columns', '*.php'); + + foreach ($files as $file) { + $times[$file] = filemtime($file); + } } return $times; diff --git a/core/Container/ContainerFactory.php b/core/Container/ContainerFactory.php index e1696db1945e..39d398782dd0 100644 --- a/core/Container/ContainerFactory.php +++ b/core/Container/ContainerFactory.php @@ -121,7 +121,7 @@ private function addEnvironmentConfig(ContainerBuilder $builder, $environment) // add plugin environment configs $plugins = $this->pluginList->getActivatedPlugins(); foreach ($plugins as $plugin) { - $baseDir = Manager::getPluginsDirectory() . $plugin; + $baseDir = Manager::getPluginDirectory($plugin); $environmentFile = $baseDir . '/config/' . $environment . '.php'; if (file_exists($environmentFile)) { @@ -135,7 +135,7 @@ private function addPluginConfigs(ContainerBuilder $builder) $plugins = $this->pluginList->getActivatedPlugins(); foreach ($plugins as $plugin) { - $baseDir = Manager::getPluginsDirectory() . $plugin; + $baseDir = Manager::getPluginDirectory($plugin); $file = $baseDir . '/config/config.php'; if (file_exists($file)) { diff --git a/core/Plugin.php b/core/Plugin.php index fcfdc612a718..c0ac9ecb0a2b 100644 --- a/core/Plugin.php +++ b/core/Plugin.php @@ -355,9 +355,9 @@ public function findComponent($componentName, $expectedSubclass) $cacheId = 'Plugin' . $this->pluginName . $componentName . $expectedSubclass; - $pluginsDir = Manager::getPluginsDirectory(); + $pluginsDir = Manager::getPluginDirectory($this->pluginName); - $componentFile = sprintf('%s%s/%s.php', $pluginsDir, $this->pluginName, $componentName); + $componentFile = sprintf('%s/%s.php', $pluginsDir, $componentName); if ($this->cache->contains($cacheId)) { $classname = $this->cache->fetch($cacheId); @@ -537,8 +537,9 @@ private function doFindMultipleComponents($directoryWithinPlugin, $expectedSubcl { $components = array(); - $pluginsDir = Manager::getPluginsDirectory(); - $baseDir = $pluginsDir . $this->pluginName . '/' . $directoryWithinPlugin; + $pluginsDir = Manager::getPluginDirectory($this->pluginName); + $baseDir = $pluginsDir . '/' . $directoryWithinPlugin; + $files = Filesystem::globr($baseDir, '*.php'); foreach ($files as $file) { diff --git a/core/Plugin/ArchivedMetric.php b/core/Plugin/ArchivedMetric.php index 05fa3d866538..f68a1f2c1025 100644 --- a/core/Plugin/ArchivedMetric.php +++ b/core/Plugin/ArchivedMetric.php @@ -64,6 +64,11 @@ public function __construct(Dimension $dimension, $aggregation = false) $this->aggregation = $aggregation; } + public function getAggregation() + { + return $this->aggregation; + } + public function setDimension($dimension) { $this->dimension = $dimension; diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php index d25234c73549..f48f8416fb6a 100644 --- a/core/Plugin/Manager.php +++ b/core/Plugin/Manager.php @@ -12,11 +12,13 @@ use Piwik\Application\Kernel\PluginList; use Piwik\Cache; use Piwik\Columns\Dimension; +use Piwik\Common; use Piwik\Config; use Piwik\Config as PiwikConfig; use Piwik\Container\StaticContainer; use Piwik\Development; use Piwik\EventDispatcher; +use Piwik\Exception\Exception; use Piwik\Exception\PluginDeactivatedException; use Piwik\Filesystem; use Piwik\Log; @@ -26,7 +28,6 @@ use Piwik\Plugin\Dimension\ActionDimension; use Piwik\Plugin\Dimension\ConversionDimension; use Piwik\Plugin\Dimension\VisitDimension; -use Piwik\Plugins\Marketplace\Api\Client; use Piwik\Settings\Storage as SettingsStorage; use Piwik\SettingsPiwik; use Piwik\Theme; @@ -52,6 +53,8 @@ public static function getInstance() protected $doLoadPlugins = true; + protected static $pluginsToPathCache = array(); + private $pluginsLoadedAndActivated; /** @@ -316,21 +319,164 @@ public function isPluginLoaded($name) */ public function readPluginsDirectory() { - $pluginsName = _glob(self::getPluginsDirectory() . '*', GLOB_ONLYDIR); $result = array(); - if ($pluginsName != false) { - foreach ($pluginsName as $path) { - if (self::pluginStructureLooksValid($path)) { - $result[] = basename($path); + foreach (self::getPluginsDirectories() as $pluginsDir) { + $pluginsName = _glob($pluginsDir . '*', GLOB_ONLYDIR); + if ($pluginsName != false) { + foreach ($pluginsName as $path) { + if (self::pluginStructureLooksValid($path)) { + $result[] = basename($path); + } } } } + + sort($result); + return $result; } + public static function initPluginDirectories() + { + $envDirs = getenv('MATOMO_PLUGIN_DIRS'); + if (!empty($envDirs)) { + // we expect it in the format `absoluteStorageDir1;webrootPathRelative1:absoluteStorageDir2;webrootPathRelative1` + if (empty($GLOBALS['MATOMO_PLUGIN_DIRS'])) { + $GLOBALS['MATOMO_PLUGIN_DIRS'] = array(); + } + + $envDirs = explode(':', $envDirs); + foreach ($envDirs as $envDir) { + $envDir = explode(';', $envDir); + $absoluteDir = rtrim($envDir[0], '/') . '/'; + $GLOBALS['MATOMO_PLUGIN_DIRS'][] = array( + 'pluginsPathAbsolute' => $absoluteDir, + 'webrootDirRelativeToMatomo' => isset($envDir[1]) ? $envDir[1] : null, + ); + } + } + + if (!empty($GLOBALS['MATOMO_PLUGIN_DIRS'])) { + foreach ($GLOBALS['MATOMO_PLUGIN_DIRS'] as $pluginDir => &$settings) { + if (!isset($settings['pluginsPathAbsolute'])) { + throw new \Exception('Missing "pluginsPathAbsolute" configuration for plugin dir'); + } + if (!isset($settings['webrootDirRelativeToMatomo'])) { + throw new \Exception('Missing "webrootDirRelativeToMatomo" configuration for plugin dir'); + } + } + + $pluginDirs = self::getPluginsDirectories(); + if (count($pluginDirs) > 1) { + spl_autoload_register(function ($className) use ($pluginDirs) { + if (strpos($className, 'Piwik\Plugins\\') === 0) { + $withoutPrefix = str_replace('Piwik\Plugins\\', '', $className); + $path = str_replace('\\', DIRECTORY_SEPARATOR, $withoutPrefix) . '.php'; + foreach ($pluginDirs as $pluginsDirectory) { + if (file_exists($pluginsDirectory . $path)) { + require_once $pluginsDirectory . $path; + } + } + } + }); + } + } + } + + public static function getAlternativeWebRootDirectories() + { + $dirs = array(); + + if (!empty($GLOBALS['MATOMO_PLUGIN_DIRS'])) { + foreach ($GLOBALS['MATOMO_PLUGIN_DIRS'] as $pluginDir) { + $absolute = rtrim($pluginDir['pluginsPathAbsolute'], '/') . '/'; + $relative = rtrim($pluginDir['webrootDirRelativeToMatomo'], '/') . '/'; + $dirs[$absolute] = $relative; + } + } + + return $dirs; + } + + /** + * Returns the path to all plugins directories. Each plugins directory may contain several plugins. + * All paths have a trailing slash '/'. + * @return string[] + * @api + */ + public static function getPluginsDirectories() + { + $dirs = array(self::getPluginsDirectory()); + + if (!empty($GLOBALS['MATOMO_PLUGIN_DIRS'])) { + $extraDirs = array_map(function ($dir) { + return rtrim($dir['pluginsPathAbsolute'], '/') . '/'; + }, $GLOBALS['MATOMO_PLUGIN_DIRS']); + $dirs = array_merge($dirs, $extraDirs); + } + + return $dirs; + } + + private static function getPluginRealPath($path) + { + if (strpos($path, '../') !== false) { + // for tests, only do it when needed re performance etc + $real = realpath($path); + if ($real && Common::stringEndsWith($path, '/')) { + return rtrim($real, '/') . '/'; + } + if ($real) { + return $real; + } + } + return $path; + } + + /** + * Gets the path to a specific plugin. If the plugin does not exist in any plugins folder, the default plugins + * folder will be assumed. + * + * @param $pluginName + * @return mixed|string + * @api + */ + public static function getPluginDirectory($pluginName) + { + if (isset(self::$pluginsToPathCache[$pluginName])) { + return self::$pluginsToPathCache[$pluginName]; + } + + $corePluginsDir = PIWIK_INCLUDE_PATH . 'plugins/' . $pluginName; + if (is_dir($corePluginsDir)) { + // for faster performance + self::$pluginsToPathCache[$pluginName] = self::getPluginRealPath($corePluginsDir); + return self::$pluginsToPathCache[$pluginName]; + } + + foreach (self::getPluginsDirectories() as $dir) { + $path = $dir . $pluginName; + if (is_dir($path)) { + self::$pluginsToPathCache[$pluginName] = self::getPluginRealPath($path); + return $path; + } + } + + // assume default directory when plugin does not exist just yet + return self::getPluginsDirectory() . $pluginName; + } + + /** + * Returns the path to the directory where core plugins are located. Please note since Matomo 3.9 + * plugins may also be located in other directories and therefore this method has been deprecated. + * @deprecated since Matomo 3.9.0 use {@link (getPluginsDirectories())} or {@link getPluginDirectory($pluginName)} instead + * @return string + */ public static function getPluginsDirectory() { - return PIWIK_INCLUDE_PATH . '/plugins/'; + $path = rtrim(PIWIK_INCLUDE_PATH, '/') . '/plugins/'; + $path = self::getPluginRealPath($path); + return $path; } /** @@ -459,8 +605,11 @@ private function clearCache($pluginName) public static function deletePluginFromFilesystem($plugin) { - $pluginDir = self::getPluginsDirectory(); - Filesystem::unlinkRecursive($pluginDir . $plugin, $deleteRootToo = true); + $pluginDir = self::getPluginDirectory($plugin); + if (strpos($pluginDir, PIWIK_INCLUDE_PATH) === 0) { + // only delete files for plugins within matomo directory... + Filesystem::unlinkRecursive($pluginDir, $deleteRootToo = true); + } } /** @@ -633,7 +782,7 @@ public function loadAllPluginsAndGetTheirInfo() 'uninstallable' => true, ); } else { - $translator->addDirectory(self::getPluginsDirectory() . $pluginName . '/lang'); + $translator->addDirectory(self::getPluginDirectory($pluginName) . '/lang'); $this->loadPlugin($pluginName); $info = array( 'activated' => $this->isPluginActivated($pluginName), @@ -694,7 +843,8 @@ public function isPluginThirdPartyAndBogus($pluginName) return true; } - $path = self::getPluginsDirectory() . $pluginName; + $path = self::getPluginDirectory($pluginName); + if (!$this->isManifestFileFound($path)) { return true; } @@ -1006,14 +1156,14 @@ public function isValidPluginName($pluginName) */ protected function makePluginClass($pluginName) { - $pluginFileName = sprintf("%s/%s.php", $pluginName, $pluginName); $pluginClassName = $pluginName; if (!$this->isValidPluginName($pluginName)) { - throw new \Exception(sprintf("The plugin filename '%s' is not a valid plugin name", $pluginFileName)); + throw new \Exception(sprintf("The plugin name '%s' is not a valid plugin name", $pluginName)); } - $path = self::getPluginsDirectory() . $pluginFileName; + $path = self::getPluginDirectory($pluginName); + $path = sprintf('%s/%s.php', $path, $pluginName); if (!file_exists($path)) { // Create the smallest minimal Piwik Plugin @@ -1470,7 +1620,7 @@ public function loadPluginTranslations() /** @var Translator $translator */ $translator = StaticContainer::get('Piwik\Translation\Translator'); foreach ($this->getAllPluginsNames() as $pluginName) { - $translator->addDirectory(self::getPluginsDirectory() . $pluginName . '/lang'); + $translator->addDirectory(self::getPluginDirectory($pluginName) . '/lang'); } } } diff --git a/core/Plugin/MetadataLoader.php b/core/Plugin/MetadataLoader.php index 80eae18a80e3..a28f4cfc4310 100644 --- a/core/Plugin/MetadataLoader.php +++ b/core/Plugin/MetadataLoader.php @@ -133,7 +133,7 @@ private function loadJsonMetadata($path) */ private function getPathToPluginFolder() { - return \Piwik\Plugin\Manager::getPluginsDirectory() . $this->pluginName; + return \Piwik\Plugin\Manager::getPluginDirectory($this->pluginName); } /** diff --git a/core/Theme.php b/core/Theme.php index ed6261334ccd..e6eb8756c9b3 100644 --- a/core/Theme.php +++ b/core/Theme.php @@ -75,7 +75,8 @@ public function getJavaScriptFiles() public function rewriteAssetsPathToTheme($output) { - if ($this->themeName == \Piwik\Plugin\Manager::DEFAULT_THEME) { + if ($this->themeName == \Piwik\Plugin\Manager::DEFAULT_THEME + && !Manager::getAlternativeWebRootDirectories()) { return $output; } @@ -140,6 +141,15 @@ private function rewriteAssetPathIfOverridesFound($src) if (file_exists($fileToCheck)) { return str_replace($pathAsset, $overridingAsset, $source); } + + // not rewritten by theme, but may be located in custom webroot directory + foreach (Manager::getAlternativeWebRootDirectories() as $absDir => $webRootDirectory) { + $withoutPlugins = str_replace('plugins/', '', $pathAsset); + if (file_exists($absDir . '/' . $withoutPlugins)) { + return $webRootDirectory . $withoutPlugins; + } + } + return $source; } diff --git a/core/Twig.php b/core/Twig.php index 4b5f1e51ea2e..cac862420181 100644 --- a/core/Twig.php +++ b/core/Twig.php @@ -313,9 +313,8 @@ protected function addFunction_linkTo() */ private function getDefaultThemeLoader() { - $themeLoader = new Twig_Loader_Filesystem(array( - sprintf("%s%s/templates/", Manager::getPluginsDirectory(), \Piwik\Plugin\Manager::DEFAULT_THEME) - ), PIWIK_DOCUMENT_ROOT.DIRECTORY_SEPARATOR); + $themeDir = Manager::getPluginDirectory(\Piwik\Plugin\Manager::DEFAULT_THEME) . '/templates/'; + $themeLoader = new Twig_Loader_Filesystem(array($themeDir), PIWIK_DOCUMENT_ROOT.DIRECTORY_SEPARATOR); return $themeLoader; } @@ -327,13 +326,13 @@ private function getDefaultThemeLoader() */ protected function getCustomThemeLoader(Plugin $theme) { - $pluginsDir = Manager::getPluginsDirectory(); - if (!file_exists(sprintf("%s%s/templates/", $pluginsDir, $theme->getPluginName()))) { + $pluginsDir = Manager::getPluginDirectory($theme->getPluginName()); + $themeDir = $pluginsDir . '/templates/'; + + if (!file_exists($themeDir)) { return false; } - $themeLoader = new Twig_Loader_Filesystem(array( - sprintf("%s%s/templates/", $pluginsDir, $theme->getPluginName()) - ), PIWIK_DOCUMENT_ROOT.DIRECTORY_SEPARATOR); + $themeLoader = new Twig_Loader_Filesystem(array($themeDir), PIWIK_DOCUMENT_ROOT.DIRECTORY_SEPARATOR); return $themeLoader; } @@ -522,11 +521,11 @@ private function addPluginNamespaces(Twig_Loader_Filesystem $loader) $pluginManager = \Piwik\Plugin\Manager::getInstance(); $plugins = $pluginManager->getAllPluginsNames(); - $pluginsDir = Manager::getPluginsDirectory(); foreach ($plugins as $name) { - $path = sprintf("%s%s/templates/", $pluginsDir, $name); + $pluginsDir = Manager::getPluginDirectory($name); + $path = sprintf("%s/templates/", $pluginsDir); if (is_dir($path)) { - $loader->addPath($pluginsDir . $name . '/templates', $name); + $loader->addPath(rtrim($path, '/'), $name); } } } @@ -541,12 +540,11 @@ private function addCustomPluginNamespaces(Twig_Loader_Filesystem $loader, $plug $pluginManager = \Piwik\Plugin\Manager::getInstance(); $plugins = $pluginManager->getAllPluginsNames(); - $pluginsDir = Manager::getPluginsDirectory(); - foreach ($plugins as $name) { - $path = sprintf("%s%s/templates/plugins/%s/", $pluginsDir, $pluginName, $name); + $pluginsDir = Manager::getPluginDirectory($name); + $path = sprintf("%s/templates/plugins/%s/", $pluginsDir, $name); if (is_dir($path)) { - $loader->addPath($pluginsDir . $pluginName . '/templates/plugins/'. $name, $name); + $loader->addPath(rtrim($path, '/'), $name); } } } diff --git a/core/Updater.php b/core/Updater.php index 9af07459b2b4..85c52e309b6c 100644 --- a/core/Updater.php +++ b/core/Updater.php @@ -63,7 +63,13 @@ class Updater public function __construct($pathUpdateFileCore = null, $pathUpdateFilePlugins = null, Columns\Updater $columnsUpdater = null) { $this->pathUpdateFileCore = $pathUpdateFileCore ?: PIWIK_INCLUDE_PATH . '/core/Updates/'; - $this->pathUpdateFilePlugins = $pathUpdateFilePlugins ?: Manager::getPluginsDirectory() . '%s/Updates/'; + + if ($pathUpdateFilePlugins) { + $this->pathUpdateFilePlugins = $pathUpdateFilePlugins; + } else { + $this->pathUpdateFilePlugins = null; + } + $this->columnsUpdater = $columnsUpdater ?: new Columns\Updater(); self::$activeInstance = $this; @@ -345,7 +351,11 @@ private function loadComponentsWithUpdateFile() } elseif (ColumnUpdater::isDimensionComponent($name)) { $componentsWithUpdateFile[$name][PIWIK_INCLUDE_PATH . '/core/Columns/Updater.php'] = $newVersion; } else { - $pathToUpdates = sprintf($this->pathUpdateFilePlugins, $name) . '*.php'; + if ($this->pathUpdateFilePlugins) { + $pathToUpdates = sprintf($this->pathUpdateFilePlugins, $name) . '*.php'; + } else { + $pathToUpdates = Manager::getPluginDirectory($name) . '/Updates/*.php'; + } } if (!empty($pathToUpdates)) { diff --git a/core/bootstrap.php b/core/bootstrap.php index f0cae7495e1f..004ce593274a 100644 --- a/core/bootstrap.php +++ b/core/bootstrap.php @@ -41,6 +41,8 @@ // Composer autoloader require_once PIWIK_VENDOR_PATH . '/autoload.php'; +\Piwik\Plugin\Manager::initPluginDirectories(); + /** * Eaccelerator does not support closures and is known to be not comptabile with Piwik. Therefore we are disabling * it automatically. At this point it looks like Eaccelerator is no longer under development and the bug has not diff --git a/plugins/CoreConsole/Commands/GenerateAngularComponent.php b/plugins/CoreConsole/Commands/GenerateAngularComponent.php index 081da16b0081..c5a7de2ef549 100644 --- a/plugins/CoreConsole/Commands/GenerateAngularComponent.php +++ b/plugins/CoreConsole/Commands/GenerateAngularComponent.php @@ -9,6 +9,7 @@ namespace Piwik\Plugins\CoreConsole\Commands; +use Piwik\Plugin\Manager; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; @@ -38,7 +39,7 @@ protected function execute(InputInterface $input, OutputInterface $output) . $pluginName); } - $exampleFolder = PIWIK_INCLUDE_PATH . '/plugins/ExamplePlugin'; + $exampleFolder = Manager::getPluginDirectory('ExamplePlugin'); $replace = array( 'ExamplePlugin' => $pluginName, 'example-component' => $componentLower, diff --git a/plugins/CoreConsole/Commands/GenerateAngularDirective.php b/plugins/CoreConsole/Commands/GenerateAngularDirective.php index c5c0a767c769..605f417dfd9a 100644 --- a/plugins/CoreConsole/Commands/GenerateAngularDirective.php +++ b/plugins/CoreConsole/Commands/GenerateAngularDirective.php @@ -9,6 +9,7 @@ namespace Piwik\Plugins\CoreConsole\Commands; +use Piwik\Plugin\Manager; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; @@ -39,7 +40,7 @@ protected function execute(InputInterface $input, OutputInterface $output) throw new \Exception('The AngularJS directive ' . $directiveLower . ' already exists in plugin ' . $pluginName); } - $exampleFolder = PIWIK_INCLUDE_PATH . '/plugins/ExamplePlugin'; + $exampleFolder = Manager::getPluginDirectory('ExamplePlugin'); $replace = array( 'ExamplePlugin' => $pluginName, 'directive-component' => $directiveLower, diff --git a/plugins/CoreConsole/Commands/GenerateApi.php b/plugins/CoreConsole/Commands/GenerateApi.php index 9fc3c5b7ae8e..cbaaa9cdc9c1 100644 --- a/plugins/CoreConsole/Commands/GenerateApi.php +++ b/plugins/CoreConsole/Commands/GenerateApi.php @@ -9,6 +9,7 @@ namespace Piwik\Plugins\CoreConsole\Commands; +use Piwik\Plugin\Manager; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; @@ -29,7 +30,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $pluginName = $this->getPluginName($input, $output); $this->checkAndUpdateRequiredPiwikVersion($pluginName, $output); - $exampleFolder = PIWIK_INCLUDE_PATH . '/plugins/ExamplePlugin'; + $exampleFolder = Manager::getPluginDirectory('ExamplePlugin'); $replace = array('ExamplePlugin' => $pluginName); $whitelistFiles = array('/API.php'); diff --git a/plugins/CoreConsole/Commands/GenerateArchiver.php b/plugins/CoreConsole/Commands/GenerateArchiver.php index 29bcee7bb6fa..18e43c11e811 100644 --- a/plugins/CoreConsole/Commands/GenerateArchiver.php +++ b/plugins/CoreConsole/Commands/GenerateArchiver.php @@ -9,6 +9,7 @@ namespace Piwik\Plugins\CoreConsole\Commands; +use Piwik\Plugin\Manager; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; @@ -29,7 +30,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $pluginName = $this->getPluginName($input, $output); $this->checkAndUpdateRequiredPiwikVersion($pluginName, $output); - $exampleFolder = PIWIK_INCLUDE_PATH . '/plugins/ExamplePlugin'; + $exampleFolder = Manager::getPluginDirectory('ExamplePlugin'); $replace = array('ExamplePlugin' => $pluginName, 'EXAMPLEPLUGIN' => strtoupper($pluginName)); $whitelistFiles = array('/Archiver.php'); diff --git a/plugins/CoreConsole/Commands/GenerateCommand.php b/plugins/CoreConsole/Commands/GenerateCommand.php index 9fe95c06d3be..243a61dc75eb 100644 --- a/plugins/CoreConsole/Commands/GenerateCommand.php +++ b/plugins/CoreConsole/Commands/GenerateCommand.php @@ -9,6 +9,7 @@ namespace Piwik\Plugins\CoreConsole\Commands; +use Piwik\Plugin\Manager; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; @@ -32,7 +33,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $commandName = $this->getCommandName($input, $output); - $exampleFolder = PIWIK_INCLUDE_PATH . '/plugins/ExampleCommand'; + $exampleFolder = Manager::getPluginDirectory('ExampleCommand'); $replace = array( 'ExampleCommandDescription' => $commandName, 'ExampleCommand' => $pluginName, diff --git a/plugins/CoreConsole/Commands/GenerateController.php b/plugins/CoreConsole/Commands/GenerateController.php index d5c3b840788e..863c3fe8678c 100644 --- a/plugins/CoreConsole/Commands/GenerateController.php +++ b/plugins/CoreConsole/Commands/GenerateController.php @@ -9,6 +9,7 @@ namespace Piwik\Plugins\CoreConsole\Commands; +use Piwik\Plugin\Manager; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; @@ -29,7 +30,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $pluginName = $this->getPluginName($input, $output); $this->checkAndUpdateRequiredPiwikVersion($pluginName, $output); - $exampleFolder = PIWIK_INCLUDE_PATH . '/plugins/ExamplePlugin'; + $exampleFolder = Manager::getPluginDirectory('ExamplePlugin'); $replace = array('ExamplePlugin' => $pluginName); $whitelistFiles = array('/Controller.php', '/templates', '/templates/index.twig'); diff --git a/plugins/CoreConsole/Commands/GenerateDimension.php b/plugins/CoreConsole/Commands/GenerateDimension.php index 900b6c053361..bc10670cde48 100644 --- a/plugins/CoreConsole/Commands/GenerateDimension.php +++ b/plugins/CoreConsole/Commands/GenerateDimension.php @@ -11,6 +11,7 @@ use Piwik\Common; use Piwik\DbHelper; +use Piwik\Plugin\Manager; use Piwik\Plugin\Report; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; @@ -53,7 +54,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $dimensionClassName = $this->getDimensionClassName($dimensionName); $translatedDimensionName = $this->makeTranslationIfPossible($pluginName, ucfirst($dimensionName)); - $exampleFolder = PIWIK_INCLUDE_PATH . '/plugins/ExampleTracker'; + $exampleFolder = Manager::getPluginDirectory('ExampleTracker'); $replace = array('example_action_dimension' => strtolower($columnName), 'example_visit_dimension' => strtolower($columnName), 'example_conversion_dimension' => strtolower($columnName), diff --git a/plugins/CoreConsole/Commands/GenerateMenu.php b/plugins/CoreConsole/Commands/GenerateMenu.php index 868a47b8f3cc..e6539d7c9f6c 100644 --- a/plugins/CoreConsole/Commands/GenerateMenu.php +++ b/plugins/CoreConsole/Commands/GenerateMenu.php @@ -9,6 +9,7 @@ namespace Piwik\Plugins\CoreConsole\Commands; +use Piwik\Plugin\Manager; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; @@ -29,7 +30,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $pluginName = $this->getPluginName($input, $output); $this->checkAndUpdateRequiredPiwikVersion($pluginName, $output); - $exampleFolder = PIWIK_INCLUDE_PATH . '/plugins/ExamplePlugin'; + $exampleFolder = Manager::getPluginDirectory('ExamplePlugin'); $replace = array('ExamplePlugin' => $pluginName); $whitelistFiles = array('/Menu.php'); diff --git a/plugins/CoreConsole/Commands/GeneratePlugin.php b/plugins/CoreConsole/Commands/GeneratePlugin.php index a214a40a5f19..ad29a39a940f 100644 --- a/plugins/CoreConsole/Commands/GeneratePlugin.php +++ b/plugins/CoreConsole/Commands/GeneratePlugin.php @@ -47,7 +47,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $exampleDescription = $info['description']; if ($isTheme) { - $exampleFolder = PIWIK_INCLUDE_PATH . '/plugins/ExampleTheme'; + $exampleFolder = Plugin\Manager::getPluginDirectory('ExampleTheme'); $replace = array( 'ExampleTheme' => $pluginName, $exampleDescription => $description, @@ -58,7 +58,7 @@ protected function execute(InputInterface $input, OutputInterface $output) } else { - $exampleFolder = PIWIK_INCLUDE_PATH . '/plugins/ExamplePlugin'; + $exampleFolder = Plugin\Manager::getPluginDirectory('ExamplePlugin'); $replace = array( 'ExamplePlugin' => $pluginName, $exampleDescription => $description, diff --git a/plugins/CoreConsole/Commands/GeneratePluginBase.php b/plugins/CoreConsole/Commands/GeneratePluginBase.php index 211dc94db3a5..6d99e13a7b0c 100644 --- a/plugins/CoreConsole/Commands/GeneratePluginBase.php +++ b/plugins/CoreConsole/Commands/GeneratePluginBase.php @@ -14,6 +14,7 @@ use Piwik\Filesystem; use Piwik\Plugin\ConsoleCommand; use Piwik\Plugin\Dependency; +use Piwik\Plugin\Manager; use Piwik\Version; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -27,12 +28,7 @@ public function isEnabled() public function getPluginPath($pluginName) { - return PIWIK_INCLUDE_PATH . $this->getRelativePluginPath($pluginName); - } - - private function getRelativePluginPath($pluginName) - { - return '/plugins/' . $pluginName; + return Manager::getPluginDirectory($pluginName); } private function createFolderWithinPluginIfNotExists($pluginNameOrCore, $folder) @@ -111,7 +107,7 @@ protected function makeTranslationIfPossible($pluginName, $translatedText, $tran protected function checkAndUpdateRequiredPiwikVersion($pluginName, OutputInterface $output) { $pluginJsonPath = $this->getPluginPath($pluginName) . '/plugin.json'; - $relativePluginJson = $this->getRelativePluginPath($pluginName) . '/plugin.json'; + $relativePluginJson = Manager::getPluginDirectory($pluginName) . '/plugin.json'; if (!file_exists($pluginJsonPath) || !is_writable($pluginJsonPath)) { return; @@ -326,11 +322,13 @@ protected function copyTemplateToPlugin($templateFolder, $pluginName, array $rep protected function getPluginNames() { - $pluginDirs = \_glob(PIWIK_INCLUDE_PATH . '/plugins/*', GLOB_ONLYDIR); - $pluginNames = array(); - foreach ($pluginDirs as $pluginDir) { - $pluginNames[] = basename($pluginDir); + foreach (Manager::getPluginsDirectories() as $pluginsDir) { + $pluginDirs = \_glob($pluginsDir . '*', GLOB_ONLYDIR); + + foreach ($pluginDirs as $pluginDir) { + $pluginNames[] = basename($pluginDir); + } } return $pluginNames; @@ -338,15 +336,17 @@ protected function getPluginNames() protected function getPluginNamesHavingNotSpecificFile($filename) { - $pluginDirs = \_glob(PIWIK_INCLUDE_PATH . '/plugins/*', GLOB_ONLYDIR); - $pluginNames = array(); - foreach ($pluginDirs as $pluginDir) { - if (!file_exists($pluginDir . '/' . $filename)) { - $pluginNames[] = basename($pluginDir); + foreach (Manager::getPluginsDirectories() as $pluginsDir) { + $pluginDirs = \_glob($pluginsDir . '*', GLOB_ONLYDIR); + + foreach ($pluginDirs as $pluginDir) { + if (!file_exists($pluginDir . '/' . $filename)) { + $pluginNames[] = basename($pluginDir); + } } - } + } return $pluginNames; } diff --git a/plugins/CoreConsole/Commands/GenerateReport.php b/plugins/CoreConsole/Commands/GenerateReport.php index 1faa1c9dc6cf..b30ec7d61e3b 100644 --- a/plugins/CoreConsole/Commands/GenerateReport.php +++ b/plugins/CoreConsole/Commands/GenerateReport.php @@ -45,7 +45,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $order = $this->getOrder($category); $apiName = $this->getApiName($reportName); - $exampleFolder = PIWIK_INCLUDE_PATH . '/plugins/ExampleReport'; + $exampleFolder = Manager::getPluginDirectory('ExampleReport'); $replace = array('GetExampleReport' => ucfirst($apiName), 'getExampleReport' => lcfirst($apiName), 'getApiReport' => lcfirst($apiName), diff --git a/plugins/CoreConsole/Commands/GenerateScheduledTask.php b/plugins/CoreConsole/Commands/GenerateScheduledTask.php index 8337e7146f95..2317805aec24 100644 --- a/plugins/CoreConsole/Commands/GenerateScheduledTask.php +++ b/plugins/CoreConsole/Commands/GenerateScheduledTask.php @@ -9,6 +9,7 @@ namespace Piwik\Plugins\CoreConsole\Commands; +use Piwik\Plugin\Manager; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; @@ -29,7 +30,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $pluginName = $this->getPluginName($input, $output); $this->checkAndUpdateRequiredPiwikVersion($pluginName, $output); - $exampleFolder = PIWIK_INCLUDE_PATH . '/plugins/ExamplePlugin'; + $exampleFolder = Manager::getPluginDirectory('ExamplePlugin'); $replace = array('ExamplePlugin' => $pluginName); $whitelistFiles = array('/Tasks.php'); diff --git a/plugins/CoreConsole/Commands/GenerateSettings.php b/plugins/CoreConsole/Commands/GenerateSettings.php index a5b0c4e07760..245446fa6a75 100644 --- a/plugins/CoreConsole/Commands/GenerateSettings.php +++ b/plugins/CoreConsole/Commands/GenerateSettings.php @@ -9,6 +9,7 @@ namespace Piwik\Plugins\CoreConsole\Commands; +use Piwik\Plugin\Manager; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; @@ -33,7 +34,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $pluginName = $this->getPluginName($input, $output, $settingsType, $settingsFilename); $this->checkAndUpdateRequiredPiwikVersion($pluginName, $output); - $exampleFolder = PIWIK_INCLUDE_PATH . '/plugins/ExampleSettingsPlugin'; + $exampleFolder = Manager::getPluginDirectory('ExampleSettingsPlugin'); $replace = array('ExampleSettingsPlugin' => $pluginName); $whitelistFiles = array('/' . $settingsFilename); diff --git a/plugins/CoreConsole/Commands/GenerateTest.php b/plugins/CoreConsole/Commands/GenerateTest.php index 95dac4cfbd7f..b489c74d1d5f 100644 --- a/plugins/CoreConsole/Commands/GenerateTest.php +++ b/plugins/CoreConsole/Commands/GenerateTest.php @@ -10,6 +10,7 @@ namespace Piwik\Plugins\CoreConsole\Commands; use Piwik\Common; +use Piwik\Plugin\Manager; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; @@ -33,7 +34,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $testType = $this->getTestType($input, $output); $testName = $this->getTestName($input, $output, $testType); - $exampleFolder = PIWIK_INCLUDE_PATH . '/plugins/ExamplePlugin'; + $exampleFolder = Manager::getPluginDirectory('ExamplePlugin'); $replace = array( 'ExamplePlugin' => $pluginName, 'SimpleTest' => $testName, diff --git a/plugins/CoreConsole/Commands/GenerateUpdate.php b/plugins/CoreConsole/Commands/GenerateUpdate.php index 826448de38e4..9dffe019f2c0 100644 --- a/plugins/CoreConsole/Commands/GenerateUpdate.php +++ b/plugins/CoreConsole/Commands/GenerateUpdate.php @@ -33,7 +33,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $namespace = $this->getNamespace($component); $className = $this->getUpdateClassName($component, $version); - $exampleFolder = PIWIK_INCLUDE_PATH . '/plugins/ExamplePlugin'; + $exampleFolder = Plugin\Manager::getPluginDirectory('ExamplePlugin'); $replace = array('Piwik\Plugins\ExamplePlugin\Updates' => $namespace, 'ExamplePlugin' => $component, 'Updates_0_0_2' => $className, diff --git a/plugins/CoreConsole/Commands/GenerateVisualizationPlugin.php b/plugins/CoreConsole/Commands/GenerateVisualizationPlugin.php index 92a50277167e..807646b2c2e7 100644 --- a/plugins/CoreConsole/Commands/GenerateVisualizationPlugin.php +++ b/plugins/CoreConsole/Commands/GenerateVisualizationPlugin.php @@ -9,6 +9,7 @@ namespace Piwik\Plugins\CoreConsole\Commands; +use Piwik\Plugin\Manager; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; @@ -39,7 +40,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $this->generatePluginFolder($pluginName); - $exampleFolder = PIWIK_INCLUDE_PATH . '/plugins/ExampleVisualization'; + $exampleFolder = Manager::getPluginDirectory('ExampleVisualization'); $replace = array( 'SimpleTable' => $visualizationName, 'simpleTable' => lcfirst($visualizationName), diff --git a/plugins/CoreConsole/Commands/GenerateWidget.php b/plugins/CoreConsole/Commands/GenerateWidget.php index 2b603aa1face..a66efba3c6ed 100644 --- a/plugins/CoreConsole/Commands/GenerateWidget.php +++ b/plugins/CoreConsole/Commands/GenerateWidget.php @@ -10,6 +10,7 @@ namespace Piwik\Plugins\CoreConsole\Commands; use Piwik\Piwik; +use Piwik\Plugin\Manager; use Piwik\Translate; use Piwik\Widget\WidgetsList; use Symfony\Component\Console\Input\InputInterface; @@ -45,7 +46,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $widgetMethod = $this->getWidgetMethodName($widgetName); $widgetClass = ucfirst($widgetMethod); - $exampleFolder = PIWIK_INCLUDE_PATH . '/plugins/ExamplePlugin'; + $exampleFolder = Manager::getPluginDirectory('ExamplePlugin'); $replace = array('ExamplePlugin' => $pluginName, 'MyExampleWidget' => $widgetClass, 'Example Widget Name' => $this->makeTranslationIfPossible($pluginName, $widgetName), diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php index cefb7e4080da..bbcd04cb9fa2 100644 --- a/plugins/CorePluginsAdmin/Controller.php +++ b/plugins/CorePluginsAdmin/Controller.php @@ -480,7 +480,8 @@ public function uninstall($redirectAfter = true) $uninstalled = $this->pluginManager->uninstallPlugin($pluginName); if (!$uninstalled) { - $path = Plugin\Manager::getPluginsDirectory() . $pluginName . '/'; + $path = Plugin\Manager::getPluginDirectory($pluginName) . '/'; + $messagePermissions = Filechecks::getErrorMessageMissingPermissions($path); $messageIntro = $this->translator->translate("Warning: \"%s\" could not be uninstalled. Piwik did not have enough permission to delete the files in $path. ", diff --git a/plugins/CorePluginsAdmin/PluginInstaller.php b/plugins/CorePluginsAdmin/PluginInstaller.php index 09ec89de592b..78bccb88c43f 100644 --- a/plugins/CorePluginsAdmin/PluginInstaller.php +++ b/plugins/CorePluginsAdmin/PluginInstaller.php @@ -129,10 +129,13 @@ public function installOrUpdatePluginFromFile($pathToZip) private function makeSureFoldersAreWritable() { - Filechecks::dieIfDirectoriesNotWritable(array( + $dirs = array( StaticContainer::get('path.tmp') . self::PATH_TO_DOWNLOAD, Manager::getPluginsDirectory() - )); + ); + // we do not require additional plugin directories to be writeable ({@link Manager::getPluginsDirectories()}) + // as we only upload to core plugins directory anyway + Filechecks::dieIfDirectoriesNotWritable($dirs); } /** diff --git a/plugins/ExampleTheme/ExampleTheme.php b/plugins/ExampleTheme/ExampleTheme.php index 0ca5b8fcf75f..dd9711c64cda 100644 --- a/plugins/ExampleTheme/ExampleTheme.php +++ b/plugins/ExampleTheme/ExampleTheme.php @@ -22,9 +22,6 @@ public function getListHooksRegistered() public function configureThemeVariables(Plugin\ThemeStyles $vars) { - $vars->fontFamilyBase = 'Arial, Verdana, sans-serif'; - $vars->colorBrand = '#5793d4'; - $vars->colorHeaderBackground = '#0091ea'; - $vars->colorHeaderText = '#0d0d0d'; + $vars->fontFamilyBase = 'Verdana, sans-serif'; } } diff --git a/plugins/LanguagesManager/API.php b/plugins/LanguagesManager/API.php index 9946da3b8843..b41ba9c68b7d 100644 --- a/plugins/LanguagesManager/API.php +++ b/plugins/LanguagesManager/API.php @@ -105,11 +105,18 @@ public function getAvailableLanguagesInfo($excludeNonCorePlugins=true) $data = file_get_contents(PIWIK_INCLUDE_PATH . '/lang/en.json'); $englishTranslation = json_decode($data, true); + $pluginDirectories = Manager::getPluginsDirectories(); // merge with plugin translations if any - $pluginFiles = glob(sprintf('%s*/lang/en.json', Manager::getPluginsDirectory())); + + $pluginFiles = array(); + foreach ($pluginDirectories as $pluginsDir) { + $pluginFiles = array_merge($pluginFiles, glob(sprintf('%s*/lang/en.json', $pluginsDir))); + } + foreach ($pluginFiles as $file) { + $fileWithoutPluginDir = str_replace($pluginDirectories, '', $file); - preg_match('/\/plugins\/([^\/]+)\/lang/i', $file, $matches); + preg_match('/([^\/]+)\/lang/i', $fileWithoutPluginDir, $matches); $plugin = $matches[1]; if (!$excludeNonCorePlugins || Manager::getInstance()->isPluginBundledWithCore($plugin)) { @@ -126,10 +133,15 @@ public function getAvailableLanguagesInfo($excludeNonCorePlugins=true) $translations = json_decode($data, true); // merge with plugin translations if any - $pluginFiles = glob(sprintf('%s*/lang/%s.json', Manager::getPluginsDirectory(), $filename)); + $pluginFiles = array(); + foreach ($pluginDirectories as $pluginsDir) { + $pluginFiles = array_merge($pluginFiles, glob(sprintf('%s*/lang/%s.json', $pluginsDir, $filename))); + } + foreach ($pluginFiles as $file) { + $fileWithoutPluginDir = str_replace($pluginDirectories, '', $file); - preg_match('/\/plugins\/([^\/]+)\/lang/i', $file, $matches); + preg_match('/([^\/]+)\/lang/i', $fileWithoutPluginDir, $matches); $plugin = $matches[1]; if (!$excludeNonCorePlugins || Manager::getInstance()->isPluginBundledWithCore($plugin)) { @@ -232,7 +244,7 @@ public function getPluginTranslationsForLanguage($pluginName, $languageCode) return false; } - $languageFile = Manager::getPluginsDirectory() . "$pluginName/lang/$languageCode.json"; + $languageFile = Manager::getPluginDirectory($pluginName) . "/lang/$languageCode.json"; if (!file_exists($languageFile)) { return false; diff --git a/plugins/LanguagesManager/Commands/PluginsWithTranslations.php b/plugins/LanguagesManager/Commands/PluginsWithTranslations.php index 62d13cda70aa..2b24b7cacd8a 100644 --- a/plugins/LanguagesManager/Commands/PluginsWithTranslations.php +++ b/plugins/LanguagesManager/Commands/PluginsWithTranslations.php @@ -27,9 +27,14 @@ protected function execute(InputInterface $input, OutputInterface $output) { $output->writeln("Following plugins contain their own translation files:"); - $pluginFiles = glob(sprintf('%s*/lang/en.json', Manager::getPluginsDirectory())); + $pluginFiles = array(); + foreach (Manager::getPluginsDirectories() as $pluginsDir) { + $pluginFiles = array_merge($pluginsDir, glob(sprintf('%s*/lang/en.json', $pluginsDir))); + } $pluginFiles = array_map(function($elem){ - return str_replace(array(Manager::getPluginsDirectory(), '/lang/en.json'), '', $elem); + $replace = Manager::getPluginsDirectories(); + $replace[] = '/lang/en.json'; + return str_replace($replace, '', $elem); }, $pluginFiles); $output->writeln(join("\n", $pluginFiles)); diff --git a/plugins/LanguagesManager/Commands/Update.php b/plugins/LanguagesManager/Commands/Update.php index 4e79b8383bb8..bb9efbcc1e6b 100644 --- a/plugins/LanguagesManager/Commands/Update.php +++ b/plugins/LanguagesManager/Commands/Update.php @@ -158,9 +158,14 @@ public static function getAllPlugins() return $pluginsWithTranslations; } - $pluginsWithTranslations = glob(sprintf('%s*/lang/en.json', Manager::getPluginsDirectory())); + $pluginsWithTranslations = array(); + foreach (Manager::getPluginsDirectories() as $pluginsDir) { + $pluginsWithTranslations = array_merge($pluginsWithTranslations, glob(sprintf('%s*/lang/en.json', $pluginsDir))); + } $pluginsWithTranslations = array_map(function ($elem) { - return str_replace(array(Manager::getPluginsDirectory(), '/lang/en.json'), '', $elem); + $replace = Manager::getPluginsDirectories(); + $replace[] = '/lang/en.json'; + return str_replace($replace, '', $elem); }, $pluginsWithTranslations); return $pluginsWithTranslations; @@ -188,10 +193,14 @@ public static function getPluginsInCore() $newPlugins = $matches[1]; $pluginsNotInCore = array_merge($submodulePlugins, $newPlugins); - - $pluginsWithTranslations = glob(sprintf('%s*/lang/en.json', Manager::getPluginsDirectory())); + $pluginsWithTranslations = array(); + foreach (Manager::getPluginsDirectories() as $pluginsDir) { + $pluginsWithTranslations = array_merge($pluginsWithTranslations, glob(sprintf('%s*/lang/en.json', $pluginsDir))); + } $pluginsWithTranslations = array_map(function ($elem) { - return str_replace(array(Manager::getPluginsDirectory(), '/lang/en.json'), '', $elem); + $replace = Manager::getPluginsDirectories(); + $replace[] = '/lang/en.json'; + return str_replace($replace, '', $elem); }, $pluginsWithTranslations); $pluginsInCore = array_diff($pluginsWithTranslations, $pluginsNotInCore); diff --git a/plugins/LanguagesManager/TranslationWriter/Writer.php b/plugins/LanguagesManager/TranslationWriter/Writer.php index 8dc2260cdb77..679433b34eae 100644 --- a/plugins/LanguagesManager/TranslationWriter/Writer.php +++ b/plugins/LanguagesManager/TranslationWriter/Writer.php @@ -202,7 +202,7 @@ protected function getTranslationPathBaseDirectory($base, $lang = null) if ($base == 'tmp') { return sprintf('%s/plugins/%s/lang/%s.json', StaticContainer::get('path.tmp'), $this->pluginName, $lang); } else { - return sprintf('%s%s/lang/%s.json', Manager::getPluginsDirectory(), $this->pluginName, $lang); + return sprintf('%s/lang/%s.json', Manager::getPluginDirectory($this->pluginName), $lang); } } diff --git a/tests/PHPUnit/Fixtures/UITestFixture.php b/tests/PHPUnit/Fixtures/UITestFixture.php index 49b480f793bc..1c6c92b9bb4a 100644 --- a/tests/PHPUnit/Fixtures/UITestFixture.php +++ b/tests/PHPUnit/Fixtures/UITestFixture.php @@ -70,6 +70,7 @@ public function setUp() self::resetPluginsInstalledConfig(); self::updateDatabase(); self::installAndActivatePlugins($this->getTestEnvironment()); + self::updateDatabase(); // make sure site has an early enough creation date (for period selector tests) Db::get()->update(Common::prefixTable("site"), @@ -127,6 +128,9 @@ public function performSetUp($setupEnvironmentOnly = false) $this->extraTestEnvVars = array( 'loadRealTranslations' => 1, ); + $this->extraPluginsToLoad = array( + 'CustomDirPlugin' + ); parent::performSetUp($setupEnvironmentOnly); diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php index 444728bafd8c..1fae5acbf9bf 100644 --- a/tests/PHPUnit/bootstrap.php +++ b/tests/PHPUnit/bootstrap.php @@ -36,6 +36,13 @@ @set_include_path(PIWIK_INCLUDE_SEARCH_PATH); @ini_set('memory_limit', -1); +$GLOBALS['MATOMO_PLUGIN_DIRS'] = array( + array( + 'pluginsPathAbsolute' => PIWIK_INCLUDE_PATH . '/tests/resources/custompluginsdir', + 'webrootDirRelativeToMatomo' => 'tests/resources/custompluginsdir' + ), +); + require_once PIWIK_INCLUDE_PATH . '/core/bootstrap.php'; require_once PIWIK_INCLUDE_PATH . '/libs/PiwikTracker/PiwikTracker.php'; diff --git a/tests/PHPUnit/phpunit.xml.dist b/tests/PHPUnit/phpunit.xml.dist index caf5cf2d1615..0aab2c517823 100644 --- a/tests/PHPUnit/phpunit.xml.dist +++ b/tests/PHPUnit/phpunit.xml.dist @@ -23,6 +23,8 @@ ./System ../../plugins/*/tests ../../plugins/*/Test + ../../tests/resources/custompluginsdir/*/tests/System + ../../tests/resources/custompluginsdir/*/Test/System ../../plugins/*/tests/Integration ../../plugins/*/Test/Integration ../../plugins/*/tests/Unit @@ -34,6 +36,8 @@ ../../plugins/*/tests ../../plugins/*/Test + ../../tests/resources/custompluginsdir/*/tests/System + ../../tests/resources/custompluginsdir/*/Test/System ../../plugins/*/tests/Integration ../../plugins/*/Test/Integration ../../plugins/*/tests/Unit @@ -43,11 +47,15 @@ ./Integration ../../plugins/*/tests/Integration ../../plugins/*/Test/Integration + ../../tests/resources/custompluginsdir/*/tests/Integration + ../../tests/resources/custompluginsdir/*/Test/Integration ./Unit ../../plugins/*/tests/Unit ../../plugins/*/Test/Unit + ../../tests/resources/custompluginsdir/*/tests/Unit + ../../tests/resources/custompluginsdir/*/Test/Unit ../../plugins/*/tests diff --git a/tests/PHPUnit/proxy/includes.php b/tests/PHPUnit/proxy/includes.php index 2b3407f5d543..c6f301623c71 100644 --- a/tests/PHPUnit/proxy/includes.php +++ b/tests/PHPUnit/proxy/includes.php @@ -10,6 +10,13 @@ define('PIWIK_TEST_MODE', true); } +$GLOBALS['MATOMO_PLUGIN_DIRS'] = array( + array( + 'pluginsPathAbsolute' => realpath(PIWIK_INCLUDE_PATH . 'tests/resources/custompluginsdir'), + 'webrootDirRelativeToMatomo' => '../../resources/custompluginsdir' + ), +); + require_once PIWIK_INCLUDE_PATH . '/core/bootstrap.php'; Piwik\SettingsServer::setMaxExecutionTime(0); diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png index d692196c24ac..065a48ac190f 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3b6c8c65e4aa9a62b618825e4cde3839f119ca28b839fbf607c788f2f0c3846 -size 1071976 +oid sha256:0766ddf41affb5c22ad653a4bd364dc374ba0b70421fdad8622393d7025cd590 +size 1085586 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_customdirplugin.png b/tests/UI/expected-screenshots/UIIntegrationTest_customdirplugin.png new file mode 100644 index 000000000000..7809e57f214a --- /dev/null +++ b/tests/UI/expected-screenshots/UIIntegrationTest_customdirplugin.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e5cf38c4abbfc04c5d1de2903bc4a242db8e9a6a8c7be2bf2fd99d24f89808e +size 66157 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png b/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png index aacf0c3d473b..c3779e6ac184 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68503ef9dafa19792aba12552ab81872b25247b619851d0ba1b743b31a51c919 -size 203273 +oid sha256:204573e81aa9a39a5cffdacc90e49b6f71735fdd1dec9bc6fa20a77b68525edd +size 208738 diff --git a/tests/UI/specs/UIIntegration_spec.js b/tests/UI/specs/UIIntegration_spec.js index 55729cce0a88..f63d3dc81426 100644 --- a/tests/UI/specs/UIIntegration_spec.js +++ b/tests/UI/specs/UIIntegration_spec.js @@ -27,6 +27,9 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? testEnvironment.save(); testEnvironment.callApi("SitesManager.setSiteAliasUrls", {idSite: 3, urls: []}, done); + + testEnvironment.pluginsToLoad = ['CustomDirPlugin']; + testEnvironment.save(); }); beforeEach(function () { @@ -83,6 +86,11 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? }, done); }); + it("should load the page of a plugin located in a custom directory", function (done) { + expect.screenshot("customdirplugin").to.be.captureSelector('.pageWrap', function (page) { + page.load("?module=CustomDirPlugin&action=index&idSite=1&period=day&date=yesterday"); + }, done); + }); // shortcuts help it("should show shortcut help", function (done) { expect.screenshot("shortcuts").to.be.captureSelector('.modal.open', function (page) { diff --git a/tests/resources/custompluginsdir/CustomDirPlugin/.gitignore b/tests/resources/custompluginsdir/CustomDirPlugin/.gitignore new file mode 100644 index 000000000000..c8c9480010db --- /dev/null +++ b/tests/resources/custompluginsdir/CustomDirPlugin/.gitignore @@ -0,0 +1 @@ +tests/System/processed/*xml \ No newline at end of file diff --git a/tests/resources/custompluginsdir/CustomDirPlugin/API.php b/tests/resources/custompluginsdir/CustomDirPlugin/API.php new file mode 100644 index 000000000000..08a0a957c55c --- /dev/null +++ b/tests/resources/custompluginsdir/CustomDirPlugin/API.php @@ -0,0 +1,22 @@ +renderTemplate('index', array( + 'answerToLife' => 42, + 'diTest' => StaticContainer::get('customDirPluginTest') + )); + } +} diff --git a/tests/resources/custompluginsdir/CustomDirPlugin/CustomClass.php b/tests/resources/custompluginsdir/CustomDirPlugin/CustomClass.php new file mode 100644 index 000000000000..01d3fe9c494d --- /dev/null +++ b/tests/resources/custompluginsdir/CustomDirPlugin/CustomClass.php @@ -0,0 +1,15 @@ + 'getStylesheetFiles', + 'AssetManager.getJavaScriptFiles' => 'getJsFiles', + ); + } + + public function getStylesheetFiles(&$stylesheets) + { + $stylesheets[] = "plugins/CustomDirPlugin/stylesheets/test.less"; + } + + public function getJsFiles(&$jsFiles) + { + $jsFiles[] = "tests/resources/custompluginsdir/javascripts/test.js"; + } + + public function postLoad() + { + // we make sure auto loading works for these directories + return new CustomClass(); + } + + public function isTrackerPlugin() + { + return true; + } +} diff --git a/tests/resources/custompluginsdir/CustomDirPlugin/SystemSettings.php b/tests/resources/custompluginsdir/CustomDirPlugin/SystemSettings.php new file mode 100644 index 000000000000..d219451fa93b --- /dev/null +++ b/tests/resources/custompluginsdir/CustomDirPlugin/SystemSettings.php @@ -0,0 +1,34 @@ +custom = $this->createMetricSetting(); + } + + private function createMetricSetting() + { + return $this->makeSetting('custom', $default = '', FieldConfig::TYPE_STRING, function (FieldConfig $field) { + $field->title = 'Custom setting'; + $field->uiControl = FieldConfig::UI_CONTROL_TEXT; + $field->description = 'Enter some custom text here'; + $field->validators[] = new NotEmpty(); + }); + } +} diff --git a/tests/resources/custompluginsdir/CustomDirPlugin/config/config.php b/tests/resources/custompluginsdir/CustomDirPlugin/config/config.php new file mode 100644 index 000000000000..d546932d9144 --- /dev/null +++ b/tests/resources/custompluginsdir/CustomDirPlugin/config/config.php @@ -0,0 +1,4 @@ + 'hello world!' +); \ No newline at end of file diff --git a/tests/resources/custompluginsdir/CustomDirPlugin/images/ok.png b/tests/resources/custompluginsdir/CustomDirPlugin/images/ok.png new file mode 100644 index 0000000000000000000000000000000000000000..148319419d5e05aee7cf521c127d934f092ec71b GIT binary patch literal 626 zcmV-&0*(ENP)D zl22%oaTv$H?;BI!a_?ShzK7V-JOq1%F4%Nx%JXB!de`gQX<^&jpY4I?^gN#r&-3tbx~^jxz&iu9nnM~#w5xr)Nq0v~K1b|(VB=vhdp2EN2 znVDyobsbZhrdd^0^}Ad>1pwfQn0b7BA`%XV4X2649`f;cJgjNjeQ9rpsa~%|dwbof zjXFOzHu{7yaucyfq0mjC6^=wA?TpbhXW_5U_k6%YHdiHLN^1`f07UGDEX(JAXzR0z zGQ1A}LZOhIh@~uDma})eCm}9$V5PKjZD{C1y;Z<%{6QcPNOfM6`_#nu!Z&J+w6&S; z*-zT#+olN&2m|PTaUdBCj`%jO_-pTCu@qd-sd(y6ICjf>V%C1EJWL8KWWoNIT`Cb> zHM$Yk`iXwO|9Q<{JDy$5qP$iHI6!GvP@SueMx)VNMuOiiUo4h_uKZz?m&-s6IAuDG z&xys4jIldL@RkVx!0YuU%;(I$x0QDoTpPrf+~SF3GCBL-0;kh?#B-+a6=&lxKmGne zI-S1qC)iK`01k)au_Q@H8Dod?`TWD3FdJI+oSuwc>n+a M07*qoM6N<$f}KPhX#fBK literal 0 HcmV?d00001 diff --git a/tests/resources/custompluginsdir/CustomDirPlugin/lang/en.json b/tests/resources/custompluginsdir/CustomDirPlugin/lang/en.json new file mode 100644 index 000000000000..20927d76ef68 --- /dev/null +++ b/tests/resources/custompluginsdir/CustomDirPlugin/lang/en.json @@ -0,0 +1,5 @@ +{ + "CustomDirPlugin": { + "CustomName": "Custom Name" + } +} \ No newline at end of file diff --git a/tests/resources/custompluginsdir/CustomDirPlugin/plugin.json b/tests/resources/custompluginsdir/CustomDirPlugin/plugin.json new file mode 100644 index 000000000000..2d4b3c19a290 --- /dev/null +++ b/tests/resources/custompluginsdir/CustomDirPlugin/plugin.json @@ -0,0 +1,29 @@ +{ + "name": "CustomDirPlugin", + "description": "Custom Plugin located in different directory", + "version": "0.1.0", + "theme": false, + "require": { + "piwik": ">=3.8.1-stable,<4.0.0-b1" + }, + "authors": [ + { + "name": "Matomo", + "email": "", + "homepage": "https://matomo.org" + } + ], + "support": { + "email": "", + "issues": "", + "forum": "", + "irc": "", + "wiki": "", + "source": "", + "docs": "", + "rss": "" + }, + "homepage": "https://matomo.org", + "license": "GPL v3+", + "keywords": [] +} \ No newline at end of file diff --git a/tests/resources/custompluginsdir/CustomDirPlugin/stylesheets/import.less b/tests/resources/custompluginsdir/CustomDirPlugin/stylesheets/import.less new file mode 100644 index 000000000000..707bfa8e9449 --- /dev/null +++ b/tests/resources/custompluginsdir/CustomDirPlugin/stylesheets/import.less @@ -0,0 +1,3 @@ +.customPluginDirImportTest { + color: green; +} \ No newline at end of file diff --git a/tests/resources/custompluginsdir/CustomDirPlugin/stylesheets/test.less b/tests/resources/custompluginsdir/CustomDirPlugin/stylesheets/test.less new file mode 100644 index 000000000000..d2885913bc03 --- /dev/null +++ b/tests/resources/custompluginsdir/CustomDirPlugin/stylesheets/test.less @@ -0,0 +1,15 @@ +.fooBarBazCustom { + font-weight: bold; + color: red; +} + +@import "import.less"; + +.customPluginDirBackgroundTestRelative { + background: url('../images/ok.png'); + min-height: 30px; +} +.customPluginDirBackgroundTestPluginRelative { + background: url('plugins/CustomDirPlugin/images/ok.png'); + min-height: 30px; +} \ No newline at end of file diff --git a/tests/resources/custompluginsdir/CustomDirPlugin/templates/index.twig b/tests/resources/custompluginsdir/CustomDirPlugin/templates/index.twig new file mode 100644 index 000000000000..24bce30dca0f --- /dev/null +++ b/tests/resources/custompluginsdir/CustomDirPlugin/templates/index.twig @@ -0,0 +1,27 @@ +{% extends 'dashboard.twig' %} + +{% block content %} + This is our custom plugin! +
+ + The answer to life is {{ answerToLife }} + +
+

Translation test

+

This should be translated: {{ 'CustomDirPlugin_CustomName'|translate }}

+ +

image test

+

You should see an image showing a check here:

+ +

CSS import test

+

this text should appear green!

+ +

CSS background images test

+

This should have a background image relative

+ +

This should have a background image relative to plugins

+ +

Dependency Injection Test

+

You should now see hello world: {{ diTest }}

+ +{% endblock %} \ No newline at end of file diff --git a/tests/resources/custompluginsdir/CustomDirPlugin/tests/Fixtures/SimpleFixtureTrackFewVisits.php b/tests/resources/custompluginsdir/CustomDirPlugin/tests/Fixtures/SimpleFixtureTrackFewVisits.php new file mode 100644 index 000000000000..f5d58969d09b --- /dev/null +++ b/tests/resources/custompluginsdir/CustomDirPlugin/tests/Fixtures/SimpleFixtureTrackFewVisits.php @@ -0,0 +1,35 @@ +setUpWebsite(); + } + + public function tearDown() + { + // empty + } + + private function setUpWebsite() + { + if (!self::siteCreated($this->idSite)) { + $idSite = self::createWebsite($this->dateTime, $ecommerce = 1); + $this->assertSame($this->idSite, $idSite); + } + } + +} \ No newline at end of file diff --git a/tests/resources/custompluginsdir/CustomDirPlugin/tests/Integration/SystemSettingsTest.php b/tests/resources/custompluginsdir/CustomDirPlugin/tests/Integration/SystemSettingsTest.php new file mode 100644 index 000000000000..a9dd935a1e30 --- /dev/null +++ b/tests/resources/custompluginsdir/CustomDirPlugin/tests/Integration/SystemSettingsTest.php @@ -0,0 +1,49 @@ +settings = new SystemSettings(); + } + + public function test_get_pluginName() + { + $this->assertSame('CustomDirPlugin', $this->settings->getPluginName()); + } + + public function test_get_default() + { + $this->assertSame('', $this->settings->custom->getValue()); + } + + public function test_set_value() + { + $this->settings->custom->setValue('%'); + $this->assertSame('%', $this->settings->custom->getValue()); + } + +} diff --git a/tests/resources/custompluginsdir/CustomDirPlugin/tests/System/APITest.php b/tests/resources/custompluginsdir/CustomDirPlugin/tests/System/APITest.php new file mode 100644 index 000000000000..11fd73a4f59e --- /dev/null +++ b/tests/resources/custompluginsdir/CustomDirPlugin/tests/System/APITest.php @@ -0,0 +1,44 @@ +assertEquals(42, Request::processRequest('CustomDirPlugin.getCustomAnswerToLive')); + } + + public static function getOutputPrefix() + { + return ''; + } + + public static function getPathToTestDirectory() + { + return dirname(__FILE__); + } + +} + +APITest::$fixture = new SimpleFixtureTrackFewVisits(); \ No newline at end of file diff --git a/tests/resources/custompluginsdir/CustomDirPlugin/tests/System/expected/test___API.get_day.xml b/tests/resources/custompluginsdir/CustomDirPlugin/tests/System/expected/test___API.get_day.xml new file mode 100644 index 000000000000..213b91b66a82 --- /dev/null +++ b/tests/resources/custompluginsdir/CustomDirPlugin/tests/System/expected/test___API.get_day.xml @@ -0,0 +1,44 @@ + + + 2 + 2 + 0 + 4 + 2 + 0 + 1264 + 0 + 0 + 0 + 0 + 0 + 0% + 0 + 0 + 1 + 1 + 2541 + 50% + 1 + 1 + 2541 + 50% + 0 + 0 + 0 + 0% + 0 + 0 + 0 + 3 + 3 + 0 + 0 + 0 + 0 + 1 + 1 + 0% + 2 + 632 + \ No newline at end of file diff --git a/tests/resources/custompluginsdir/CustomDirPlugin/tests/System/expected/test___Goals.getItemsSku_day.xml b/tests/resources/custompluginsdir/CustomDirPlugin/tests/System/expected/test___Goals.getItemsSku_day.xml new file mode 100644 index 000000000000..ba820ed64985 --- /dev/null +++ b/tests/resources/custompluginsdir/CustomDirPlugin/tests/System/expected/test___Goals.getItemsSku_day.xml @@ -0,0 +1,12 @@ + + + + + 25641 + 33 + 1 + 777 + 33 + 0% + + \ No newline at end of file diff --git a/tests/resources/custompluginsdir/CustomDirPlugin/tests/Unit/CustomClassTest.php b/tests/resources/custompluginsdir/CustomDirPlugin/tests/Unit/CustomClassTest.php new file mode 100644 index 000000000000..0018108c66c0 --- /dev/null +++ b/tests/resources/custompluginsdir/CustomDirPlugin/tests/Unit/CustomClassTest.php @@ -0,0 +1,35 @@ +assertTrue($customClass instanceof CustomClass); + } + +} diff --git a/tests/resources/custompluginsdir/javascripts/test.js b/tests/resources/custompluginsdir/javascripts/test.js new file mode 100644 index 000000000000..1b98ac75de16 --- /dev/null +++ b/tests/resources/custompluginsdir/javascripts/test.js @@ -0,0 +1 @@ +window.fooBarBazBarFoo = 'fooBarBaz'; \ No newline at end of file From a99baa987892daae0c616fbaf52fa14e97e2f890 Mon Sep 17 00:00:00 2001 From: Kate Butler Date: Fri, 15 Mar 2019 11:42:04 +1300 Subject: [PATCH 12/15] Improve wording on anonymous user settings page (#14175) --- plugins/UsersManager/lang/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/UsersManager/lang/en.json b/plugins/UsersManager/lang/en.json index 99d585aed145..95293636e780 100644 --- a/plugins/UsersManager/lang/en.json +++ b/plugins/UsersManager/lang/en.json @@ -96,7 +96,7 @@ "UserHasNoPermission":"%1$s currently has %2$s to %3$s", "UsersManagement": "Users Management", "UsersManagementMainDescription": "Create new users or update the existing users. You can then set their permissions above.", - "WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "When users are not logged in and visit Matomo, they should access", + "WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess": "When users are not logged in and visit Matomo, they should initially see", "YourUsernameCannotBeChanged": "Your username cannot be changed.", "YourVisitsAreIgnoredOnDomain": "%1$sYour visits are ignored by Matomo on %2$s %3$s (the Matomo ignore cookie was found in your browser).", "YourVisitsAreNotIgnored": "%1$sYour visits are not ignored by Matomo%2$s (the Matomo ignore cookie was not found in your browser).", From 3474bf211f0119436c9439b1307bac601e673453 Mon Sep 17 00:00:00 2001 From: Stefan Giehl Date: Fri, 15 Mar 2019 01:35:51 +0100 Subject: [PATCH 13/15] Allow customization of GeoIP2 database location using DI (#13913) --- plugins/GeoIp2/LocationProvider/GeoIp2.php | 5 ++--- plugins/GeoIp2/config/config.php | 5 +++++ plugins/GeoIp2/config/test.php | 5 +++++ .../GeoIp2/tests/Integration/LocationProviderTest.php | 10 ---------- .../tests/System/ConvertRegionCodesToIsoTest.php | 1 - plugins/UserCountry/tests/Integration/APITest.php | 1 - tests/PHPUnit/Fixtures/ManySitesImportedLogs.php | 2 -- tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php | 1 - tests/PHPUnit/Fixtures/UITestFixture.php | 1 - tests/PHPUnit/proxy/piwik.php | 2 -- 10 files changed, 12 insertions(+), 21 deletions(-) create mode 100644 plugins/GeoIp2/config/config.php create mode 100644 plugins/GeoIp2/config/test.php diff --git a/plugins/GeoIp2/LocationProvider/GeoIp2.php b/plugins/GeoIp2/LocationProvider/GeoIp2.php index 8a7da913d28b..6116b52c6650 100644 --- a/plugins/GeoIp2/LocationProvider/GeoIp2.php +++ b/plugins/GeoIp2/LocationProvider/GeoIp2.php @@ -9,6 +9,7 @@ namespace Piwik\Plugins\GeoIp2\LocationProvider; use Exception; +use Piwik\Container\StaticContainer; use Piwik\Option; use Piwik\Piwik; use Piwik\Plugins\UserCountry\LocationProvider; @@ -23,8 +24,6 @@ abstract class GeoIp2 extends LocationProvider const TEST_IP = '194.57.91.215'; const SWITCH_TO_ISO_REGIONS_OPTION_NAME = 'usercountry.switchtoisoregions'; - public static $geoIPDatabaseDir = 'misc'; - /** * Cached region name array. Data is from geoipregionvars.php. * @@ -125,7 +124,7 @@ public static function getPathToGeoIpDatabase($possibleFileNames) */ public static function getPathForGeoIpDatabase($filename) { - return PIWIK_INCLUDE_PATH . '/' . self::$geoIPDatabaseDir . '/' . $filename; + return StaticContainer::get('path.geoip2') . $filename; } /** diff --git a/plugins/GeoIp2/config/config.php b/plugins/GeoIp2/config/config.php new file mode 100644 index 000000000000..54b0797861ed --- /dev/null +++ b/plugins/GeoIp2/config/config.php @@ -0,0 +1,5 @@ + DI\string('{path.root}/misc/'), +]; \ No newline at end of file diff --git a/plugins/GeoIp2/config/test.php b/plugins/GeoIp2/config/test.php new file mode 100644 index 000000000000..c45c66093f0a --- /dev/null +++ b/plugins/GeoIp2/config/test.php @@ -0,0 +1,5 @@ + DI\string('{path.root}/tests/lib/geoip-files/'), +]; \ No newline at end of file diff --git a/plugins/GeoIp2/tests/Integration/LocationProviderTest.php b/plugins/GeoIp2/tests/Integration/LocationProviderTest.php index 02150ddc818a..a127f91bb3ad 100644 --- a/plugins/GeoIp2/tests/Integration/LocationProviderTest.php +++ b/plugins/GeoIp2/tests/Integration/LocationProviderTest.php @@ -17,8 +17,6 @@ class LocationProviderTest extends \PHPUnit_Framework_TestCase { public function testGeoIP2City() { - GeoIp2::$geoIPDatabaseDir = 'tests/lib/geoip-files'; - $locationProvider = new GeoIp2\Php(['loc' => ['GeoIP2-City.mmdb'], 'isp' => []]); $result = $locationProvider->getLocation(['ip' => '194.57.91.215']); @@ -38,8 +36,6 @@ public function testGeoIP2City() public function testGeoIP2Country() { - GeoIp2::$geoIPDatabaseDir = 'tests/lib/geoip-files'; - $locationProvider = new GeoIp2\Php(['loc' => ['GeoIP2-Country.mmdb'], 'isp' => []]); $result = $locationProvider->getLocation(['ip' => '194.57.91.215']); @@ -53,8 +49,6 @@ public function testGeoIP2Country() public function testGeoIP2ASN() { - GeoIp2::$geoIPDatabaseDir = 'tests/lib/geoip-files'; - $locationProvider = new GeoIp2\Php(['loc' => [], 'isp' => ['GeoLite2-ASN.mmdb']]); $result = $locationProvider->getLocation(['ip' => '194.57.91.215']); @@ -66,8 +60,6 @@ public function testGeoIP2ASN() public function testGeoIP2ISP() { - GeoIp2::$geoIPDatabaseDir = 'tests/lib/geoip-files'; - $locationProvider = new GeoIp2\Php(['loc' => [], 'isp' => ['GeoIP2-ISP.mmdb']]); $result = $locationProvider->getLocation(['ip' => '194.57.91.215']); @@ -79,8 +71,6 @@ public function testGeoIP2ISP() public function testGeoIP2CityAndISP() { - GeoIp2::$geoIPDatabaseDir = 'tests/lib/geoip-files'; - $locationProvider = new GeoIp2\Php(['loc' => ['GeoIP2-City.mmdb'], 'isp' => ['GeoIP2-ISP.mmdb']]); $result = $locationProvider->getLocation(['ip' => '194.57.91.215']); diff --git a/plugins/GeoIp2/tests/System/ConvertRegionCodesToIsoTest.php b/plugins/GeoIp2/tests/System/ConvertRegionCodesToIsoTest.php index ba1909ed1f94..66011b030b93 100644 --- a/plugins/GeoIp2/tests/System/ConvertRegionCodesToIsoTest.php +++ b/plugins/GeoIp2/tests/System/ConvertRegionCodesToIsoTest.php @@ -38,7 +38,6 @@ public function setUp() self::$idSite = Fixture::createWebsite('2016-01-01'); Fixture::createSuperUser(true); - GeoIp2::$geoIPDatabaseDir = 'tests/lib/geoip-files'; LocationProvider::$providers = null; LocationProvider::setCurrentProvider('geoip2php'); } diff --git a/plugins/UserCountry/tests/Integration/APITest.php b/plugins/UserCountry/tests/Integration/APITest.php index 689f1e0867ff..99f8a0397366 100644 --- a/plugins/UserCountry/tests/Integration/APITest.php +++ b/plugins/UserCountry/tests/Integration/APITest.php @@ -42,7 +42,6 @@ public function setUp() public function test_setLocationProvider() { - GeoIp2::$geoIPDatabaseDir = 'tests/lib/geoip-files'; $locationProvider = GeoIp2\Php::ID; $this->api->setLocationProvider($locationProvider); $this->assertEquals($locationProvider, Common::getCurrentLocationProviderId()); diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php index dab3691789f3..6b4fea810234 100644 --- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php +++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php @@ -37,7 +37,6 @@ public function setUp() $this->setUpWebsitesAndGoals(); LocationProvider::$providers = null; - GeoIp2::$geoIPDatabaseDir = 'tests/lib/geoip-files'; LocationProvider::setCurrentProvider('geoip2php'); self::createSuperUser(); @@ -49,7 +48,6 @@ public function setUp() public function tearDown() { LocationProvider::$providers = null; - GeoIp2::$geoIPDatabaseDir = 'tests/lib/geoip-files'; ManyVisitsWithGeoIP::unsetLocationProvider(); } diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php index ce31f20bd076..275f72a62d35 100644 --- a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php +++ b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php @@ -245,7 +245,6 @@ private function trackOtherVisits() public function setLocationProvider($file) { GeoIp2::$dbNames['loc'] = array($file); - GeoIp2::$geoIPDatabaseDir = 'tests/lib/geoip-files'; LocationProvider::$providers = null; LocationProvider::setCurrentProvider(self::GEOIP_IMPL_TO_TEST); diff --git a/tests/PHPUnit/Fixtures/UITestFixture.php b/tests/PHPUnit/Fixtures/UITestFixture.php index 1c6c92b9bb4a..03d7a4696f44 100644 --- a/tests/PHPUnit/Fixtures/UITestFixture.php +++ b/tests/PHPUnit/Fixtures/UITestFixture.php @@ -79,7 +79,6 @@ public function setUp() ); // for proper geolocation - GeoIp2::$geoIPDatabaseDir = 'tests/lib/geoip-files'; LocationProvider::setCurrentProvider(GeoIp2\Php::ID); IPAnonymizer::deactivate(); diff --git a/tests/PHPUnit/proxy/piwik.php b/tests/PHPUnit/proxy/piwik.php index 64df843390e8..81356594105d 100644 --- a/tests/PHPUnit/proxy/piwik.php +++ b/tests/PHPUnit/proxy/piwik.php @@ -33,8 +33,6 @@ Environment::setGlobalEnvironmentManipulator(new TestingEnvironmentManipulator(new TestingEnvironmentVariables(), $globalObservers)); - \Piwik\Plugins\GeoIp2\LocationProvider\GeoIp2::$geoIPDatabaseDir = 'tests/lib/geoip-files'; - include PIWIK_INCLUDE_PATH . '/matomo.php'; } catch (Exception $ex) { echo "Unexpected error during tracking: " . $ex->getMessage() . "\n" . $ex->getTraceAsString() . "\n"; From 8edc76eee3ceeb5da8d3ad8403c2c2bf9c5bf8e9 Mon Sep 17 00:00:00 2001 From: Matthieu Aubry Date: Fri, 15 Mar 2019 16:43:53 +1300 Subject: [PATCH 14/15] 3.9.0-rc1 --- core/Version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Version.php b/core/Version.php index ec3066efbd83..fbf23ad18930 100644 --- a/core/Version.php +++ b/core/Version.php @@ -20,7 +20,7 @@ final class Version * The current Matomo version. * @var string */ - const VERSION = '3.9.0-b3'; + const VERSION = '3.9.0-rc1'; public function isStableVersion($version) { From da7272436fdac34470987f60bba92aea21b9eabd Mon Sep 17 00:00:00 2001 From: diosmosis Date: Thu, 14 Mar 2019 21:18:45 -0700 Subject: [PATCH 15/15] Do not match by config ID if trust visitor cookies is used and a user ID is supplied. (#14196) --- core/Tracker/VisitorRecognizer.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/Tracker/VisitorRecognizer.php b/core/Tracker/VisitorRecognizer.php index 7e6db6b9b9fa..249c31af5a22 100644 --- a/core/Tracker/VisitorRecognizer.php +++ b/core/Tracker/VisitorRecognizer.php @@ -161,17 +161,17 @@ protected function shouldLookupOneVisitorFieldOnly($isVisitorIdToLookup, Request { $isForcedUserIdMustMatch = (false !== $request->getForcedUserId()); - if ($isForcedUserIdMustMatch) { - // if &iud was set, we must try and match both idvisitor and config_id - return false; - } - // This setting would be enabled for Intranet websites, to ensure that visitors using all the same computer config, same IP // are not counted as 1 visitor. In this case, we want to enforce and trust the visitor ID from the cookie. - if ($isVisitorIdToLookup && $this->trustCookiesOnly) { + if (($isVisitorIdToLookup || $isForcedUserIdMustMatch) && $this->trustCookiesOnly) { return true; } + if ($isForcedUserIdMustMatch) { + // if &iud was set, we must try and match both idvisitor and config_id + return false; + } + // If a &cid= was set, we force to select this visitor (or create a new one) $isForcedVisitorIdMustMatch = ($request->getForcedVisitorId() != null);