diff options
682 files changed, 1341 insertions, 1319 deletions
diff --git a/.gitmodules b/.gitmodules index ba524bbbd1..c7aa0f27e0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -57,5 +57,8 @@ path = misc/log-analytics url = https://github.com/piwik/piwik-log-analytics.git branch = master +[submodule "plugins/Morpheus/icons"] + path = plugins/Morpheus/icons + url = https://github.com/piwik/piwik-icons.git # Note: do not add new plugin submodules here, but a few lines above 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 784d322f4a..436975fff5 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 @@ -61,14 +61,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -92,11 +92,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -173,14 +173,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -204,7 +204,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> 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 784d322f4a..436975fff5 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 @@ -61,14 +61,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -92,11 +92,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -173,14 +173,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -204,7 +204,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> 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 784d322f4a..436975fff5 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 @@ -61,14 +61,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -92,11 +92,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -173,14 +173,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -204,7 +204,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> 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 784d322f4a..436975fff5 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 @@ -61,14 +61,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -92,11 +92,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -173,14 +173,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -204,7 +204,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> 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 784d322f4a..436975fff5 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 @@ -61,14 +61,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -92,11 +92,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -173,14 +173,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -204,7 +204,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> diff --git a/plugins/CoreHome/templates/getPromoVideo.twig b/plugins/CoreHome/templates/getPromoVideo.twig index e65a7c5677..227ce9670a 100755 --- a/plugins/CoreHome/templates/getPromoVideo.twig +++ b/plugins/CoreHome/templates/getPromoVideo.twig @@ -17,12 +17,12 @@ {# facebook #} <a href="http://www.facebook.com/sharer.php?u={{ promoVideoUrl|url_encode }}" rel="noreferrer" target="_blank"> - <img src="plugins/Referrers/images/socials/facebook.com.png" width="16px" height="16px" /> + <img src="plugins/Morpheus/icons/dist/socials/facebook.com.png" width="16px" height="16px" /> </a> {# twitter #} <a href="http://twitter.com/share?text={{ shareText|url_encode }}&url={{ promoVideoUrl|url_encode }}" rel="noreferrer" target="_blank"> - <img src="plugins/Referrers/images/socials/twitter.com.png" width="16px" height="16px" /> + <img src="plugins/Morpheus/icons/dist/socials/twitter.com.png" width="16px" height="16px" /> </a> {# email #} diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions -Subproject b4170a796a533b5d7fb8b78411ee83b0ffe082d +Subproject 6c39cfbb2189178aa10705e1a4fb5dd3212729c 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 54510c7ec9..aee0c3d3da 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 @@ -93,7 +93,7 @@ <referrerKeywordPosition>1</referrerKeywordPosition> <referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> - <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon> <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> @@ -102,14 +102,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -165,11 +165,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/plugins/DevicePlugins/functions.php b/plugins/DevicePlugins/functions.php index ad27e67b72..30a6cf504b 100644 --- a/plugins/DevicePlugins/functions.php +++ b/plugins/DevicePlugins/functions.php @@ -16,5 +16,5 @@ function getPluginsLogo($label) if ($label == Piwik::translate('General_Others')) { return false; } - return 'plugins/DevicePlugins/images/plugins/' . $label . '.png'; + return 'plugins/Morpheus/icons/dist/plugins/' . $label . '.png'; } diff --git a/plugins/DevicePlugins/images/plugins/cookie.png b/plugins/DevicePlugins/images/plugins/cookie.png Binary files differdeleted file mode 100644 index 6a2c66726b..0000000000 --- a/plugins/DevicePlugins/images/plugins/cookie.png +++ /dev/null diff --git a/plugins/DevicePlugins/images/plugins/director.png b/plugins/DevicePlugins/images/plugins/director.png Binary files differdeleted file mode 100644 index 529b54402c..0000000000 --- a/plugins/DevicePlugins/images/plugins/director.png +++ /dev/null diff --git a/plugins/DevicePlugins/images/plugins/flash.png b/plugins/DevicePlugins/images/plugins/flash.png Binary files differdeleted file mode 100644 index 3c10ce920c..0000000000 --- a/plugins/DevicePlugins/images/plugins/flash.png +++ /dev/null diff --git a/plugins/DevicePlugins/images/plugins/gears.png b/plugins/DevicePlugins/images/plugins/gears.png Binary files differdeleted file mode 100644 index bcd3a408c0..0000000000 --- a/plugins/DevicePlugins/images/plugins/gears.png +++ /dev/null diff --git a/plugins/DevicePlugins/images/plugins/java.png b/plugins/DevicePlugins/images/plugins/java.png Binary files differdeleted file mode 100644 index ab07c395ed..0000000000 --- a/plugins/DevicePlugins/images/plugins/java.png +++ /dev/null diff --git a/plugins/DevicePlugins/images/plugins/pdf.png b/plugins/DevicePlugins/images/plugins/pdf.png Binary files differdeleted file mode 100644 index b3e5f6a5b0..0000000000 --- a/plugins/DevicePlugins/images/plugins/pdf.png +++ /dev/null diff --git a/plugins/DevicePlugins/images/plugins/quicktime.png b/plugins/DevicePlugins/images/plugins/quicktime.png Binary files differdeleted file mode 100644 index 2b2b1f5a2b..0000000000 --- a/plugins/DevicePlugins/images/plugins/quicktime.png +++ /dev/null diff --git a/plugins/DevicePlugins/images/plugins/realplayer.png b/plugins/DevicePlugins/images/plugins/realplayer.png Binary files differdeleted file mode 100644 index 26b2695e35..0000000000 --- a/plugins/DevicePlugins/images/plugins/realplayer.png +++ /dev/null diff --git a/plugins/DevicePlugins/images/plugins/silverlight.png b/plugins/DevicePlugins/images/plugins/silverlight.png Binary files differdeleted file mode 100644 index 148279faf4..0000000000 --- a/plugins/DevicePlugins/images/plugins/silverlight.png +++ /dev/null diff --git a/plugins/DevicePlugins/images/plugins/windowsmedia.png b/plugins/DevicePlugins/images/plugins/windowsmedia.png Binary files differdeleted file mode 100644 index b066b614a2..0000000000 --- a/plugins/DevicePlugins/images/plugins/windowsmedia.png +++ /dev/null diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php index e50edf8dde..af821c43c7 100644 --- a/plugins/DevicesDetection/functions.php +++ b/plugins/DevicesDetection/functions.php @@ -80,7 +80,7 @@ function getBrowserName($label) */ function getBrowserLogo($short) { - $path = 'plugins/DevicesDetection/images/browsers/%s.png'; + $path = 'plugins/Morpheus/icons/dist/browsers/%s.png'; // If name is given instead of short code, try to find matching shortcode if (strlen($short) > 2) { @@ -282,7 +282,7 @@ function _mapLegacyOsShortCodes($shortCode) */ function getOsLogo($short) { - $path = 'plugins/DevicesDetection/images/os/%s.png'; + $path = 'plugins/Morpheus/icons/dist/os/%s.png'; $short = _mapLegacyOsShortCodes($short); diff --git a/plugins/DevicesDetection/images/browsers/36.png b/plugins/DevicesDetection/images/browsers/36.png Binary files differdeleted file mode 100644 index 7e388c8049..0000000000 --- a/plugins/DevicesDetection/images/browsers/36.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/3B.png b/plugins/DevicesDetection/images/browsers/3B.png Binary files differdeleted file mode 100644 index 7e388c8049..0000000000 --- a/plugins/DevicesDetection/images/browsers/3B.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/AA.png b/plugins/DevicesDetection/images/browsers/AA.png Binary files differdeleted file mode 100644 index 9e8e540307..0000000000 --- a/plugins/DevicesDetection/images/browsers/AA.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/AB.png b/plugins/DevicesDetection/images/browsers/AB.png Binary files differdeleted file mode 100644 index 8ee185c4d0..0000000000 --- a/plugins/DevicesDetection/images/browsers/AB.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/AG.png b/plugins/DevicesDetection/images/browsers/AG.png Binary files differdeleted file mode 100644 index de9efe46cc..0000000000 --- a/plugins/DevicesDetection/images/browsers/AG.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/AM.png b/plugins/DevicesDetection/images/browsers/AM.png Binary files differdeleted file mode 100644 index 5faf598faf..0000000000 --- a/plugins/DevicesDetection/images/browsers/AM.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/AN.png b/plugins/DevicesDetection/images/browsers/AN.png Binary files differdeleted file mode 100644 index 79c6385840..0000000000 --- a/plugins/DevicesDetection/images/browsers/AN.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/AO.png b/plugins/DevicesDetection/images/browsers/AO.png Binary files differdeleted file mode 100644 index 0456b1e10c..0000000000 --- a/plugins/DevicesDetection/images/browsers/AO.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/AR.png b/plugins/DevicesDetection/images/browsers/AR.png Binary files differdeleted file mode 100644 index 6adb1db06c..0000000000 --- a/plugins/DevicesDetection/images/browsers/AR.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/AT.png b/plugins/DevicesDetection/images/browsers/AT.png Binary files differdeleted file mode 100644 index 03bcaca597..0000000000 --- a/plugins/DevicesDetection/images/browsers/AT.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/AV.png b/plugins/DevicesDetection/images/browsers/AV.png Binary files differdeleted file mode 100644 index e024bad015..0000000000 --- a/plugins/DevicesDetection/images/browsers/AV.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/AW.png b/plugins/DevicesDetection/images/browsers/AW.png Binary files differdeleted file mode 100644 index 0c437c160d..0000000000 --- a/plugins/DevicesDetection/images/browsers/AW.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/BB.png b/plugins/DevicesDetection/images/browsers/BB.png Binary files differdeleted file mode 100644 index 9febbfe9cf..0000000000 --- a/plugins/DevicesDetection/images/browsers/BB.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/BD.png b/plugins/DevicesDetection/images/browsers/BD.png Binary files differdeleted file mode 100644 index 9daf8f0bbd..0000000000 --- a/plugins/DevicesDetection/images/browsers/BD.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/BE.png b/plugins/DevicesDetection/images/browsers/BE.png Binary files differdeleted file mode 100644 index 89fbce616b..0000000000 --- a/plugins/DevicesDetection/images/browsers/BE.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/BJ.png b/plugins/DevicesDetection/images/browsers/BJ.png Binary files differdeleted file mode 100644 index eeaf23a826..0000000000 --- a/plugins/DevicesDetection/images/browsers/BJ.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/BK.png b/plugins/DevicesDetection/images/browsers/BK.png Binary files differdeleted file mode 100644 index 46382173a9..0000000000 --- a/plugins/DevicesDetection/images/browsers/BK.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/BL.png b/plugins/DevicesDetection/images/browsers/BL.png Binary files differdeleted file mode 100644 index 7fb2cf73e7..0000000000 --- a/plugins/DevicesDetection/images/browsers/BL.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/BR.png b/plugins/DevicesDetection/images/browsers/BR.png Binary files differdeleted file mode 100644 index 0cb1795957..0000000000 --- a/plugins/DevicesDetection/images/browsers/BR.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/BS.png b/plugins/DevicesDetection/images/browsers/BS.png Binary files differdeleted file mode 100644 index 9daf8f0bbd..0000000000 --- a/plugins/DevicesDetection/images/browsers/BS.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/BX.png b/plugins/DevicesDetection/images/browsers/BX.png Binary files differdeleted file mode 100644 index 54be00e9ef..0000000000 --- a/plugins/DevicesDetection/images/browsers/BX.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/CA.png b/plugins/DevicesDetection/images/browsers/CA.png Binary files differdeleted file mode 100644 index ae2df04d2b..0000000000 --- a/plugins/DevicesDetection/images/browsers/CA.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/CC.png b/plugins/DevicesDetection/images/browsers/CC.png Binary files differdeleted file mode 100644 index c5ef24947b..0000000000 --- a/plugins/DevicesDetection/images/browsers/CC.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/CD.png b/plugins/DevicesDetection/images/browsers/CD.png Binary files differdeleted file mode 100644 index 88aecb0c73..0000000000 --- a/plugins/DevicesDetection/images/browsers/CD.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/CF.png b/plugins/DevicesDetection/images/browsers/CF.png Binary files differdeleted file mode 100644 index 6bac5c24f7..0000000000 --- a/plugins/DevicesDetection/images/browsers/CF.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/CH.png b/plugins/DevicesDetection/images/browsers/CH.png Binary files differdeleted file mode 100644 index 6bac5c24f7..0000000000 --- a/plugins/DevicesDetection/images/browsers/CH.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/CI.png b/plugins/DevicesDetection/images/browsers/CI.png Binary files differdeleted file mode 100644 index 6bac5c24f7..0000000000 --- a/plugins/DevicesDetection/images/browsers/CI.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/CK.png b/plugins/DevicesDetection/images/browsers/CK.png Binary files differdeleted file mode 100644 index 78cd73f776..0000000000 --- a/plugins/DevicesDetection/images/browsers/CK.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/CM.png b/plugins/DevicesDetection/images/browsers/CM.png Binary files differdeleted file mode 100644 index 6bac5c24f7..0000000000 --- a/plugins/DevicesDetection/images/browsers/CM.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/CN.png b/plugins/DevicesDetection/images/browsers/CN.png Binary files differdeleted file mode 100644 index 6e744e3cea..0000000000 --- a/plugins/DevicesDetection/images/browsers/CN.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/CO.png b/plugins/DevicesDetection/images/browsers/CO.png Binary files differdeleted file mode 100644 index 1e3b7035e3..0000000000 --- a/plugins/DevicesDetection/images/browsers/CO.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/CP.png b/plugins/DevicesDetection/images/browsers/CP.png Binary files differdeleted file mode 100644 index 6e744e3cea..0000000000 --- a/plugins/DevicesDetection/images/browsers/CP.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/CR.png b/plugins/DevicesDetection/images/browsers/CR.png Binary files differdeleted file mode 100644 index 9edd343b85..0000000000 --- a/plugins/DevicesDetection/images/browsers/CR.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/DE.png b/plugins/DevicesDetection/images/browsers/DE.png Binary files differdeleted file mode 100644 index e5795948a4..0000000000 --- a/plugins/DevicesDetection/images/browsers/DE.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/DF.png b/plugins/DevicesDetection/images/browsers/DF.png Binary files differdeleted file mode 100644 index 25fe4a23be..0000000000 --- a/plugins/DevicesDetection/images/browsers/DF.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/DI.png b/plugins/DevicesDetection/images/browsers/DI.png Binary files differdeleted file mode 100644 index d81b1df934..0000000000 --- a/plugins/DevicesDetection/images/browsers/DI.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/EL.png b/plugins/DevicesDetection/images/browsers/EL.png Binary files differdeleted file mode 100644 index a4e54b3aab..0000000000 --- a/plugins/DevicesDetection/images/browsers/EL.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/EP.png b/plugins/DevicesDetection/images/browsers/EP.png Binary files differdeleted file mode 100644 index fc7bfd791b..0000000000 --- a/plugins/DevicesDetection/images/browsers/EP.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/ES.png b/plugins/DevicesDetection/images/browsers/ES.png Binary files differdeleted file mode 100644 index cf318a8381..0000000000 --- a/plugins/DevicesDetection/images/browsers/ES.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/FB.png b/plugins/DevicesDetection/images/browsers/FB.png Binary files differdeleted file mode 100644 index db8c135542..0000000000 --- a/plugins/DevicesDetection/images/browsers/FB.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/FD.png b/plugins/DevicesDetection/images/browsers/FD.png Binary files differdeleted file mode 100644 index 9c12a4f7e7..0000000000 --- a/plugins/DevicesDetection/images/browsers/FD.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/FE.png b/plugins/DevicesDetection/images/browsers/FE.png Binary files differdeleted file mode 100644 index 192db90a2d..0000000000 --- a/plugins/DevicesDetection/images/browsers/FE.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/FF.png b/plugins/DevicesDetection/images/browsers/FF.png Binary files differdeleted file mode 100644 index 099d5689a9..0000000000 --- a/plugins/DevicesDetection/images/browsers/FF.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/FL.png b/plugins/DevicesDetection/images/browsers/FL.png Binary files differdeleted file mode 100644 index 81c58dad55..0000000000 --- a/plugins/DevicesDetection/images/browsers/FL.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/FN.png b/plugins/DevicesDetection/images/browsers/FN.png Binary files differdeleted file mode 100644 index 93ca6276e4..0000000000 --- a/plugins/DevicesDetection/images/browsers/FN.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/FW.png b/plugins/DevicesDetection/images/browsers/FW.png Binary files differdeleted file mode 100644 index 876481f867..0000000000 --- a/plugins/DevicesDetection/images/browsers/FW.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/GA.png b/plugins/DevicesDetection/images/browsers/GA.png Binary files differdeleted file mode 100644 index 5ef97f3d89..0000000000 --- a/plugins/DevicesDetection/images/browsers/GA.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/GE.png b/plugins/DevicesDetection/images/browsers/GE.png Binary files differdeleted file mode 100644 index 51fb7c4eda..0000000000 --- a/plugins/DevicesDetection/images/browsers/GE.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/HJ.png b/plugins/DevicesDetection/images/browsers/HJ.png Binary files differdeleted file mode 100644 index 025577be2b..0000000000 --- a/plugins/DevicesDetection/images/browsers/HJ.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/IA.png b/plugins/DevicesDetection/images/browsers/IA.png Binary files differdeleted file mode 100644 index 25dfd29003..0000000000 --- a/plugins/DevicesDetection/images/browsers/IA.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/IB.png b/plugins/DevicesDetection/images/browsers/IB.png Binary files differdeleted file mode 100644 index a803577ab7..0000000000 --- a/plugins/DevicesDetection/images/browsers/IB.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/IC.png b/plugins/DevicesDetection/images/browsers/IC.png Binary files differdeleted file mode 100644 index 6d16304510..0000000000 --- a/plugins/DevicesDetection/images/browsers/IC.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/ID.png b/plugins/DevicesDetection/images/browsers/ID.png Binary files differdeleted file mode 100644 index f81132778c..0000000000 --- a/plugins/DevicesDetection/images/browsers/ID.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/IE.png b/plugins/DevicesDetection/images/browsers/IE.png Binary files differdeleted file mode 100644 index a0cfd5a91d..0000000000 --- a/plugins/DevicesDetection/images/browsers/IE.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/IM.png b/plugins/DevicesDetection/images/browsers/IM.png Binary files differdeleted file mode 100644 index 7f579b7cfd..0000000000 --- a/plugins/DevicesDetection/images/browsers/IM.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/IR.png b/plugins/DevicesDetection/images/browsers/IR.png Binary files differdeleted file mode 100644 index 97f591a8d9..0000000000 --- a/plugins/DevicesDetection/images/browsers/IR.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/IV.png b/plugins/DevicesDetection/images/browsers/IV.png Binary files differdeleted file mode 100644 index 3968d702ea..0000000000 --- a/plugins/DevicesDetection/images/browsers/IV.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/IW.png b/plugins/DevicesDetection/images/browsers/IW.png Binary files differdeleted file mode 100644 index 232cabc95f..0000000000 --- a/plugins/DevicesDetection/images/browsers/IW.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/JI.png b/plugins/DevicesDetection/images/browsers/JI.png Binary files differdeleted file mode 100644 index d0aea6052d..0000000000 --- a/plugins/DevicesDetection/images/browsers/JI.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/JS.png b/plugins/DevicesDetection/images/browsers/JS.png Binary files differdeleted file mode 100644 index 0b04a90087..0000000000 --- a/plugins/DevicesDetection/images/browsers/JS.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/KI.png b/plugins/DevicesDetection/images/browsers/KI.png Binary files differdeleted file mode 100644 index e23dbef9a1..0000000000 --- a/plugins/DevicesDetection/images/browsers/KI.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/KM.png b/plugins/DevicesDetection/images/browsers/KM.png Binary files differdeleted file mode 100644 index ca26a7a776..0000000000 --- a/plugins/DevicesDetection/images/browsers/KM.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/KO.png b/plugins/DevicesDetection/images/browsers/KO.png Binary files differdeleted file mode 100644 index d3e75a66fb..0000000000 --- a/plugins/DevicesDetection/images/browsers/KO.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/KP.png b/plugins/DevicesDetection/images/browsers/KP.png Binary files differdeleted file mode 100644 index 30a2ace214..0000000000 --- a/plugins/DevicesDetection/images/browsers/KP.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/KY.png b/plugins/DevicesDetection/images/browsers/KY.png Binary files differdeleted file mode 100644 index 8bdc38e8ec..0000000000 --- a/plugins/DevicesDetection/images/browsers/KY.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/KZ.png b/plugins/DevicesDetection/images/browsers/KZ.png Binary files differdeleted file mode 100644 index 41af2edc16..0000000000 --- a/plugins/DevicesDetection/images/browsers/KZ.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/LB.png b/plugins/DevicesDetection/images/browsers/LB.png Binary files differdeleted file mode 100644 index 2157f3c3ab..0000000000 --- a/plugins/DevicesDetection/images/browsers/LB.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/LG.png b/plugins/DevicesDetection/images/browsers/LG.png Binary files differdeleted file mode 100644 index fc2bf99a07..0000000000 --- a/plugins/DevicesDetection/images/browsers/LG.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/LI.png b/plugins/DevicesDetection/images/browsers/LI.png Binary files differdeleted file mode 100644 index d678dc5596..0000000000 --- a/plugins/DevicesDetection/images/browsers/LI.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/LS.png b/plugins/DevicesDetection/images/browsers/LS.png Binary files differdeleted file mode 100644 index b5e82bd54c..0000000000 --- a/plugins/DevicesDetection/images/browsers/LS.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/LX.png b/plugins/DevicesDetection/images/browsers/LX.png Binary files differdeleted file mode 100644 index 804614158e..0000000000 --- a/plugins/DevicesDetection/images/browsers/LX.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/MB.png b/plugins/DevicesDetection/images/browsers/MB.png Binary files differdeleted file mode 100644 index ff43e26ff7..0000000000 --- a/plugins/DevicesDetection/images/browsers/MB.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/MC.png b/plugins/DevicesDetection/images/browsers/MC.png Binary files differdeleted file mode 100644 index e7e73bc265..0000000000 --- a/plugins/DevicesDetection/images/browsers/MC.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/ME.png b/plugins/DevicesDetection/images/browsers/ME.png Binary files differdeleted file mode 100644 index a867267343..0000000000 --- a/plugins/DevicesDetection/images/browsers/ME.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/MF.png b/plugins/DevicesDetection/images/browsers/MF.png Binary files differdeleted file mode 100644 index b4ffe6d7a7..0000000000 --- a/plugins/DevicesDetection/images/browsers/MF.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/MI.png b/plugins/DevicesDetection/images/browsers/MI.png Binary files differdeleted file mode 100644 index a0d7ed1f9d..0000000000 --- a/plugins/DevicesDetection/images/browsers/MI.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/MS.png b/plugins/DevicesDetection/images/browsers/MS.png Binary files differdeleted file mode 100644 index 3088f3fa1e..0000000000 --- a/plugins/DevicesDetection/images/browsers/MS.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/MU.png b/plugins/DevicesDetection/images/browsers/MU.png Binary files differdeleted file mode 100644 index 7e388c8049..0000000000 --- a/plugins/DevicesDetection/images/browsers/MU.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/MX.png b/plugins/DevicesDetection/images/browsers/MX.png Binary files differdeleted file mode 100644 index 7b96c1ee62..0000000000 --- a/plugins/DevicesDetection/images/browsers/MX.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/NB.png b/plugins/DevicesDetection/images/browsers/NB.png Binary files differdeleted file mode 100644 index 70e444f7d6..0000000000 --- a/plugins/DevicesDetection/images/browsers/NB.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/NF.png b/plugins/DevicesDetection/images/browsers/NF.png Binary files differdeleted file mode 100644 index 4e47798961..0000000000 --- a/plugins/DevicesDetection/images/browsers/NF.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/NL.png b/plugins/DevicesDetection/images/browsers/NL.png Binary files differdeleted file mode 100644 index 1143e3ae50..0000000000 --- a/plugins/DevicesDetection/images/browsers/NL.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/NO.png b/plugins/DevicesDetection/images/browsers/NO.png Binary files differdeleted file mode 100644 index 70e444f7d6..0000000000 --- a/plugins/DevicesDetection/images/browsers/NO.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/NP.png b/plugins/DevicesDetection/images/browsers/NP.png Binary files differdeleted file mode 100644 index 8a5500d69f..0000000000 --- a/plugins/DevicesDetection/images/browsers/NP.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/NS.png b/plugins/DevicesDetection/images/browsers/NS.png Binary files differdeleted file mode 100644 index ba5048f1fb..0000000000 --- a/plugins/DevicesDetection/images/browsers/NS.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/NV.png b/plugins/DevicesDetection/images/browsers/NV.png Binary files differdeleted file mode 100644 index 70e444f7d6..0000000000 --- a/plugins/DevicesDetection/images/browsers/NV.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/OB.png b/plugins/DevicesDetection/images/browsers/OB.png Binary files differdeleted file mode 100644 index a7def9c056..0000000000 --- a/plugins/DevicesDetection/images/browsers/OB.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/OE.png b/plugins/DevicesDetection/images/browsers/OE.png Binary files differdeleted file mode 100644 index 636f7a3260..0000000000 --- a/plugins/DevicesDetection/images/browsers/OE.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/OF.png b/plugins/DevicesDetection/images/browsers/OF.png Binary files differdeleted file mode 100644 index aaf5d7aa2c..0000000000 --- a/plugins/DevicesDetection/images/browsers/OF.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/OI.png b/plugins/DevicesDetection/images/browsers/OI.png Binary files differdeleted file mode 100644 index ffc9db9f2f..0000000000 --- a/plugins/DevicesDetection/images/browsers/OI.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/OM.png b/plugins/DevicesDetection/images/browsers/OM.png Binary files differdeleted file mode 100644 index 9bf6af61bd..0000000000 --- a/plugins/DevicesDetection/images/browsers/OM.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/ON.png b/plugins/DevicesDetection/images/browsers/ON.png Binary files differdeleted file mode 100644 index e02682d853..0000000000 --- a/plugins/DevicesDetection/images/browsers/ON.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/OP.png b/plugins/DevicesDetection/images/browsers/OP.png Binary files differdeleted file mode 100644 index 9bf6af61bd..0000000000 --- a/plugins/DevicesDetection/images/browsers/OP.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/OR.png b/plugins/DevicesDetection/images/browsers/OR.png Binary files differdeleted file mode 100644 index 51a86f5ddf..0000000000 --- a/plugins/DevicesDetection/images/browsers/OR.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/OT.png b/plugins/DevicesDetection/images/browsers/OT.png Binary files differdeleted file mode 100644 index 66ca6c2725..0000000000 --- a/plugins/DevicesDetection/images/browsers/OT.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/OV.png b/plugins/DevicesDetection/images/browsers/OV.png Binary files differdeleted file mode 100644 index e3345e8fcb..0000000000 --- a/plugins/DevicesDetection/images/browsers/OV.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/OW.png b/plugins/DevicesDetection/images/browsers/OW.png Binary files differdeleted file mode 100644 index f0454528f4..0000000000 --- a/plugins/DevicesDetection/images/browsers/OW.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/PA.png b/plugins/DevicesDetection/images/browsers/PA.png Binary files differdeleted file mode 100644 index 3c051b50d5..0000000000 --- a/plugins/DevicesDetection/images/browsers/PA.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/PL.png b/plugins/DevicesDetection/images/browsers/PL.png Binary files differdeleted file mode 100644 index 3c051b50d5..0000000000 --- a/plugins/DevicesDetection/images/browsers/PL.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/PM.png b/plugins/DevicesDetection/images/browsers/PM.png Binary files differdeleted file mode 100644 index 2fa25e484c..0000000000 --- a/plugins/DevicesDetection/images/browsers/PM.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/PO.png b/plugins/DevicesDetection/images/browsers/PO.png Binary files differdeleted file mode 100644 index 47983b13c4..0000000000 --- a/plugins/DevicesDetection/images/browsers/PO.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/PR.png b/plugins/DevicesDetection/images/browsers/PR.png Binary files differdeleted file mode 100644 index 3c051b50d5..0000000000 --- a/plugins/DevicesDetection/images/browsers/PR.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/PS.png b/plugins/DevicesDetection/images/browsers/PS.png Binary files differdeleted file mode 100644 index 71e70e21b4..0000000000 --- a/plugins/DevicesDetection/images/browsers/PS.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/PU.png b/plugins/DevicesDetection/images/browsers/PU.png Binary files differdeleted file mode 100644 index a6e09599c5..0000000000 --- a/plugins/DevicesDetection/images/browsers/PU.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/PW.png b/plugins/DevicesDetection/images/browsers/PW.png Binary files differdeleted file mode 100644 index 3c051b50d5..0000000000 --- a/plugins/DevicesDetection/images/browsers/PW.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/PX.png b/plugins/DevicesDetection/images/browsers/PX.png Binary files differdeleted file mode 100644 index db8c135542..0000000000 --- a/plugins/DevicesDetection/images/browsers/PX.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/QQ.png b/plugins/DevicesDetection/images/browsers/QQ.png Binary files differdeleted file mode 100644 index 6fbca0d6d4..0000000000 --- a/plugins/DevicesDetection/images/browsers/QQ.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/RK.png b/plugins/DevicesDetection/images/browsers/RK.png Binary files differdeleted file mode 100644 index 93a695ac0c..0000000000 --- a/plugins/DevicesDetection/images/browsers/RK.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/RM.png b/plugins/DevicesDetection/images/browsers/RM.png Binary files differdeleted file mode 100644 index ebd15da1c7..0000000000 --- a/plugins/DevicesDetection/images/browsers/RM.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/SA.png b/plugins/DevicesDetection/images/browsers/SA.png Binary files differdeleted file mode 100644 index 8316db4bd2..0000000000 --- a/plugins/DevicesDetection/images/browsers/SA.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/SB.png b/plugins/DevicesDetection/images/browsers/SB.png Binary files differdeleted file mode 100644 index 4eda015f64..0000000000 --- a/plugins/DevicesDetection/images/browsers/SB.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/SE.png b/plugins/DevicesDetection/images/browsers/SE.png Binary files differdeleted file mode 100644 index 7729eeb9b6..0000000000 --- a/plugins/DevicesDetection/images/browsers/SE.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/SF.png b/plugins/DevicesDetection/images/browsers/SF.png Binary files differdeleted file mode 100644 index b4ffe6d7a7..0000000000 --- a/plugins/DevicesDetection/images/browsers/SF.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/SH.png b/plugins/DevicesDetection/images/browsers/SH.png Binary files differdeleted file mode 100644 index cb07b1fac7..0000000000 --- a/plugins/DevicesDetection/images/browsers/SH.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/SK.png b/plugins/DevicesDetection/images/browsers/SK.png Binary files differdeleted file mode 100644 index a5f515114a..0000000000 --- a/plugins/DevicesDetection/images/browsers/SK.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/SL.png b/plugins/DevicesDetection/images/browsers/SL.png Binary files differdeleted file mode 100644 index 7c412d489c..0000000000 --- a/plugins/DevicesDetection/images/browsers/SL.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/SM.png b/plugins/DevicesDetection/images/browsers/SM.png Binary files differdeleted file mode 100644 index 80c63876d7..0000000000 --- a/plugins/DevicesDetection/images/browsers/SM.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/SP.png b/plugins/DevicesDetection/images/browsers/SP.png Binary files differdeleted file mode 100644 index 93c6642781..0000000000 --- a/plugins/DevicesDetection/images/browsers/SP.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/SS.png b/plugins/DevicesDetection/images/browsers/SS.png Binary files differdeleted file mode 100644 index 9fbbf6363a..0000000000 --- a/plugins/DevicesDetection/images/browsers/SS.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/ST.png b/plugins/DevicesDetection/images/browsers/ST.png Binary files differdeleted file mode 100644 index 825664192e..0000000000 --- a/plugins/DevicesDetection/images/browsers/ST.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/SX.png b/plugins/DevicesDetection/images/browsers/SX.png Binary files differdeleted file mode 100644 index d6e007c1c1..0000000000 --- a/plugins/DevicesDetection/images/browsers/SX.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/TS.png b/plugins/DevicesDetection/images/browsers/TS.png Binary files differdeleted file mode 100644 index ffe9d4cd0b..0000000000 --- a/plugins/DevicesDetection/images/browsers/TS.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/TZ.png b/plugins/DevicesDetection/images/browsers/TZ.png Binary files differdeleted file mode 100644 index 2bf8cb52f5..0000000000 --- a/plugins/DevicesDetection/images/browsers/TZ.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/UC.png b/plugins/DevicesDetection/images/browsers/UC.png Binary files differdeleted file mode 100644 index 041ce90d50..0000000000 --- a/plugins/DevicesDetection/images/browsers/UC.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/UNK.png b/plugins/DevicesDetection/images/browsers/UNK.png Binary files differdeleted file mode 100644 index 6a63dcea00..0000000000 --- a/plugins/DevicesDetection/images/browsers/UNK.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/VI.png b/plugins/DevicesDetection/images/browsers/VI.png Binary files differdeleted file mode 100644 index acd2fc6286..0000000000 --- a/plugins/DevicesDetection/images/browsers/VI.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/WE.png b/plugins/DevicesDetection/images/browsers/WE.png Binary files differdeleted file mode 100644 index a14235ddae..0000000000 --- a/plugins/DevicesDetection/images/browsers/WE.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/WO.png b/plugins/DevicesDetection/images/browsers/WO.png Binary files differdeleted file mode 100644 index 59b5f68ff3..0000000000 --- a/plugins/DevicesDetection/images/browsers/WO.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/YA.png b/plugins/DevicesDetection/images/browsers/YA.png Binary files differdeleted file mode 100644 index ae0418c403..0000000000 --- a/plugins/DevicesDetection/images/browsers/YA.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/AIX.png b/plugins/DevicesDetection/images/os/AIX.png Binary files differdeleted file mode 100644 index 6c963cea5f..0000000000 --- a/plugins/DevicesDetection/images/os/AIX.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/AMG.png b/plugins/DevicesDetection/images/os/AMG.png Binary files differdeleted file mode 100644 index c0dd351093..0000000000 --- a/plugins/DevicesDetection/images/os/AMG.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/AND.png b/plugins/DevicesDetection/images/os/AND.png Binary files differdeleted file mode 100644 index 79c6385840..0000000000 --- a/plugins/DevicesDetection/images/os/AND.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/ARL.png b/plugins/DevicesDetection/images/os/ARL.png Binary files differdeleted file mode 100644 index 3556fffe6a..0000000000 --- a/plugins/DevicesDetection/images/os/ARL.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/ATV.png b/plugins/DevicesDetection/images/os/ATV.png Binary files differdeleted file mode 100644 index d55f8d7390..0000000000 --- a/plugins/DevicesDetection/images/os/ATV.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/BEO.png b/plugins/DevicesDetection/images/os/BEO.png Binary files differdeleted file mode 100644 index fcce455b86..0000000000 --- a/plugins/DevicesDetection/images/os/BEO.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/BLB.png b/plugins/DevicesDetection/images/os/BLB.png Binary files differdeleted file mode 100644 index 9febbfe9cf..0000000000 --- a/plugins/DevicesDetection/images/os/BLB.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/BSD.png b/plugins/DevicesDetection/images/os/BSD.png Binary files differdeleted file mode 100644 index ccf075485c..0000000000 --- a/plugins/DevicesDetection/images/os/BSD.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/BTR.png b/plugins/DevicesDetection/images/os/BTR.png Binary files differdeleted file mode 100644 index 00c51ee5d6..0000000000 --- a/plugins/DevicesDetection/images/os/BTR.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/CES.png b/plugins/DevicesDetection/images/os/CES.png Binary files differdeleted file mode 100644 index 40145f6c56..0000000000 --- a/plugins/DevicesDetection/images/os/CES.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/COS.png b/plugins/DevicesDetection/images/os/COS.png Binary files differdeleted file mode 100644 index 6bac5c24f7..0000000000 --- a/plugins/DevicesDetection/images/os/COS.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/CYN.png b/plugins/DevicesDetection/images/os/CYN.png Binary files differdeleted file mode 100644 index da02d339b0..0000000000 --- a/plugins/DevicesDetection/images/os/CYN.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/DEB.png b/plugins/DevicesDetection/images/os/DEB.png Binary files differdeleted file mode 100644 index 1e5a3b81a5..0000000000 --- a/plugins/DevicesDetection/images/os/DEB.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/DFB.png b/plugins/DevicesDetection/images/os/DFB.png Binary files differdeleted file mode 100644 index 2aaba1dbb9..0000000000 --- a/plugins/DevicesDetection/images/os/DFB.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/FED.png b/plugins/DevicesDetection/images/os/FED.png Binary files differdeleted file mode 100644 index 4c22f14ce2..0000000000 --- a/plugins/DevicesDetection/images/os/FED.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/FOS.png b/plugins/DevicesDetection/images/os/FOS.png Binary files differdeleted file mode 100644 index 099d5689a9..0000000000 --- a/plugins/DevicesDetection/images/os/FOS.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/GNT.png b/plugins/DevicesDetection/images/os/GNT.png Binary files differdeleted file mode 100644 index 48614998ca..0000000000 --- a/plugins/DevicesDetection/images/os/GNT.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/GTV.png b/plugins/DevicesDetection/images/os/GTV.png Binary files differdeleted file mode 100644 index ee3f559d26..0000000000 --- a/plugins/DevicesDetection/images/os/GTV.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/HAI.png b/plugins/DevicesDetection/images/os/HAI.png Binary files differdeleted file mode 100644 index a3906dd313..0000000000 --- a/plugins/DevicesDetection/images/os/HAI.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/HPX.png b/plugins/DevicesDetection/images/os/HPX.png Binary files differdeleted file mode 100644 index 828762a9c2..0000000000 --- a/plugins/DevicesDetection/images/os/HPX.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/IOS.png b/plugins/DevicesDetection/images/os/IOS.png Binary files differdeleted file mode 100644 index 9b276daad4..0000000000 --- a/plugins/DevicesDetection/images/os/IOS.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/IRI.png b/plugins/DevicesDetection/images/os/IRI.png Binary files differdeleted file mode 100644 index a69ce07e03..0000000000 --- a/plugins/DevicesDetection/images/os/IRI.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/KBT.png b/plugins/DevicesDetection/images/os/KBT.png Binary files differdeleted file mode 100644 index 50a88cdf61..0000000000 --- a/plugins/DevicesDetection/images/os/KBT.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/KNO.png b/plugins/DevicesDetection/images/os/KNO.png Binary files differdeleted file mode 100644 index 5b980ee65f..0000000000 --- a/plugins/DevicesDetection/images/os/KNO.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/LBT.png b/plugins/DevicesDetection/images/os/LBT.png Binary files differdeleted file mode 100644 index b2d070163d..0000000000 --- a/plugins/DevicesDetection/images/os/LBT.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/LIN.png b/plugins/DevicesDetection/images/os/LIN.png Binary files differdeleted file mode 100644 index 9f9914dfb5..0000000000 --- a/plugins/DevicesDetection/images/os/LIN.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/MAC.png b/plugins/DevicesDetection/images/os/MAC.png Binary files differdeleted file mode 100644 index f679d4e8ba..0000000000 --- a/plugins/DevicesDetection/images/os/MAC.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/MAE.png b/plugins/DevicesDetection/images/os/MAE.png Binary files differdeleted file mode 100644 index a8c99a72ba..0000000000 --- a/plugins/DevicesDetection/images/os/MAE.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/MDR.png b/plugins/DevicesDetection/images/os/MDR.png Binary files differdeleted file mode 100644 index e5f5a01143..0000000000 --- a/plugins/DevicesDetection/images/os/MDR.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/MIN.png b/plugins/DevicesDetection/images/os/MIN.png Binary files differdeleted file mode 100644 index 02441696e8..0000000000 --- a/plugins/DevicesDetection/images/os/MIN.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/MOR.png b/plugins/DevicesDetection/images/os/MOR.png Binary files differdeleted file mode 100644 index d87c63c388..0000000000 --- a/plugins/DevicesDetection/images/os/MOR.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/NBS.png b/plugins/DevicesDetection/images/os/NBS.png Binary files differdeleted file mode 100644 index 85987a385e..0000000000 --- a/plugins/DevicesDetection/images/os/NBS.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/NDS.png b/plugins/DevicesDetection/images/os/NDS.png Binary files differdeleted file mode 100644 index 9045704a9d..0000000000 --- a/plugins/DevicesDetection/images/os/NDS.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/OBS.png b/plugins/DevicesDetection/images/os/OBS.png Binary files differdeleted file mode 100644 index 8038d66344..0000000000 --- a/plugins/DevicesDetection/images/os/OBS.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/OS2.png b/plugins/DevicesDetection/images/os/OS2.png Binary files differdeleted file mode 100644 index ebf559a786..0000000000 --- a/plugins/DevicesDetection/images/os/OS2.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/POS.png b/plugins/DevicesDetection/images/os/POS.png Binary files differdeleted file mode 100644 index 3c051b50d5..0000000000 --- a/plugins/DevicesDetection/images/os/POS.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/PS3.png b/plugins/DevicesDetection/images/os/PS3.png Binary files differdeleted file mode 100644 index a303c86f7e..0000000000 --- a/plugins/DevicesDetection/images/os/PS3.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/PSP.png b/plugins/DevicesDetection/images/os/PSP.png Binary files differdeleted file mode 100644 index 2ad577284c..0000000000 --- a/plugins/DevicesDetection/images/os/PSP.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/QNX.png b/plugins/DevicesDetection/images/os/QNX.png Binary files differdeleted file mode 100644 index 9febbfe9cf..0000000000 --- a/plugins/DevicesDetection/images/os/QNX.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/RHT.png b/plugins/DevicesDetection/images/os/RHT.png Binary files differdeleted file mode 100644 index fc0e410c21..0000000000 --- a/plugins/DevicesDetection/images/os/RHT.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/ROS.png b/plugins/DevicesDetection/images/os/ROS.png Binary files differdeleted file mode 100644 index 1d174fbb35..0000000000 --- a/plugins/DevicesDetection/images/os/ROS.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/SAB.png b/plugins/DevicesDetection/images/os/SAB.png Binary files differdeleted file mode 100644 index baa0d25467..0000000000 --- a/plugins/DevicesDetection/images/os/SAB.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/SAF.png b/plugins/DevicesDetection/images/os/SAF.png Binary files differdeleted file mode 100644 index ebfb367071..0000000000 --- a/plugins/DevicesDetection/images/os/SAF.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/SBA.png b/plugins/DevicesDetection/images/os/SBA.png Binary files differdeleted file mode 100644 index 3207fa7324..0000000000 --- a/plugins/DevicesDetection/images/os/SBA.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/SLW.png b/plugins/DevicesDetection/images/os/SLW.png Binary files differdeleted file mode 100644 index ab7b53f545..0000000000 --- a/plugins/DevicesDetection/images/os/SLW.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/SMG.png b/plugins/DevicesDetection/images/os/SMG.png Binary files differdeleted file mode 100644 index d552a65991..0000000000 --- a/plugins/DevicesDetection/images/os/SMG.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/SOS.png b/plugins/DevicesDetection/images/os/SOS.png Binary files differdeleted file mode 100644 index f836bbf235..0000000000 --- a/plugins/DevicesDetection/images/os/SOS.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/SSE.png b/plugins/DevicesDetection/images/os/SSE.png Binary files differdeleted file mode 100644 index 403b65f84e..0000000000 --- a/plugins/DevicesDetection/images/os/SSE.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/SYL.png b/plugins/DevicesDetection/images/os/SYL.png Binary files differdeleted file mode 100644 index cc1f3c31b4..0000000000 --- a/plugins/DevicesDetection/images/os/SYL.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/SYM.png b/plugins/DevicesDetection/images/os/SYM.png Binary files differdeleted file mode 100644 index d110bb977d..0000000000 --- a/plugins/DevicesDetection/images/os/SYM.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/T64.png b/plugins/DevicesDetection/images/os/T64.png Binary files differdeleted file mode 100644 index 11b965fe3d..0000000000 --- a/plugins/DevicesDetection/images/os/T64.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/TDX.png b/plugins/DevicesDetection/images/os/TDX.png Binary files differdeleted file mode 100644 index 22857fa2e7..0000000000 --- a/plugins/DevicesDetection/images/os/TDX.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/TIZ.png b/plugins/DevicesDetection/images/os/TIZ.png Binary files differdeleted file mode 100644 index 2bf8cb52f5..0000000000 --- a/plugins/DevicesDetection/images/os/TIZ.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/UBT.png b/plugins/DevicesDetection/images/os/UBT.png Binary files differdeleted file mode 100644 index 2e42276be5..0000000000 --- a/plugins/DevicesDetection/images/os/UBT.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/UNK.png b/plugins/DevicesDetection/images/os/UNK.png Binary files differdeleted file mode 100644 index 6a63dcea00..0000000000 --- a/plugins/DevicesDetection/images/os/UNK.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/VLN.png b/plugins/DevicesDetection/images/os/VLN.png Binary files differdeleted file mode 100644 index d4d681f553..0000000000 --- a/plugins/DevicesDetection/images/os/VLN.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WCE.png b/plugins/DevicesDetection/images/os/WCE.png Binary files differdeleted file mode 100644 index f631eb62d8..0000000000 --- a/plugins/DevicesDetection/images/os/WCE.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WII.png b/plugins/DevicesDetection/images/os/WII.png Binary files differdeleted file mode 100644 index 23624cccaa..0000000000 --- a/plugins/DevicesDetection/images/os/WII.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WIN.png b/plugins/DevicesDetection/images/os/WIN.png Binary files differdeleted file mode 100644 index f2d70c2a1f..0000000000 --- a/plugins/DevicesDetection/images/os/WIN.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WMO.png b/plugins/DevicesDetection/images/os/WMO.png Binary files differdeleted file mode 100644 index e65261dc97..0000000000 --- a/plugins/DevicesDetection/images/os/WMO.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WOS.png b/plugins/DevicesDetection/images/os/WOS.png Binary files differdeleted file mode 100644 index f48c457e3c..0000000000 --- a/plugins/DevicesDetection/images/os/WOS.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WPH.png b/plugins/DevicesDetection/images/os/WPH.png Binary files differdeleted file mode 100644 index cf7db3225c..0000000000 --- a/plugins/DevicesDetection/images/os/WPH.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/XBT.png b/plugins/DevicesDetection/images/os/XBT.png Binary files differdeleted file mode 100644 index a4ea2829f7..0000000000 --- a/plugins/DevicesDetection/images/os/XBT.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/XBX.png b/plugins/DevicesDetection/images/os/XBX.png Binary files differdeleted file mode 100644 index 8f1175eaa9..0000000000 --- a/plugins/DevicesDetection/images/os/XBX.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/YNS.png b/plugins/DevicesDetection/images/os/YNS.png Binary files differdeleted file mode 100644 index 5d53645b95..0000000000 --- a/plugins/DevicesDetection/images/os/YNS.png +++ /dev/null diff --git a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml index ba7132d703..ebb9d33283 100644 --- a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml +++ b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml @@ -115,14 +115,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -146,11 +146,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -223,14 +223,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -254,11 +254,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -331,14 +331,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -362,11 +362,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -439,14 +439,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -470,11 +470,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -547,14 +547,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -578,11 +578,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -655,14 +655,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -686,11 +686,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -763,14 +763,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -794,11 +794,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -871,14 +871,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -902,11 +902,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -979,14 +979,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1010,11 +1010,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1087,14 +1087,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1118,11 +1118,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> 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 afc57e17de..816f5a2df7 100644 --- a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml +++ b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml @@ -115,14 +115,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -146,11 +146,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -223,14 +223,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -254,11 +254,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -331,14 +331,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -362,11 +362,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -439,14 +439,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -470,11 +470,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -547,14 +547,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -578,11 +578,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -655,14 +655,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -686,11 +686,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -763,14 +763,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -794,11 +794,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -871,14 +871,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -902,11 +902,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -979,14 +979,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1010,11 +1010,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1087,14 +1087,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1118,11 +1118,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1195,14 +1195,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1226,11 +1226,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1303,14 +1303,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1334,11 +1334,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1411,14 +1411,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1442,11 +1442,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1519,14 +1519,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1550,11 +1550,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1627,14 +1627,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1658,11 +1658,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1735,14 +1735,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1766,11 +1766,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1843,14 +1843,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1874,11 +1874,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1951,14 +1951,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1982,11 +1982,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -2059,14 +2059,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -2090,11 +2090,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -2167,14 +2167,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -2198,11 +2198,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/plugins/Morpheus/icons b/plugins/Morpheus/icons new file mode 160000 +Subproject 73ceb86e07fa0d963a791aac8337736901a9f54 diff --git a/plugins/Referrers/SearchEngine.php b/plugins/Referrers/SearchEngine.php index e2970c61ad..f8b1f806e0 100644 --- a/plugins/Referrers/SearchEngine.php +++ b/plugins/Referrers/SearchEngine.php @@ -460,11 +460,11 @@ class SearchEngine extends Singleton * * @param string $url * @return string path - * @see plugins/Referrers/images/searchEnginges/ + * @see plugins/Morpheus/icons/dist/searchEnginges/ */ public function getLogoFromUrl($url) { - $pathInPiwik = 'plugins/Referrers/images/searchEngines/%s.png'; + $pathInPiwik = 'plugins/Morpheus/icons/dist/searchEngines/%s.png'; $pathWithCode = sprintf($pathInPiwik, $this->getHostFromUrl($url)); $absolutePath = PIWIK_INCLUDE_PATH . '/' . $pathWithCode; if (file_exists($absolutePath)) { diff --git a/plugins/Referrers/Social.php b/plugins/Referrers/Social.php index 1de70a3068..9b81cb7adc 100644 --- a/plugins/Referrers/Social.php +++ b/plugins/Referrers/Social.php @@ -162,14 +162,14 @@ class Social extends Singleton * * @param string $domain * @return string path - * @see plugins/Referrers/images/socials/ + * @see plugins/Morpheus/icons/dist/socials/ */ public function getLogoFromUrl($domain) { $social = $this->getSocialNetworkFromDomain($domain); $socialNetworks = $this->getDefinitions(); - $filePattern = 'plugins/Referrers/images/socials/%s.png'; + $filePattern = 'plugins/Morpheus/icons/dist/socials/%s.png'; $socialDomains = array_keys($socialNetworks, $social); foreach ($socialDomains as $domain) { diff --git a/plugins/Referrers/images/searchEngines/1.cz.png b/plugins/Referrers/images/searchEngines/1.cz.png Binary files differdeleted file mode 100644 index 0740cef1a7..0000000000 --- a/plugins/Referrers/images/searchEngines/1.cz.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/abcsok.no.png b/plugins/Referrers/images/searchEngines/abcsok.no.png Binary files differdeleted file mode 100644 index 11ef049908..0000000000 --- a/plugins/Referrers/images/searchEngines/abcsok.no.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/alexa.com.png b/plugins/Referrers/images/searchEngines/alexa.com.png Binary files differdeleted file mode 100644 index 5460d51092..0000000000 --- a/plugins/Referrers/images/searchEngines/alexa.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/all.by.png b/plugins/Referrers/images/searchEngines/all.by.png Binary files differdeleted file mode 100644 index fedcc5b744..0000000000 --- a/plugins/Referrers/images/searchEngines/all.by.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/apollo.lv.png b/plugins/Referrers/images/searchEngines/apollo.lv.png Binary files differdeleted file mode 100644 index 1f69668a00..0000000000 --- a/plugins/Referrers/images/searchEngines/apollo.lv.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/apollo7.de.png b/plugins/Referrers/images/searchEngines/apollo7.de.png Binary files differdeleted file mode 100644 index b012f6e4b2..0000000000 --- a/plugins/Referrers/images/searchEngines/apollo7.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/arama.com.png b/plugins/Referrers/images/searchEngines/arama.com.png Binary files differdeleted file mode 100644 index 7735bc7ffe..0000000000 --- a/plugins/Referrers/images/searchEngines/arama.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/ariadna.elmundo.es.png b/plugins/Referrers/images/searchEngines/ariadna.elmundo.es.png Binary files differdeleted file mode 100644 index f54bff2a0e..0000000000 --- a/plugins/Referrers/images/searchEngines/ariadna.elmundo.es.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/arianna.libero.it.png b/plugins/Referrers/images/searchEngines/arianna.libero.it.png Binary files differdeleted file mode 100644 index 7122d9eb93..0000000000 --- a/plugins/Referrers/images/searchEngines/arianna.libero.it.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/ask.com.png b/plugins/Referrers/images/searchEngines/ask.com.png Binary files differdeleted file mode 100644 index e701055521..0000000000 --- a/plugins/Referrers/images/searchEngines/ask.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/bg.setooz.com.png b/plugins/Referrers/images/searchEngines/bg.setooz.com.png Binary files differdeleted file mode 100644 index c1528359f6..0000000000 --- a/plugins/Referrers/images/searchEngines/bg.setooz.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/bing.com.png b/plugins/Referrers/images/searchEngines/bing.com.png Binary files differdeleted file mode 100644 index 9c91ad9879..0000000000 --- a/plugins/Referrers/images/searchEngines/bing.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/blekko.com.png b/plugins/Referrers/images/searchEngines/blekko.com.png Binary files differdeleted file mode 100644 index 41bbf477f9..0000000000 --- a/plugins/Referrers/images/searchEngines/blekko.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/blogs.icerocket.com.png b/plugins/Referrers/images/searchEngines/blogs.icerocket.com.png Binary files differdeleted file mode 100644 index 91b8a09e8f..0000000000 --- a/plugins/Referrers/images/searchEngines/blogs.icerocket.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/blogsearch.google.com.png b/plugins/Referrers/images/searchEngines/blogsearch.google.com.png Binary files differdeleted file mode 100644 index 6745d4b002..0000000000 --- a/plugins/Referrers/images/searchEngines/blogsearch.google.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/busca.orange.es.png b/plugins/Referrers/images/searchEngines/busca.orange.es.png Binary files differdeleted file mode 100644 index 78fd0e2ba2..0000000000 --- a/plugins/Referrers/images/searchEngines/busca.orange.es.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/busca.uol.com.br.png b/plugins/Referrers/images/searchEngines/busca.uol.com.br.png Binary files differdeleted file mode 100644 index 723ec39a92..0000000000 --- a/plugins/Referrers/images/searchEngines/busca.uol.com.br.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/buscador.terra.es.png b/plugins/Referrers/images/searchEngines/buscador.terra.es.png Binary files differdeleted file mode 100644 index 5e1d55e60c..0000000000 --- a/plugins/Referrers/images/searchEngines/buscador.terra.es.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/cgi.search.biglobe.ne.jp.png b/plugins/Referrers/images/searchEngines/cgi.search.biglobe.ne.jp.png Binary files differdeleted file mode 100644 index 1445448503..0000000000 --- a/plugins/Referrers/images/searchEngines/cgi.search.biglobe.ne.jp.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/chercherfr.aguea.com.png b/plugins/Referrers/images/searchEngines/chercherfr.aguea.com.png Binary files differdeleted file mode 100644 index c256f96217..0000000000 --- a/plugins/Referrers/images/searchEngines/chercherfr.aguea.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/claro-search.com.png b/plugins/Referrers/images/searchEngines/claro-search.com.png Binary files differdeleted file mode 100644 index bd41239878..0000000000 --- a/plugins/Referrers/images/searchEngines/claro-search.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/cse.google.com.png b/plugins/Referrers/images/searchEngines/cse.google.com.png Binary files differdeleted file mode 100644 index e00a1ee0ed..0000000000 --- a/plugins/Referrers/images/searchEngines/cse.google.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/daemon-search.com.png b/plugins/Referrers/images/searchEngines/daemon-search.com.png Binary files differdeleted file mode 100644 index 950b01320d..0000000000 --- a/plugins/Referrers/images/searchEngines/daemon-search.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/digg.com.png b/plugins/Referrers/images/searchEngines/digg.com.png Binary files differdeleted file mode 100644 index 2a9a8870b6..0000000000 --- a/plugins/Referrers/images/searchEngines/digg.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/dir.gigablast.com.png b/plugins/Referrers/images/searchEngines/dir.gigablast.com.png Binary files differdeleted file mode 100644 index e108ead10f..0000000000 --- a/plugins/Referrers/images/searchEngines/dir.gigablast.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/dmoz.org.png b/plugins/Referrers/images/searchEngines/dmoz.org.png Binary files differdeleted file mode 100644 index 9743170a61..0000000000 --- a/plugins/Referrers/images/searchEngines/dmoz.org.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/duckduckgo.com.png b/plugins/Referrers/images/searchEngines/duckduckgo.com.png Binary files differdeleted file mode 100644 index a7690935e2..0000000000 --- a/plugins/Referrers/images/searchEngines/duckduckgo.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/ecosia.org.png b/plugins/Referrers/images/searchEngines/ecosia.org.png Binary files differdeleted file mode 100644 index 9fbb2330cc..0000000000 --- a/plugins/Referrers/images/searchEngines/ecosia.org.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/encrypted.google.com.png b/plugins/Referrers/images/searchEngines/encrypted.google.com.png Binary files differdeleted file mode 100644 index 6745d4b002..0000000000 --- a/plugins/Referrers/images/searchEngines/encrypted.google.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/eo.st.png b/plugins/Referrers/images/searchEngines/eo.st.png Binary files differdeleted file mode 100644 index d236620190..0000000000 --- a/plugins/Referrers/images/searchEngines/eo.st.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/extern.peoplecheck.de.png b/plugins/Referrers/images/searchEngines/extern.peoplecheck.de.png Binary files differdeleted file mode 100644 index 6b4b314e3b..0000000000 --- a/plugins/Referrers/images/searchEngines/extern.peoplecheck.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/forestle.org.png b/plugins/Referrers/images/searchEngines/forestle.org.png Binary files differdeleted file mode 100644 index 9fbb2330cc..0000000000 --- a/plugins/Referrers/images/searchEngines/forestle.org.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/fr.dir.com.png b/plugins/Referrers/images/searchEngines/fr.dir.com.png Binary files differdeleted file mode 100644 index da8ba3703d..0000000000 --- a/plugins/Referrers/images/searchEngines/fr.dir.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/fr.wedoo.com.png b/plugins/Referrers/images/searchEngines/fr.wedoo.com.png Binary files differdeleted file mode 100644 index b44da23e05..0000000000 --- a/plugins/Referrers/images/searchEngines/fr.wedoo.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/friendfeed.com.png b/plugins/Referrers/images/searchEngines/friendfeed.com.png Binary files differdeleted file mode 100644 index 75deab4280..0000000000 --- a/plugins/Referrers/images/searchEngines/friendfeed.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/gais.cs.ccu.edu.tw.png b/plugins/Referrers/images/searchEngines/gais.cs.ccu.edu.tw.png Binary files differdeleted file mode 100644 index 0740cef1a7..0000000000 --- a/plugins/Referrers/images/searchEngines/gais.cs.ccu.edu.tw.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/geona.net.png b/plugins/Referrers/images/searchEngines/geona.net.png Binary files differdeleted file mode 100644 index c3cf014946..0000000000 --- a/plugins/Referrers/images/searchEngines/geona.net.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/go.mail.ru.png b/plugins/Referrers/images/searchEngines/go.mail.ru.png Binary files differdeleted file mode 100644 index 39213540f8..0000000000 --- a/plugins/Referrers/images/searchEngines/go.mail.ru.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/google.com.png b/plugins/Referrers/images/searchEngines/google.com.png Binary files differdeleted file mode 100644 index e00a1ee0ed..0000000000 --- a/plugins/Referrers/images/searchEngines/google.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/googlesyndicatedsearch.com.png b/plugins/Referrers/images/searchEngines/googlesyndicatedsearch.com.png Binary files differdeleted file mode 100644 index 6745d4b002..0000000000 --- a/plugins/Referrers/images/searchEngines/googlesyndicatedsearch.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/holmes.ge.png b/plugins/Referrers/images/searchEngines/holmes.ge.png Binary files differdeleted file mode 100644 index 6185d23372..0000000000 --- a/plugins/Referrers/images/searchEngines/holmes.ge.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/image.search.yahoo.co.jp.png b/plugins/Referrers/images/searchEngines/image.search.yahoo.co.jp.png Binary files differdeleted file mode 100644 index cffaf98e76..0000000000 --- a/plugins/Referrers/images/searchEngines/image.search.yahoo.co.jp.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/images.google.com.png b/plugins/Referrers/images/searchEngines/images.google.com.png Binary files differdeleted file mode 100644 index e00a1ee0ed..0000000000 --- a/plugins/Referrers/images/searchEngines/images.google.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/images.search.biglobe.ne.jp.png b/plugins/Referrers/images/searchEngines/images.search.biglobe.ne.jp.png Binary files differdeleted file mode 100644 index 1445448503..0000000000 --- a/plugins/Referrers/images/searchEngines/images.search.biglobe.ne.jp.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/images.search.yahoo.com.png b/plugins/Referrers/images/searchEngines/images.search.yahoo.com.png Binary files differdeleted file mode 100644 index f10ccebf21..0000000000 --- a/plugins/Referrers/images/searchEngines/images.search.yahoo.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/images.yandex.ru.png b/plugins/Referrers/images/searchEngines/images.yandex.ru.png Binary files differdeleted file mode 100644 index 092f883398..0000000000 --- a/plugins/Referrers/images/searchEngines/images.yandex.ru.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/infospace.com.png b/plugins/Referrers/images/searchEngines/infospace.com.png Binary files differdeleted file mode 100644 index 1df903bc89..0000000000 --- a/plugins/Referrers/images/searchEngines/infospace.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/iwon.ask.com.png b/plugins/Referrers/images/searchEngines/iwon.ask.com.png Binary files differdeleted file mode 100644 index 0a8883f84b..0000000000 --- a/plugins/Referrers/images/searchEngines/iwon.ask.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/ixquick.com.png b/plugins/Referrers/images/searchEngines/ixquick.com.png Binary files differdeleted file mode 100644 index a2cb6dfbbe..0000000000 --- a/plugins/Referrers/images/searchEngines/ixquick.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/junglekey.com.png b/plugins/Referrers/images/searchEngines/junglekey.com.png Binary files differdeleted file mode 100644 index 46ea986847..0000000000 --- a/plugins/Referrers/images/searchEngines/junglekey.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/jyxo.1188.cz.png b/plugins/Referrers/images/searchEngines/jyxo.1188.cz.png Binary files differdeleted file mode 100644 index d8c80e708f..0000000000 --- a/plugins/Referrers/images/searchEngines/jyxo.1188.cz.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/k9safesearch.com.png b/plugins/Referrers/images/searchEngines/k9safesearch.com.png Binary files differdeleted file mode 100644 index e607512dbb..0000000000 --- a/plugins/Referrers/images/searchEngines/k9safesearch.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/ko.search.need2find.com.png b/plugins/Referrers/images/searchEngines/ko.search.need2find.com.png Binary files differdeleted file mode 100644 index 0740cef1a7..0000000000 --- a/plugins/Referrers/images/searchEngines/ko.search.need2find.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/kvasir.no.png b/plugins/Referrers/images/searchEngines/kvasir.no.png Binary files differdeleted file mode 100644 index 7d1f6faf1c..0000000000 --- a/plugins/Referrers/images/searchEngines/kvasir.no.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/kwzf.net.png b/plugins/Referrers/images/searchEngines/kwzf.net.png Binary files differdeleted file mode 100644 index fe2401be73..0000000000 --- a/plugins/Referrers/images/searchEngines/kwzf.net.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/lo.st.png b/plugins/Referrers/images/searchEngines/lo.st.png Binary files differdeleted file mode 100644 index e28d1b2a9c..0000000000 --- a/plugins/Referrers/images/searchEngines/lo.st.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/m.sm.cn.png b/plugins/Referrers/images/searchEngines/m.sm.cn.png Binary files differdeleted file mode 100644 index 0b8cebcd65..0000000000 --- a/plugins/Referrers/images/searchEngines/m.sm.cn.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/maps.google.com.png b/plugins/Referrers/images/searchEngines/maps.google.com.png Binary files differdeleted file mode 100644 index 548f2ae5c3..0000000000 --- a/plugins/Referrers/images/searchEngines/maps.google.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/meta.rrzn.uni-hannover.de.png b/plugins/Referrers/images/searchEngines/meta.rrzn.uni-hannover.de.png Binary files differdeleted file mode 100644 index c940ab6219..0000000000 --- a/plugins/Referrers/images/searchEngines/meta.rrzn.uni-hannover.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/meta.ua.png b/plugins/Referrers/images/searchEngines/meta.ua.png Binary files differdeleted file mode 100644 index e84c2369bb..0000000000 --- a/plugins/Referrers/images/searchEngines/meta.ua.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/metager2.de.png b/plugins/Referrers/images/searchEngines/metager2.de.png Binary files differdeleted file mode 100644 index 2ff8f0e12f..0000000000 --- a/plugins/Referrers/images/searchEngines/metager2.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/news.google.com.png b/plugins/Referrers/images/searchEngines/news.google.com.png Binary files differdeleted file mode 100644 index 9b71e257ca..0000000000 --- a/plugins/Referrers/images/searchEngines/news.google.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/nigma.ru.png b/plugins/Referrers/images/searchEngines/nigma.ru.png Binary files differdeleted file mode 100644 index 0eeec77847..0000000000 --- a/plugins/Referrers/images/searchEngines/nigma.ru.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/nova.rambler.ru.png b/plugins/Referrers/images/searchEngines/nova.rambler.ru.png Binary files differdeleted file mode 100644 index f2ed20ec56..0000000000 --- a/plugins/Referrers/images/searchEngines/nova.rambler.ru.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/online.no.png b/plugins/Referrers/images/searchEngines/online.no.png Binary files differdeleted file mode 100644 index 5fa700d49c..0000000000 --- a/plugins/Referrers/images/searchEngines/online.no.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/otsing.delfi.ee.png b/plugins/Referrers/images/searchEngines/otsing.delfi.ee.png Binary files differdeleted file mode 100644 index 04ec7a06df..0000000000 --- a/plugins/Referrers/images/searchEngines/otsing.delfi.ee.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/p.zhongsou.com.png b/plugins/Referrers/images/searchEngines/p.zhongsou.com.png Binary files differdeleted file mode 100644 index f7d0fd5d72..0000000000 --- a/plugins/Referrers/images/searchEngines/p.zhongsou.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/pesquisa.clix.pt.png b/plugins/Referrers/images/searchEngines/pesquisa.clix.pt.png Binary files differdeleted file mode 100644 index 1b081257a1..0000000000 --- a/plugins/Referrers/images/searchEngines/pesquisa.clix.pt.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/pesquisa.sapo.pt.png b/plugins/Referrers/images/searchEngines/pesquisa.sapo.pt.png Binary files differdeleted file mode 100644 index 3782a811c8..0000000000 --- a/plugins/Referrers/images/searchEngines/pesquisa.sapo.pt.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/plusnetwork.com.png b/plugins/Referrers/images/searchEngines/plusnetwork.com.png Binary files differdeleted file mode 100644 index 5edf452e26..0000000000 --- a/plugins/Referrers/images/searchEngines/plusnetwork.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/poisk.ru.png b/plugins/Referrers/images/searchEngines/poisk.ru.png Binary files differdeleted file mode 100644 index 212ea95ed9..0000000000 --- a/plugins/Referrers/images/searchEngines/poisk.ru.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/recherche.francite.com.png b/plugins/Referrers/images/searchEngines/recherche.francite.com.png Binary files differdeleted file mode 100644 index fd80433a70..0000000000 --- a/plugins/Referrers/images/searchEngines/recherche.francite.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/rechercher.aliceadsl.fr.png b/plugins/Referrers/images/searchEngines/rechercher.aliceadsl.fr.png Binary files differdeleted file mode 100644 index 33029846f9..0000000000 --- a/plugins/Referrers/images/searchEngines/rechercher.aliceadsl.fr.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/req.hit-parade.com.png b/plugins/Referrers/images/searchEngines/req.hit-parade.com.png Binary files differdeleted file mode 100644 index 887a8503f6..0000000000 --- a/plugins/Referrers/images/searchEngines/req.hit-parade.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/ricerca.virgilio.it.png b/plugins/Referrers/images/searchEngines/ricerca.virgilio.it.png Binary files differdeleted file mode 100644 index c192ad9278..0000000000 --- a/plugins/Referrers/images/searchEngines/ricerca.virgilio.it.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/rpmfind.net.png b/plugins/Referrers/images/searchEngines/rpmfind.net.png Binary files differdeleted file mode 100644 index aaa1aa2ec0..0000000000 --- a/plugins/Referrers/images/searchEngines/rpmfind.net.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/s1.metacrawler.de.png b/plugins/Referrers/images/searchEngines/s1.metacrawler.de.png Binary files differdeleted file mode 100644 index 0ccebf080b..0000000000 --- a/plugins/Referrers/images/searchEngines/s1.metacrawler.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/scholar.google.com.png b/plugins/Referrers/images/searchEngines/scholar.google.com.png Binary files differdeleted file mode 100644 index cc8a5523dc..0000000000 --- a/plugins/Referrers/images/searchEngines/scholar.google.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/scour.com.png b/plugins/Referrers/images/searchEngines/scour.com.png Binary files differdeleted file mode 100644 index 725e2316e2..0000000000 --- a/plugins/Referrers/images/searchEngines/scour.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.aol.com.png b/plugins/Referrers/images/searchEngines/search.aol.com.png Binary files differdeleted file mode 100644 index d6530cdf41..0000000000 --- a/plugins/Referrers/images/searchEngines/search.aol.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.auone.jp.png b/plugins/Referrers/images/searchEngines/search.auone.jp.png Binary files differdeleted file mode 100644 index e3197e0cc6..0000000000 --- a/plugins/Referrers/images/searchEngines/search.auone.jp.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.babylon.com.png b/plugins/Referrers/images/searchEngines/search.babylon.com.png Binary files differdeleted file mode 100644 index dd6cd9c028..0000000000 --- a/plugins/Referrers/images/searchEngines/search.babylon.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.bluewin.ch.png b/plugins/Referrers/images/searchEngines/search.bluewin.ch.png Binary files differdeleted file mode 100644 index 6522b29b33..0000000000 --- a/plugins/Referrers/images/searchEngines/search.bluewin.ch.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.centrum.cz.png b/plugins/Referrers/images/searchEngines/search.centrum.cz.png Binary files differdeleted file mode 100644 index b827625dd6..0000000000 --- a/plugins/Referrers/images/searchEngines/search.centrum.cz.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.comcast.net.png b/plugins/Referrers/images/searchEngines/search.comcast.net.png Binary files differdeleted file mode 100644 index c49a83ed1a..0000000000 --- a/plugins/Referrers/images/searchEngines/search.comcast.net.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.conduit.com.png b/plugins/Referrers/images/searchEngines/search.conduit.com.png Binary files differdeleted file mode 100644 index bad0e8b59e..0000000000 --- a/plugins/Referrers/images/searchEngines/search.conduit.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.daum.net.png b/plugins/Referrers/images/searchEngines/search.daum.net.png Binary files differdeleted file mode 100644 index e81728f616..0000000000 --- a/plugins/Referrers/images/searchEngines/search.daum.net.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.disconnect.me.png b/plugins/Referrers/images/searchEngines/search.disconnect.me.png Binary files differdeleted file mode 100644 index 1e3f02102d..0000000000 --- a/plugins/Referrers/images/searchEngines/search.disconnect.me.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.earthlink.net.png b/plugins/Referrers/images/searchEngines/search.earthlink.net.png Binary files differdeleted file mode 100644 index b2287f4e0c..0000000000 --- a/plugins/Referrers/images/searchEngines/search.earthlink.net.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.excite.it.png b/plugins/Referrers/images/searchEngines/search.excite.it.png Binary files differdeleted file mode 100644 index d84bbf4472..0000000000 --- a/plugins/Referrers/images/searchEngines/search.excite.it.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.fooooo.com.png b/plugins/Referrers/images/searchEngines/search.fooooo.com.png Binary files differdeleted file mode 100644 index e813cf9b10..0000000000 --- a/plugins/Referrers/images/searchEngines/search.fooooo.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.free.fr.png b/plugins/Referrers/images/searchEngines/search.free.fr.png Binary files differdeleted file mode 100644 index d87e467fb7..0000000000 --- a/plugins/Referrers/images/searchEngines/search.free.fr.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.freecause.com.png b/plugins/Referrers/images/searchEngines/search.freecause.com.png Binary files differdeleted file mode 100644 index 05976030d5..0000000000 --- a/plugins/Referrers/images/searchEngines/search.freecause.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.genieo.com.png b/plugins/Referrers/images/searchEngines/search.genieo.com.png Binary files differdeleted file mode 100644 index 3c3b072ae3..0000000000 --- a/plugins/Referrers/images/searchEngines/search.genieo.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.goo.ne.jp.png b/plugins/Referrers/images/searchEngines/search.goo.ne.jp.png Binary files differdeleted file mode 100644 index 53a53c9e0c..0000000000 --- a/plugins/Referrers/images/searchEngines/search.goo.ne.jp.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.imesh.com.png b/plugins/Referrers/images/searchEngines/search.imesh.com.png Binary files differdeleted file mode 100644 index 22a83ffb9d..0000000000 --- a/plugins/Referrers/images/searchEngines/search.imesh.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.ke.voila.fr.png b/plugins/Referrers/images/searchEngines/search.ke.voila.fr.png Binary files differdeleted file mode 100644 index 6c0e90bbab..0000000000 --- a/plugins/Referrers/images/searchEngines/search.ke.voila.fr.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.lookseek.com.png b/plugins/Referrers/images/searchEngines/search.lookseek.com.png Binary files differdeleted file mode 100644 index aca4427af2..0000000000 --- a/plugins/Referrers/images/searchEngines/search.lookseek.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.lycos.com.png b/plugins/Referrers/images/searchEngines/search.lycos.com.png Binary files differdeleted file mode 100644 index a2f9df710c..0000000000 --- a/plugins/Referrers/images/searchEngines/search.lycos.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.nate.com.png b/plugins/Referrers/images/searchEngines/search.nate.com.png Binary files differdeleted file mode 100644 index 89560471ba..0000000000 --- a/plugins/Referrers/images/searchEngines/search.nate.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.naver.com.png b/plugins/Referrers/images/searchEngines/search.naver.com.png Binary files differdeleted file mode 100644 index f59d1203c2..0000000000 --- a/plugins/Referrers/images/searchEngines/search.naver.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.nifty.com.png b/plugins/Referrers/images/searchEngines/search.nifty.com.png Binary files differdeleted file mode 100644 index 9798bd1aef..0000000000 --- a/plugins/Referrers/images/searchEngines/search.nifty.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.peoplepc.com.png b/plugins/Referrers/images/searchEngines/search.peoplepc.com.png Binary files differdeleted file mode 100644 index 1c83e927d7..0000000000 --- a/plugins/Referrers/images/searchEngines/search.peoplepc.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.qip.ru.png b/plugins/Referrers/images/searchEngines/search.qip.ru.png Binary files differdeleted file mode 100644 index fd5c55df2f..0000000000 --- a/plugins/Referrers/images/searchEngines/search.qip.ru.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.rr.com.png b/plugins/Referrers/images/searchEngines/search.rr.com.png Binary files differdeleted file mode 100644 index 2edfb8175f..0000000000 --- a/plugins/Referrers/images/searchEngines/search.rr.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.seesaa.jp.png b/plugins/Referrers/images/searchEngines/search.seesaa.jp.png Binary files differdeleted file mode 100644 index 3bdebea72b..0000000000 --- a/plugins/Referrers/images/searchEngines/search.seesaa.jp.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.seznam.cz.png b/plugins/Referrers/images/searchEngines/search.seznam.cz.png Binary files differdeleted file mode 100644 index ac1c662f33..0000000000 --- a/plugins/Referrers/images/searchEngines/search.seznam.cz.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.smartaddressbar.com.png b/plugins/Referrers/images/searchEngines/search.smartaddressbar.com.png Binary files differdeleted file mode 100644 index 588ea02dd8..0000000000 --- a/plugins/Referrers/images/searchEngines/search.smartaddressbar.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.smartshopping.com.png b/plugins/Referrers/images/searchEngines/search.smartshopping.com.png Binary files differdeleted file mode 100644 index 320ede63d5..0000000000 --- a/plugins/Referrers/images/searchEngines/search.smartshopping.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.snap.do.png b/plugins/Referrers/images/searchEngines/search.snap.do.png Binary files differdeleted file mode 100644 index 49e73863d0..0000000000 --- a/plugins/Referrers/images/searchEngines/search.snap.do.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.softonic.com.png b/plugins/Referrers/images/searchEngines/search.softonic.com.png Binary files differdeleted file mode 100644 index 795fbffce0..0000000000 --- a/plugins/Referrers/images/searchEngines/search.softonic.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.tiscali.it.png b/plugins/Referrers/images/searchEngines/search.tiscali.it.png Binary files differdeleted file mode 100644 index 2763baa5fa..0000000000 --- a/plugins/Referrers/images/searchEngines/search.tiscali.it.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.winamp.com.png b/plugins/Referrers/images/searchEngines/search.winamp.com.png Binary files differdeleted file mode 100644 index 0191d459d6..0000000000 --- a/plugins/Referrers/images/searchEngines/search.winamp.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.www.ee.png b/plugins/Referrers/images/searchEngines/search.www.ee.png Binary files differdeleted file mode 100644 index 9844bffc67..0000000000 --- a/plugins/Referrers/images/searchEngines/search.www.ee.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.yahoo.co.jp.png b/plugins/Referrers/images/searchEngines/search.yahoo.co.jp.png Binary files differdeleted file mode 100644 index cffaf98e76..0000000000 --- a/plugins/Referrers/images/searchEngines/search.yahoo.co.jp.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.yahoo.com.png b/plugins/Referrers/images/searchEngines/search.yahoo.com.png Binary files differdeleted file mode 100644 index f10ccebf21..0000000000 --- a/plugins/Referrers/images/searchEngines/search.yahoo.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.yam.com.png b/plugins/Referrers/images/searchEngines/search.yam.com.png Binary files differdeleted file mode 100644 index c0a2a1fb45..0000000000 --- a/plugins/Referrers/images/searchEngines/search.yam.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/search.yippy.com.png b/plugins/Referrers/images/searchEngines/search.yippy.com.png Binary files differdeleted file mode 100644 index 8c6530c49d..0000000000 --- a/plugins/Referrers/images/searchEngines/search.yippy.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/searchalot.com.png b/plugins/Referrers/images/searchEngines/searchalot.com.png Binary files differdeleted file mode 100644 index 22664b3ff3..0000000000 --- a/plugins/Referrers/images/searchEngines/searchalot.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/searchatlas.centrum.cz.png b/plugins/Referrers/images/searchEngines/searchatlas.centrum.cz.png Binary files differdeleted file mode 100644 index 93a1817ee5..0000000000 --- a/plugins/Referrers/images/searchEngines/searchatlas.centrum.cz.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/searchlock.com.png b/plugins/Referrers/images/searchEngines/searchlock.com.png Binary files differdeleted file mode 100644 index aff0cd9a5a..0000000000 --- a/plugins/Referrers/images/searchEngines/searchlock.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/searchservice.myspace.com.png b/plugins/Referrers/images/searchEngines/searchservice.myspace.com.png Binary files differdeleted file mode 100644 index 4263e378d3..0000000000 --- a/plugins/Referrers/images/searchEngines/searchservice.myspace.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/sm.aport.ru.png b/plugins/Referrers/images/searchEngines/sm.aport.ru.png Binary files differdeleted file mode 100644 index e122927067..0000000000 --- a/plugins/Referrers/images/searchEngines/sm.aport.ru.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/smart.delfi.lv.png b/plugins/Referrers/images/searchEngines/smart.delfi.lv.png Binary files differdeleted file mode 100644 index 14a0c70273..0000000000 --- a/plugins/Referrers/images/searchEngines/smart.delfi.lv.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/so.360.cn.png b/plugins/Referrers/images/searchEngines/so.360.cn.png Binary files differdeleted file mode 100644 index e77ed7ea79..0000000000 --- a/plugins/Referrers/images/searchEngines/so.360.cn.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/sp-image.search.auone.jp.png b/plugins/Referrers/images/searchEngines/sp-image.search.auone.jp.png Binary files differdeleted file mode 100644 index e3197e0cc6..0000000000 --- a/plugins/Referrers/images/searchEngines/sp-image.search.auone.jp.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/start.iplay.com.png b/plugins/Referrers/images/searchEngines/start.iplay.com.png Binary files differdeleted file mode 100644 index 88e81f755f..0000000000 --- a/plugins/Referrers/images/searchEngines/start.iplay.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/startgoogle.startpagina.nl.png b/plugins/Referrers/images/searchEngines/startgoogle.startpagina.nl.png Binary files differdeleted file mode 100644 index c1a30ca2c2..0000000000 --- a/plugins/Referrers/images/searchEngines/startgoogle.startpagina.nl.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/startpage.com.png b/plugins/Referrers/images/searchEngines/startpage.com.png Binary files differdeleted file mode 100644 index a2cb6dfbbe..0000000000 --- a/plugins/Referrers/images/searchEngines/startpage.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/suche.freenet.de.png b/plugins/Referrers/images/searchEngines/suche.freenet.de.png Binary files differdeleted file mode 100644 index 92ffb51da4..0000000000 --- a/plugins/Referrers/images/searchEngines/suche.freenet.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/suche.info.png b/plugins/Referrers/images/searchEngines/suche.info.png Binary files differdeleted file mode 100644 index 05b425f292..0000000000 --- a/plugins/Referrers/images/searchEngines/suche.info.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/suche.t-online.de.png b/plugins/Referrers/images/searchEngines/suche.t-online.de.png Binary files differdeleted file mode 100644 index 06b2b1fbf0..0000000000 --- a/plugins/Referrers/images/searchEngines/suche.t-online.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/suche.web.de.png b/plugins/Referrers/images/searchEngines/suche.web.de.png Binary files differdeleted file mode 100644 index 5b8bf0962f..0000000000 --- a/plugins/Referrers/images/searchEngines/suche.web.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/surfcanyon.com.png b/plugins/Referrers/images/searchEngines/surfcanyon.com.png Binary files differdeleted file mode 100644 index b798af3179..0000000000 --- a/plugins/Referrers/images/searchEngines/surfcanyon.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/szukaj.onet.pl.png b/plugins/Referrers/images/searchEngines/szukaj.onet.pl.png Binary files differdeleted file mode 100644 index 53f966f47a..0000000000 --- a/plugins/Referrers/images/searchEngines/szukaj.onet.pl.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/szukaj.wp.pl.png b/plugins/Referrers/images/searchEngines/szukaj.wp.pl.png Binary files differdeleted file mode 100644 index 2769a9745b..0000000000 --- a/plugins/Referrers/images/searchEngines/szukaj.wp.pl.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/technorati.com.png b/plugins/Referrers/images/searchEngines/technorati.com.png Binary files differdeleted file mode 100644 index 68150bee2a..0000000000 --- a/plugins/Referrers/images/searchEngines/technorati.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/translate.google.com.png b/plugins/Referrers/images/searchEngines/translate.google.com.png Binary files differdeleted file mode 100644 index d8b7a941e2..0000000000 --- a/plugins/Referrers/images/searchEngines/translate.google.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/videa.seznam.cz.png b/plugins/Referrers/images/searchEngines/videa.seznam.cz.png Binary files differdeleted file mode 100644 index ac1c662f33..0000000000 --- a/plugins/Referrers/images/searchEngines/videa.seznam.cz.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/video.google.com.png b/plugins/Referrers/images/searchEngines/video.google.com.png Binary files differdeleted file mode 100644 index 6745d4b002..0000000000 --- a/plugins/Referrers/images/searchEngines/video.google.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/video.search.yahoo.co.jp.png b/plugins/Referrers/images/searchEngines/video.search.yahoo.co.jp.png Binary files differdeleted file mode 100644 index cffaf98e76..0000000000 --- a/plugins/Referrers/images/searchEngines/video.search.yahoo.co.jp.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/video.so-net.ne.jp.png b/plugins/Referrers/images/searchEngines/video.so-net.ne.jp.png Binary files differdeleted file mode 100644 index 6b071e50fd..0000000000 --- a/plugins/Referrers/images/searchEngines/video.so-net.ne.jp.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/videosearch.nifty.com.png b/plugins/Referrers/images/searchEngines/videosearch.nifty.com.png Binary files differdeleted file mode 100644 index 6e76348780..0000000000 --- a/plugins/Referrers/images/searchEngines/videosearch.nifty.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/web.canoe.ca.png b/plugins/Referrers/images/searchEngines/web.canoe.ca.png Binary files differdeleted file mode 100644 index fada634cac..0000000000 --- a/plugins/Referrers/images/searchEngines/web.canoe.ca.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/web.volny.cz.png b/plugins/Referrers/images/searchEngines/web.volny.cz.png Binary files differdeleted file mode 100644 index 820951a6c6..0000000000 --- a/plugins/Referrers/images/searchEngines/web.volny.cz.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/websearch.cs.com.png b/plugins/Referrers/images/searchEngines/websearch.cs.com.png Binary files differdeleted file mode 100644 index 6245b6d2ed..0000000000 --- a/plugins/Referrers/images/searchEngines/websearch.cs.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/websearch.rakuten.co.jp.png b/plugins/Referrers/images/searchEngines/websearch.rakuten.co.jp.png Binary files differdeleted file mode 100644 index 1c8b17f4d7..0000000000 --- a/plugins/Referrers/images/searchEngines/websearch.rakuten.co.jp.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.118700.se.png b/plugins/Referrers/images/searchEngines/www.118700.se.png Binary files differdeleted file mode 100644 index 67950640bf..0000000000 --- a/plugins/Referrers/images/searchEngines/www.118700.se.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.123people.com.png b/plugins/Referrers/images/searchEngines/www.123people.com.png Binary files differdeleted file mode 100644 index 30d938ea19..0000000000 --- a/plugins/Referrers/images/searchEngines/www.123people.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.1881.no.png b/plugins/Referrers/images/searchEngines/www.1881.no.png Binary files differdeleted file mode 100644 index cc2f181c79..0000000000 --- a/plugins/Referrers/images/searchEngines/www.1881.no.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.abacho.de.png b/plugins/Referrers/images/searchEngines/www.abacho.de.png Binary files differdeleted file mode 100644 index d94eea3cea..0000000000 --- a/plugins/Referrers/images/searchEngines/www.abacho.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.acoon.de.png b/plugins/Referrers/images/searchEngines/www.acoon.de.png Binary files differdeleted file mode 100644 index 0740cef1a7..0000000000 --- a/plugins/Referrers/images/searchEngines/www.acoon.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.allaverksamheter.se.png b/plugins/Referrers/images/searchEngines/www.allaverksamheter.se.png Binary files differdeleted file mode 100644 index 1933cd967f..0000000000 --- a/plugins/Referrers/images/searchEngines/www.allaverksamheter.se.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.allesklar.de.png b/plugins/Referrers/images/searchEngines/www.allesklar.de.png Binary files differdeleted file mode 100644 index 992dc6d0f5..0000000000 --- a/plugins/Referrers/images/searchEngines/www.allesklar.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.alltheweb.com.png b/plugins/Referrers/images/searchEngines/www.alltheweb.com.png Binary files differdeleted file mode 100644 index f10ccebf21..0000000000 --- a/plugins/Referrers/images/searchEngines/www.alltheweb.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.altavista.com.png b/plugins/Referrers/images/searchEngines/www.altavista.com.png Binary files differdeleted file mode 100644 index f10ccebf21..0000000000 --- a/plugins/Referrers/images/searchEngines/www.altavista.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.arcor.de.png b/plugins/Referrers/images/searchEngines/www.arcor.de.png Binary files differdeleted file mode 100644 index 97570702cf..0000000000 --- a/plugins/Referrers/images/searchEngines/www.arcor.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.baidu.com.png b/plugins/Referrers/images/searchEngines/www.baidu.com.png Binary files differdeleted file mode 100644 index ab860ceab1..0000000000 --- a/plugins/Referrers/images/searchEngines/www.baidu.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.blogdigger.com.png b/plugins/Referrers/images/searchEngines/www.blogdigger.com.png Binary files differdeleted file mode 100644 index 10b7b00331..0000000000 --- a/plugins/Referrers/images/searchEngines/www.blogdigger.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.blogpulse.com.png b/plugins/Referrers/images/searchEngines/www.blogpulse.com.png Binary files differdeleted file mode 100644 index b44009ceea..0000000000 --- a/plugins/Referrers/images/searchEngines/www.blogpulse.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.charter.net.png b/plugins/Referrers/images/searchEngines/www.charter.net.png Binary files differdeleted file mode 100644 index 09e15f1cb2..0000000000 --- a/plugins/Referrers/images/searchEngines/www.charter.net.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.crawler.com.png b/plugins/Referrers/images/searchEngines/www.crawler.com.png Binary files differdeleted file mode 100644 index e0396c182c..0000000000 --- a/plugins/Referrers/images/searchEngines/www.crawler.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.cuil.com.png b/plugins/Referrers/images/searchEngines/www.cuil.com.png Binary files differdeleted file mode 100644 index e4cfb87a94..0000000000 --- a/plugins/Referrers/images/searchEngines/www.cuil.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.dasoertliche.de.png b/plugins/Referrers/images/searchEngines/www.dasoertliche.de.png Binary files differdeleted file mode 100644 index 0a3f0c1363..0000000000 --- a/plugins/Referrers/images/searchEngines/www.dasoertliche.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.eniro.se.png b/plugins/Referrers/images/searchEngines/www.eniro.se.png Binary files differdeleted file mode 100644 index e1e8a1e970..0000000000 --- a/plugins/Referrers/images/searchEngines/www.eniro.se.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.eurip.com.png b/plugins/Referrers/images/searchEngines/www.eurip.com.png Binary files differdeleted file mode 100644 index 0740cef1a7..0000000000 --- a/plugins/Referrers/images/searchEngines/www.eurip.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.euroseek.com.png b/plugins/Referrers/images/searchEngines/www.euroseek.com.png Binary files differdeleted file mode 100644 index 13577a52cf..0000000000 --- a/plugins/Referrers/images/searchEngines/www.euroseek.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.everyclick.com.png b/plugins/Referrers/images/searchEngines/www.everyclick.com.png Binary files differdeleted file mode 100644 index e2159ed1da..0000000000 --- a/plugins/Referrers/images/searchEngines/www.everyclick.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.exalead.fr.png b/plugins/Referrers/images/searchEngines/www.exalead.fr.png Binary files differdeleted file mode 100644 index 27418e0898..0000000000 --- a/plugins/Referrers/images/searchEngines/www.exalead.fr.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.facebook.com.png b/plugins/Referrers/images/searchEngines/www.facebook.com.png Binary files differdeleted file mode 100644 index 75deab4280..0000000000 --- a/plugins/Referrers/images/searchEngines/www.facebook.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.fastbrowsersearch.com.png b/plugins/Referrers/images/searchEngines/www.fastbrowsersearch.com.png Binary files differdeleted file mode 100644 index 7064b9436e..0000000000 --- a/plugins/Referrers/images/searchEngines/www.fastbrowsersearch.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.findhurtig.dk.png b/plugins/Referrers/images/searchEngines/www.findhurtig.dk.png Binary files differdeleted file mode 100644 index 6769ce82b7..0000000000 --- a/plugins/Referrers/images/searchEngines/www.findhurtig.dk.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.fireball.de.png b/plugins/Referrers/images/searchEngines/www.fireball.de.png Binary files differdeleted file mode 100644 index 2a822fe275..0000000000 --- a/plugins/Referrers/images/searchEngines/www.fireball.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.firstsfind.com.png b/plugins/Referrers/images/searchEngines/www.firstsfind.com.png Binary files differdeleted file mode 100644 index 0740cef1a7..0000000000 --- a/plugins/Referrers/images/searchEngines/www.firstsfind.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.fixsuche.de.png b/plugins/Referrers/images/searchEngines/www.fixsuche.de.png Binary files differdeleted file mode 100644 index 713d5ca1d5..0000000000 --- a/plugins/Referrers/images/searchEngines/www.fixsuche.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.flix.de.png b/plugins/Referrers/images/searchEngines/www.flix.de.png Binary files differdeleted file mode 100644 index 2f15e7c3d7..0000000000 --- a/plugins/Referrers/images/searchEngines/www.flix.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.gigablast.com.png b/plugins/Referrers/images/searchEngines/www.gigablast.com.png Binary files differdeleted file mode 100644 index e108ead10f..0000000000 --- a/plugins/Referrers/images/searchEngines/www.gigablast.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.gnadenmeer.de.png b/plugins/Referrers/images/searchEngines/www.gnadenmeer.de.png Binary files differdeleted file mode 100644 index 574462ab0a..0000000000 --- a/plugins/Referrers/images/searchEngines/www.gnadenmeer.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.gomeo.com.png b/plugins/Referrers/images/searchEngines/www.gomeo.com.png Binary files differdeleted file mode 100644 index b190f14390..0000000000 --- a/plugins/Referrers/images/searchEngines/www.gomeo.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.google.interia.pl.png b/plugins/Referrers/images/searchEngines/www.google.interia.pl.png Binary files differdeleted file mode 100644 index dccdb3899b..0000000000 --- a/plugins/Referrers/images/searchEngines/www.google.interia.pl.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.goyellow.de.png b/plugins/Referrers/images/searchEngines/www.goyellow.de.png Binary files differdeleted file mode 100644 index c3286a6340..0000000000 --- a/plugins/Referrers/images/searchEngines/www.goyellow.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.gulesider.no.png b/plugins/Referrers/images/searchEngines/www.gulesider.no.png Binary files differdeleted file mode 100644 index 4979aaf397..0000000000 --- a/plugins/Referrers/images/searchEngines/www.gulesider.no.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.haosou.com.png b/plugins/Referrers/images/searchEngines/www.haosou.com.png Binary files differdeleted file mode 100644 index e77ed7ea79..0000000000 --- a/plugins/Referrers/images/searchEngines/www.haosou.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.highbeam.com.png b/plugins/Referrers/images/searchEngines/www.highbeam.com.png Binary files differdeleted file mode 100644 index 2593553e11..0000000000 --- a/plugins/Referrers/images/searchEngines/www.highbeam.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.hooseek.com.png b/plugins/Referrers/images/searchEngines/www.hooseek.com.png Binary files differdeleted file mode 100644 index fe21a1f12d..0000000000 --- a/plugins/Referrers/images/searchEngines/www.hooseek.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.hotbot.com.png b/plugins/Referrers/images/searchEngines/www.hotbot.com.png Binary files differdeleted file mode 100644 index 0c06c8b6e3..0000000000 --- a/plugins/Referrers/images/searchEngines/www.hotbot.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.icq.com.png b/plugins/Referrers/images/searchEngines/www.icq.com.png Binary files differdeleted file mode 100644 index d7c0f60f83..0000000000 --- a/plugins/Referrers/images/searchEngines/www.icq.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.ilse.nl.png b/plugins/Referrers/images/searchEngines/www.ilse.nl.png Binary files differdeleted file mode 100644 index a878aada88..0000000000 --- a/plugins/Referrers/images/searchEngines/www.ilse.nl.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.isodelen.se.png b/plugins/Referrers/images/searchEngines/www.isodelen.se.png Binary files differdeleted file mode 100644 index ecb033fe41..0000000000 --- a/plugins/Referrers/images/searchEngines/www.isodelen.se.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.jungle-spider.de.png b/plugins/Referrers/images/searchEngines/www.jungle-spider.de.png Binary files differdeleted file mode 100644 index 264d7c34db..0000000000 --- a/plugins/Referrers/images/searchEngines/www.jungle-spider.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.kataweb.it.png b/plugins/Referrers/images/searchEngines/www.kataweb.it.png Binary files differdeleted file mode 100644 index 6be4418281..0000000000 --- a/plugins/Referrers/images/searchEngines/www.kataweb.it.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.kensaq.com.png b/plugins/Referrers/images/searchEngines/www.kensaq.com.png Binary files differdeleted file mode 100644 index e701055521..0000000000 --- a/plugins/Referrers/images/searchEngines/www.kensaq.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.latne.lv.png b/plugins/Referrers/images/searchEngines/www.latne.lv.png Binary files differdeleted file mode 100644 index 38c34b8deb..0000000000 --- a/plugins/Referrers/images/searchEngines/www.latne.lv.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.lookany.com.png b/plugins/Referrers/images/searchEngines/www.lookany.com.png Binary files differdeleted file mode 100644 index ef58320f47..0000000000 --- a/plugins/Referrers/images/searchEngines/www.lookany.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.looksmart.com.png b/plugins/Referrers/images/searchEngines/www.looksmart.com.png Binary files differdeleted file mode 100644 index 55b9df7cd0..0000000000 --- a/plugins/Referrers/images/searchEngines/www.looksmart.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.maailm.com.png b/plugins/Referrers/images/searchEngines/www.maailm.com.png Binary files differdeleted file mode 100644 index 0740cef1a7..0000000000 --- a/plugins/Referrers/images/searchEngines/www.maailm.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.mamma.com.png b/plugins/Referrers/images/searchEngines/www.mamma.com.png Binary files differdeleted file mode 100644 index decfd3db4c..0000000000 --- a/plugins/Referrers/images/searchEngines/www.mamma.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.meinestadt.de.png b/plugins/Referrers/images/searchEngines/www.meinestadt.de.png Binary files differdeleted file mode 100644 index 47c5727a83..0000000000 --- a/plugins/Referrers/images/searchEngines/www.meinestadt.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.mister-wong.com.png b/plugins/Referrers/images/searchEngines/www.mister-wong.com.png Binary files differdeleted file mode 100644 index ce05c10505..0000000000 --- a/plugins/Referrers/images/searchEngines/www.mister-wong.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.monstercrawler.com.png b/plugins/Referrers/images/searchEngines/www.monstercrawler.com.png Binary files differdeleted file mode 100644 index bf26708d0c..0000000000 --- a/plugins/Referrers/images/searchEngines/www.monstercrawler.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.mozbot.fr.png b/plugins/Referrers/images/searchEngines/www.mozbot.fr.png Binary files differdeleted file mode 100644 index 538ddb1b41..0000000000 --- a/plugins/Referrers/images/searchEngines/www.mozbot.fr.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.mysearch.com.png b/plugins/Referrers/images/searchEngines/www.mysearch.com.png Binary files differdeleted file mode 100644 index b15f86a984..0000000000 --- a/plugins/Referrers/images/searchEngines/www.mysearch.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.najdi.si.png b/plugins/Referrers/images/searchEngines/www.najdi.si.png Binary files differdeleted file mode 100644 index 4f983caa62..0000000000 --- a/plugins/Referrers/images/searchEngines/www.najdi.si.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.neti.ee.png b/plugins/Referrers/images/searchEngines/www.neti.ee.png Binary files differdeleted file mode 100644 index 9f27eb75ac..0000000000 --- a/plugins/Referrers/images/searchEngines/www.neti.ee.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.only-search.com.png b/plugins/Referrers/images/searchEngines/www.only-search.com.png Binary files differdeleted file mode 100644 index 883d5e2139..0000000000 --- a/plugins/Referrers/images/searchEngines/www.only-search.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.paperball.de.png b/plugins/Referrers/images/searchEngines/www.paperball.de.png Binary files differdeleted file mode 100644 index 1453206a62..0000000000 --- a/plugins/Referrers/images/searchEngines/www.paperball.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.picsearch.com.png b/plugins/Referrers/images/searchEngines/www.picsearch.com.png Binary files differdeleted file mode 100644 index ed9865a9ef..0000000000 --- a/plugins/Referrers/images/searchEngines/www.picsearch.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.plazoo.com.png b/plugins/Referrers/images/searchEngines/www.plazoo.com.png Binary files differdeleted file mode 100644 index d75fbbe0db..0000000000 --- a/plugins/Referrers/images/searchEngines/www.plazoo.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.qualigo.at.png b/plugins/Referrers/images/searchEngines/www.qualigo.at.png Binary files differdeleted file mode 100644 index 7ece5c84fc..0000000000 --- a/plugins/Referrers/images/searchEngines/www.qualigo.at.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.qwant.com.png b/plugins/Referrers/images/searchEngines/www.qwant.com.png Binary files differdeleted file mode 100644 index 8462df98ff..0000000000 --- a/plugins/Referrers/images/searchEngines/www.qwant.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.riksdelen.se.png b/plugins/Referrers/images/searchEngines/www.riksdelen.se.png Binary files differdeleted file mode 100644 index 356e66f146..0000000000 --- a/plugins/Referrers/images/searchEngines/www.riksdelen.se.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.search.ch.png b/plugins/Referrers/images/searchEngines/www.search.ch.png Binary files differdeleted file mode 100644 index 73a3c508a2..0000000000 --- a/plugins/Referrers/images/searchEngines/www.search.ch.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.search.com.png b/plugins/Referrers/images/searchEngines/www.search.com.png Binary files differdeleted file mode 100644 index 04f1b4b185..0000000000 --- a/plugins/Referrers/images/searchEngines/www.search.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.searchcanvas.com.png b/plugins/Referrers/images/searchEngines/www.searchcanvas.com.png Binary files differdeleted file mode 100644 index d62d60144b..0000000000 --- a/plugins/Referrers/images/searchEngines/www.searchcanvas.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.searchy.co.uk.png b/plugins/Referrers/images/searchEngines/www.searchy.co.uk.png Binary files differdeleted file mode 100644 index 97d1fa2540..0000000000 --- a/plugins/Referrers/images/searchEngines/www.searchy.co.uk.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.sharelook.fr.png b/plugins/Referrers/images/searchEngines/www.sharelook.fr.png Binary files differdeleted file mode 100644 index ccb784855b..0000000000 --- a/plugins/Referrers/images/searchEngines/www.sharelook.fr.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.skynet.be.png b/plugins/Referrers/images/searchEngines/www.skynet.be.png Binary files differdeleted file mode 100644 index 5f2a39ae11..0000000000 --- a/plugins/Referrers/images/searchEngines/www.skynet.be.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.sm.de.png b/plugins/Referrers/images/searchEngines/www.sm.de.png Binary files differdeleted file mode 100644 index 25dfc52512..0000000000 --- a/plugins/Referrers/images/searchEngines/www.sm.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.so-net.ne.jp.png b/plugins/Referrers/images/searchEngines/www.so-net.ne.jp.png Binary files differdeleted file mode 100644 index 64dad033fd..0000000000 --- a/plugins/Referrers/images/searchEngines/www.so-net.ne.jp.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.sogou.com.png b/plugins/Referrers/images/searchEngines/www.sogou.com.png Binary files differdeleted file mode 100644 index 532ae870a3..0000000000 --- a/plugins/Referrers/images/searchEngines/www.sogou.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.soso.com.png b/plugins/Referrers/images/searchEngines/www.soso.com.png Binary files differdeleted file mode 100644 index 532ae870a3..0000000000 --- a/plugins/Referrers/images/searchEngines/www.soso.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.sputnik.ru.png b/plugins/Referrers/images/searchEngines/www.sputnik.ru.png Binary files differdeleted file mode 100644 index 7e0561d59d..0000000000 --- a/plugins/Referrers/images/searchEngines/www.sputnik.ru.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.startsiden.no.png b/plugins/Referrers/images/searchEngines/www.startsiden.no.png Binary files differdeleted file mode 100644 index f895c1da46..0000000000 --- a/plugins/Referrers/images/searchEngines/www.startsiden.no.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.suchmaschine.com.png b/plugins/Referrers/images/searchEngines/www.suchmaschine.com.png Binary files differdeleted file mode 100644 index f627733347..0000000000 --- a/plugins/Referrers/images/searchEngines/www.suchmaschine.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.suchnase.de.png b/plugins/Referrers/images/searchEngines/www.suchnase.de.png Binary files differdeleted file mode 100644 index 200c6d35f3..0000000000 --- a/plugins/Referrers/images/searchEngines/www.suchnase.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.talimba.com.png b/plugins/Referrers/images/searchEngines/www.talimba.com.png Binary files differdeleted file mode 100644 index bc48365f86..0000000000 --- a/plugins/Referrers/images/searchEngines/www.talimba.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.talktalk.co.uk.png b/plugins/Referrers/images/searchEngines/www.talktalk.co.uk.png Binary files differdeleted file mode 100644 index 810a2a641f..0000000000 --- a/plugins/Referrers/images/searchEngines/www.talktalk.co.uk.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.teoma.com.png b/plugins/Referrers/images/searchEngines/www.teoma.com.png Binary files differdeleted file mode 100644 index 07a49af0cb..0000000000 --- a/plugins/Referrers/images/searchEngines/www.teoma.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.tixuma.de.png b/plugins/Referrers/images/searchEngines/www.tixuma.de.png Binary files differdeleted file mode 100644 index 113efcd76c..0000000000 --- a/plugins/Referrers/images/searchEngines/www.tixuma.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.toile.com.png b/plugins/Referrers/images/searchEngines/www.toile.com.png Binary files differdeleted file mode 100644 index d696996369..0000000000 --- a/plugins/Referrers/images/searchEngines/www.toile.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.toolbarhome.com.png b/plugins/Referrers/images/searchEngines/www.toolbarhome.com.png Binary files differdeleted file mode 100644 index 5bd6311d31..0000000000 --- a/plugins/Referrers/images/searchEngines/www.toolbarhome.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.toppreise.ch.png b/plugins/Referrers/images/searchEngines/www.toppreise.ch.png Binary files differdeleted file mode 100644 index 5d83066717..0000000000 --- a/plugins/Referrers/images/searchEngines/www.toppreise.ch.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.trouvez.com.png b/plugins/Referrers/images/searchEngines/www.trouvez.com.png Binary files differdeleted file mode 100644 index fea4b8a110..0000000000 --- a/plugins/Referrers/images/searchEngines/www.trouvez.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.trovarapido.com.png b/plugins/Referrers/images/searchEngines/www.trovarapido.com.png Binary files differdeleted file mode 100644 index 9580118266..0000000000 --- a/plugins/Referrers/images/searchEngines/www.trovarapido.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.trusted-search.com.png b/plugins/Referrers/images/searchEngines/www.trusted-search.com.png Binary files differdeleted file mode 100644 index 0740cef1a7..0000000000 --- a/plugins/Referrers/images/searchEngines/www.trusted-search.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.twingly.com.png b/plugins/Referrers/images/searchEngines/www.twingly.com.png Binary files differdeleted file mode 100644 index 975018ea2b..0000000000 --- a/plugins/Referrers/images/searchEngines/www.twingly.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.url.org.png b/plugins/Referrers/images/searchEngines/www.url.org.png Binary files differdeleted file mode 100644 index 662ef9eeb3..0000000000 --- a/plugins/Referrers/images/searchEngines/www.url.org.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.vinden.nl.png b/plugins/Referrers/images/searchEngines/www.vinden.nl.png Binary files differdeleted file mode 100644 index 541e7f28d7..0000000000 --- a/plugins/Referrers/images/searchEngines/www.vinden.nl.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.vindex.nl.png b/plugins/Referrers/images/searchEngines/www.vindex.nl.png Binary files differdeleted file mode 100644 index 735107c64e..0000000000 --- a/plugins/Referrers/images/searchEngines/www.vindex.nl.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.walhello.info.png b/plugins/Referrers/images/searchEngines/www.walhello.info.png Binary files differdeleted file mode 100644 index e02068c6fc..0000000000 --- a/plugins/Referrers/images/searchEngines/www.walhello.info.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.web.nl.png b/plugins/Referrers/images/searchEngines/www.web.nl.png Binary files differdeleted file mode 100644 index 4e2255e804..0000000000 --- a/plugins/Referrers/images/searchEngines/www.web.nl.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.weborama.fr.png b/plugins/Referrers/images/searchEngines/www.weborama.fr.png Binary files differdeleted file mode 100644 index 39a8ecbbe8..0000000000 --- a/plugins/Referrers/images/searchEngines/www.weborama.fr.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.websearch.com.png b/plugins/Referrers/images/searchEngines/www.websearch.com.png Binary files differdeleted file mode 100644 index 13ec51b003..0000000000 --- a/plugins/Referrers/images/searchEngines/www.websearch.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.witch.de.png b/plugins/Referrers/images/searchEngines/www.witch.de.png Binary files differdeleted file mode 100644 index 1f1766b6a4..0000000000 --- a/plugins/Referrers/images/searchEngines/www.witch.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.woopie.jp.png b/plugins/Referrers/images/searchEngines/www.woopie.jp.png Binary files differdeleted file mode 100644 index bccf2539be..0000000000 --- a/plugins/Referrers/images/searchEngines/www.woopie.jp.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.x-recherche.com.png b/plugins/Referrers/images/searchEngines/www.x-recherche.com.png Binary files differdeleted file mode 100644 index 29b2625cbb..0000000000 --- a/plugins/Referrers/images/searchEngines/www.x-recherche.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.yasni.de.png b/plugins/Referrers/images/searchEngines/www.yasni.de.png Binary files differdeleted file mode 100644 index 43536f6d9c..0000000000 --- a/plugins/Referrers/images/searchEngines/www.yasni.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.yatedo.com.png b/plugins/Referrers/images/searchEngines/www.yatedo.com.png Binary files differdeleted file mode 100644 index 1eb86be92e..0000000000 --- a/plugins/Referrers/images/searchEngines/www.yatedo.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.yougoo.fr.png b/plugins/Referrers/images/searchEngines/www.yougoo.fr.png Binary files differdeleted file mode 100644 index 0129dec9bd..0000000000 --- a/plugins/Referrers/images/searchEngines/www.yougoo.fr.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.zapmeta.com.png b/plugins/Referrers/images/searchEngines/www.zapmeta.com.png Binary files differdeleted file mode 100644 index f9d9cb431b..0000000000 --- a/plugins/Referrers/images/searchEngines/www.zapmeta.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.zoeken.nl.png b/plugins/Referrers/images/searchEngines/www.zoeken.nl.png Binary files differdeleted file mode 100644 index 74fa24b55f..0000000000 --- a/plugins/Referrers/images/searchEngines/www.zoeken.nl.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.zoznam.sk.png b/plugins/Referrers/images/searchEngines/www.zoznam.sk.png Binary files differdeleted file mode 100644 index b9a66ed3fe..0000000000 --- a/plugins/Referrers/images/searchEngines/www.zoznam.sk.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www.zxuso.com.png b/plugins/Referrers/images/searchEngines/www.zxuso.com.png Binary files differdeleted file mode 100644 index adad7eb500..0000000000 --- a/plugins/Referrers/images/searchEngines/www.zxuso.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www1.dastelefonbuch.de.png b/plugins/Referrers/images/searchEngines/www1.dastelefonbuch.de.png Binary files differdeleted file mode 100644 index 2036085f88..0000000000 --- a/plugins/Referrers/images/searchEngines/www1.dastelefonbuch.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www2.austronaut.at.png b/plugins/Referrers/images/searchEngines/www2.austronaut.at.png Binary files differdeleted file mode 100644 index bf9c47dafa..0000000000 --- a/plugins/Referrers/images/searchEngines/www2.austronaut.at.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www2.inbox.com.png b/plugins/Referrers/images/searchEngines/www2.inbox.com.png Binary files differdeleted file mode 100644 index 13b55a1892..0000000000 --- a/plugins/Referrers/images/searchEngines/www2.inbox.com.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/www3.zoek.nl.png b/plugins/Referrers/images/searchEngines/www3.zoek.nl.png Binary files differdeleted file mode 100644 index 0d58439ef6..0000000000 --- a/plugins/Referrers/images/searchEngines/www3.zoek.nl.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/xx.png b/plugins/Referrers/images/searchEngines/xx.png Binary files differdeleted file mode 100644 index 6a63dcea00..0000000000 --- a/plugins/Referrers/images/searchEngines/xx.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/yandex.ru.png b/plugins/Referrers/images/searchEngines/yandex.ru.png Binary files differdeleted file mode 100644 index 820691dd5d..0000000000 --- a/plugins/Referrers/images/searchEngines/yandex.ru.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/yellowmap.de.png b/plugins/Referrers/images/searchEngines/yellowmap.de.png Binary files differdeleted file mode 100644 index 5b33986484..0000000000 --- a/plugins/Referrers/images/searchEngines/yellowmap.de.png +++ /dev/null diff --git a/plugins/Referrers/images/searchEngines/zoohoo.cz.png b/plugins/Referrers/images/searchEngines/zoohoo.cz.png Binary files differdeleted file mode 100644 index e1077e28a5..0000000000 --- a/plugins/Referrers/images/searchEngines/zoohoo.cz.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/badoo.com.png b/plugins/Referrers/images/socials/badoo.com.png Binary files differdeleted file mode 100644 index fc3834784d..0000000000 --- a/plugins/Referrers/images/socials/badoo.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/bebo.com.png b/plugins/Referrers/images/socials/bebo.com.png Binary files differdeleted file mode 100644 index 35f19be55f..0000000000 --- a/plugins/Referrers/images/socials/bebo.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/blackplanet.com.png b/plugins/Referrers/images/socials/blackplanet.com.png Binary files differdeleted file mode 100644 index 6a33a3fc1f..0000000000 --- a/plugins/Referrers/images/socials/blackplanet.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/buzznet.com.png b/plugins/Referrers/images/socials/buzznet.com.png Binary files differdeleted file mode 100644 index 2ef3bd39c6..0000000000 --- a/plugins/Referrers/images/socials/buzznet.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/classmates.com.png b/plugins/Referrers/images/socials/classmates.com.png Binary files differdeleted file mode 100644 index 34b54aa5d7..0000000000 --- a/plugins/Referrers/images/socials/classmates.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/douban.com.png b/plugins/Referrers/images/socials/douban.com.png Binary files differdeleted file mode 100644 index a4a95bb572..0000000000 --- a/plugins/Referrers/images/socials/douban.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/dribbble.com.png b/plugins/Referrers/images/socials/dribbble.com.png Binary files differdeleted file mode 100644 index 8941880deb..0000000000 --- a/plugins/Referrers/images/socials/dribbble.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/facebook.com.png b/plugins/Referrers/images/socials/facebook.com.png Binary files differdeleted file mode 100644 index 75deab4280..0000000000 --- a/plugins/Referrers/images/socials/facebook.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/fb.me.png b/plugins/Referrers/images/socials/fb.me.png Binary files differdeleted file mode 100644 index 0d901fdd5d..0000000000 --- a/plugins/Referrers/images/socials/fb.me.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/flickr.com.png b/plugins/Referrers/images/socials/flickr.com.png Binary files differdeleted file mode 100644 index 82486f6d3d..0000000000 --- a/plugins/Referrers/images/socials/flickr.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/flixster.com.png b/plugins/Referrers/images/socials/flixster.com.png Binary files differdeleted file mode 100644 index bd0d1cc9fb..0000000000 --- a/plugins/Referrers/images/socials/flixster.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/fotolog.com.png b/plugins/Referrers/images/socials/fotolog.com.png Binary files differdeleted file mode 100644 index 82152207de..0000000000 --- a/plugins/Referrers/images/socials/fotolog.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/foursquare.com.png b/plugins/Referrers/images/socials/foursquare.com.png Binary files differdeleted file mode 100644 index 1924b1fb3a..0000000000 --- a/plugins/Referrers/images/socials/foursquare.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/friendsreunited.com.png b/plugins/Referrers/images/socials/friendsreunited.com.png Binary files differdeleted file mode 100644 index b12f23d8c1..0000000000 --- a/plugins/Referrers/images/socials/friendsreunited.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/friendster.com.png b/plugins/Referrers/images/socials/friendster.com.png Binary files differdeleted file mode 100644 index 918641431c..0000000000 --- a/plugins/Referrers/images/socials/friendster.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/gaiaonline.com.png b/plugins/Referrers/images/socials/gaiaonline.com.png Binary files differdeleted file mode 100644 index b734e6697c..0000000000 --- a/plugins/Referrers/images/socials/gaiaonline.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/geni.com.png b/plugins/Referrers/images/socials/geni.com.png Binary files differdeleted file mode 100644 index cdf91122f8..0000000000 --- a/plugins/Referrers/images/socials/geni.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/github.com.png b/plugins/Referrers/images/socials/github.com.png Binary files differdeleted file mode 100644 index c9157c3655..0000000000 --- a/plugins/Referrers/images/socials/github.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/gree.jp.png b/plugins/Referrers/images/socials/gree.jp.png Binary files differdeleted file mode 100644 index 9a9d7ed3d8..0000000000 --- a/plugins/Referrers/images/socials/gree.jp.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/habbo.com.png b/plugins/Referrers/images/socials/habbo.com.png Binary files differdeleted file mode 100644 index 4e6437f8b6..0000000000 --- a/plugins/Referrers/images/socials/habbo.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/hi5.com.png b/plugins/Referrers/images/socials/hi5.com.png Binary files differdeleted file mode 100644 index a3cfc5b748..0000000000 --- a/plugins/Referrers/images/socials/hi5.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/hyves.nl.png b/plugins/Referrers/images/socials/hyves.nl.png Binary files differdeleted file mode 100644 index dcfd56d926..0000000000 --- a/plugins/Referrers/images/socials/hyves.nl.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/identi.ca.png b/plugins/Referrers/images/socials/identi.ca.png Binary files differdeleted file mode 100644 index d12393aef3..0000000000 --- a/plugins/Referrers/images/socials/identi.ca.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/lang-8.com.png b/plugins/Referrers/images/socials/lang-8.com.png Binary files differdeleted file mode 100644 index 6bce01de8d..0000000000 --- a/plugins/Referrers/images/socials/lang-8.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/last.fm.png b/plugins/Referrers/images/socials/last.fm.png Binary files differdeleted file mode 100644 index 9a99899c1a..0000000000 --- a/plugins/Referrers/images/socials/last.fm.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/lastfm.com.br.png b/plugins/Referrers/images/socials/lastfm.com.br.png Binary files differdeleted file mode 100644 index 688b3bca56..0000000000 --- a/plugins/Referrers/images/socials/lastfm.com.br.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/lastfm.com.tr.png b/plugins/Referrers/images/socials/lastfm.com.tr.png Binary files differdeleted file mode 100644 index 688b3bca56..0000000000 --- a/plugins/Referrers/images/socials/lastfm.com.tr.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/lastfm.de.png b/plugins/Referrers/images/socials/lastfm.de.png Binary files differdeleted file mode 100644 index 688b3bca56..0000000000 --- a/plugins/Referrers/images/socials/lastfm.de.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/lastfm.es.png b/plugins/Referrers/images/socials/lastfm.es.png Binary files differdeleted file mode 100644 index 688b3bca56..0000000000 --- a/plugins/Referrers/images/socials/lastfm.es.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/lastfm.fr.png b/plugins/Referrers/images/socials/lastfm.fr.png Binary files differdeleted file mode 100644 index 688b3bca56..0000000000 --- a/plugins/Referrers/images/socials/lastfm.fr.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/lastfm.it.png b/plugins/Referrers/images/socials/lastfm.it.png Binary files differdeleted file mode 100644 index 688b3bca56..0000000000 --- a/plugins/Referrers/images/socials/lastfm.it.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/lastfm.jp.png b/plugins/Referrers/images/socials/lastfm.jp.png Binary files differdeleted file mode 100644 index 688b3bca56..0000000000 --- a/plugins/Referrers/images/socials/lastfm.jp.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/lastfm.pl.png b/plugins/Referrers/images/socials/lastfm.pl.png Binary files differdeleted file mode 100644 index 688b3bca56..0000000000 --- a/plugins/Referrers/images/socials/lastfm.pl.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/lastfm.ru.png b/plugins/Referrers/images/socials/lastfm.ru.png Binary files differdeleted file mode 100644 index 688b3bca56..0000000000 --- a/plugins/Referrers/images/socials/lastfm.ru.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/lastfm.se.png b/plugins/Referrers/images/socials/lastfm.se.png Binary files differdeleted file mode 100644 index 688b3bca56..0000000000 --- a/plugins/Referrers/images/socials/lastfm.se.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/linkedin.com.png b/plugins/Referrers/images/socials/linkedin.com.png Binary files differdeleted file mode 100644 index 00dbff22af..0000000000 --- a/plugins/Referrers/images/socials/linkedin.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/livejournal.com.png b/plugins/Referrers/images/socials/livejournal.com.png Binary files differdeleted file mode 100644 index 88f94a9154..0000000000 --- a/plugins/Referrers/images/socials/livejournal.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/livejournal.ru.png b/plugins/Referrers/images/socials/livejournal.ru.png Binary files differdeleted file mode 100644 index 260109ad14..0000000000 --- a/plugins/Referrers/images/socials/livejournal.ru.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/lnkd.in.png b/plugins/Referrers/images/socials/lnkd.in.png Binary files differdeleted file mode 100644 index d030e0ae02..0000000000 --- a/plugins/Referrers/images/socials/lnkd.in.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/login.live.com.png b/plugins/Referrers/images/socials/login.live.com.png Binary files differdeleted file mode 100644 index afbcd3583e..0000000000 --- a/plugins/Referrers/images/socials/login.live.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/login.tagged.com.png b/plugins/Referrers/images/socials/login.tagged.com.png Binary files differdeleted file mode 100644 index d965e720c8..0000000000 --- a/plugins/Referrers/images/socials/login.tagged.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/meinvz.net.png b/plugins/Referrers/images/socials/meinvz.net.png Binary files differdeleted file mode 100644 index ce19429fd5..0000000000 --- a/plugins/Referrers/images/socials/meinvz.net.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/mixi.jp.png b/plugins/Referrers/images/socials/mixi.jp.png Binary files differdeleted file mode 100644 index 641d9f263c..0000000000 --- a/plugins/Referrers/images/socials/mixi.jp.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/moikrug.ru.png b/plugins/Referrers/images/socials/moikrug.ru.png Binary files differdeleted file mode 100644 index 2478057caa..0000000000 --- a/plugins/Referrers/images/socials/moikrug.ru.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/multiply.com.png b/plugins/Referrers/images/socials/multiply.com.png Binary files differdeleted file mode 100644 index 8d4b21a0c5..0000000000 --- a/plugins/Referrers/images/socials/multiply.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/my.mail.ru.png b/plugins/Referrers/images/socials/my.mail.ru.png Binary files differdeleted file mode 100644 index eb38c82d7c..0000000000 --- a/plugins/Referrers/images/socials/my.mail.ru.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/myheritage.com.png b/plugins/Referrers/images/socials/myheritage.com.png Binary files differdeleted file mode 100644 index 6ec3716e36..0000000000 --- a/plugins/Referrers/images/socials/myheritage.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/mylife.ru.png b/plugins/Referrers/images/socials/mylife.ru.png Binary files differdeleted file mode 100644 index cfa4ac14c2..0000000000 --- a/plugins/Referrers/images/socials/mylife.ru.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/myspace.com.png b/plugins/Referrers/images/socials/myspace.com.png Binary files differdeleted file mode 100644 index 4263e378d3..0000000000 --- a/plugins/Referrers/images/socials/myspace.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/myyearbook.com.png b/plugins/Referrers/images/socials/myyearbook.com.png Binary files differdeleted file mode 100644 index 6e73c715fc..0000000000 --- a/plugins/Referrers/images/socials/myyearbook.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/netlog.com.png b/plugins/Referrers/images/socials/netlog.com.png Binary files differdeleted file mode 100644 index c2ef3953c9..0000000000 --- a/plugins/Referrers/images/socials/netlog.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/news.ycombinator.com.png b/plugins/Referrers/images/socials/news.ycombinator.com.png Binary files differdeleted file mode 100644 index 19169c8520..0000000000 --- a/plugins/Referrers/images/socials/news.ycombinator.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/nk.pl.png b/plugins/Referrers/images/socials/nk.pl.png Binary files differdeleted file mode 100644 index 010cdf5533..0000000000 --- a/plugins/Referrers/images/socials/nk.pl.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/odnoklassniki.ru.png b/plugins/Referrers/images/socials/odnoklassniki.ru.png Binary files differdeleted file mode 100644 index e533c8fbf4..0000000000 --- a/plugins/Referrers/images/socials/odnoklassniki.ru.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/orkut.com.png b/plugins/Referrers/images/socials/orkut.com.png Binary files differdeleted file mode 100644 index d0b72ab1f4..0000000000 --- a/plugins/Referrers/images/socials/orkut.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/pinterest.com.png b/plugins/Referrers/images/socials/pinterest.com.png Binary files differdeleted file mode 100644 index c6533c3f4c..0000000000 --- a/plugins/Referrers/images/socials/pinterest.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/plaxo.com.png b/plugins/Referrers/images/socials/plaxo.com.png Binary files differdeleted file mode 100644 index 77ef030aca..0000000000 --- a/plugins/Referrers/images/socials/plaxo.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/plus.google.com.png b/plugins/Referrers/images/socials/plus.google.com.png Binary files differdeleted file mode 100644 index 28aa24a5e8..0000000000 --- a/plugins/Referrers/images/socials/plus.google.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/qzone.qq.com.png b/plugins/Referrers/images/socials/qzone.qq.com.png Binary files differdeleted file mode 100644 index 355b9d137b..0000000000 --- a/plugins/Referrers/images/socials/qzone.qq.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/reddit.com.png b/plugins/Referrers/images/socials/reddit.com.png Binary files differdeleted file mode 100644 index e910f73c1a..0000000000 --- a/plugins/Referrers/images/socials/reddit.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/renren.com.png b/plugins/Referrers/images/socials/renren.com.png Binary files differdeleted file mode 100644 index 2be45a863a..0000000000 --- a/plugins/Referrers/images/socials/renren.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/ru.netlog.com.png b/plugins/Referrers/images/socials/ru.netlog.com.png Binary files differdeleted file mode 100644 index ac2dc071c4..0000000000 --- a/plugins/Referrers/images/socials/ru.netlog.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/skyrock.com.png b/plugins/Referrers/images/socials/skyrock.com.png Binary files differdeleted file mode 100644 index c75eb7c4b8..0000000000 --- a/plugins/Referrers/images/socials/skyrock.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/sonico.com.png b/plugins/Referrers/images/socials/sonico.com.png Binary files differdeleted file mode 100644 index c2ef3953c9..0000000000 --- a/plugins/Referrers/images/socials/sonico.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/sourceforge.net.png b/plugins/Referrers/images/socials/sourceforge.net.png Binary files differdeleted file mode 100644 index 28910b26c4..0000000000 --- a/plugins/Referrers/images/socials/sourceforge.net.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/stackoverflow.com.png b/plugins/Referrers/images/socials/stackoverflow.com.png Binary files differdeleted file mode 100644 index 2b8b3068f1..0000000000 --- a/plugins/Referrers/images/socials/stackoverflow.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/studivz.net.png b/plugins/Referrers/images/socials/studivz.net.png Binary files differdeleted file mode 100644 index ec38a6a00e..0000000000 --- a/plugins/Referrers/images/socials/studivz.net.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/stumbleupon.com.png b/plugins/Referrers/images/socials/stumbleupon.com.png Binary files differdeleted file mode 100644 index 3a5a8c440c..0000000000 --- a/plugins/Referrers/images/socials/stumbleupon.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/t.co.png b/plugins/Referrers/images/socials/t.co.png Binary files differdeleted file mode 100644 index 2170f09918..0000000000 --- a/plugins/Referrers/images/socials/t.co.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/tagged.com.png b/plugins/Referrers/images/socials/tagged.com.png Binary files differdeleted file mode 100644 index ff369f74da..0000000000 --- a/plugins/Referrers/images/socials/tagged.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/taringa.net.png b/plugins/Referrers/images/socials/taringa.net.png Binary files differdeleted file mode 100644 index f3db083f71..0000000000 --- a/plugins/Referrers/images/socials/taringa.net.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/tuenti.com.png b/plugins/Referrers/images/socials/tuenti.com.png Binary files differdeleted file mode 100644 index 482e22d523..0000000000 --- a/plugins/Referrers/images/socials/tuenti.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/tumblr.com.png b/plugins/Referrers/images/socials/tumblr.com.png Binary files differdeleted file mode 100644 index 0092f69263..0000000000 --- a/plugins/Referrers/images/socials/tumblr.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/twitter.com.png b/plugins/Referrers/images/socials/twitter.com.png Binary files differdeleted file mode 100644 index da919d0a06..0000000000 --- a/plugins/Referrers/images/socials/twitter.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/url.google.com.png b/plugins/Referrers/images/socials/url.google.com.png Binary files differdeleted file mode 100644 index 8de0de27d7..0000000000 --- a/plugins/Referrers/images/socials/url.google.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/v2ex.com.png b/plugins/Referrers/images/socials/v2ex.com.png Binary files differdeleted file mode 100644 index 40b8402fcc..0000000000 --- a/plugins/Referrers/images/socials/v2ex.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/viadeo.com.png b/plugins/Referrers/images/socials/viadeo.com.png Binary files differdeleted file mode 100644 index e262533f18..0000000000 --- a/plugins/Referrers/images/socials/viadeo.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/vimeo.com.png b/plugins/Referrers/images/socials/vimeo.com.png Binary files differdeleted file mode 100644 index 8ea6e5b615..0000000000 --- a/plugins/Referrers/images/socials/vimeo.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/vk.com.png b/plugins/Referrers/images/socials/vk.com.png Binary files differdeleted file mode 100644 index 3a2fa3724d..0000000000 --- a/plugins/Referrers/images/socials/vk.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/vkontakte.ru.png b/plugins/Referrers/images/socials/vkontakte.ru.png Binary files differdeleted file mode 100644 index ab1148424e..0000000000 --- a/plugins/Referrers/images/socials/vkontakte.ru.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/vkrugudruzei.ru.png b/plugins/Referrers/images/socials/vkrugudruzei.ru.png Binary files differdeleted file mode 100644 index 3ec8b21327..0000000000 --- a/plugins/Referrers/images/socials/vkrugudruzei.ru.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/wayn.com.png b/plugins/Referrers/images/socials/wayn.com.png Binary files differdeleted file mode 100644 index 710186906d..0000000000 --- a/plugins/Referrers/images/socials/wayn.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/weeworld.com.png b/plugins/Referrers/images/socials/weeworld.com.png Binary files differdeleted file mode 100644 index 708284e2ad..0000000000 --- a/plugins/Referrers/images/socials/weeworld.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/weibo.com.png b/plugins/Referrers/images/socials/weibo.com.png Binary files differdeleted file mode 100644 index c9fda88e7c..0000000000 --- a/plugins/Referrers/images/socials/weibo.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/xanga.com.png b/plugins/Referrers/images/socials/xanga.com.png Binary files differdeleted file mode 100644 index 948ace2280..0000000000 --- a/plugins/Referrers/images/socials/xanga.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/xing.com.png b/plugins/Referrers/images/socials/xing.com.png Binary files differdeleted file mode 100644 index 4375046788..0000000000 --- a/plugins/Referrers/images/socials/xing.com.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/xx.png b/plugins/Referrers/images/socials/xx.png Binary files differdeleted file mode 100644 index 6a63dcea00..0000000000 --- a/plugins/Referrers/images/socials/xx.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/youtu.be.png b/plugins/Referrers/images/socials/youtu.be.png Binary files differdeleted file mode 100644 index 812fddfcce..0000000000 --- a/plugins/Referrers/images/socials/youtu.be.png +++ /dev/null diff --git a/plugins/Referrers/images/socials/youtube.com.png b/plugins/Referrers/images/socials/youtube.com.png Binary files differdeleted file mode 100644 index a49072ba3b..0000000000 --- a/plugins/Referrers/images/socials/youtube.com.png +++ /dev/null diff --git a/plugins/Referrers/tests/Unit/SearchEngineTest.php b/plugins/Referrers/tests/Unit/SearchEngineTest.php index 1b5cab4dbc..0b0803aa03 100644 --- a/plugins/Referrers/tests/Unit/SearchEngineTest.php +++ b/plugins/Referrers/tests/Unit/SearchEngineTest.php @@ -132,7 +132,7 @@ class SearchEngineTest extends \PHPUnit_Framework_TestCase public function testMissingSearchEngineIcons($url, $searchEngine) { // Get list of existing favicons - $favicons = scandir(PIWIK_PATH_TEST_TO_ROOT . '/plugins/Referrers/images/searchEngines/'); + $favicons = scandir(PIWIK_PATH_TEST_TO_ROOT . '/plugins/Morpheus/icons/dist/searchEngines/'); // Get list of search engines and first appearing URL static $searchEngines = array(); @@ -160,7 +160,7 @@ class SearchEngineTest extends \PHPUnit_Framework_TestCase } // Get list of existing favicons - $favicons = scandir(PIWIK_PATH_TEST_TO_ROOT . '/plugins/Referrers/images/searchEngines/'); + $favicons = scandir(PIWIK_PATH_TEST_TO_ROOT . '/plugins/Morpheus/icons/dist/searchEngines/'); foreach ($favicons as $name) { if ($name[0] == '.' || strpos($name, 'xx.') === 0) { continue; diff --git a/plugins/SEO/Metric/Alexa.php b/plugins/SEO/Metric/Alexa.php index ef9a73a5ec..7192113886 100644 --- a/plugins/SEO/Metric/Alexa.php +++ b/plugins/SEO/Metric/Alexa.php @@ -42,7 +42,7 @@ class Alexa implements MetricsProvider $value = null; } - $logo = "plugins/SEO/images/alexa.com.png"; + $logo = "plugins/Morpheus/icons/dist/SEO/alexa.com.png"; $link = self::LINK . urlencode($domain); return array( diff --git a/plugins/SEO/Metric/Bing.php b/plugins/SEO/Metric/Bing.php index 325af69492..e345d19cce 100644 --- a/plugins/SEO/Metric/Bing.php +++ b/plugins/SEO/Metric/Bing.php @@ -46,7 +46,7 @@ class Bing implements MetricsProvider $pageCount = null; } - $logo = "plugins/SEO/images/bing.com.png"; + $logo = "plugins/Morpheus/icons/dist/SEO/bing.com.png"; return array( new Metric('bing-index', 'SEO_Bing_IndexedPages', $pageCount, $logo, null, null, 'General_Pages') diff --git a/plugins/SEO/Metric/Dmoz.php b/plugins/SEO/Metric/Dmoz.php index b1f3567f06..c14792aa31 100644 --- a/plugins/SEO/Metric/Dmoz.php +++ b/plugins/SEO/Metric/Dmoz.php @@ -53,7 +53,7 @@ class Dmoz implements MetricsProvider $value = null; } - $logo = "plugins/SEO/images/dmoz.org.png"; + $logo = "plugins/Morpheus/icons/dist/SEO/dmoz.org.png"; return array( new Metric('dmoz', 'SEO_Dmoz', $value, $logo) diff --git a/plugins/SEO/Metric/DomainAge.php b/plugins/SEO/Metric/DomainAge.php index 836011b12e..e08dc3fa98 100644 --- a/plugins/SEO/Metric/DomainAge.php +++ b/plugins/SEO/Metric/DomainAge.php @@ -62,7 +62,7 @@ class DomainAge implements MetricsProvider } return array( - new Metric('domain-age', 'SEO_DomainAge', $value, 'plugins/SEO/images/whois.png') + new Metric('domain-age', 'SEO_DomainAge', $value, 'plugins/Morpheus/icons/dist/SEO/whois.png') ); } diff --git a/plugins/SEO/Metric/Google.php b/plugins/SEO/Metric/Google.php index c96e7fbb16..76a1a43e30 100644 --- a/plugins/SEO/Metric/Google.php +++ b/plugins/SEO/Metric/Google.php @@ -36,7 +36,7 @@ class Google implements MetricsProvider { $pageCount = $this->fetchIndexedPagesCount($domain); - $logo = "plugins/SEO/images/google.com.png"; + $logo = "plugins/Morpheus/icons/dist/SEO/google.com.png"; return array( new Metric('google-index', 'SEO_Google_IndexedPages', $pageCount, $logo, null, null, 'General_Pages'), diff --git a/plugins/SEO/images/alexa.com.png b/plugins/SEO/images/alexa.com.png Binary files differdeleted file mode 100644 index 0bc9c78887..0000000000 --- a/plugins/SEO/images/alexa.com.png +++ /dev/null diff --git a/plugins/SEO/images/bing.com.png b/plugins/SEO/images/bing.com.png Binary files differdeleted file mode 100644 index 8c798c92ac..0000000000 --- a/plugins/SEO/images/bing.com.png +++ /dev/null diff --git a/plugins/SEO/images/dmoz.org.png b/plugins/SEO/images/dmoz.org.png Binary files differdeleted file mode 100644 index 67349352de..0000000000 --- a/plugins/SEO/images/dmoz.org.png +++ /dev/null diff --git a/plugins/SEO/images/google.com.png b/plugins/SEO/images/google.com.png Binary files differdeleted file mode 100644 index f860e43207..0000000000 --- a/plugins/SEO/images/google.com.png +++ /dev/null diff --git a/plugins/SEO/images/whois.png b/plugins/SEO/images/whois.png Binary files differdeleted file mode 100644 index 642c2a5c92..0000000000 --- a/plugins/SEO/images/whois.png +++ /dev/null diff --git a/plugins/ScheduledReports/ScheduledReports.php b/plugins/ScheduledReports/ScheduledReports.php index dcab10dcfd..b22d4cecdc 100644 --- a/plugins/ScheduledReports/ScheduledReports.php +++ b/plugins/ScheduledReports/ScheduledReports.php @@ -64,7 +64,7 @@ class ScheduledReports extends \Piwik\Plugin private static $managedReportFormats = array( ReportRenderer::HTML_FORMAT => 'plugins/Morpheus/images/html_icon.png', - ReportRenderer::PDF_FORMAT => 'plugins/DevicePlugins/images/plugins/pdf.png', + ReportRenderer::PDF_FORMAT => 'plugins/Morpheus/icons/dist/plugins/pdf.png', ReportRenderer::CSV_FORMAT => 'plugins/Morpheus/images/export.png', ); diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php index 27a4ce4692..5fa9baaffd 100644 --- a/tests/PHPUnit/Framework/Fixture.php +++ b/tests/PHPUnit/Framework/Fixture.php @@ -794,6 +794,10 @@ class Fixture extends \PHPUnit_Framework_Assert */ public static function canImagesBeIncludedInScheduledReports() { + if(!function_exists('gd_info')) { + echo "GD is not installed so cannot run these tests. please enable GD in PHP!\n"; + return false; + } $gdInfo = gd_info(); return stristr(php_uname(), self::IMAGES_GENERATED_ONLY_FOR_OS) && diff --git a/tests/PHPUnit/Integration/HttpTest.php b/tests/PHPUnit/Integration/HttpTest.php index afa068bdf4..1fdec7b6ed 100644 --- a/tests/PHPUnit/Integration/HttpTest.php +++ b/tests/PHPUnit/Integration/HttpTest.php @@ -260,12 +260,9 @@ class HttpTest extends \PHPUnit_Framework_TestCase Http::sendHttpRequestBy('fopen', 'https://self-signed.badssl.com/', 10); } - /** - * We check that HTTPS is not supported with the "socket" method - */ - public function testSocketHttpsWorksEvenWithInvalidCertificate() + public function testSocketHttpsWorksWithValidCertificate() { - $result = Http::sendHttpRequestBy('socket', 'https://divezone.net', 10); + $result = Http::sendHttpRequestBy('socket', 'https://divezone.net/', 10); $this->assertNotEmpty($result); } } diff --git a/tests/PHPUnit/Integration/ReleaseCheckListTest.php b/tests/PHPUnit/Integration/ReleaseCheckListTest.php index d880f5bfb6..04fdfc0925 100644 --- a/tests/PHPUnit/Integration/ReleaseCheckListTest.php +++ b/tests/PHPUnit/Integration/ReleaseCheckListTest.php @@ -60,6 +60,9 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase // filter favicon.ico as it may not be in PNG format which is fine $files = array_filter($files, function($value) { return !preg_match('/favicon.ico/', $value); }); + // filter source files for icon creation as they can be favicons + $files = array_filter($files, function($value) { return !preg_match('~icons/src~', $value); }); + $this->checkFilesAreInPngFormat($files); $files = Filesystem::globr(PIWIK_INCLUDE_PATH . '/core', '*.ico'); $this->checkFilesAreInPngFormat($files); @@ -193,6 +196,7 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase PIWIK_INCLUDE_PATH . '/tests/resources/overlay-test-site-real/', PIWIK_INCLUDE_PATH . '/tests/resources/overlay-test-site/', PIWIK_INCLUDE_PATH . '/vendor/facebook/xhprof/xhprof_html/docs/', + PIWIK_INCLUDE_PATH . '/plugins/Morpheus/icons/', ); $files = Filesystem::globr(PIWIK_INCLUDE_PATH, '*.' . $extension); @@ -596,6 +600,11 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase return false; } + if($this->isFileIsAnIconButDoesNotBelongToDistribution($file)) { + return false; + } + + if($this->isPluginSubmoduleAndThereforeNotFoundInFinalRelease($file)) { return false; } @@ -811,4 +820,13 @@ class ReleaseCheckListTest extends \PHPUnit_Framework_TestCase return $composerJson; } + /** + * ignore icon source files as they are large, but not included in the final package + * + */ + private function isFileIsAnIconButDoesNotBelongToDistribution($file) + { + return preg_match('~Morpheus/icons/(?!dist)~', $file); + } + } diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml index 4c118588fa..1767b3b86f 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml @@ -74,14 +74,14 @@ <deviceModel /> <operatingSystem>Mac 10.8</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.8</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 19.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> <events>0</events> @@ -188,14 +188,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 6.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -302,14 +302,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 19.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> <events>0</events> @@ -416,14 +416,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/EP.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -530,14 +530,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -644,14 +644,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 6.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -758,14 +758,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/EP.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -872,14 +872,14 @@ <deviceModel>Vision</deviceModel> <operatingSystem>Android 2.3</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>2.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/AN.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/AN.png</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <events>0</events> @@ -986,14 +986,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml index 85550a6dc1..9d70523384 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml @@ -265,14 +265,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -387,14 +387,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 6.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -420,11 +420,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -514,14 +514,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -632,14 +632,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -769,14 +769,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -914,14 +914,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -1032,14 +1032,14 @@ <deviceModel /> <operatingSystem>Bot</operatingSystem> <operatingSystemName>Bot</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> <operatingSystemCode>BOT</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1150,14 +1150,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -1257,14 +1257,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1375,14 +1375,14 @@ <deviceModel>Vision</deviceModel> <operatingSystem>Android 2.3</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>2.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/AN.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/AN.png</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index 8c9dbbcce2..2569b8da4d 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -59,7 +59,7 @@ <referrerKeywordPosition /> <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> - <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon> <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> @@ -68,14 +68,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion /> <events>0</events> @@ -99,11 +99,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -253,14 +253,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -292,11 +292,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -384,14 +384,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -423,11 +423,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -558,14 +558,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -597,11 +597,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -689,14 +689,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -728,11 +728,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -882,14 +882,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -921,11 +921,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1013,14 +1013,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1052,11 +1052,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1187,14 +1187,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1226,11 +1226,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1318,14 +1318,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1357,11 +1357,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1511,14 +1511,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1550,11 +1550,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1642,14 +1642,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1681,11 +1681,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1816,14 +1816,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1855,11 +1855,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1990,14 +1990,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -2021,11 +2021,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -2113,14 +2113,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -2152,11 +2152,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -2244,14 +2244,14 @@ <deviceModel>Xperia Tablet S</deviceModel> <operatingSystem>Android 4.1</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>4.1</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 34.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>34.0</browserVersion> <events>0</events> @@ -2283,11 +2283,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -2437,14 +2437,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -2476,11 +2476,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -2630,14 +2630,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -2661,11 +2661,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -2753,14 +2753,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -2792,11 +2792,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -2884,14 +2884,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 11.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>11.0</browserVersion> <events>0</events> @@ -2923,11 +2923,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -3058,14 +3058,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -3097,11 +3097,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -3232,14 +3232,14 @@ <deviceModel>Desire</deviceModel> <operatingSystem>MildWild 8.0</operatingSystem> <operatingSystemName>MildWild</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/AND.png</operatingSystemIcon> <operatingSystemCode>MLD</operatingSystemCode> <operatingSystemVersion>8.0</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/AN.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/AN.png</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <events>1</events> @@ -3271,11 +3271,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -3406,14 +3406,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -3437,11 +3437,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -3572,14 +3572,14 @@ <deviceModel /> <operatingSystem>Ubuntu 9.04</operatingSystem> <operatingSystemName>Ubuntu</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UBT.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UBT.png</operatingSystemIcon> <operatingSystemCode>UBT</operatingSystemCode> <operatingSystemVersion>9.04</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>1</events> @@ -3611,11 +3611,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -3703,14 +3703,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -3742,11 +3742,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -3834,14 +3834,14 @@ <deviceModel>Desire</deviceModel> <operatingSystem>MildWild 8.0</operatingSystem> <operatingSystemName>MildWild</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/AND.png</operatingSystemIcon> <operatingSystemCode>MLD</operatingSystemCode> <operatingSystemVersion>8.0</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/AN.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/AN.png</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <events>0</events> @@ -3873,11 +3873,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -3965,14 +3965,14 @@ <deviceModel /> <operatingSystem>Windows Vista</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 8.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>8.0</browserVersion> <events>0</events> @@ -4004,11 +4004,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -4096,14 +4096,14 @@ <deviceModel /> <operatingSystem>Ubuntu 9.04</operatingSystem> <operatingSystemName>Ubuntu</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UBT.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UBT.png</operatingSystemIcon> <operatingSystemCode>UBT</operatingSystemCode> <operatingSystemVersion>9.04</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -4135,11 +4135,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -4289,14 +4289,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -4328,11 +4328,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -4482,14 +4482,14 @@ <deviceModel>Nexus 4</deviceModel> <operatingSystem>Android 4.4</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>4.4</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome Mobile 33.0</browser> <browserName>Chrome Mobile</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CM.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CM.png</browserIcon> <browserCode>CM</browserCode> <browserVersion>33.0</browserVersion> <events>1</events> @@ -4521,11 +4521,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -4675,14 +4675,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -4706,11 +4706,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -4860,14 +4860,14 @@ <deviceModel>GALAXY Note 3</deviceModel> <operatingSystem>Android 4.3</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>4.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>QQ Browser 5.0</browser> <browserName>QQ Browser</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/QQ.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/QQ.png</browserIcon> <browserCode>QQ</browserCode> <browserVersion>5.0</browserVersion> <events>1</events> @@ -4899,11 +4899,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -4991,14 +4991,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -5030,11 +5030,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -5122,14 +5122,14 @@ <deviceModel>Nexus 4</deviceModel> <operatingSystem>Android 4.4</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>4.4</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome Mobile 33.0</browser> <browserName>Chrome Mobile</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CM.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CM.png</browserIcon> <browserCode>CM</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -5161,11 +5161,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -5253,14 +5253,14 @@ <deviceModel /> <operatingSystem>Windows 8.1</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>8.1</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 32.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>32.0</browserVersion> <events>0</events> @@ -5292,11 +5292,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -5384,14 +5384,14 @@ <deviceModel>GALAXY Note 3</deviceModel> <operatingSystem>Android 4.3</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>4.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>QQ Browser 5.0</browser> <browserName>QQ Browser</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/QQ.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/QQ.png</browserIcon> <browserCode>QQ</browserCode> <browserVersion>5.0</browserVersion> <events>0</events> @@ -5423,11 +5423,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> 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 ec75eaf279..cc96799a61 100644 --- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml @@ -10,6 +10,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>operatingSystemCode==WXP;operatingSystemVersion==XP</segment> - <logo>plugins/DevicesDetection/images/os/WIN.png</logo> + <logo>plugins/Morpheus/icons/dist/os/WIN.png</logo> </row> </result>
\ No newline at end of file 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 8b3a825d75..f1426e40f6 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -58,14 +58,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -93,11 +93,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -171,14 +171,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -206,11 +206,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -362,14 +362,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>6</events> @@ -397,11 +397,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -475,14 +475,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -510,11 +510,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -879,14 +879,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>14</events> @@ -914,11 +914,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -992,14 +992,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1027,7 +1027,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -1101,14 +1101,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1136,7 +1136,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -1288,14 +1288,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>6</events> @@ -1323,7 +1323,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -1397,14 +1397,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1432,7 +1432,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -1746,14 +1746,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>13</events> @@ -1781,7 +1781,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> 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 2a30c29c88..3327e3002e 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -58,14 +58,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -93,7 +93,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -167,14 +167,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -202,7 +202,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -354,14 +354,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>6</events> @@ -389,7 +389,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -463,14 +463,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -498,7 +498,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -812,14 +812,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>13</events> @@ -847,7 +847,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -921,14 +921,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -956,11 +956,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1034,14 +1034,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1069,11 +1069,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1225,14 +1225,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>6</events> @@ -1260,11 +1260,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1338,14 +1338,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1373,11 +1373,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1742,14 +1742,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>14</events> @@ -1777,11 +1777,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml index ede776e224..94a694cef6 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml @@ -4,60 +4,60 @@ <label>Cookie</label> <nb_visits>2</nb_visits> <nb_visits_percentage>6%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/cookie.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/cookie.png</logo> </row> <row> <label>Flash</label> <nb_visits>2</nb_visits> <nb_visits_percentage>6%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/flash.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/flash.png</logo> </row> <row> <label>Java</label> <nb_visits>2</nb_visits> <nb_visits_percentage>6%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/java.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/java.png</logo> </row> <row> <label>Director</label> <nb_visits>1</nb_visits> <nb_visits_percentage>3%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/director.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/director.png</logo> </row> <row> <label>Gears</label> <nb_visits>1</nb_visits> <nb_visits_percentage>3%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/gears.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/gears.png</logo> </row> <row> <label>Pdf</label> <nb_visits>1</nb_visits> <nb_visits_percentage>3%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/pdf.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/pdf.png</logo> </row> <row> <label>Windowsmedia</label> <nb_visits>1</nb_visits> <nb_visits_percentage>3%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/windowsmedia.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/windowsmedia.png</logo> </row> <row> <label>Quicktime</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/quicktime.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/quicktime.png</logo> </row> <row> <label>Realplayer</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/realplayer.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/realplayer.png</logo> </row> <row> <label>Silverlight</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/silverlight.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/silverlight.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml index 9abb2c8121..e053d47f03 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>10</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/CH.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/CH.png</logo> </row> <row> <label>Internet Explorer</label> @@ -22,7 +22,7 @@ <nb_visits_converted>8</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/IE.png</logo> </row> <row> <label>RockMelt</label> @@ -34,7 +34,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/RM.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/RM.png</logo> </row> <row> <label>Epiphany</label> @@ -46,7 +46,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/EP.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/EP.png</logo> </row> <row> <label>Unknown</label> @@ -58,7 +58,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/UNK.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/UNK.png</logo> </row> <row> <label>Android Browser</label> @@ -70,7 +70,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/AN.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/AN.png</logo> </row> <row> <label>Firefox</label> @@ -82,7 +82,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo> </row> <row> <label>Chrome Mobile</label> @@ -94,6 +94,6 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/CM.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/CM.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml index c0c93c6084..08c57eeae0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -11,7 +11,7 @@ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==RM;browserVersion==0.9</segment> - <logo>plugins/DevicesDetection/images/browsers/RM.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/RM.png</logo> </row> <row> <label>Epiphany 2.30</label> @@ -24,7 +24,7 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==EP;browserVersion==2.30</segment> - <logo>plugins/DevicesDetection/images/browsers/EP.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/EP.png</logo> </row> <row> <label>Internet Explorer 9.0</label> @@ -37,7 +37,7 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==IE;browserVersion==9.0</segment> - <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/IE.png</logo> </row> <row> <label>Unknown</label> @@ -50,7 +50,7 @@ <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==UNK;browserVersion==</segment> - <logo>plugins/DevicesDetection/images/browsers/UNK.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/UNK.png</logo> </row> <row> <label>Chrome 37.0</label> @@ -63,7 +63,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <segment>browserCode==CH;browserVersion==37.0</segment> - <logo>plugins/DevicesDetection/images/browsers/CH.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/CH.png</logo> </row> <row> <label>Android Browser</label> @@ -76,7 +76,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==AN;browserVersion==</segment> - <logo>plugins/DevicesDetection/images/browsers/AN.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/AN.png</logo> </row> <row> <label>Chrome 19.0</label> @@ -89,7 +89,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==CH;browserVersion==19.0</segment> - <logo>plugins/DevicesDetection/images/browsers/CH.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/CH.png</logo> </row> <row> <label>Chrome 20.0</label> @@ -102,7 +102,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <segment>browserCode==CH;browserVersion==20.0</segment> - <logo>plugins/DevicesDetection/images/browsers/CH.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/CH.png</logo> </row> <row> <label>Firefox 6.0</label> @@ -115,7 +115,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==FF;browserVersion==6.0</segment> - <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo> </row> <row> <label>Chrome 11.0</label> @@ -128,7 +128,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==CH;browserVersion==11.0</segment> - <logo>plugins/DevicesDetection/images/browsers/CH.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/CH.png</logo> </row> <row> <label>Chrome 39.0</label> @@ -141,7 +141,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==CH;browserVersion==39.0</segment> - <logo>plugins/DevicesDetection/images/browsers/CH.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/CH.png</logo> </row> <row> <label>Chrome 41.0</label> @@ -154,7 +154,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==CH;browserVersion==41.0</segment> - <logo>plugins/DevicesDetection/images/browsers/CH.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/CH.png</logo> </row> <row> <label>Chrome Mobile 39.0</label> @@ -167,7 +167,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <segment>browserCode==CM;browserVersion==39.0</segment> - <logo>plugins/DevicesDetection/images/browsers/CM.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/CM.png</logo> </row> <row> <label>Internet Explorer 5.0</label> @@ -180,7 +180,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==IE;browserVersion==5.0</segment> - <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/IE.png</logo> </row> <row> <label>Internet Explorer 6.0</label> @@ -193,7 +193,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==IE;browserVersion==6.0</segment> - <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/IE.png</logo> </row> <row> <label>Internet Explorer 8.0</label> @@ -206,7 +206,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==IE;browserVersion==8.0</segment> - <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/IE.png</logo> </row> <row> <label>Unknown</label> @@ -219,6 +219,6 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==UNK;browserVersion==1.0</segment> - <logo>plugins/DevicesDetection/images/browsers/UNK.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/UNK.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml index 69929893e9..912ac1bc8b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>10</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/CH.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/CH.png</logo> <segment>browserCode==CH</segment> </row> <row> @@ -23,7 +23,7 @@ <nb_visits_converted>8</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/IE.png</logo> <segment>browserCode==IE</segment> </row> <row> @@ -36,7 +36,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/RM.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/RM.png</logo> <segment>browserCode==RM</segment> </row> <row> @@ -49,7 +49,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/EP.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/EP.png</logo> <segment>browserCode==EP</segment> </row> <row> @@ -62,7 +62,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/UNK.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/UNK.png</logo> <segment>browserCode==UNK</segment> </row> <row> @@ -75,7 +75,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/AN.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/AN.png</logo> <segment>browserCode==AN</segment> </row> <row> @@ -88,7 +88,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo> <segment>browserCode==FF</segment> </row> <row> @@ -101,7 +101,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/CM.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/CM.png</logo> <segment>browserCode==CM</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml index a605a1c734..10b83b8800 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>11</nb_visits_converted> <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/MAC.png</logo> + <logo>plugins/Morpheus/icons/dist/os/MAC.png</logo> </row> <row> <label>Windows</label> @@ -22,7 +22,7 @@ <nb_visits_converted>11</nb_visits_converted> <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/WIN.png</logo> + <logo>plugins/Morpheus/icons/dist/os/WIN.png</logo> </row> <row> <label>GNU/Linux</label> @@ -34,7 +34,7 @@ <nb_visits_converted>8</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/LIN.png</logo> + <logo>plugins/Morpheus/icons/dist/os/LIN.png</logo> </row> <row> <label>Android</label> @@ -46,7 +46,7 @@ <nb_visits_converted>3</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/AND.png</logo> + <logo>plugins/Morpheus/icons/dist/os/AND.png</logo> </row> <row> <label>Unknown</label> @@ -58,7 +58,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/UNK.png</logo> + <logo>plugins/Morpheus/icons/dist/os/UNK.png</logo> </row> <row> <label>Bot</label> @@ -70,7 +70,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/UNK.png</logo> + <logo>plugins/Morpheus/icons/dist/os/UNK.png</logo> </row> <row> <label>iOS</label> @@ -82,6 +82,6 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/IOS.png</logo> + <logo>plugins/Morpheus/icons/dist/os/IOS.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml index a648a6436a..d0f8f30c53 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -11,7 +11,7 @@ <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==LIN;operatingSystemVersion==</segment> - <logo>plugins/DevicesDetection/images/os/LIN.png</logo> + <logo>plugins/Morpheus/icons/dist/os/LIN.png</logo> </row> <row> <label>Windows 7</label> @@ -24,7 +24,7 @@ <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <segment>operatingSystemCode==WIN;operatingSystemVersion==7</segment> - <logo>plugins/DevicesDetection/images/os/WIN.png</logo> + <logo>plugins/Morpheus/icons/dist/os/WIN.png</logo> </row> <row> <label>Mac 10.6</label> @@ -37,7 +37,7 @@ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==MAC;operatingSystemVersion==10.6</segment> - <logo>plugins/DevicesDetection/images/os/MAC.png</logo> + <logo>plugins/Morpheus/icons/dist/os/MAC.png</logo> </row> <row> <label>Mac 10.10</label> @@ -50,7 +50,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <segment>operatingSystemCode==MAC;operatingSystemVersion==10.10</segment> - <logo>plugins/DevicesDetection/images/os/MAC.png</logo> + <logo>plugins/Morpheus/icons/dist/os/MAC.png</logo> </row> <row> <label>Unknown</label> @@ -63,7 +63,7 @@ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==UNK;operatingSystemVersion==UNK</segment> - <logo>plugins/DevicesDetection/images/os/UNK.png</logo> + <logo>plugins/Morpheus/icons/dist/os/UNK.png</logo> </row> <row> <label>Windows XP</label> @@ -76,7 +76,7 @@ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==WIN;operatingSystemVersion==XP</segment> - <logo>plugins/DevicesDetection/images/os/WIN.png</logo> + <logo>plugins/Morpheus/icons/dist/os/WIN.png</logo> </row> <row> <label>Android 2.3</label> @@ -89,7 +89,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==AND;operatingSystemVersion==2.3</segment> - <logo>plugins/DevicesDetection/images/os/AND.png</logo> + <logo>plugins/Morpheus/icons/dist/os/AND.png</logo> </row> <row> <label>Android 4.4</label> @@ -102,7 +102,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <segment>operatingSystemCode==AND;operatingSystemVersion==4.4</segment> - <logo>plugins/DevicesDetection/images/os/AND.png</logo> + <logo>plugins/Morpheus/icons/dist/os/AND.png</logo> </row> <row> <label>Bot</label> @@ -115,7 +115,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==BOT;operatingSystemVersion==UNK</segment> - <logo>plugins/DevicesDetection/images/os/UNK.png</logo> + <logo>plugins/Morpheus/icons/dist/os/UNK.png</logo> </row> <row> <label>iOS 7.1</label> @@ -128,7 +128,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==IOS;operatingSystemVersion==7.1</segment> - <logo>plugins/DevicesDetection/images/os/IOS.png</logo> + <logo>plugins/Morpheus/icons/dist/os/IOS.png</logo> </row> <row> <label>Mac</label> @@ -141,7 +141,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==MAC;operatingSystemVersion==</segment> - <logo>plugins/DevicesDetection/images/os/MAC.png</logo> + <logo>plugins/Morpheus/icons/dist/os/MAC.png</logo> </row> <row> <label>Mac 10.8</label> @@ -154,7 +154,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==MAC;operatingSystemVersion==10.8</segment> - <logo>plugins/DevicesDetection/images/os/MAC.png</logo> + <logo>plugins/Morpheus/icons/dist/os/MAC.png</logo> </row> <row> <label>Windows</label> @@ -167,6 +167,6 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==WIN;operatingSystemVersion==</segment> - <logo>plugins/DevicesDetection/images/os/WIN.png</logo> + <logo>plugins/Morpheus/icons/dist/os/WIN.png</logo> </row> </result>
\ 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 8b4b94a0fd..a41bee8bd7 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -76,14 +76,14 @@ <deviceModel /> <operatingSystem>Windows 8.1</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>8.1</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -111,15 +111,15 @@ <plugins>pdf, flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -228,14 +228,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 8.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>8.0</browserVersion> <events>0</events> @@ -350,14 +350,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 34.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>34.0</browserVersion> <events>0</events> @@ -389,23 +389,23 @@ <plugins>pdf, flash, java, quicktime, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -505,7 +505,7 @@ <referrerKeywordPosition>1</referrerKeywordPosition> <referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> - <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon> <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> @@ -514,14 +514,14 @@ <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.9</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari 7.0</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -549,19 +549,19 @@ <plugins>pdf, flash, java, quicktime</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> </pluginsIcons> @@ -640,14 +640,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -675,19 +675,19 @@ <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -770,7 +770,7 @@ <referrerKeywordPosition /> <referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> - <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon> <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> @@ -779,14 +779,14 @@ <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.9</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -814,27 +814,27 @@ <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/windowsmedia.png</pluginIcon> <pluginName>windowsmedia</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -915,7 +915,7 @@ <referrerKeywordPosition>2</referrerKeywordPosition> <referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> - <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon> <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> @@ -924,14 +924,14 @@ <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.9</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari 7.0</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -959,15 +959,15 @@ <plugins>pdf, java, quicktime</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> </pluginsIcons> @@ -1059,14 +1059,14 @@ <deviceModel /> <operatingSystem>Android</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion /> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <events>0</events> @@ -1094,7 +1094,7 @@ <plugins>flash</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> </pluginsIcons> @@ -1186,14 +1186,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <events>0</events> @@ -1221,27 +1221,27 @@ <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/windowsmedia.png</pluginIcon> <pluginName>windowsmedia</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -1364,7 +1364,7 @@ <referrerKeywordPosition>1</referrerKeywordPosition> <referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> - <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon> <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> @@ -1373,14 +1373,14 @@ <deviceModel /> <operatingSystem>Windows 8</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>8</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <events>0</events> @@ -1408,11 +1408,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1504,14 +1504,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -1539,19 +1539,19 @@ <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -1643,14 +1643,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -1678,19 +1678,19 @@ <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -1971,14 +1971,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -2089,14 +2089,14 @@ <deviceModel /> <operatingSystem>Mac</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion /> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 5.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>5.0</browserVersion> <events>0</events> @@ -2224,14 +2224,14 @@ <deviceModel /> <operatingSystem>Windows</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 8.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>8.0</browserVersion> <events>0</events> @@ -2350,14 +2350,14 @@ <deviceModel /> <operatingSystem>Mac 10.10</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.10</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 37.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>37.0</browserVersion> <events>0</events> @@ -2520,14 +2520,14 @@ <deviceModel>GALAXY S5</deviceModel> <operatingSystem>Android 4.4</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>4.4</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome Mobile 39.0</browser> <browserName>Chrome Mobile</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CM.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CM.png</browserIcon> <browserCode>CM</browserCode> <browserVersion>39.0</browserVersion> <events>0</events> @@ -2642,14 +2642,14 @@ <deviceModel /> <operatingSystem>Mac 10.10</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.10</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 37.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>37.0</browserVersion> <events>0</events> @@ -2789,14 +2789,14 @@ <deviceModel /> <operatingSystem>Mac 10.10</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.10</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 37.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>37.0</browserVersion> <events>0</events> @@ -2913,14 +2913,14 @@ <deviceModel /> <operatingSystem>Mac 10.10</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.10</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 41.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>41.0</browserVersion> <events>0</events> @@ -3041,14 +3041,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 6.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -3076,11 +3076,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -3170,14 +3170,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 11.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>11.0</browserVersion> <events>0</events> @@ -3205,27 +3205,27 @@ <plugins>pdf, flash, java, director, windowsmedia, gears</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/windowsmedia.png</pluginIcon> <pluginName>windowsmedia</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/gears.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/gears.png</pluginIcon> <pluginName>gears</pluginName> </row> </pluginsIcons> @@ -3317,14 +3317,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 39.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>39.0</browserVersion> <events>0</events> @@ -3435,14 +3435,14 @@ <deviceModel>iPhone</deviceModel> <operatingSystem>iOS 7.1</operatingSystem> <operatingSystemName>iOS</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/IOS.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/IOS.png</operatingSystemIcon> <operatingSystemCode>IOS</operatingSystemCode> <operatingSystemVersion>7.1</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion>1.0</browserVersion> <events>0</events> @@ -3542,14 +3542,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -3648,14 +3648,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -3764,14 +3764,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -3884,14 +3884,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -4023,14 +4023,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -4170,14 +4170,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -4290,14 +4290,14 @@ <deviceModel /> <operatingSystem>Bot</operatingSystem> <operatingSystemName>Bot</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> <operatingSystemCode>BOT</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -4410,14 +4410,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -4519,14 +4519,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -4639,14 +4639,14 @@ <deviceModel>Vision</deviceModel> <operatingSystem>Android 2.3</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>2.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/AN.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/AN.png</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <events>0</events> @@ -4759,14 +4759,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -4879,14 +4879,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 20.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>20.0</browserVersion> <events>0</events> @@ -4995,14 +4995,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/EP.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -5111,14 +5111,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 20.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>20.0</browserVersion> <events>0</events> @@ -5227,14 +5227,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/EP.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -5343,14 +5343,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -5459,14 +5459,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/EP.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -5575,14 +5575,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -5691,14 +5691,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -5807,14 +5807,14 @@ <deviceModel /> <operatingSystem>Mac 10.8</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.8</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 19.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> <events>0</events> @@ -5923,14 +5923,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 6.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -6039,14 +6039,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 19.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> <events>0</events> @@ -6155,14 +6155,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/EP.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -6271,14 +6271,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -6387,14 +6387,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 6.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -6503,14 +6503,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/EP.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -6619,14 +6619,14 @@ <deviceModel>Vision</deviceModel> <operatingSystem>Android 2.3</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>2.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/AN.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/AN.png</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <events>0</events> @@ -6735,14 +6735,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> 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 072b65b52a..6e91c71915 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 @@ -65,14 +65,14 @@ <deviceModel /> <operatingSystem>Windows 8.1</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>8.1</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -100,15 +100,15 @@ <plugins>pdf, flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -206,14 +206,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 8.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>8.0</browserVersion> <events>0</events> @@ -317,14 +317,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 34.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>34.0</browserVersion> <events>0</events> @@ -356,23 +356,23 @@ <plugins>pdf, flash, java, quicktime, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -461,7 +461,7 @@ <referrerKeywordPosition>1</referrerKeywordPosition> <referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> - <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon> <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> @@ -470,14 +470,14 @@ <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.9</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari 7.0</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -505,19 +505,19 @@ <plugins>pdf, flash, java, quicktime</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> </pluginsIcons> @@ -596,14 +596,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -631,19 +631,19 @@ <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -715,7 +715,7 @@ <referrerKeywordPosition /> <referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> - <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon> <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> @@ -724,14 +724,14 @@ <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.9</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -759,27 +759,27 @@ <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/windowsmedia.png</pluginIcon> <pluginName>windowsmedia</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -849,7 +849,7 @@ <referrerKeywordPosition>2</referrerKeywordPosition> <referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> - <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon> <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> @@ -858,14 +858,14 @@ <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.9</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari 7.0</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -893,15 +893,15 @@ <plugins>pdf, java, quicktime</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> </pluginsIcons> @@ -982,14 +982,14 @@ <deviceModel /> <operatingSystem>Android</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion /> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <events>0</events> @@ -1017,7 +1017,7 @@ <plugins>flash</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> </pluginsIcons> @@ -1098,14 +1098,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <events>0</events> @@ -1133,27 +1133,27 @@ <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/windowsmedia.png</pluginIcon> <pluginName>windowsmedia</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -1265,7 +1265,7 @@ <referrerKeywordPosition>1</referrerKeywordPosition> <referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> - <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon> <languageCode /> <language>Unknown</language> <deviceType>Desktop</deviceType> @@ -1274,14 +1274,14 @@ <deviceModel /> <operatingSystem>Windows 8</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>8</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <events>0</events> @@ -1309,11 +1309,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1394,14 +1394,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -1429,19 +1429,19 @@ <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -1522,14 +1522,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -1557,19 +1557,19 @@ <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -1656,14 +1656,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 6.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -1691,11 +1691,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1774,14 +1774,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 11.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>11.0</browserVersion> <events>0</events> @@ -1809,27 +1809,27 @@ <plugins>pdf, flash, java, director, windowsmedia, gears</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/windowsmedia.png</pluginIcon> <pluginName>windowsmedia</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/gears.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/gears.png</pluginIcon> <pluginName>gears</pluginName> </row> </pluginsIcons> @@ -1950,14 +1950,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari 5.0</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion>5.0</browserVersion> <events>0</events> @@ -1985,11 +1985,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> 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 8697efbd17..94f689d62d 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 @@ -140,14 +140,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -179,11 +179,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -277,14 +277,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -316,11 +316,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -457,14 +457,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -496,11 +496,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> 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 7ac82f7b43..d454b9c3db 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 @@ -78,14 +78,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -117,11 +117,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -277,14 +277,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -316,11 +316,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -414,14 +414,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -453,11 +453,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml index 9f8bfc5a7e..5a4b100f86 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml @@ -95,11 +95,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -216,11 +216,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -337,11 +337,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -458,11 +458,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -610,11 +610,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -762,11 +762,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -906,11 +906,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion>UNK</browserVersion> <deviceType>Desktop</deviceType> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml index d70e0114c0..d7bb4bf39a 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml @@ -74,14 +74,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -101,11 +101,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -236,14 +236,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -263,11 +263,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -364,14 +364,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -391,11 +391,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -526,14 +526,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -553,11 +553,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -654,14 +654,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -681,11 +681,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -816,14 +816,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <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/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -843,11 +843,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -936,14 +936,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -963,11 +963,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> 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 43833e94bc..6860c259d7 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 @@ -59,7 +59,7 @@ <referrerKeywordPosition /> <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> - <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon> <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> @@ -68,14 +68,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion /> <events>0</events> @@ -99,11 +99,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -259,14 +259,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -298,11 +298,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -396,14 +396,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -435,11 +435,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -576,14 +576,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -615,11 +615,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -713,14 +713,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -752,11 +752,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -912,14 +912,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -951,11 +951,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1049,14 +1049,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1088,11 +1088,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml index 08eebcd87f..6b0807d712 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml @@ -108,14 +108,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -137,11 +137,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -238,14 +238,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -267,11 +267,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -402,14 +402,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -431,11 +431,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -548,14 +548,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -577,11 +577,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -678,14 +678,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -707,11 +707,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -808,14 +808,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -837,11 +837,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -921,21 +921,21 @@ <referrerKeywordPosition /> <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> - <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion /> <events>0</events> @@ -957,11 +957,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> 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 43833e94bc..6860c259d7 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 @@ -59,7 +59,7 @@ <referrerKeywordPosition /> <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> - <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon> <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> @@ -68,14 +68,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion /> <events>0</events> @@ -99,11 +99,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -259,14 +259,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -298,11 +298,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -396,14 +396,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -435,11 +435,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -576,14 +576,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -615,11 +615,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -713,14 +713,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -752,11 +752,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -912,14 +912,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -951,11 +951,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1049,14 +1049,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1088,11 +1088,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> 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 f558426ca7..29a0f0d4fb 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -59,7 +59,7 @@ <referrerKeywordPosition /> <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> - <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon> <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> @@ -68,14 +68,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion /> <events>0</events> @@ -99,11 +99,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -259,14 +259,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -298,11 +298,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -396,14 +396,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -435,11 +435,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -576,14 +576,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -615,11 +615,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -713,14 +713,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -752,11 +752,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -912,14 +912,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -951,11 +951,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1049,14 +1049,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1088,11 +1088,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1229,14 +1229,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1268,11 +1268,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1366,14 +1366,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1405,11 +1405,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1565,14 +1565,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1604,11 +1604,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicePlugins.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicePlugins.getPlugin_day.xml index 5fb88fd638..6dd8447a8b 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicePlugins.getPlugin_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicePlugins.getPlugin_day.xml @@ -4,60 +4,60 @@ <label>Cookie</label> <nb_visits>2</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/cookie.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/cookie.png</logo> </row> <row> <label>Flash</label> <nb_visits>2</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/flash.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/flash.png</logo> </row> <row> <label>Java</label> <nb_visits>2</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/java.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/java.png</logo> </row> <row> <label>Director</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/director.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/director.png</logo> </row> <row> <label>Gears</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/gears.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/gears.png</logo> </row> <row> <label>Pdf</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/pdf.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/pdf.png</logo> </row> <row> <label>Quicktime</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/quicktime.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/quicktime.png</logo> </row> <row> <label>Realplayer</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/realplayer.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/realplayer.png</logo> </row> <row> <label>Silverlight</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/silverlight.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/silverlight.png</logo> </row> <row> <label>Windowsmedia</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/windowsmedia.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/windowsmedia.png</logo> </row> </result>
\ No newline at end of file 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 f9671f4619..fdae1ac533 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml @@ -9,6 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo> </row> </result>
\ No newline at end of file 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 2603420cd3..dc67261f58 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml @@ -10,6 +10,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>browserCode==FF;browserVersion==3.6</segment> - <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo> </row> </result>
\ No newline at end of file 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 9d976b6ea3..3c5c78e32f 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml @@ -9,7 +9,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo> <segment>browserCode==FF</segment> </row> </result>
\ No newline at end of file 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 07e1a01b33..e97badfc7a 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml @@ -9,6 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/os/WIN.png</logo> + <logo>plugins/Morpheus/icons/dist/os/WIN.png</logo> </row> </result>
\ No newline at end of file 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 3086cf37f6..24cf680d07 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml @@ -10,6 +10,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>operatingSystemCode==WIN;operatingSystemVersion==XP</segment> - <logo>plugins/DevicesDetection/images/os/WIN.png</logo> + <logo>plugins/Morpheus/icons/dist/os/WIN.png</logo> </row> </result>
\ No newline at end of file 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 9c7860d9da..822ff82c39 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml @@ -19,7 +19,7 @@ <revenue>1</revenue> <segment>referrerType==search;referrerName==Yahoo%21</segment> <url>http://search.yahoo.com</url> - <logo>plugins/Referrers/images/searchEngines/search.yahoo.com.png</logo> + <logo>plugins/Morpheus/icons/dist/searchEngines/search.yahoo.com.png</logo> <subtable> <row> <label>purchase</label> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicePlugins.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicePlugins.getPlugin_day.xml index 5fb88fd638..6dd8447a8b 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicePlugins.getPlugin_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicePlugins.getPlugin_day.xml @@ -4,60 +4,60 @@ <label>Cookie</label> <nb_visits>2</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/cookie.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/cookie.png</logo> </row> <row> <label>Flash</label> <nb_visits>2</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/flash.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/flash.png</logo> </row> <row> <label>Java</label> <nb_visits>2</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/java.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/java.png</logo> </row> <row> <label>Director</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/director.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/director.png</logo> </row> <row> <label>Gears</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/gears.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/gears.png</logo> </row> <row> <label>Pdf</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/pdf.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/pdf.png</logo> </row> <row> <label>Quicktime</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/quicktime.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/quicktime.png</logo> </row> <row> <label>Realplayer</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/realplayer.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/realplayer.png</logo> </row> <row> <label>Silverlight</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/silverlight.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/silverlight.png</logo> </row> <row> <label>Windowsmedia</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/windowsmedia.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/windowsmedia.png</logo> </row> </result>
\ No newline at end of file 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 5d97f32abd..70be909782 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 @@ -10,6 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo> </row> </result>
\ No newline at end of file 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 4aadf7058b..741d8d0537 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 @@ -11,6 +11,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>browserCode==FF;browserVersion==3.6</segment> - <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo> </row> </result>
\ No newline at end of file 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 8a48a353ab..743078e026 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 @@ -10,7 +10,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo> <segment>browserCode==FF</segment> </row> </result>
\ No newline at end of file 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 7948d87923..55011bb7df 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 @@ -10,6 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/os/WIN.png</logo> + <logo>plugins/Morpheus/icons/dist/os/WIN.png</logo> </row> </result>
\ No newline at end of file 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 1f8831dbca..c80d98672c 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 @@ -11,6 +11,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>operatingSystemCode==WIN;operatingSystemVersion==XP</segment> - <logo>plugins/DevicesDetection/images/os/WIN.png</logo> + <logo>plugins/Morpheus/icons/dist/os/WIN.png</logo> </row> </result>
\ No newline at end of file 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 625255ec8c..ef0c6d4fcf 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 @@ -61,7 +61,7 @@ <referrerKeywordPosition /> <referrerUrl>http://search.yahoo.com/search?p=purchase</referrerUrl> <referrerSearchEngineUrl>http://search.yahoo.com</referrerSearchEngineUrl> - <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/search.yahoo.com.png</referrerSearchEngineIcon> + <referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/search.yahoo.com.png</referrerSearchEngineIcon> <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> @@ -70,14 +70,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -101,11 +101,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -288,14 +288,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -319,11 +319,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> 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 35b195308e..db56768738 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 @@ -20,7 +20,7 @@ <revenue>1</revenue> <segment>referrerType==search;referrerName==Yahoo%21</segment> <url>http://search.yahoo.com</url> - <logo>plugins/Referrers/images/searchEngines/search.yahoo.com.png</logo> + <logo>plugins/Morpheus/icons/dist/searchEngines/search.yahoo.com.png</logo> <subtable> <row> <label>purchase</label> diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__DevicePlugins.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__DevicePlugins.getPlugin_day.xml index a9110fd732..e576c4ad5c 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__DevicePlugins.getPlugin_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__DevicePlugins.getPlugin_day.xml @@ -4,13 +4,13 @@ <label>Cookie</label> <nb_visits>7</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/cookie.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/cookie.png</logo> </row> <row> <label>Flash</label> <nb_visits>7</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/flash.png</logo> + <logo>plugins/Morpheus/icons/dist/plugins/flash.png</logo> </row> <row> <label>Autres</label> 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 e566232c1c..c75da162ca 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 @@ -48,7 +48,7 @@ <referrerKeywordPosition>4</referrerKeywordPosition> <referrerUrl>http://www.google.com.vn/search?q=%3C%3E%26%5C%22the+pdo+extension+is+required+for+this+adapter+but+the+extension+is+not+loaded</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> - <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon> <languageCode>fr</languageCode> <language>Français</language> <deviceType>Inconnu</deviceType> @@ -57,14 +57,14 @@ <deviceModel /> <operatingSystem>Bot</operatingSystem> <operatingSystemName>Bot</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> <operatingSystemCode>BOT</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Inconnu</browserFamilyDescription> <browser>Inconnu</browser> <browserName>Inconnu</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -88,11 +88,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -169,7 +169,7 @@ <referrerKeywordPosition>1</referrerKeywordPosition> <referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> - <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon> <languageCode>fr</languageCode> <language>Français</language> <deviceType>Inconnu</deviceType> @@ -178,14 +178,14 @@ <deviceModel /> <operatingSystem>Bot</operatingSystem> <operatingSystemName>Bot</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> <operatingSystemCode>BOT</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Inconnu</browserFamilyDescription> <browser>Inconnu</browser> <browserName>Inconnu</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -209,11 +209,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> 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 4d38ab8282..00e9c1cdba 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 @@ -62,14 +62,14 @@ <deviceModel /> <operatingSystem>Windows Vista</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 7.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -166,14 +166,14 @@ <deviceModel /> <operatingSystem>Windows Vista</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 7.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -270,14 +270,14 @@ <deviceModel /> <operatingSystem>Windows Vista</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 7.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml index 3354c1df29..579575d2a0 100644 --- a/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml @@ -255,7 +255,7 @@ </nb_visits_2> <nb_visits_3> <name>Google (Visits)</name> - <logo>plugins/Referrers/images/searchEngines/google.com.png</logo> + <logo>plugins/Morpheus/icons/dist/searchEngines/google.com.png</logo> <min>1</min> <max>1</max> <change>0%</change> diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml b/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml index 8a1dc9d833..9e96e35b46 100644 --- a/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml +++ b/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml @@ -11,7 +11,7 @@ <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <url>http://google.com/search?q=free+%3E+proprietary</url> - <logo>plugins/Referrers/images/searchEngines/google.com.png</logo> + <logo>plugins/Morpheus/icons/dist/searchEngines/google.com.png</logo> </row> <row> <label>Google - justice )(&^#%$ not '" corruption!</label> @@ -24,7 +24,7 @@ <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <url>http://google.com/search?q=justice+%29%28%26%5E%23%25%24+not+%27%22+corruption%21</url> - <logo>plugins/Referrers/images/searchEngines/google.com.png</logo> + <logo>plugins/Morpheus/icons/dist/searchEngines/google.com.png</logo> </row> <row> <label>Google - peace "," not war</label> @@ -37,6 +37,6 @@ <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <url>http://google.com/search?q=peace+%22%2C%22+not+war</url> - <logo>plugins/Referrers/images/searchEngines/google.com.png</logo> + <logo>plugins/Morpheus/icons/dist/searchEngines/google.com.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml index 2f815adae7..bf05786f61 100644 --- a/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml @@ -49,7 +49,7 @@ <metrics> <nb_visits_0> <name>Firefox (Visits)</name> - <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo> <min>0</min> <max>1</max> </nb_visits_0> @@ -58,7 +58,7 @@ </nb_visits_1> <nb_visits_2> <name>Opera (Visits)</name> - <logo>plugins/DevicesDetection/images/browsers/OP.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/OP.png</logo> <min>0</min> <max>1</max> <change>-100%</change> diff --git a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml index 5f57be7817..0fba801755 100644 --- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml @@ -57,14 +57,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -88,11 +88,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html index cc5191aea4..95b5726131 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html @@ -923,7 +923,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/UNK.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/UNK.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -948,7 +948,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/WIN.png'> Windows XP </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -982,7 +982,7 @@ </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700" margin="0 auto"/> @@ -1018,7 +1018,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/UNK.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/UNK.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1043,7 +1043,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/FF.png'> Firefox </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1068,7 +1068,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/OP.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/OP.png'> Opera </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1102,7 +1102,7 @@ </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700" margin="0 auto"/> @@ -1138,7 +1138,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/UNK.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/UNK.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1163,7 +1163,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/FF.png'> Firefox 3.6 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1188,7 +1188,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/OP.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/OP.png'> Opera 9.63 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1372,7 +1372,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/UNK.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/UNK.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1397,7 +1397,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/WIN.png'> Windows </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1569,7 +1569,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/cookie.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/cookie.png'> Cookie </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1582,7 +1582,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/flash.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/flash.png'> Flash </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1595,7 +1595,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/java.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/java.png'> Java </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1608,7 +1608,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/director.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/director.png'> Director </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1621,7 +1621,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/gears.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/gears.png'> Gears </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1634,7 +1634,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/pdf.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/pdf.png'> Pdf </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1647,7 +1647,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/quicktime.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/quicktime.png'> Quicktime </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1660,7 +1660,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/realplayer.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/realplayer.png'> Realplayer </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1673,7 +1673,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/silverlight.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/silverlight.png'> Silverlight </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1686,7 +1686,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/windowsmedia.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/windowsmedia.png'> Windowsmedia </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html index be472ece87..6369647644 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -874,7 +874,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/UNK.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/UNK.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -899,7 +899,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/WIN.png'> Windows XP </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -962,7 +962,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/UNK.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/UNK.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -987,7 +987,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/FF.png'> Firefox </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1012,7 +1012,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/OP.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/OP.png'> Opera </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1075,7 +1075,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/UNK.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/UNK.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1100,7 +1100,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/FF.png'> Firefox 3.6 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1125,7 +1125,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/OP.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/OP.png'> Opera 9.63 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1295,7 +1295,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/UNK.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/UNK.png'> Unknown </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1320,7 +1320,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/WIN.png'> Windows </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1478,7 +1478,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/cookie.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/cookie.png'> Cookie </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1491,7 +1491,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/flash.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/flash.png'> Flash </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1504,7 +1504,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/java.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/java.png'> Java </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1517,7 +1517,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/director.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/director.png'> Director </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1530,7 +1530,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/gears.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/gears.png'> Gears </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1543,7 +1543,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/pdf.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/pdf.png'> Pdf </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1556,7 +1556,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/quicktime.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/quicktime.png'> Quicktime </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1569,7 +1569,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/realplayer.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/realplayer.png'> Realplayer </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1582,7 +1582,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/silverlight.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/silverlight.png'> Silverlight </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1595,7 +1595,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/windowsmedia.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/windowsmedia.png'> Windowsmedia </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf Binary files differindex 1aa153ef88..adda5aaba5 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv Binary files differindex 98507835ad..a6d50f68e5 100644 --- a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv +++ b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml index 77544ebc9f..d931369c63 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml @@ -83,14 +83,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -126,11 +126,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -312,14 +312,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -355,11 +355,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml index 6e082082a8..8504c298e6 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -166,14 +166,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -209,11 +209,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -522,14 +522,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -565,11 +565,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -760,14 +760,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -799,11 +799,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index 25d7949eb9..d0e86d01ac 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html @@ -1043,7 +1043,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/WIN.png'> Windows XP </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1077,7 +1077,7 @@ </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700" margin="0 auto"/> @@ -1113,7 +1113,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/FF.png'> Firefox </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1147,7 +1147,7 @@ </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700" margin="0 auto"/> @@ -1183,7 +1183,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/FF.png'> Firefox 3.6 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1321,7 +1321,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/WIN.png'> Windows </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1447,7 +1447,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/cookie.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/cookie.png'> Cookie </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1460,7 +1460,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/flash.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/flash.png'> Flash </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1473,7 +1473,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/java.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/java.png'> Java </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1486,7 +1486,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/director.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/director.png'> Director </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1499,7 +1499,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/gears.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/gears.png'> Gears </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1512,7 +1512,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/pdf.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/pdf.png'> Pdf </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1525,7 +1525,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/quicktime.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/quicktime.png'> Quicktime </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1538,7 +1538,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/realplayer.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/realplayer.png'> Realplayer </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1551,7 +1551,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/silverlight.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/silverlight.png'> Silverlight </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1564,7 +1564,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/windowsmedia.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/windowsmedia.png'> Windowsmedia </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html index 6b3d2cc819..e4e55f4bc1 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -987,7 +987,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/WIN.png'> Windows XP </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1050,7 +1050,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/FF.png'> Firefox </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1113,7 +1113,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/browsers/FF.png'> Firefox 3.6 </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1237,7 +1237,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/os/WIN.png'> Windows </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1349,7 +1349,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/cookie.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/cookie.png'> Cookie </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1362,7 +1362,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/flash.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/flash.png'> Flash </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1375,7 +1375,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/java.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/java.png'> Java </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1388,7 +1388,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/director.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/director.png'> Director </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1401,7 +1401,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/gears.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/gears.png'> Gears </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1414,7 +1414,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/pdf.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/pdf.png'> Pdf </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1427,7 +1427,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/quicktime.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/quicktime.png'> Quicktime </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1440,7 +1440,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/realplayer.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/realplayer.png'> Realplayer </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1453,7 +1453,7 @@ <tr style=";"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/silverlight.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/silverlight.png'> Silverlight </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> @@ -1466,7 +1466,7 @@ <tr style="background-color: rgb(242,242,242);"> <td style="padding:17px 15px;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> - <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/windowsmedia.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/Morpheus/icons/dist/plugins/windowsmedia.png'> Windowsmedia </td> <td style="padding:17px 15px; text-align:right;;border-bottom:1px solid rgb(231,231,231);font-size: 15px;padding:17px 15px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif;"> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf Binary files differindex 83194fbbe9..8bf8259f0d 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_Flattened__Referrers.getSocials_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_Flattened__Referrers.getSocials_range.xml index 1bf3f656ab..aba4cd467c 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_Flattened__Referrers.getSocials_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_Flattened__Referrers.getSocials_range.xml @@ -11,7 +11,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <url>http://facebook.com/whatever</url> - <logo>plugins/Referrers/images/socials/facebook.com.png</logo> + <logo>plugins/Morpheus/icons/dist/socials/facebook.com.png</logo> </row> <row> <label>Facebook - fb.me/?q=sdlfjs&n=slfjsd</label> @@ -24,7 +24,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <url>http://fb.me/?q=sdlfjs&n=slfjsd</url> - <logo>plugins/Referrers/images/socials/facebook.com.png</logo> + <logo>plugins/Morpheus/icons/dist/socials/facebook.com.png</logo> </row> <row> <label>Facebook - www.facebook.com/another/path</label> @@ -37,7 +37,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <url>http://www.facebook.com/another/path</url> - <logo>plugins/Referrers/images/socials/facebook.com.png</logo> + <logo>plugins/Morpheus/icons/dist/socials/facebook.com.png</logo> </row> <row> <label>Flickr - www.flickr.com</label> @@ -50,7 +50,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <url>http://www.flickr.com</url> - <logo>plugins/Referrers/images/socials/flickr.com.png</logo> + <logo>plugins/Morpheus/icons/dist/socials/flickr.com.png</logo> </row> <row> <label>Mixi - mixi.jp</label> @@ -63,7 +63,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <url>http://mixi.jp</url> - <logo>plugins/Referrers/images/socials/mixi.jp.png</logo> + <logo>plugins/Morpheus/icons/dist/socials/mixi.jp.png</logo> </row> <row> <label>Skyrock - skyrock.com</label> @@ -76,7 +76,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <url>http://skyrock.com</url> - <logo>plugins/Referrers/images/socials/skyrock.com.png</logo> + <logo>plugins/Morpheus/icons/dist/socials/skyrock.com.png</logo> </row> <row> <label>Twitter - t.co/id/?y=dsfs</label> @@ -89,7 +89,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <url>http://t.co/id/?y=dsfs</url> - <logo>plugins/Referrers/images/socials/twitter.com.png</logo> + <logo>plugins/Morpheus/icons/dist/socials/twitter.com.png</logo> </row> <row> <label>Twitter - twitter.com/whatever2</label> @@ -102,7 +102,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <url>http://twitter.com/whatever2</url> - <logo>plugins/Referrers/images/socials/twitter.com.png</logo> + <logo>plugins/Morpheus/icons/dist/socials/twitter.com.png</logo> </row> <row> <label>Twitter - www.twitter.com/index?a=2334</label> @@ -115,7 +115,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <url>http://www.twitter.com/index?a=2334</url> - <logo>plugins/Referrers/images/socials/twitter.com.png</logo> + <logo>plugins/Morpheus/icons/dist/socials/twitter.com.png</logo> </row> <row> <label>Xanga - xanga.com</label> @@ -128,6 +128,6 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <url>http://xanga.com</url> - <logo>plugins/Referrers/images/socials/xanga.com.png</logo> + <logo>plugins/Morpheus/icons/dist/socials/xanga.com.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml index 1ffd258f3c..622686427b 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml @@ -17,7 +17,7 @@ <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <url>facebook.com</url> - <logo>plugins/Referrers/images/socials/facebook.com.png</logo> + <logo>plugins/Morpheus/icons/dist/socials/facebook.com.png</logo> </row> </result> <result date="2010-12-15"> @@ -32,7 +32,7 @@ <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <url>facebook.com</url> - <logo>plugins/Referrers/images/socials/facebook.com.png</logo> + <logo>plugins/Morpheus/icons/dist/socials/facebook.com.png</logo> </row> <row> <label>Twitter</label> @@ -45,7 +45,7 @@ <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <url>twitter.com</url> - <logo>plugins/Referrers/images/socials/twitter.com.png</logo> + <logo>plugins/Morpheus/icons/dist/socials/twitter.com.png</logo> </row> </result> <result date="2010-12-16" /> @@ -67,7 +67,7 @@ <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <url>facebook.com</url> - <logo>plugins/Referrers/images/socials/facebook.com.png</logo> + <logo>plugins/Morpheus/icons/dist/socials/facebook.com.png</logo> </row> </result> <result date="2010-12-15"> @@ -82,7 +82,7 @@ <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <url>twitter.com</url> - <logo>plugins/Referrers/images/socials/twitter.com.png</logo> + <logo>plugins/Morpheus/icons/dist/socials/twitter.com.png</logo> </row> </result> <result date="2010-12-16" /> diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml index fc306b3b48..0ea3f3ea86 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml @@ -12,7 +12,7 @@ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <url>facebook.com</url> - <logo>plugins/Referrers/images/socials/facebook.com.png</logo> + <logo>plugins/Morpheus/icons/dist/socials/facebook.com.png</logo> </row> <row> <label>Twitter</label> @@ -25,7 +25,7 @@ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <url>twitter.com</url> - <logo>plugins/Referrers/images/socials/twitter.com.png</logo> + <logo>plugins/Morpheus/icons/dist/socials/twitter.com.png</logo> </row> <row> <label>Flickr</label> @@ -38,7 +38,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <url>flickr.com</url> - <logo>plugins/Referrers/images/socials/flickr.com.png</logo> + <logo>plugins/Morpheus/icons/dist/socials/flickr.com.png</logo> </row> <row> <label>Mixi</label> @@ -51,7 +51,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <url>mixi.jp</url> - <logo>plugins/Referrers/images/socials/mixi.jp.png</logo> + <logo>plugins/Morpheus/icons/dist/socials/mixi.jp.png</logo> </row> <row> <label>Skyrock</label> @@ -64,7 +64,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <url>skyrock.com</url> - <logo>plugins/Referrers/images/socials/skyrock.com.png</logo> + <logo>plugins/Morpheus/icons/dist/socials/skyrock.com.png</logo> </row> <row> <label>Xanga</label> @@ -77,7 +77,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <url>xanga.com</url> - <logo>plugins/Referrers/images/socials/xanga.com.png</logo> + <logo>plugins/Morpheus/icons/dist/socials/xanga.com.png</logo> </row> </result> <result idSite="2"> @@ -92,7 +92,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <url>twitter.com</url> - <logo>plugins/Referrers/images/socials/twitter.com.png</logo> + <logo>plugins/Morpheus/icons/dist/socials/twitter.com.png</logo> </row> <row> <label>Facebook</label> @@ -105,7 +105,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <url>facebook.com</url> - <logo>plugins/Referrers/images/socials/facebook.com.png</logo> + <logo>plugins/Morpheus/icons/dist/socials/facebook.com.png</logo> </row> </result> </results>
\ No newline at end of file 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 6ea02a4d85..de354fdde7 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 @@ -57,14 +57,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -96,11 +96,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -184,14 +184,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -223,11 +223,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -363,7 +363,7 @@ <referrerKeywordPosition>1</referrerKeywordPosition> <referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> - <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon> <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> @@ -372,14 +372,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -415,11 +415,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> 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 6ea02a4d85..de354fdde7 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 @@ -57,14 +57,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -96,11 +96,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -184,14 +184,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -223,11 +223,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -363,7 +363,7 @@ <referrerKeywordPosition>1</referrerKeywordPosition> <referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> - <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon> <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> @@ -372,14 +372,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -415,11 +415,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> 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 3733797b27..d9f537271f 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 @@ -108,14 +108,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -147,11 +147,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -235,14 +235,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -274,11 +274,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> 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 6ea02a4d85..de354fdde7 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 @@ -57,14 +57,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -96,11 +96,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -184,14 +184,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -223,11 +223,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -363,7 +363,7 @@ <referrerKeywordPosition>1</referrerKeywordPosition> <referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> - <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon> <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> @@ -372,14 +372,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -415,11 +415,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> 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 6ea02a4d85..de354fdde7 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 @@ -57,14 +57,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -96,11 +96,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -184,14 +184,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -223,11 +223,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -363,7 +363,7 @@ <referrerKeywordPosition>1</referrerKeywordPosition> <referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> - <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> + <referrerSearchEngineIcon>plugins/Morpheus/icons/dist/searchEngines/google.com.png</referrerSearchEngineIcon> <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> @@ -372,14 +372,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -415,11 +415,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> 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 3733797b27..d9f537271f 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 @@ -108,14 +108,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -147,11 +147,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -235,14 +235,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> + <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> + <browserIcon>plugins/Morpheus/icons/dist/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -274,11 +274,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> + <pluginIcon>plugins/Morpheus/icons/dist/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml index a8c967db5e..945c55b1ac 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml @@ -11,7 +11,7 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>browserCode==FF;browserVersion==6.0</segment> - <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo> </row> <row> <label>Internet Explorer 9.0</label> @@ -24,7 +24,7 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>browserCode==IE;browserVersion==9.0</segment> - <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/IE.png</logo> </row> <row> <label>Others</label> @@ -36,6 +36,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>45</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/DevicesDetection/images/browsers/UNK.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/UNK.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml index ae73047a6d..0d5db7195b 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml @@ -11,7 +11,7 @@ <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>operatingSystemCode==LIN;operatingSystemVersion==</segment> - <logo>plugins/DevicesDetection/images/os/LIN.png</logo> + <logo>plugins/Morpheus/icons/dist/os/LIN.png</logo> </row> <row> <label>Android 4.0</label> @@ -24,7 +24,7 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>operatingSystemCode==AND;operatingSystemVersion==4.0</segment> - <logo>plugins/DevicesDetection/images/os/AND.png</logo> + <logo>plugins/Morpheus/icons/dist/os/AND.png</logo> </row> <row> <label>Others</label> @@ -36,6 +36,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>40</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/DevicesDetection/images/os/UNK.png</logo> + <logo>plugins/Morpheus/icons/dist/os/UNK.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml index fbd996bbe3..4e00626c24 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml @@ -12,7 +12,7 @@ <nb_visits_converted>0</nb_visits_converted> <segment>referrerType==search;referrerName==Google</segment> <url>http://google.com</url> - <logo>plugins/Referrers/images/searchEngines/google.com.png</logo> + <logo>plugins/Morpheus/icons/dist/searchEngines/google.com.png</logo> <subtable> <row> <label>search term 3</label> @@ -50,7 +50,7 @@ <nb_visits_converted>0</nb_visits_converted> <segment>referrerType==search;referrerName==Yahoo%21</segment> <url>http://search.yahoo.com</url> - <logo>plugins/Referrers/images/searchEngines/search.yahoo.com.png</logo> + <logo>plugins/Morpheus/icons/dist/searchEngines/search.yahoo.com.png</logo> <subtable> <row> <label>search term 4</label> @@ -87,6 +87,6 @@ <bounce_count>6</bounce_count> <nb_visits_converted>0</nb_visits_converted> <url>URL unknown!</url> - <logo>plugins/Referrers/images/searchEngines/xx.png</logo> + <logo>plugins/Morpheus/icons/dist/searchEngines/xx.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml index 80480a92da..f001add435 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>45</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/DevicesDetection/images/browsers/UNK.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/UNK.png</logo> </row> <row> <label>Firefox 6.0</label> @@ -23,7 +23,7 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>browserCode==FF;browserVersion==6.0</segment> - <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo> </row> <row> <label>Internet Explorer 9.0</label> @@ -36,6 +36,6 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>browserCode==IE;browserVersion==9.0</segment> - <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/IE.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml index a3444c4edf..e89d340a58 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>40</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/DevicesDetection/images/os/UNK.png</logo> + <logo>plugins/Morpheus/icons/dist/os/UNK.png</logo> </row> <row> <label>GNU/Linux</label> @@ -23,7 +23,7 @@ <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>operatingSystemCode==LIN;operatingSystemVersion==</segment> - <logo>plugins/DevicesDetection/images/os/LIN.png</logo> + <logo>plugins/Morpheus/icons/dist/os/LIN.png</logo> </row> <row> <label>Android 4.0</label> @@ -36,6 +36,6 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>operatingSystemCode==AND;operatingSystemVersion==4.0</segment> - <logo>plugins/DevicesDetection/images/os/AND.png</logo> + <logo>plugins/Morpheus/icons/dist/os/AND.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml index 7bcbbd88ce..7ab79eb874 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml @@ -21,7 +21,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/Referrers/images/searchEngines/xx.png</logo> + <logo>plugins/Morpheus/icons/dist/searchEngines/xx.png</logo> </row> <row> <label>search term 2 - Alexa</label> @@ -34,7 +34,7 @@ <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <url>http://alexa.com/search?q=search+term+2</url> - <logo>plugins/Referrers/images/searchEngines/alexa.com.png</logo> + <logo>plugins/Morpheus/icons/dist/searchEngines/alexa.com.png</logo> </row> <row> <label>search term 2 - Babylon</label> @@ -47,7 +47,7 @@ <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <url>http://search.babylon.com/?q=search+term+2</url> - <logo>plugins/Referrers/images/searchEngines/search.babylon.com.png</logo> + <logo>plugins/Morpheus/icons/dist/searchEngines/search.babylon.com.png</logo> </row> <row> <label>this search term - Ask</label> @@ -60,6 +60,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <url>http://ask.com/web?q=this+search+term</url> - <logo>plugins/Referrers/images/searchEngines/ask.com.png</logo> + <logo>plugins/Morpheus/icons/dist/searchEngines/ask.com.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml index 17ab7cc1e9..9d53c575a0 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml @@ -11,7 +11,7 @@ <bounce_count>6</bounce_count> <nb_visits_converted>0</nb_visits_converted> <url>URL unknown!</url> - <logo>plugins/Referrers/images/searchEngines/xx.png</logo> + <logo>plugins/Morpheus/icons/dist/searchEngines/xx.png</logo> </row> <row> <label>Google - Others</label> @@ -23,7 +23,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/Referrers/images/searchEngines/google.com.png</logo> + <logo>plugins/Morpheus/icons/dist/searchEngines/google.com.png</logo> </row> <row> <label>Yahoo! - Others</label> @@ -35,7 +35,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/Referrers/images/searchEngines/search.yahoo.com.png</logo> + <logo>plugins/Morpheus/icons/dist/searchEngines/search.yahoo.com.png</logo> </row> <row> <label>Google - search term 3</label> @@ -48,7 +48,7 @@ <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <url>http://google.com/search?q=search+term+3</url> - <logo>plugins/Referrers/images/searchEngines/google.com.png</logo> + <logo>plugins/Morpheus/icons/dist/searchEngines/google.com.png</logo> </row> <row> <label>Yahoo! - search term 4</label> @@ -61,6 +61,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <url>http://search.yahoo.com/search?p=search+term+4</url> - <logo>plugins/Referrers/images/searchEngines/search.yahoo.com.png</logo> + <logo>plugins/Morpheus/icons/dist/searchEngines/search.yahoo.com.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml index a8c967db5e..945c55b1ac 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml @@ -11,7 +11,7 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>browserCode==FF;browserVersion==6.0</segment> - <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/FF.png</logo> </row> <row> <label>Internet Explorer 9.0</label> @@ -24,7 +24,7 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>browserCode==IE;browserVersion==9.0</segment> - <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/IE.png</logo> </row> <row> <label>Others</label> @@ -36,6 +36,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>45</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/DevicesDetection/images/browsers/UNK.png</logo> + <logo>plugins/Morpheus/icons/dist/browsers/UNK.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml index ae73047a6d..0d5db7195b 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml @@ -11,7 +11,7 @@ <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>operatingSystemCode==LIN;operatingSystemVersion==</segment> - <logo>plugins/DevicesDetection/images/os/LIN.png</logo> + <logo>plugins/Morpheus/icons/dist/os/LIN.png</logo> </row> <row> <label>Android 4.0</label> @@ -24,7 +24,7 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>operatingSystemCode==AND;operatingSystemVersion==4.0</segment> - <logo>plugins/DevicesDetection/images/os/AND.png</logo> + <logo>plugins/Morpheus/icons/dist/os/AND.png</logo> </row> <row> <label>Others</label> @@ -36,6 +36,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>40</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/DevicesDetection/images/os/UNK.png</logo> + <logo>plugins/Morpheus/icons/dist/os/UNK.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml index fbd996bbe3..4e00626c24 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml @@ -12,7 +12,7 @@ <nb_visits_converted>0</nb_visits_converted> <segment>referrerType==search;referrerName==Google</segment> <url>http://google.com</url> - <logo>plugins/Referrers/images/searchEngines/google.com.png</logo> + <logo>plugins/Morpheus/icons/dist/searchEngines/google.com.png</logo> <subtable> <row> <label>search term 3</label> @@ -50,7 +50,7 @@ <nb_visits_converted>0</nb_visits_converted> <segment>referrerType==search;referrerName==Yahoo%21</segment> <url>http://search.yahoo.com</url> - <logo>plugins/Referrers/images/searchEngines/search.yahoo.com.png</logo> + <logo>plugins/Morpheus/icons/dist/searchEngines/search.yahoo.com.png</logo> <subtable> <row> <label>search term 4</label> @@ -87,6 +87,6 @@ <bounce_count>6</bounce_count> <nb_visits_converted>0</nb_visits_converted> <url>URL unknown!</url> - <logo>plugins/Referrers/images/searchEngines/xx.png</logo> + <logo>plugins/Morpheus/icons/dist/searchEngines/xx.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php index 057f500d18..701ba88dc1 100644 --- a/tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php +++ b/tests/PHPUnit/Unit/DataTable/Renderer/CSVTest.php @@ -45,10 +45,10 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase $array = array( array(Row::COLUMNS => array('label' => 'Google©', 'bool' => false, 'goals' => array('idgoal=1' => array('revenue' => 5.5, 'nb_conversions' => 10)), 'nb_uniq_visitors' => 11, 'nb_visits' => 11, 'nb_actions' => 17, 'max_actions' => '5', 'sum_visit_length' => 517, 'bounce_count' => 9), - Row::METADATA => array('url' => 'http://www.google.com/display"and,properly', 'logo' => './plugins/Referrers/images/searchEngines/www.google.com.png'), + Row::METADATA => array('url' => 'http://www.google.com/display"and,properly', 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.google.com.png'), ), array(Row::COLUMNS => array('label' => 'Yahoo!', 'nb_uniq_visitors' => 15, 'bool' => true, 'nb_visits' => 151, 'nb_actions' => 147, 'max_actions' => '50', 'sum_visit_length' => 517, 'bounce_count' => 90), - Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Referrers/images/searchEngines/www.yahoo.com.png'), + Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png'), Row::DATATABLE_ASSOCIATED => $subDataTableForRow2, ) ); @@ -121,8 +121,8 @@ class DataTable_Renderer_CSVTest extends \PHPUnit_Framework_TestCase $render->setTable($dataTable); $render->convertToUnicode = false; $expected = "label,bool,goals_idgoal=1_revenue,goals_idgoal=1_nb_conversions,nb_uniq_visitors,nb_visits,nb_actions,max_actions,sum_visit_length,bounce_count,metadata_url,metadata_logo\n" . - "Google©,0,5.5,10,11,11,17,5,517,9,\"http://www.google.com/display\"\"and,properly\",./plugins/Referrers/images/searchEngines/www.google.com.png\n" . - "Yahoo!,1,,,15,151,147,50,517,90,http://www.yahoo.com,./plugins/Referrers/images/searchEngines/www.yahoo.com.png"; + "Google©,0,5.5,10,11,11,17,5,517,9,\"http://www.google.com/display\"\"and,properly\",./plugins/Morpheus/icons/dist/searchEngines/www.google.com.png\n" . + "Yahoo!,1,,,15,151,147,50,517,90,http://www.yahoo.com,./plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png"; $rendered = $render->render(); $this->assertEquals($expected, $rendered); @@ -229,10 +229,10 @@ sub6,3,,renderrrrrr"; { $array1 = array( array(Row::COLUMNS => array('label' => 'Google', 'nb_uniq_visitors' => 11, 'nb_visits' => 11,), - Row::METADATA => array('url' => 'http://www.google.com', 'logo' => './plugins/Referrers/images/searchEngines/www.google.com.png'), + Row::METADATA => array('url' => 'http://www.google.com', 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.google.com.png'), ), array(Row::COLUMNS => array('label' => 'Yahoo!', 'nb_uniq_visitors' => 15, 'nb_visits' => 151,), - Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Referrers/images/searchEngines/www.yahoo.com.png'), + Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png'), ) ); $table1 = new DataTable(); @@ -240,10 +240,10 @@ sub6,3,,renderrrrrr"; $array2 = array( array(Row::COLUMNS => array('label' => 'Google1©', 'nb_uniq_visitors' => 110, 'nb_visits' => 110,), - Row::METADATA => array('url' => 'http://www.google.com1', 'logo' => './plugins/Referrers/images/searchEngines/www.google.com.png1'), + Row::METADATA => array('url' => 'http://www.google.com1', 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.google.com.png1'), ), array(Row::COLUMNS => array('label' => 'Yahoo!1', 'nb_uniq_visitors' => 150, 'nb_visits' => 1510,), - Row::METADATA => array('url' => 'http://www.yahoo.com1', 'logo' => './plugins/Referrers/images/searchEngines/www.yahoo.com.png1'), + Row::METADATA => array('url' => 'http://www.yahoo.com1', 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png1'), ) ); $table2 = new DataTable(); @@ -333,10 +333,10 @@ sub6,3,,renderrrrrr"; $render->setTable($dataTable); $render->convertToUnicode = false; $expected = "testKey,label,nb_uniq_visitors,nb_visits,metadata_url,metadata_logo\n" . - "date1,Google,11,11,http://www.google.com,./plugins/Referrers/images/searchEngines/www.google.com.png\n" . - "date1,Yahoo!,15,151,http://www.yahoo.com,./plugins/Referrers/images/searchEngines/www.yahoo.com.png\n" . - "date2,Google1©,110,110,http://www.google.com1,./plugins/Referrers/images/searchEngines/www.google.com.png1\n" . - "date2,Yahoo!1,150,1510,http://www.yahoo.com1,./plugins/Referrers/images/searchEngines/www.yahoo.com.png1"; + "date1,Google,11,11,http://www.google.com,./plugins/Morpheus/icons/dist/searchEngines/www.google.com.png\n" . + "date1,Yahoo!,15,151,http://www.yahoo.com,./plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png\n" . + "date2,Google1©,110,110,http://www.google.com1,./plugins/Morpheus/icons/dist/searchEngines/www.google.com.png1\n" . + "date2,Yahoo!1,150,1510,http://www.yahoo.com1,./plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png1"; $rendered = $render->render(); $this->assertEquals($expected, $rendered); @@ -375,10 +375,10 @@ sub6,3,,renderrrrrr"; $render->setTable($dataTable); $render->convertToUnicode = false; $expected = "parentArrayKey,testKey,label,nb_uniq_visitors,nb_visits,metadata_url,metadata_logo\n" . - "idSite,date1,Google,11,11,http://www.google.com,./plugins/Referrers/images/searchEngines/www.google.com.png\n" . - "idSite,date1,Yahoo!,15,151,http://www.yahoo.com,./plugins/Referrers/images/searchEngines/www.yahoo.com.png\n" . - "idSite,date2,Google1©,110,110,http://www.google.com1,./plugins/Referrers/images/searchEngines/www.google.com.png1\n" . - "idSite,date2,Yahoo!1,150,1510,http://www.yahoo.com1,./plugins/Referrers/images/searchEngines/www.yahoo.com.png1"; + "idSite,date1,Google,11,11,http://www.google.com,./plugins/Morpheus/icons/dist/searchEngines/www.google.com.png\n" . + "idSite,date1,Yahoo!,15,151,http://www.yahoo.com,./plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png\n" . + "idSite,date2,Google1©,110,110,http://www.google.com1,./plugins/Morpheus/icons/dist/searchEngines/www.google.com.png1\n" . + "idSite,date2,Yahoo!1,150,1510,http://www.yahoo.com1,./plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png1"; $rendered = $render->render(); $this->assertEquals($expected, $rendered); diff --git a/tests/PHPUnit/Unit/DataTable/Renderer/JSONTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/JSONTest.php index 754424182c..e481da3515 100644 --- a/tests/PHPUnit/Unit/DataTable/Renderer/JSONTest.php +++ b/tests/PHPUnit/Unit/DataTable/Renderer/JSONTest.php @@ -45,10 +45,10 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase $array = array( array(Row::COLUMNS => array('label' => 'Google©', 'bool' => false, 'goals' => array('idgoal=1' => array('revenue' => 5.5, 'nb_conversions' => 10)), 'nb_uniq_visitors' => 11, 'nb_visits' => 11, 'nb_actions' => 17, 'max_actions' => '5', 'sum_visit_length' => 517, 'bounce_count' => 9), - Row::METADATA => array('url' => 'http://www.google.com/display"and,properly', 'logo' => './plugins/Referrers/images/searchEngines/www.google.com.png'), + Row::METADATA => array('url' => 'http://www.google.com/display"and,properly', 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.google.com.png'), ), array(Row::COLUMNS => array('label' => 'Yahoo!', 'nb_uniq_visitors' => 15, 'bool' => true, 'nb_visits' => 151, 'nb_actions' => 147, 'max_actions' => '50', 'sum_visit_length' => 517, 'bounce_count' => 90), - Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Referrers/images/searchEngines/www.yahoo.com.png'), + Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png'), Row::DATATABLE_ASSOCIATED => $subDataTableForRow2, ) ); @@ -103,7 +103,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase $render = new Json(); $render->setTable($dataTable); $render->setRenderSubTables(true); - $expected = '[{"label":"Google\u00a9","bool":false,"goals":{"idgoal=1":{"revenue":5.5,"nb_conversions":10}},"nb_uniq_visitors":11,"nb_visits":11,"nb_actions":17,"max_actions":"5","sum_visit_length":517,"bounce_count":9,"url":"http:\/\/www.google.com\/display\"and,properly","logo":".\/plugins\/Referrers\/images\/searchEngines\/www.google.com.png"},{"label":"Yahoo!","nb_uniq_visitors":15,"bool":true,"nb_visits":151,"nb_actions":147,"max_actions":"50","sum_visit_length":517,"bounce_count":90,"url":"http:\/\/www.yahoo.com","logo":".\/plugins\/Referrers\/images\/searchEngines\/www.yahoo.com.png","idsubdatatable":2,"subtable":[{"label":"sub1","count":1,"bool":false},{"label":"sub2","count":2,"bool":true}]}]'; + $expected = '[{"label":"Google\u00a9","bool":false,"goals":{"idgoal=1":{"revenue":5.5,"nb_conversions":10}},"nb_uniq_visitors":11,"nb_visits":11,"nb_actions":17,"max_actions":"5","sum_visit_length":517,"bounce_count":9,"url":"http:\/\/www.google.com\/display\"and,properly","logo":".\/plugins\/Morpheus\/icons\/dist\/searchEngines\/www.google.com.png"},{"label":"Yahoo!","nb_uniq_visitors":15,"bool":true,"nb_visits":151,"nb_actions":147,"max_actions":"50","sum_visit_length":517,"bounce_count":90,"url":"http:\/\/www.yahoo.com","logo":".\/plugins\/Morpheus\/icons\/dist\/searchEngines\/www.yahoo.com.png","idsubdatatable":2,"subtable":[{"label":"sub1","count":1,"bool":false},{"label":"sub2","count":2,"bool":true}]}]'; $rendered = $render->render(); $this->assertEquals($expected, $rendered); @@ -169,10 +169,10 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase { $array1 = array( array(Row::COLUMNS => array('label' => 'Google', 'nb_uniq_visitors' => 11, 'nb_visits' => 11,), - Row::METADATA => array('url' => 'http://www.google.com', 'logo' => './plugins/Referrers/images/searchEngines/www.google.com.png'), + Row::METADATA => array('url' => 'http://www.google.com', 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.google.com.png'), ), array(Row::COLUMNS => array('label' => 'Yahoo!', 'nb_uniq_visitors' => 15, 'nb_visits' => 151,), - Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Referrers/images/searchEngines/www.yahoo.com.png'), + Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png'), ) ); $table1 = new DataTable(); @@ -180,10 +180,10 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase $array2 = array( array(Row::COLUMNS => array('label' => 'Google1©', 'nb_uniq_visitors' => 110, 'nb_visits' => 110,), - Row::METADATA => array('url' => 'http://www.google.com1', 'logo' => './plugins/Referrers/images/searchEngines/www.google.com.png1'), + Row::METADATA => array('url' => 'http://www.google.com1', 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.google.com.png1'), ), array(Row::COLUMNS => array('label' => 'Yahoo!1', 'nb_uniq_visitors' => 150, 'nb_visits' => 1510,), - Row::METADATA => array('url' => 'http://www.yahoo.com1', 'logo' => './plugins/Referrers/images/searchEngines/www.yahoo.com.png1'), + Row::METADATA => array('url' => 'http://www.yahoo.com1', 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png1'), ) ); $table2 = new DataTable(); @@ -272,7 +272,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase $render = new Json(); $render->setTable($dataTable); $rendered = $render->render(); - $expected = '{"date1":[{"label":"Google","nb_uniq_visitors":11,"nb_visits":11,"url":"http:\/\/www.google.com","logo":".\/plugins\/Referrers\/images\/searchEngines\/www.google.com.png"},{"label":"Yahoo!","nb_uniq_visitors":15,"nb_visits":151,"url":"http:\/\/www.yahoo.com","logo":".\/plugins\/Referrers\/images\/searchEngines\/www.yahoo.com.png"}],"date2":[{"label":"Google1\u00a9","nb_uniq_visitors":110,"nb_visits":110,"url":"http:\/\/www.google.com1","logo":".\/plugins\/Referrers\/images\/searchEngines\/www.google.com.png1"},{"label":"Yahoo!1","nb_uniq_visitors":150,"nb_visits":1510,"url":"http:\/\/www.yahoo.com1","logo":".\/plugins\/Referrers\/images\/searchEngines\/www.yahoo.com.png1"}],"date3":[]}'; + $expected = '{"date1":[{"label":"Google","nb_uniq_visitors":11,"nb_visits":11,"url":"http:\/\/www.google.com","logo":".\/plugins\/Morpheus\/icons\/dist\/searchEngines\/www.google.com.png"},{"label":"Yahoo!","nb_uniq_visitors":15,"nb_visits":151,"url":"http:\/\/www.yahoo.com","logo":".\/plugins\/Morpheus\/icons\/dist\/searchEngines\/www.yahoo.com.png"}],"date2":[{"label":"Google1\u00a9","nb_uniq_visitors":110,"nb_visits":110,"url":"http:\/\/www.google.com1","logo":".\/plugins\/Morpheus\/icons\/dist\/searchEngines\/www.google.com.png1"},{"label":"Yahoo!1","nb_uniq_visitors":150,"nb_visits":1510,"url":"http:\/\/www.yahoo.com1","logo":".\/plugins\/Morpheus\/icons\/dist\/searchEngines\/www.yahoo.com.png1"}],"date3":[]}'; $this->assertEquals($expected, $rendered); } @@ -309,7 +309,7 @@ class DataTable_Renderer_JSONTest extends \PHPUnit_Framework_TestCase $render = new Json(); $render->setTable($dataTable); $rendered = $render->render(); - $expected = '{"idSite":{"date1":[{"label":"Google","nb_uniq_visitors":11,"nb_visits":11,"url":"http:\/\/www.google.com","logo":".\/plugins\/Referrers\/images\/searchEngines\/www.google.com.png"},{"label":"Yahoo!","nb_uniq_visitors":15,"nb_visits":151,"url":"http:\/\/www.yahoo.com","logo":".\/plugins\/Referrers\/images\/searchEngines\/www.yahoo.com.png"}],"date2":[{"label":"Google1\u00a9","nb_uniq_visitors":110,"nb_visits":110,"url":"http:\/\/www.google.com1","logo":".\/plugins\/Referrers\/images\/searchEngines\/www.google.com.png1"},{"label":"Yahoo!1","nb_uniq_visitors":150,"nb_visits":1510,"url":"http:\/\/www.yahoo.com1","logo":".\/plugins\/Referrers\/images\/searchEngines\/www.yahoo.com.png1"}],"date3":[]}}'; + $expected = '{"idSite":{"date1":[{"label":"Google","nb_uniq_visitors":11,"nb_visits":11,"url":"http:\/\/www.google.com","logo":".\/plugins\/Morpheus\/icons\/dist\/searchEngines\/www.google.com.png"},{"label":"Yahoo!","nb_uniq_visitors":15,"nb_visits":151,"url":"http:\/\/www.yahoo.com","logo":".\/plugins\/Morpheus\/icons\/dist\/searchEngines\/www.yahoo.com.png"}],"date2":[{"label":"Google1\u00a9","nb_uniq_visitors":110,"nb_visits":110,"url":"http:\/\/www.google.com1","logo":".\/plugins\/Morpheus\/icons\/dist\/searchEngines\/www.google.com.png1"},{"label":"Yahoo!1","nb_uniq_visitors":150,"nb_visits":1510,"url":"http:\/\/www.yahoo.com1","logo":".\/plugins\/Morpheus\/icons\/dist\/searchEngines\/www.yahoo.com.png1"}],"date3":[]}}'; $this->assertEquals($expected, $rendered); } diff --git a/tests/PHPUnit/Unit/DataTable/Renderer/PHPTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/PHPTest.php index de8128cfb9..d03e48ab76 100644 --- a/tests/PHPUnit/Unit/DataTable/Renderer/PHPTest.php +++ b/tests/PHPUnit/Unit/DataTable/Renderer/PHPTest.php @@ -45,10 +45,10 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase $array = array( array(Row::COLUMNS => array('label' => 'Google©', 'bool' => false, 'goals' => array('idgoal=1' => array('revenue' => 5.5, 'nb_conversions' => 10)), 'nb_uniq_visitors' => 11, 'nb_visits' => 11, 'nb_actions' => 17, 'max_actions' => '5', 'sum_visit_length' => 517, 'bounce_count' => 9), - Row::METADATA => array('url' => 'http://www.google.com/display"and,properly', 'logo' => './plugins/Referrers/images/searchEngines/www.google.com.png'), + Row::METADATA => array('url' => 'http://www.google.com/display"and,properly', 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.google.com.png'), ), array(Row::COLUMNS => array('label' => 'Yahoo!', 'nb_uniq_visitors' => 15, 'bool' => true, 'nb_visits' => 151, 'nb_actions' => 147, 'max_actions' => '50', 'sum_visit_length' => 517, 'bounce_count' => 90), - Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Referrers/images/searchEngines/www.yahoo.com.png'), + Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png'), Row::DATATABLE_ASSOCIATED => $subDataTableForRow2, ) ); @@ -122,7 +122,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase 'sum_visit_length' => 517, 'bounce_count' => 9, 'url' => 'http://www.google.com/display"and,properly', - 'logo' => './plugins/Referrers/images/searchEngines/www.google.com.png', + 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.google.com.png', ), 1 => array( @@ -135,7 +135,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase 'sum_visit_length' => 517, 'bounce_count' => 90, 'url' => 'http://www.yahoo.com', - 'logo' => './plugins/Referrers/images/searchEngines/www.yahoo.com.png', + 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png', 'idsubdatatable' => 2, 'subtable' => array( @@ -224,10 +224,10 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase { $array1 = array( array(Row::COLUMNS => array('label' => 'Google', 'nb_uniq_visitors' => 11, 'nb_visits' => 11,), - Row::METADATA => array('url' => 'http://www.google.com', 'logo' => './plugins/Referrers/images/searchEngines/www.google.com.png'), + Row::METADATA => array('url' => 'http://www.google.com', 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.google.com.png'), ), array(Row::COLUMNS => array('label' => 'Yahoo!', 'nb_uniq_visitors' => 15, 'nb_visits' => 151,), - Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Referrers/images/searchEngines/www.yahoo.com.png'), + Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png'), ) ); $table1 = new DataTable(); @@ -235,10 +235,10 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase $array2 = array( array(Row::COLUMNS => array('label' => 'Google1©', 'nb_uniq_visitors' => 110, 'nb_visits' => 110,), - Row::METADATA => array('url' => 'http://www.google.com1', 'logo' => './plugins/Referrers/images/searchEngines/www.google.com.png1'), + Row::METADATA => array('url' => 'http://www.google.com1', 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.google.com.png1'), ), array(Row::COLUMNS => array('label' => 'Yahoo!1', 'nb_uniq_visitors' => 150, 'nb_visits' => 1510,), - Row::METADATA => array('url' => 'http://www.yahoo.com1', 'logo' => './plugins/Referrers/images/searchEngines/www.yahoo.com.png1'), + Row::METADATA => array('url' => 'http://www.yahoo.com1', 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png1'), ) ); $table2 = new DataTable(); @@ -337,7 +337,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase 'nb_uniq_visitors' => 11, 'nb_visits' => 11, 'url' => 'http://www.google.com', - 'logo' => './plugins/Referrers/images/searchEngines/www.google.com.png', + 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.google.com.png', ), 1 => array( @@ -345,7 +345,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase 'nb_uniq_visitors' => 15, 'nb_visits' => 151, 'url' => 'http://www.yahoo.com', - 'logo' => './plugins/Referrers/images/searchEngines/www.yahoo.com.png', + 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png', ), ), 'date2' => @@ -356,7 +356,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase 'nb_uniq_visitors' => 110, 'nb_visits' => 110, 'url' => 'http://www.google.com1', - 'logo' => './plugins/Referrers/images/searchEngines/www.google.com.png1', + 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.google.com.png1', ), 1 => array( @@ -364,7 +364,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase 'nb_uniq_visitors' => 150, 'nb_visits' => 1510, 'url' => 'http://www.yahoo.com1', - 'logo' => './plugins/Referrers/images/searchEngines/www.yahoo.com.png1', + 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png1', ), ), 'date3' => array(), @@ -431,7 +431,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase 'nb_uniq_visitors' => 11, 'nb_visits' => 11, 'url' => 'http://www.google.com', - 'logo' => './plugins/Referrers/images/searchEngines/www.google.com.png', + 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.google.com.png', ), 1 => array( @@ -439,7 +439,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase 'nb_uniq_visitors' => 15, 'nb_visits' => 151, 'url' => 'http://www.yahoo.com', - 'logo' => './plugins/Referrers/images/searchEngines/www.yahoo.com.png', + 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png', ), ), 'date2' => @@ -450,7 +450,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase 'nb_uniq_visitors' => 110, 'nb_visits' => 110, 'url' => 'http://www.google.com1', - 'logo' => './plugins/Referrers/images/searchEngines/www.google.com.png1', + 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.google.com.png1', ), 1 => array( @@ -458,7 +458,7 @@ class DataTable_Renderer_PHPTest extends \PHPUnit_Framework_TestCase 'nb_uniq_visitors' => 150, 'nb_visits' => 1510, 'url' => 'http://www.yahoo.com1', - 'logo' => './plugins/Referrers/images/searchEngines/www.yahoo.com.png1', + 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png1', ), ), 'date3' => array(), diff --git a/tests/PHPUnit/Unit/DataTable/Renderer/XMLTest.php b/tests/PHPUnit/Unit/DataTable/Renderer/XMLTest.php index e9b02a9bd1..af23e787ab 100644 --- a/tests/PHPUnit/Unit/DataTable/Renderer/XMLTest.php +++ b/tests/PHPUnit/Unit/DataTable/Renderer/XMLTest.php @@ -45,10 +45,10 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase $array = array( array(Row::COLUMNS => array('label' => 'Google©', 'bool' => false, 'goals' => array('idgoal=1' => array('revenue' => 5.5, 'nb_conversions' => 10)), 'nb_uniq_visitors' => 11, 'nb_visits' => 11, 'nb_actions' => 17, 'max_actions' => '5', 'sum_visit_length' => 517, 'bounce_count' => 9), - Row::METADATA => array('url' => 'http://www.google.com/display"and,properly', 'logo' => './plugins/Referrers/images/searchEngines/www.google.com.png'), + Row::METADATA => array('url' => 'http://www.google.com/display"and,properly', 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.google.com.png'), ), array(Row::COLUMNS => array('label' => 'Yahoo!', 'nb_uniq_visitors' => 15, 'bool' => true, 'nb_visits' => 151, 'nb_actions' => 147, 'max_actions' => '50', 'sum_visit_length' => 517, 'bounce_count' => 90), - Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Referrers/images/searchEngines/www.yahoo.com.png'), + Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png'), Row::DATATABLE_ASSOCIATED => $subDataTableForRow2, ) ); @@ -121,7 +121,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase <sum_visit_length>517</sum_visit_length> <bounce_count>9</bounce_count> <url>http://www.google.com/display"and,properly</url> - <logo>./plugins/Referrers/images/searchEngines/www.google.com.png</logo> + <logo>./plugins/Morpheus/icons/dist/searchEngines/www.google.com.png</logo> </row> <row> <label>Yahoo!</label> @@ -133,7 +133,7 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase <sum_visit_length>517</sum_visit_length> <bounce_count>90</bounce_count> <url>http://www.yahoo.com</url> - <logo>./plugins/Referrers/images/searchEngines/www.yahoo.com.png</logo> + <logo>./plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png</logo> <idsubdatatable>2</idsubdatatable> <subtable> <row> @@ -256,10 +256,10 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase { $array1 = array( array(Row::COLUMNS => array('label' => 'Google', 'nb_uniq_visitors' => 11, 'nb_visits' => 11,), - Row::METADATA => array('url' => 'http://www.google.com', 'logo' => './plugins/Referrers/images/searchEngines/www.google.com.png'), + Row::METADATA => array('url' => 'http://www.google.com', 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.google.com.png'), ), array(Row::COLUMNS => array('label' => 'Yahoo!', 'nb_uniq_visitors' => 15, 'nb_visits' => 151,), - Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Referrers/images/searchEngines/www.yahoo.com.png'), + Row::METADATA => array('url' => 'http://www.yahoo.com', 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png'), ) ); $table1 = new DataTable(); @@ -267,10 +267,10 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase $array2 = array( array(Row::COLUMNS => array('label' => 'Google1©', 'nb_uniq_visitors' => 110, 'nb_visits' => 110,), - Row::METADATA => array('url' => 'http://www.google.com1', 'logo' => './plugins/Referrers/images/searchEngines/www.google.com.png1'), + Row::METADATA => array('url' => 'http://www.google.com1', 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.google.com.png1'), ), array(Row::COLUMNS => array('label' => 'Yahoo!1', 'nb_uniq_visitors' => 150, 'nb_visits' => 1510,), - Row::METADATA => array('url' => 'http://www.yahoo.com1', 'logo' => './plugins/Referrers/images/searchEngines/www.yahoo.com.png1'), + Row::METADATA => array('url' => 'http://www.yahoo.com1', 'logo' => './plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png1'), ) ); $table2 = new DataTable(); @@ -366,14 +366,14 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase <nb_uniq_visitors>11</nb_uniq_visitors> <nb_visits>11</nb_visits> <url>http://www.google.com</url> - <logo>./plugins/Referrers/images/searchEngines/www.google.com.png</logo> + <logo>./plugins/Morpheus/icons/dist/searchEngines/www.google.com.png</logo> </row> <row> <label>Yahoo!</label> <nb_uniq_visitors>15</nb_uniq_visitors> <nb_visits>151</nb_visits> <url>http://www.yahoo.com</url> - <logo>./plugins/Referrers/images/searchEngines/www.yahoo.com.png</logo> + <logo>./plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png</logo> </row> </result> <result testKey="date2"> @@ -382,14 +382,14 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase <nb_uniq_visitors>110</nb_uniq_visitors> <nb_visits>110</nb_visits> <url>http://www.google.com1</url> - <logo>./plugins/Referrers/images/searchEngines/www.google.com.png1</logo> + <logo>./plugins/Morpheus/icons/dist/searchEngines/www.google.com.png1</logo> </row> <row> <label>Yahoo!1</label> <nb_uniq_visitors>150</nb_uniq_visitors> <nb_visits>1510</nb_visits> <url>http://www.yahoo.com1</url> - <logo>./plugins/Referrers/images/searchEngines/www.yahoo.com.png1</logo> + <logo>./plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png1</logo> </row> </result> <result testKey="date3" /> @@ -413,14 +413,14 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase <nb_uniq_visitors>11</nb_uniq_visitors> <nb_visits>11</nb_visits> <url>http://www.google.com</url> - <logo>./plugins/Referrers/images/searchEngines/www.google.com.png</logo> + <logo>./plugins/Morpheus/icons/dist/searchEngines/www.google.com.png</logo> </row> <row> <label>Yahoo!</label> <nb_uniq_visitors>15</nb_uniq_visitors> <nb_visits>151</nb_visits> <url>http://www.yahoo.com</url> - <logo>./plugins/Referrers/images/searchEngines/www.yahoo.com.png</logo> + <logo>./plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png</logo> </row> </result> <result testKey="date2"> @@ -429,14 +429,14 @@ class DataTable_Renderer_XMLTest extends \PHPUnit_Framework_TestCase <nb_uniq_visitors>110</nb_uniq_visitors> <nb_visits>110</nb_visits> <url>http://www.google.com1</url> - <logo>./plugins/Referrers/images/searchEngines/www.google.com.png1</logo> + <logo>./plugins/Morpheus/icons/dist/searchEngines/www.google.com.png1</logo> </row> <row> <label>Yahoo!1</label> <nb_uniq_visitors>150</nb_uniq_visitors> <nb_visits>1510</nb_visits> <url>http://www.yahoo.com1</url> - <logo>./plugins/Referrers/images/searchEngines/www.yahoo.com.png1</logo> + <logo>./plugins/Morpheus/icons/dist/searchEngines/www.yahoo.com.png1</logo> </row> </result> <result testKey="date3" /> diff --git a/tests/UI/expected-screenshots/DashboardManager_removed.png b/tests/UI/expected-screenshots/DashboardManager_removed.png index 38244c3084..96a8255e96 100644 --- a/tests/UI/expected-screenshots/DashboardManager_removed.png +++ b/tests/UI/expected-screenshots/DashboardManager_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2b3588b01737a0ee874f115bbd605d0dce0e39e1000516e8ca221b59a3cb4961 -size 366902 +oid sha256:4d132f9815c0b783a0c5e7fc93dbd9c2b77ab11d200fe3d1a200cbe9f0ea9607 +size 366875 diff --git a/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png b/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png index 28beac8fa7..b658f801e8 100644 --- a/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png +++ b/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d4723f3747a76f988d21101636e7fc829ee86bea35ff73b3b1ef2a2a524e59cb -size 538083 +oid sha256:15e5dc1dceb9cf6eb9280eacae97344f85e31c24a865077812e8416965a7a9d1 +size 538041 diff --git a/tests/UI/expected-screenshots/Dashboard_removed.png b/tests/UI/expected-screenshots/Dashboard_removed.png index 7a62f15c31..e19460832d 100644 --- a/tests/UI/expected-screenshots/Dashboard_removed.png +++ b/tests/UI/expected-screenshots/Dashboard_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:805b856a9f0d1d51c163695ca4d301c2d3a17608e2c527f5f38341704c51b993 -size 537722 +oid sha256:b96de53d57212e0dd1ede66696141d213b0b5e218fdf121b5c0bfb84b15b6e16 +size 537681 diff --git a/tests/UI/expected-screenshots/Overlay_loaded.png b/tests/UI/expected-screenshots/Overlay_loaded.png index 714d4c9708..6f5837aa20 100644 --- a/tests/UI/expected-screenshots/Overlay_loaded.png +++ b/tests/UI/expected-screenshots/Overlay_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06e6f83a9bf5b90fa04c9d834c3d18e30682819745a7c9eae2de13a55238d6ee -size 90662 +oid sha256:01267d7eb51db12514bf4ea313498fba0aebb7764597044a9e6c67363fc25ada +size 91622 diff --git a/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png b/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png index 86aa47a554..ec9066dd15 100644 --- a/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png +++ b/tests/UI/expected-screenshots/Overlay_loaded_with_segment.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43b57ce669b979f74af229b11ae937030cd35309ad3f45d0718beaf69974ee0e -size 89140 +oid sha256:cb5ed8775d89fad7ee87d8e3dc46bf64b4f78a91c734943a4715342ea75f08eb +size 88700 diff --git a/tests/UI/expected-screenshots/Overlay_page_change.png b/tests/UI/expected-screenshots/Overlay_page_change.png index 8599c29f2d..b42a1e339c 100644 --- a/tests/UI/expected-screenshots/Overlay_page_change.png +++ b/tests/UI/expected-screenshots/Overlay_page_change.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:116c07c68ed377f1d9ee8f3235280037d3a29f016246ecb71c4fd35240d4d577 -size 199127 +oid sha256:8234317965f6d09a2995ee1d84c61952a4c308f5211287771ee67a6da5436eee +size 198545 diff --git a/tests/UI/expected-screenshots/Overlay_page_link_clicks.png b/tests/UI/expected-screenshots/Overlay_page_link_clicks.png index 8c5ae90776..f262228d4f 100644 --- a/tests/UI/expected-screenshots/Overlay_page_link_clicks.png +++ b/tests/UI/expected-screenshots/Overlay_page_link_clicks.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b7d7301d2b5e260db0241d0fcb0234e5d5b0215079a6f08971d424fadf938b5 -size 97493 +oid sha256:153c38995cc0214ddaa366492239d36173f45b430eb6a202691b7b7d0f7f157a +size 98305 diff --git a/tests/UI/expected-screenshots/Overlay_period_change.png b/tests/UI/expected-screenshots/Overlay_period_change.png index f1921bf3d2..24ecd1ca56 100644 --- a/tests/UI/expected-screenshots/Overlay_period_change.png +++ b/tests/UI/expected-screenshots/Overlay_period_change.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f592419ff29b16e74b49a98e743882986458021b29d6682eb3b9acbed07d8b4a -size 201409 +oid sha256:edd8fdc92e3c8faf0393abed25c21008dca5411077142ecb5e0727055af8b291 +size 200835 diff --git a/tests/UI/expected-screenshots/Theme_home.png b/tests/UI/expected-screenshots/Theme_home.png index 3972a8774d..9df53a6fdd 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:57b2802cb0e826a7425effb932ecd976a717d22fcaf29760fa4e5cd9b57171b6 -size 536754 +oid sha256:555777a1774925ccd4b54248378e9def6d2c740141b9ae4df2c08bb52433ce66 +size 536813 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png index 48849c9345..9b02897b72 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:d7ea7d95e5960174a6ff5cb36069fc4d3708a3bab4c7be0904318cde545cf828 -size 487862 +oid sha256:f6a62924f24a65bc5c14c7607b614980205a3f1b3eaef2ff65dc7325ac692186 +size 487938 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png index c98fe86da1..2e905c2a38 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:59f6fb23b6bc347c22d0fe9cb0a9a5ea8ac91b0c13ac32011f1f68b0483a6d48 -size 1448846 +oid sha256:a12c91b95c462b640e045f226c3473932892b5a92bd190ae312672650e785e23 +size 1448761 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png index f6a8d6a58f..df0c907d9d 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c55e3efaa1df793b3749cef7a989da9d48ae3d38a535088ef24a313b6fbf24d0 -size 453472 +oid sha256:d94c2d36cb25289fb20e1f7777d6dc7b5eebe7413b248e04216e8ffc63ae8b6f +size 453380 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png b/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png index bdfb7e2fb0..3ed1f4545a 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e709f1f350a1e4c7998e07542f3ebd78a37e6317b1ea94aff172fed90b08c8ce -size 493897 +oid sha256:25a9fcb2a5884b476cf1de38a6eda4108fc2aeaf03826cd774849e7d94e701e1 +size 493851 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png b/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png index cd3bf6cb14..4150fa7089 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9b4a7722576777eb1ea9172935a98a2a347b1051bb5e6d6ad3bccf0b47ecb6cd -size 803613 +oid sha256:e7de59d3457826bbd15039bfd7c35e6a322120db89edcb9bebc2b43df45cc9dd +size 803484 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png index 22599ba862..6e8da54c2d 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfa41efb8f9deff3721e592de4d7422167e55074dd19cf7d9055ec2cb10be99e -size 228710 +oid sha256:f06ec8e680da552dc576ab6ae148991cc106104b42a9aff89a3cfd6ed2a27879 +size 228716 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png index 08d17ef1a3..daf33b8ea8 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:1abd2d5eb3aea1922c62bf0a3dc3e016fe3e7864635a4c3a8d275c93eb9487bd -size 113272 +oid sha256:8097dd425997c11934e909e050768f1131dea60f19c725a5c9aa295e6a6f6f3b +size 113271 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png index 67baf4e5fd..754a66c393 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:dc82f24936677a6b2fecec702b48589de7fd1965ed2f99a04c399029073ef90c -size 160119 +oid sha256:754d69e4f6c6940c369e1ba1d006cb89d75240e5e7bf8622aa152794615e3871 +size 160022 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_with_site_search_visitorlog.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_with_site_search_visitorlog.png index a97d92fcde..f5b1096d43 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_with_site_search_visitorlog.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_with_site_search_visitorlog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d529952a6668acc6694be9e4d135ff51e9c09c592dd965322158f9ff0c9457e1 -size 110275 +oid sha256:bb7d254aa2b3a60ad890d54b2f1686c1f9805e824c6c35e3f0ae7ff66eaa5eb5 +size 110260 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png index 5ff1ebb181..f87692ce69 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b26b7a112c6ae8a63d997ffa8b48bb994edb1974aca5b2ce1318d3240a01afbd -size 448511 +oid sha256:1d6fbe98fbae04f3186b86acd70e269badabd1cfe8e818fe3e628a1e44571629 +size 448495 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png index 677acac14b..454685d2df 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee8e4d770983ced568f5e64d01d58dd4636c0187c0fc2533ce0329bb622d01cd -size 631527 +oid sha256:924d507d83b7d46da6fd2e6d6e2f4a57cc4f125915b9358d552cf414b7393974 +size 631447 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png b/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png index f05763b4c3..7f87d5be3b 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:1bcc1e41c968ea3f03e1977255a1470b3573f6d8c691f9f2fdd56b0313834eb5 -size 38625 +oid sha256:a10e23f1fd049c67fbce31163632f37e753efa7de2bed70da8f4acd238b646fb +size 38614 |
