diff options
114 files changed, 154 insertions, 1380 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 999388087d..2fa668aead 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ This is a changelog for Piwik platform developers. All changes for our HTTP API' * The API method `UserSettings.getOS` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getOsVersions` instead * The API method `UserSettings.getMobileVsDesktop` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getType` instead * The API method `UserSettings.getBrowserType` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getBrowserEngines` instead -* The API method `UserSettings.getWideScreen` is deprecated and will be removed from May 1st 2015. Use `UserSettings.getScreenType` instead +* The API method `UserSettings.getWideScreen` has been removed ## Piwik 2.9.1 diff --git a/core/API/Request.php b/core/API/Request.php index 979f1299d0..23677e45fb 100644 --- a/core/API/Request.php +++ b/core/API/Request.php @@ -46,7 +46,7 @@ use Piwik\Log; * * **Basic Usage** * - * $request = new Request('method=UserSettings.getWideScreen&idSite=1&date=yesterday&period=week' + * $request = new Request('method=UserSettings.getLanguage&idSite=1&date=yesterday&period=week' * . '&format=xml&filter_limit=5&filter_offset=0') * $result = $request->process(); * echo $result; @@ -54,7 +54,7 @@ use Piwik\Log; * **Getting a unrendered DataTable** * * // use the convenience method 'processRequest' - * $dataTable = Request::processRequest('UserSettings.getWideScreen', array( + * $dataTable = Request::processRequest('UserSettings.getLanguage', array( * 'idSite' => 1, * 'date' => 'yesterday', * 'period' => 'week', @@ -78,7 +78,7 @@ class Request * forwarded to request array before it is returned. * * @param string|array $request The base request string or array, eg, - * `'module=UserSettings&action=getWidescreen'`. + * `'module=UserSettings&action=getLanguage'`. * @param array $defaultRequest Default query parameters. If a query parameter is absent in `$request`, it will be loaded * from this. Defaults to `$_GET + $_POST`. * @return array @@ -125,7 +125,7 @@ class Request * Constructor. * * @param string|array $request Query string that defines the API call (must at least contain a **method** parameter), - * eg, `'method=UserSettings.getWideScreen&idSite=1&date=yesterday&period=week&format=xml'` + * eg, `'method=UserSettings.getLanguage&idSite=1&date=yesterday&period=week&format=xml'` * If a request is not provided, then we use the values in the `$_GET` and `$_POST` * superglobals. * @param array $defaultRequest Default query parameters. If a query parameter is absent in `$request`, it will be loaded 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 6c8c8875f0..7b62e398c2 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 @@ -77,9 +77,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -177,9 +175,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> <pluginsIcons> <row> 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 6c8c8875f0..7b62e398c2 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 @@ -77,9 +77,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -177,9 +175,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> <pluginsIcons> <row> 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 6c8c8875f0..7b62e398c2 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 @@ -77,9 +77,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -177,9 +175,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> <pluginsIcons> <row> 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 6c8c8875f0..7b62e398c2 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 @@ -77,9 +77,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -177,9 +175,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> <pluginsIcons> <row> 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 6c8c8875f0..7b62e398c2 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 @@ -77,9 +77,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -177,9 +175,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> <pluginsIcons> <row> diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js index ac59e4ff2b..9960743348 100644 --- a/plugins/CoreHome/javascripts/dataTable.js +++ b/plugins/CoreHome/javascripts/dataTable.js @@ -67,7 +67,7 @@ DataTable.registerFooterIconHandler = function (id, handler) { /** * Returns the first datatable div displaying a specific report. * - * @param {string} report The report, eg, UserSettings.getWideScreen + * @param {string} report The report, eg, UserSettings.getLanguage * @return {Element} The datatable div displaying the report, or undefined if * it cannot be found. */ 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 1fbae717c6..da580cc910 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 @@ -150,9 +150,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> diff --git a/plugins/Live/templates/_dataTableViz_visitorLog.twig b/plugins/Live/templates/_dataTableViz_visitorLog.twig index 6f79756a8b..5101544f9d 100644 --- a/plugins/Live/templates/_dataTableViz_visitorLog.twig +++ b/plugins/Live/templates/_dataTableViz_visitorLog.twig @@ -37,7 +37,7 @@ {% endif %} {% if visitor.getColumn('operatingSystemIcon') %} <img src="{{ visitor.getColumn('operatingSystemIcon') }}" - title="{{ visitor.getColumn('operatingSystem') }}, {{ visitor.getColumn('resolution') }} ({{ visitor.getColumn('screenType') }})"/>{% endif %} + title="{{ visitor.getColumn('operatingSystem') }}, {{ visitor.getColumn('resolution') }}"/>{% endif %} {% if visitor.getColumn('visitorTypeIcon') %} {% if visitor.getColumn('visitorTypeIcon') %} - <img src="{{ visitor.getColumn('visitorTypeIcon') }}" diff --git a/plugins/UserSettings/API.php b/plugins/UserSettings/API.php index 28d224cbdf..1a80da3e9f 100644 --- a/plugins/UserSettings/API.php +++ b/plugins/UserSettings/API.php @@ -106,22 +106,6 @@ class API extends \Piwik\Plugin\API return $this->getDevicesDetectorApi()->getBrowserEngines($idSite, $period, $date, $segment); } - /** - * @deprecated since 2.10.0 Use {@link getScreenType} instead. - */ - public function getWideScreen($idSite, $period, $date, $segment = false) - { - return $this->getScreenType($idSite, $period, $date, $segment); - } - - public function getScreenType($idSite, $period, $date, $segment = false) - { - $dataTable = $this->getDataTable(Archiver::SCREEN_TYPE_RECORD_NAME, $idSite, $period, $date, $segment); - $dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getScreensLogo')); - $dataTable->queueFilter('ColumnCallbackReplace', array('label', 'ucfirst')); - return $dataTable; - } - public function getPlugin($idSite, $period, $date, $segment = false) { // fetch all archive data required diff --git a/plugins/UserSettings/Archiver.php b/plugins/UserSettings/Archiver.php index fed904de7d..740e5d4d94 100644 --- a/plugins/UserSettings/Archiver.php +++ b/plugins/UserSettings/Archiver.php @@ -26,7 +26,6 @@ class Archiver extends \Piwik\Plugin\Archiver { const LANGUAGE_RECORD_NAME = 'UserSettings_language'; const PLUGIN_RECORD_NAME = 'UserSettings_plugin'; - const SCREEN_TYPE_RECORD_NAME = 'UserSettings_wideScreen'; const RESOLUTION_RECORD_NAME = 'UserSettings_resolution'; const CONFIGURATION_RECORD_NAME = 'UserSettings_configuration'; @@ -41,7 +40,7 @@ class Archiver extends \Piwik\Plugin\Archiver public function aggregateDayReport() { $this->aggregateByConfiguration(); - $this->aggregateByResolutionAndScreenType(); + $this->aggregateByResolution(); $this->aggregateByPlugin(); $this->aggregateByLanguage(); } @@ -54,7 +53,6 @@ class Archiver extends \Piwik\Plugin\Archiver $dataTableRecords = array( self::CONFIGURATION_RECORD_NAME, self::RESOLUTION_RECORD_NAME, - self::SCREEN_TYPE_RECORD_NAME, self::PLUGIN_RECORD_NAME, self::LANGUAGE_RECORD_NAME, ); @@ -67,12 +65,6 @@ class Archiver extends \Piwik\Plugin\Archiver $this->insertTable(self::CONFIGURATION_RECORD_NAME, $metrics); } - protected function aggregateByResolutionAndScreenType() - { - $resolutions = $this->aggregateByResolution(); - $this->aggregateByScreenType($resolutions); - } - protected function aggregateByResolution() { $table = $this->getLogAggregator()->getMetricsFromVisitByDimension(self::RESOLUTION_DIMENSION)->asDataTable(); @@ -83,12 +75,6 @@ class Archiver extends \Piwik\Plugin\Archiver return $table; } - protected function aggregateByScreenType(DataTable $resolutions) - { - $resolutions->filter('GroupBy', array('label', __NAMESPACE__ . '\getScreenTypeFromResolution')); - $this->insertTable(self::SCREEN_TYPE_RECORD_NAME, $resolutions); - } - protected function aggregateByPlugin() { $selects = array( diff --git a/plugins/UserSettings/Columns/TypeOfScreen.php b/plugins/UserSettings/Columns/TypeOfScreen.php deleted file mode 100644 index cdbc796ab2..0000000000 --- a/plugins/UserSettings/Columns/TypeOfScreen.php +++ /dev/null @@ -1,20 +0,0 @@ -<?php -/** - * Piwik - free/libre analytics platform - * - * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\UserSettings\Columns; - -use Piwik\Columns\Dimension; -use Piwik\Piwik; - -class TypeOfScreen extends Dimension -{ - public function getName() - { - return Piwik::translate('UserSettings_ColumnTypeOfScreen'); - } -}
\ No newline at end of file diff --git a/plugins/UserSettings/Controller.php b/plugins/UserSettings/Controller.php index 5334ee20b2..a6154b5f29 100644 --- a/plugins/UserSettings/Controller.php +++ b/plugins/UserSettings/Controller.php @@ -12,7 +12,6 @@ use Piwik\Plugins\UserSettings\Reports\GetConfiguration; use Piwik\Plugins\UserSettings\Reports\GetLanguage; use Piwik\Plugins\UserSettings\Reports\GetPlugin; use Piwik\Plugins\UserSettings\Reports\GetResolution; -use Piwik\Plugins\UserSettings\Reports\GetScreenType; use Piwik\View; /** @@ -27,7 +26,6 @@ class Controller extends \Piwik\Plugin\Controller $view->dataTablePlugin = $this->renderReport(new GetPlugin()); $view->dataTableResolution = $this->renderReport(new GetResolution()); $view->dataTableConfiguration = $this->renderReport(new GetConfiguration()); - $view->dataTableScreenType = $this->renderReport(new GetScreenType()); $view->dataTableBrowserLanguage = $this->renderReport(new GetLanguage()); return $view->render(); diff --git a/plugins/UserSettings/Reports/GetScreenType.php b/plugins/UserSettings/Reports/GetScreenType.php deleted file mode 100644 index 1b33d0dc4c..0000000000 --- a/plugins/UserSettings/Reports/GetScreenType.php +++ /dev/null @@ -1,37 +0,0 @@ -<?php -/** - * Piwik - free/libre analytics platform - * - * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\UserSettings\Reports; - -use Piwik\Piwik; -use Piwik\Plugin\ViewDataTable; -use Piwik\Plugins\UserSettings\Columns\TypeOfScreen; - -class GetScreenType extends Base -{ - protected function init() - { - parent::init(); - $this->dimension = new TypeOfScreen(); - $this->name = Piwik::translate('UserSettings_WidgetWidescreen'); - $this->documentation = ''; // TODO - $this->order = 5; - $this->widgetTitle = 'UserSettings_WidgetWidescreen'; - } - - public function configureView(ViewDataTable $view) - { - $this->getBasicUserSettingsDisplayProperties($view); - - $view->config->title = Piwik::translate('UserSettings_ColumnTypeOfScreen'); - $view->config->show_offset_information = false; - $view->config->show_pagination_control = false; - $view->config->show_limit_control = false; - $view->config->addTranslation('label', $this->dimension->getName()); - } -} diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php index d36ce093b6..8158470544 100644 --- a/plugins/UserSettings/UserSettings.php +++ b/plugins/UserSettings/UserSettings.php @@ -52,19 +52,13 @@ class UserSettings extends \Piwik\Plugin $module = 'DevicesDetection'; $action = $movedMethods[$action]; } - - if ($module == 'UserSettings' && $action == 'getWideScreen') { - $action = 'getScreenType'; - } } public function extendVisitorDetails(&$visitor, $details) { $instance = new Visitor($details); - $visitor['screenType'] = $instance->getScreenType(); $visitor['resolution'] = $instance->getResolution(); - $visitor['screenTypeIcon'] = $instance->getScreenTypeIcon(); $visitor['plugins'] = $instance->getPlugins(); $visitor['pluginsIcons'] = $instance->getPluginIcons(); } diff --git a/plugins/UserSettings/Visitor.php b/plugins/UserSettings/Visitor.php index 03e2bd958a..33f3528487 100644 --- a/plugins/UserSettings/Visitor.php +++ b/plugins/UserSettings/Visitor.php @@ -63,15 +63,6 @@ class Visitor return null; } - function getScreenType() - { - if (!array_key_exists('config_resolution', $this->details)) { - return null; - } - - return getScreenTypeFromResolution($this->details['config_resolution']); - } - function getResolution() { if (!array_key_exists('config_resolution', $this->details)) { @@ -80,16 +71,4 @@ class Visitor return $this->details['config_resolution']; } - - function getScreenTypeIcon() - { - $type = $this->getScreenType(); - - if (empty($type)) { - return null; - } - - return getScreensLogo($type); - } - }
\ No newline at end of file diff --git a/plugins/UserSettings/functions.php b/plugins/UserSettings/functions.php index e367ff8bc9..eaab5557c7 100644 --- a/plugins/UserSettings/functions.php +++ b/plugins/UserSettings/functions.php @@ -37,43 +37,6 @@ function getConfigurationLabel($str) return $os . " / " . $browser . " / " . $resolution; } -function getLogoImageFromId($dir, $id) -{ - $path = $dir . '/' . $id . '.gif'; - if (file_exists(PIWIK_INCLUDE_PATH . '/' . $path)) { - return $path; - } else { - return $dir . '/UNK.gif'; - } -} - -function getScreensLogo($label) -{ - return 'plugins/UserSettings/images/screens/' . $label . '.gif'; -} - -function getScreenTypeFromResolution($resolution) -{ - if ($resolution === Request::UNKNOWN_RESOLUTION) { - return $resolution; - } - - $width = intval(substr($resolution, 0, strpos($resolution, 'x'))); - $height = intval(substr($resolution, strpos($resolution, 'x') + 1)); - $ratio = Piwik::secureDiv($width, $height); - - if ($width < 640) { - $name = 'mobile'; - } elseif ($ratio < 1.4) { - $name = 'normal'; - } else if ($ratio < 2) { - $name = 'wide'; - } else { - $name = 'dual'; - } - return $name; -} - /** * Returns the given language code to translated language name * diff --git a/plugins/UserSettings/lang/am.json b/plugins/UserSettings/lang/am.json index e97741dcdf..2897ffa618 100644 --- a/plugins/UserSettings/lang/am.json +++ b/plugins/UserSettings/lang/am.json @@ -2,7 +2,6 @@ "UserSettings": { "ColumnConfiguration": "ውቅረት", "ColumnResolution": "ጥራት", - "ColumnTypeOfScreen": "የማያ ዓይነት", "Configurations": "ውቅረቶች", "Language_aa": "አፋርኛ", "Language_ab": "አብሐዚኛ", @@ -161,10 +160,8 @@ "LanguageCode": "የቋንቋ ኮድ", "Resolutions": "ጥራቶች", "VisitorSettings": "የጎበኚዎች ቅንብሮች", - "WideScreen": "ሰፊ ማያ", "WidgetGlobalVisitors": "የሁሉም ጎብኚዎች ውቅረት", "WidgetPlugins": "የተሰኪዎች ዝርዝር", - "WidgetResolutions": "የማያ ጥራቶች", - "WidgetWidescreen": "የተለመደ \/ ሰፊ ማያ" + "WidgetResolutions": "የማያ ጥራቶች" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/ar.json b/plugins/UserSettings/lang/ar.json index 0406a1c6d1..cd0a0568c2 100644 --- a/plugins/UserSettings/lang/ar.json +++ b/plugins/UserSettings/lang/ar.json @@ -2,7 +2,6 @@ "UserSettings": { "ColumnConfiguration": "الإعداد", "ColumnResolution": "الكثافة النقطية", - "ColumnTypeOfScreen": "نوع الشاشة", "Configurations": "الإعدادات", "Language_aa": "الأفارية", "Language_ab": "الأبخازية", @@ -192,10 +191,8 @@ "PluginDetectionDoesNotWorkInIE": "ملاحظة: اكتشاف الإضافات البرمجية لا تعمل في متصفح إنترنت إكسبلورر. هذه الخاصية ترتكز للمتصفحات من العائلات الأخرى غير إنترنت إكسبلورر.", "Resolutions": "الكثافات النقطية", "VisitorSettings": "إعدادات الزوار", - "WideScreen": "شاشة عريضة", "WidgetGlobalVisitors": "الإعدادات العامة للزوار", "WidgetPlugins": "قائمة الإضافات", - "WidgetResolutions": "كثافات الشاشة النقطية", - "WidgetWidescreen": "عادية \/ عريضة" + "WidgetResolutions": "كثافات الشاشة النقطية" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/be.json b/plugins/UserSettings/lang/be.json index ce6fe0753c..7e0d6090ae 100644 --- a/plugins/UserSettings/lang/be.json +++ b/plugins/UserSettings/lang/be.json @@ -2,7 +2,6 @@ "UserSettings": { "ColumnConfiguration": "Канфігурацыя", "ColumnResolution": "Дазвол", - "ColumnTypeOfScreen": "Тып экрана", "Configurations": "Па канфігурацыі", "Language_ab": "абхазская", "Language_af": "афрыкаанс", @@ -123,12 +122,10 @@ "PluginDetectionDoesNotWorkInIE": "Заўважце: Плагіны не вызначаюцца ў Internet Explorer. Гэта справаздача заснавана на не-IE браўзарах.", "Resolutions": "Па дазволе манітораў", "VisitorSettings": "Налады карыстача", - "WideScreen": "Па шырыні экрана", "WidgetGlobalVisitors": "Глабальная канфігурацыя", "WidgetGlobalVisitorsDocumentation": "Гэтая справаздача паказвае найбольш распаўсюджаныя агульныя канфігурацыі, якія мелі вашы наведвальнікі. Канфігурацыя - гэта спалучэнне аперацыйнай сістэмы, тыпу браўзэра і дазволу экрана.", "WidgetPlugins": "Спіс плагінаў", "WidgetPluginsDocumentation": "Гэтая справаздача паказвае, якія плагіны были ўключаны ў браўзэраў Вашых наведвальнікаў. Гэтая інфармацыя можа мець важнае значэнне для выбару правільнага спосабу дастаўкі кантэнту.", - "WidgetResolutions": "Дазвол манітораў", - "WidgetWidescreen": "Звычайны \/ Шырокаэкранны" + "WidgetResolutions": "Дазвол манітораў" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/bg.json b/plugins/UserSettings/lang/bg.json index 86f595c443..857681dd6f 100644 --- a/plugins/UserSettings/lang/bg.json +++ b/plugins/UserSettings/lang/bg.json @@ -5,7 +5,6 @@ "BrowserWithPluginsEnabled": "%1$s с добавки %2$s активиран", "ColumnConfiguration": "Обобщена конфигурация", "ColumnResolution": "Разделителна способност на екрана", - "ColumnTypeOfScreen": "Тип на екрана", "Configurations": "Конфигурации", "Language_aa": "афарски", "Language_ab": "абхазки", @@ -196,12 +195,10 @@ "PluginDetectionDoesNotWorkInIE": "Забележка: Засичането на добавки не работи при Internet Explorer. Този доклад е базиран само на браузъри, различни от IE.", "Resolutions": "Разделителна способност", "VisitorSettings": "Настройки на посетителя", - "WideScreen": "Екран", "WidgetGlobalVisitors": "Конфигурация на гло", "WidgetGlobalVisitorsDocumentation": "Този отчет показва повечето общопознати цялостни конфигурации, които вашите посетители са имали. Конфигурация е комбинацията от операционна система, тип на браузера и резолюция на екрана.", "WidgetPlugins": "Добавки", "WidgetPluginsDocumentation": "Този отчет показва каква добавка на браузъра са използвали вашите посетители. Тази информация може да е важна, за да изберете правилния начин за доставяне на вашето съдържание.", - "WidgetResolutions": "Разделителна способност", - "WidgetWidescreen": "Нормален\/Широкоекранен" + "WidgetResolutions": "Разделителна способност" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/ca.json b/plugins/UserSettings/lang/ca.json index 2f252c2af9..9fedf7f751 100644 --- a/plugins/UserSettings/lang/ca.json +++ b/plugins/UserSettings/lang/ca.json @@ -2,7 +2,6 @@ "UserSettings": { "ColumnConfiguration": "Configuració", "ColumnResolution": "Resolució", - "ColumnTypeOfScreen": "Tipus de pantalla", "Configurations": "Configuracions", "Language_aa": "Afar", "Language_ab": "Abkhazian", @@ -193,12 +192,10 @@ "PluginDetectionDoesNotWorkInIE": "Nota: La detecció d'extensions no funciona amb Internet Explorer. L'informe es basa nomes amb navegadors diferents de l'Internet Explorer", "Resolutions": "Resolucions", "VisitorSettings": "Configuració del visitant", - "WideScreen": "Pantalla panoràmica", "WidgetGlobalVisitors": "Configuracions globals dels visitants", "WidgetGlobalVisitorsDocumentation": "Aquest informe mostra les configuracions més comuns que tenen els vostres visitants. Una configuració es la combinació de Sistema Operatiu, tipus de navegador i resolució de pantalla.", "WidgetPlugins": "Llistat de connectors", "WidgetPluginsDocumentation": "Aquest informe mostra quines extensions tenen els vostres visitants activades. Aquesta informació pot ser important per determinar la forma correcta de mostrar el contingut.", - "WidgetResolutions": "Resolucions", - "WidgetWidescreen": "Normal \/ panoràmica" + "WidgetResolutions": "Resolucions" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/cs.json b/plugins/UserSettings/lang/cs.json index d804ed6ea7..50fc946965 100644 --- a/plugins/UserSettings/lang/cs.json +++ b/plugins/UserSettings/lang/cs.json @@ -5,7 +5,6 @@ "BrowserWithPluginsEnabled": "%1$s s povolenými zásuvnými moduly %2$s", "ColumnConfiguration": "Konfigurace", "ColumnResolution": "Rozlišení", - "ColumnTypeOfScreen": "Typ obrazovky", "Configurations": "Nastavení", "Language_aa": "afarština", "Language_ab": "abcházština", @@ -196,12 +195,10 @@ "PluginDetectionDoesNotWorkInIE": "Poznámka: Detekce zásuvných modulů nepracuje v prohlížeči Interet Explorer. Toto hlášení je založeno na ostatních prohlížečích", "Resolutions": "Rozlišení", "VisitorSettings": "Nastavení návštěvníků", - "WideScreen": "Širokoúhlá obrazovka", "WidgetGlobalVisitors": "Hlavní nastavení návštěvníků", "WidgetGlobalVisitorsDocumentation": "Toto hlášení zobrazuje nejčastější konfigurace, které vaši návštěvníci měli. Konfigurace je kombinace operačního systému, prohlížeče a rozlišení.", "WidgetPlugins": "Seznam zásuvných modulů", "WidgetPluginsDocumentation": "Toto hlášení zobrazuje zásuvné moduly, které měli vaši návštěvníci povoleny. Tato informace může být důležitá při rozhodování o tom, jakým způsobem prezentovat obsah.", - "WidgetResolutions": "Rozlišení obrazovky", - "WidgetWidescreen": "Normální \/ Širokoúhlá" + "WidgetResolutions": "Rozlišení obrazovky" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/da.json b/plugins/UserSettings/lang/da.json index 301063932b..a031640225 100644 --- a/plugins/UserSettings/lang/da.json +++ b/plugins/UserSettings/lang/da.json @@ -5,7 +5,6 @@ "BrowserWithPluginsEnabled": "%1$s med udvidelsesmoduler %2$s aktiveret", "ColumnConfiguration": "Konfiguration", "ColumnResolution": "Opløsning", - "ColumnTypeOfScreen": "Skærmtype", "Configurations": "Indstillinger", "Language_aa": "Afar", "Language_ab": "Abkhasisk", @@ -196,12 +195,10 @@ "PluginDetectionDoesNotWorkInIE": "Note: Udvidelsesmodul detektering virker ikke i Internet Explorer. Rapport viser kun ikke-IE browsere.", "Resolutions": "Opløsninger", "VisitorSettings": "Besøgendes indstillinger", - "WideScreen": "Bredformat", "WidgetGlobalVisitors": "Besøgendes konfiguration", "WidgetGlobalVisitorsDocumentation": "Rapporten viser de mest almindelige samlede konfigurationer, som de besøgende havde. En konfiguration er en kombination af et styresystem, en browsertype og en skærmopløsning.", "WidgetPlugins": "Udvidelsesmoduler", "WidgetPluginsDocumentation": "Rapporten viser, hvilke browserudvidelser de besøgende havde aktiveret. Oplysningerne kan være vigtigt for at vælge den rigtige måde at levere indholdet på.", - "WidgetResolutions": "Skærmopløsninger", - "WidgetWidescreen": "Normal \/ bredformat" + "WidgetResolutions": "Skærmopløsninger" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/de.json b/plugins/UserSettings/lang/de.json index 51f9695fcf..0b2cf46081 100644 --- a/plugins/UserSettings/lang/de.json +++ b/plugins/UserSettings/lang/de.json @@ -5,7 +5,6 @@ "BrowserWithPluginsEnabled": "%1$s mit den Plugins %2$s aktiviert", "ColumnConfiguration": "Konfiguration", "ColumnResolution": "Auflösung", - "ColumnTypeOfScreen": "Bildschirmtyp", "Configurations": "Konfigurationen", "Language_aa": "Afar", "Language_ab": "Abchasisch", @@ -196,12 +195,10 @@ "PluginDetectionDoesNotWorkInIE": "Hinweis: Die Erkennung von Plugins funktioniert nicht im Internet Explorer. Diese Statistik beruht nur auf Nicht-IE Browsern.", "Resolutions": "Auflösungen", "VisitorSettings": "Besuchereinstellungen", - "WideScreen": "Breitbild", "WidgetGlobalVisitors": "Globale Besucherkonfiguration", "WidgetGlobalVisitorsDocumentation": "Dieser Bericht zeigt Ihnen die häufigsten Gesamtkonfigurationen der Besucher. Eine Konfiguration ist die Kombination aus Betriebssystem, Browsertyp und Bildschirmauflösung.", "WidgetPlugins": "Liste der Plugins", "WidgetPluginsDocumentation": "Dieser Bericht zeigt Ihnen, welche Plugins Ihre Besucher in Ihren Browser aktiviert haben. Diese Informationen kann Ihnen dabei helfen, die beste Art zu finden, Ihre Inhalte auszuliefern.", - "WidgetResolutions": "Bildschirmauflösungen", - "WidgetWidescreen": "Normal \/ Breitbild" + "WidgetResolutions": "Bildschirmauflösungen" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/el.json b/plugins/UserSettings/lang/el.json index 4878908785..9b7f7395f6 100644 --- a/plugins/UserSettings/lang/el.json +++ b/plugins/UserSettings/lang/el.json @@ -5,7 +5,6 @@ "BrowserWithPluginsEnabled": "%1$s με %2$s πρόσθετα ενεργά", "ColumnConfiguration": "Ρύθμιση", "ColumnResolution": "Ανάλυση", - "ColumnTypeOfScreen": "Τύπος οθόνης", "Configurations": "Ρυθμίσεις", "Language_aa": "Αφαρικά", "Language_ab": "Αμπχαζικά", @@ -196,12 +195,10 @@ "PluginDetectionDoesNotWorkInIE": "Σημείωση: η ανίχνευση Προσθέτων δεν λειτουργεί στον Internet Explorer. Αυτή η αναφορά βασίζεται μόνο σε μη IE φυλλομετρητές.", "Resolutions": "Αναλύσεις οθόνης", "VisitorSettings": "Ρυθμίσεις επισκέπτη", - "WideScreen": "Τύποι οθόνης", "WidgetGlobalVisitors": "Γενικές ρυθμίσεις χρηστών", "WidgetGlobalVisitorsDocumentation": "Αυτή η αναφορά δείχνει τις πιο συχνές καθολικές ρυθμίσεις που έχουν οι επισκέπτες σας. Μια ρύθμιση είναι ο συνδυασμός του λειτουργικού συστήματος, του τύπου φυλλομετρητή και της ανάλυσης οθόνης.", "WidgetPlugins": "Λίστα προσθέτων", "WidgetPluginsDocumentation": "Αυτή η αναφορά δείχνει ποια πρόσθετα φυλλομετρητή έχουν ενεργά οι επισκέπτες σας. Αυτή η πληροφορία ίσως είναι σημαντική για την επιλογή του πιο σωστού τρόπου απόδοσης του περιεχομένου σας.", - "WidgetResolutions": "Αναλύσεις οθόνης", - "WidgetWidescreen": "Κανονική \/ Ευρεία οθόνη" + "WidgetResolutions": "Αναλύσεις οθόνης" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/en.json b/plugins/UserSettings/lang/en.json index 42a5756281..c692af975c 100644 --- a/plugins/UserSettings/lang/en.json +++ b/plugins/UserSettings/lang/en.json @@ -5,8 +5,6 @@ "BrowserWithPluginsEnabled": "%1$s with plugins %2$s enabled", "ColumnConfiguration": "Configuration", "ColumnResolution": "Resolution", - "ColumnTypeOfScreen": "Type of screen", - "ScreenTypes": "Screen types", "Configurations": "Configurations", "Language_aa": "Afar", "Language_ab": "Abkhazian", @@ -197,12 +195,10 @@ "PluginDetectionDoesNotWorkInIE": "Note: Plugins detection doesn't work in Internet Explorer. This report is only based on non-IE browsers.", "Resolutions": "Resolutions", "VisitorSettings": "Visitor Settings", - "WideScreen": "Wide Screen", "WidgetGlobalVisitors": "Visitor Configuration", "WidgetGlobalVisitorsDocumentation": "This report shows the most common overall configurations that your visitors had. A configuration is the combination of an operating system, a browser type and a screen resolution.", "WidgetPlugins": "Browser Plugins", "WidgetPluginsDocumentation": "This report shows which browser plugins your visitors had enabled. This information might be important for choosing the right way to deliver your content.", - "WidgetResolutions": "Screen Resolution", - "WidgetWidescreen": "Normal \/ Widescreen" + "WidgetResolutions": "Screen Resolution" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/es.json b/plugins/UserSettings/lang/es.json index a38be7d391..5a9898f09c 100644 --- a/plugins/UserSettings/lang/es.json +++ b/plugins/UserSettings/lang/es.json @@ -5,7 +5,6 @@ "BrowserWithPluginsEnabled": "%1$s con los complementos %2$s habilitados", "ColumnConfiguration": "Configuración", "ColumnResolution": "Resoluciones", - "ColumnTypeOfScreen": "Tipo de pantalla", "Configurations": "Configuración", "Language_aa": "Lejos", "Language_ab": "Abjasia", @@ -196,12 +195,10 @@ "PluginDetectionDoesNotWorkInIE": "Nota: la detección de Plugins no funciona con Internet Explorer. Este reporte solo funciona con navegadores no-IE.", "Resolutions": "Resoluciones", "VisitorSettings": "Configuración de visitantes", - "WideScreen": "Pantalla panorámica", "WidgetGlobalVisitors": "Configuración global de visitantes", "WidgetGlobalVisitorsDocumentation": "Este informe muestra las más usuales configuraciones que poseen sus visitantes. Una configuración es una combinación de un sistema operativo, un tipo de navegador de internet y una resolución de pantalla.", "WidgetPlugins": "Lista de Plugins", "WidgetPluginsDocumentation": "Este informe muestra que extensiones del navegador sus visitantes han habilitado. Esta información puede ser importante sea para elegir el método eficiente de enviar su contenido.", - "WidgetResolutions": "Resoluciones de pantalla", - "WidgetWidescreen": "Normal \/ Panorámica" + "WidgetResolutions": "Resoluciones de pantalla" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/et.json b/plugins/UserSettings/lang/et.json index dbd80b661a..4905768aca 100644 --- a/plugins/UserSettings/lang/et.json +++ b/plugins/UserSettings/lang/et.json @@ -3,7 +3,6 @@ "BrowserLanguage": "Veebisirvija keel", "ColumnConfiguration": "Konfiguratsioon", "ColumnResolution": "Resolutsioon", - "ColumnTypeOfScreen": "Ekraani tüüp", "Configurations": "Konfiguratsioonid", "Language_aa": "afari", "Language_ab": "abhaasi", @@ -193,10 +192,8 @@ "PluginDetectionDoesNotWorkInIE": "Märge: Lisatarkvara tuvastamine ei tööta Internet Exploreriga külastajatel. See raport kuvab andmeid mitte-IE veebisirvikute kohta.", "Resolutions": "Ekraani resolutsioonid", "VisitorSettings": "Külastajate seaded", - "WideScreen": "Laiekraan", "WidgetGlobalVisitors": "Kohalike külastajate seaded", "WidgetPlugins": "Sirviku lisatarkvarad", - "WidgetResolutions": "Ekraani resolutsioonid", - "WidgetWidescreen": "Normaal \/ Laiekraan" + "WidgetResolutions": "Ekraani resolutsioonid" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/eu.json b/plugins/UserSettings/lang/eu.json index 318bea4dc8..902a023d2e 100644 --- a/plugins/UserSettings/lang/eu.json +++ b/plugins/UserSettings/lang/eu.json @@ -2,7 +2,6 @@ "UserSettings": { "ColumnConfiguration": "Konfigurazioa", "ColumnResolution": "Bereizmena", - "ColumnTypeOfScreen": "Pantaila mota", "Configurations": "Konfigurazioak", "Language_ab": "abkhazera", "Language_af": "afrikaans", @@ -152,10 +151,8 @@ "LanguageCode": "Hizkuntza-kodea", "Resolutions": "Bereizmenak", "VisitorSettings": "Bisitariaren ezarpenak", - "WideScreen": "Pantaila panoramikoa", "WidgetGlobalVisitors": "Bisitarien konfigurazioa", "WidgetPlugins": "Pluginen zerrenda", - "WidgetResolutions": "Pantailaren bereizmenak", - "WidgetWidescreen": "Normala \/ Panoramikoa" + "WidgetResolutions": "Pantailaren bereizmenak" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/fa.json b/plugins/UserSettings/lang/fa.json index fc2d3b658e..eb38d32cb5 100644 --- a/plugins/UserSettings/lang/fa.json +++ b/plugins/UserSettings/lang/fa.json @@ -4,7 +4,6 @@ "BrowserWithNoPluginsEnabled": "%1$s با هیچ پلاگین را فعال کنید", "ColumnConfiguration": "پیکربندی", "ColumnResolution": "رزلوشن", - "ColumnTypeOfScreen": "نوع صفحه نمایش", "Configurations": "پیکربندی", "Language_aa": "آفاری", "Language_ab": "آبخازیایی", @@ -195,12 +194,10 @@ "PluginDetectionDoesNotWorkInIE": "توجه: تشخیص پلاگین در مرورگر اینترنت اکسپلورر کار نمی کند. این گزارش تنها بر روی مرورگرهای غیر اینترنت اکسپلورر است.", "Resolutions": "رزلوشن", "VisitorSettings": "تنظیمات بازدید کننده", - "WideScreen": "نمایشگر عریض", "WidgetGlobalVisitors": "پیکربندی بازدیدکنندگان جهانی", "WidgetGlobalVisitorsDocumentation": "این گزارش نشان می دهد پیکربندی کلی شایع ترین است که بازدید کنندگان شما است. پیکربندی ترکیبی از سیستم عامل، نوع مرورگر و صفحه نمایش با وضوح است.", "WidgetPlugins": "لیست افزونه ها", "WidgetPluginsDocumentation": "این گزارش نشان می دهد که پلاگین مرورگر بازدید کننده خود را فعال کرده بود. این اطلاعات ممکن است مهم برای انتخاب راه درست برای ارائه محتوای خود را.", - "WidgetResolutions": "رزلوشن نمایشگر", - "WidgetWidescreen": "معمولی \/ صفحه عریض" + "WidgetResolutions": "رزلوشن نمایشگر" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/fi.json b/plugins/UserSettings/lang/fi.json index d55d8d230a..f6bb711136 100644 --- a/plugins/UserSettings/lang/fi.json +++ b/plugins/UserSettings/lang/fi.json @@ -5,7 +5,6 @@ "BrowserWithPluginsEnabled": "%1$s liitännäisillä %2$s on aktivoitu", "ColumnConfiguration": "Asetukset", "ColumnResolution": "Resoluutio", - "ColumnTypeOfScreen": "Näytön tyyppi", "Configurations": "Asetukset", "Language_aa": "afar", "Language_ab": "abkhazian", @@ -196,12 +195,10 @@ "PluginDetectionDoesNotWorkInIE": "Huom: lisäosien tunnistus ei toimi Internet Explorerissa. Tämä raportti perustuu vain ei-IE-selaimiin.", "Resolutions": "Resoluutio", "VisitorSettings": "Kävijöiden asetukset", - "WideScreen": "Laajakulma", "WidgetGlobalVisitors": "Kaikkien kävijöiden asetukset", "WidgetGlobalVisitorsDocumentation": "Tämä raportti näyttää yleiskuvan eri käyttäjien asetuksista. Asetukset on yhdistelmä käyttöjärjestelmästä, selaimen tyypistä ja näytön resoluutiosta.", "WidgetPlugins": "Lista lisäosista", "WidgetPluginsDocumentation": "Tämä raportti näyttää, mitä selainlisäosia vierailijoillasi oli käytössä. Tästä tiedosta voi olla hyötyä, kun joudut valitsemaan, miten tietoa esitetään ja välitetään vierailijoille.", - "WidgetResolutions": "Näytön resoluutio", - "WidgetWidescreen": "Normaali \/ laajakuva" + "WidgetResolutions": "Näytön resoluutio" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/fr.json b/plugins/UserSettings/lang/fr.json index 6a368b943c..cb009e289c 100644 --- a/plugins/UserSettings/lang/fr.json +++ b/plugins/UserSettings/lang/fr.json @@ -5,7 +5,6 @@ "BrowserWithPluginsEnabled": "%1$s avec les plugins %2$s activés", "ColumnConfiguration": "Configuration", "ColumnResolution": "Résolution", - "ColumnTypeOfScreen": "Type d'écran", "Configurations": "Configurations", "Language_aa": "Afar", "Language_ab": "Abkhaze", @@ -196,12 +195,10 @@ "PluginDetectionDoesNotWorkInIE": "Note : La détection des plugins ne fonctionne pas avec Internet Explorer. Ce rapport est basé sur les autres navigateurs.", "Resolutions": "Résolutions", "VisitorSettings": "Paramètres visiteur", - "WideScreen": "Largeur d'écran", "WidgetGlobalVisitors": "Configuration globale des visiteurs", "WidgetGlobalVisitorsDocumentation": "Ce rapport montre les configurations globales les plus communes de vos visiteurs. Une configuration est la combinaison d'un système d'exploitation, d'un type de navigateur et d'une résolution d'écran.", "WidgetPlugins": "Liste de Plugins", "WidgetPluginsDocumentation": "Ce rapport montre quels plugins du navigateur vos visiteurs ont activés. Cette information peut être importante pour choisir le bon moyen de délivrer le contenu.", - "WidgetResolutions": "Résolutions d'écran", - "WidgetWidescreen": "Normal \/ Écran large" + "WidgetResolutions": "Résolutions d'écran" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/gl.json b/plugins/UserSettings/lang/gl.json index a5bb5a4e7c..e461b383d8 100644 --- a/plugins/UserSettings/lang/gl.json +++ b/plugins/UserSettings/lang/gl.json @@ -149,10 +149,8 @@ "Language_zu": "Zulú", "LanguageCode": "Código de idioma", "Resolutions": "Resolucións", - "WideScreen": "Pantalla panorámica", "WidgetGlobalVisitors": "Configuración global de visitantes", "WidgetPlugins": "Lista de plugins", - "WidgetResolutions": "Resolucións de pantalla", - "WidgetWidescreen": "Normal \/ Panorámica" + "WidgetResolutions": "Resolucións de pantalla" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/hi.json b/plugins/UserSettings/lang/hi.json index e33a390ea7..d6963d29e5 100644 --- a/plugins/UserSettings/lang/hi.json +++ b/plugins/UserSettings/lang/hi.json @@ -5,7 +5,6 @@ "BrowserWithPluginsEnabled": "प्लगिन %2$s से %1$s सक्षम", "ColumnConfiguration": "विन्यास", "ColumnResolution": "संकल्प", - "ColumnTypeOfScreen": "स्क्रीन के प्रकार", "Configurations": "विन्यास", "Language_aa": "अफ़ार", "Language_ab": "अब्खाज़ियन्", @@ -196,7 +195,6 @@ "PluginDetectionDoesNotWorkInIE": "नोट: प्लगइन्स का पता लगाने इंटरनेट एक्सप्लोरर में काम नहीं करता है. यह रिपोर्ट केवल गैर आईई ब्राउज़रों पर आधारित है.", "Resolutions": "संकल्प", "VisitorSettings": "आगंतुक सेटिंग्स", - "WideScreen": "वाइड स्क्रीन", "WidgetGlobalVisitors": "आगंतुक विन्यास" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/hu.json b/plugins/UserSettings/lang/hu.json index a6fcf65074..2bdabbf3c4 100644 --- a/plugins/UserSettings/lang/hu.json +++ b/plugins/UserSettings/lang/hu.json @@ -2,7 +2,6 @@ "UserSettings": { "ColumnConfiguration": "Konfiguráció", "ColumnResolution": "Felbontás", - "ColumnTypeOfScreen": "Képernyő típusa", "Configurations": "Konfigurációk", "Language_aa": "afar", "Language_ab": "abház", @@ -193,10 +192,8 @@ "PluginDetectionDoesNotWorkInIE": "A böngészők bővítményeinek detektálása nem működik az Internet Exlporernél, így ez a jelentés csak a nem Internet Explorert használó látogatók adatait jeleníti meg.", "Resolutions": "Képernyőfelbontások", "VisitorSettings": "Látogatók adatai", - "WideScreen": "Képernyő oldalarányai", "WidgetGlobalVisitors": "Globális látogatói beállítások", "WidgetPlugins": "Bővítmények listája", - "WidgetResolutions": "Képernyőfelbontások", - "WidgetWidescreen": "Normál\/szélesvásznú" + "WidgetResolutions": "Képernyőfelbontások" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/id.json b/plugins/UserSettings/lang/id.json index 069510db55..990dbd67b1 100644 --- a/plugins/UserSettings/lang/id.json +++ b/plugins/UserSettings/lang/id.json @@ -5,7 +5,6 @@ "BrowserWithPluginsEnabled": "%1$s dengan %2$s pengaya diaktifkan", "ColumnConfiguration": "Pengaturan", "ColumnResolution": "Resolusi", - "ColumnTypeOfScreen": "Jenis layar", "Configurations": "Pengaturan", "Language_aa": "Afar", "Language_ab": "Abkhaz", @@ -196,12 +195,10 @@ "PluginDetectionDoesNotWorkInIE": "Catatan: Pendeteksian pengaya tidak bekerja di Internet Explorer. Laporan ini hanya berdasarkan pada peramban bukan-IE.", "Resolutions": "Resolusi", "VisitorSettings": "Pengaturan Pengunjung", - "WideScreen": "Layar Lebar", "WidgetGlobalVisitors": "Pengaturan pengunjung umum", "WidgetGlobalVisitorsDocumentation": "Laporan ini menunjukkan pengaturan paling umum yang pengunjung miliki. Subuah pengaturan terdiri atas sistem operasi, jenis peramban, dan resolusi layar.", "WidgetPlugins": "Daftar Pengaya", "WidgetPluginsDocumentation": "Laporan ini menunjukkan pengaya peramban yang diaktifkan oleh pengunjung. Informasi yang tersedia kemungkinan penting untuk memilih cara terbaik untuk menyampaikan konten Anda.", - "WidgetResolutions": "Resolusi layar", - "WidgetWidescreen": "Normal \/ LayarLebar" + "WidgetResolutions": "Resolusi layar" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/is.json b/plugins/UserSettings/lang/is.json index 2547f6dff3..ff81439a86 100644 --- a/plugins/UserSettings/lang/is.json +++ b/plugins/UserSettings/lang/is.json @@ -2,7 +2,6 @@ "UserSettings": { "ColumnConfiguration": "Uppsetning", "ColumnResolution": "Skjáupplausn", - "ColumnTypeOfScreen": "Skjátegund", "Configurations": "Uppsetningar", "Language_aa": "afár", "Language_ab": "abkasíska", @@ -193,10 +192,8 @@ "PluginDetectionDoesNotWorkInIE": "Ath: uppgötvun á íbótum virkar ekki með Internet Explorer. Þessi skýrsla er aðeins unnin út frá öðrum vöfrum en IE.", "Resolutions": "Skjáupplausnir", "VisitorSettings": "Stillingar gesta", - "WideScreen": "Breiðskjár", "WidgetGlobalVisitors": "Altæk gestastilling", "WidgetPlugins": "Listi yfir íbætur", - "WidgetResolutions": "Skjáupplausnir", - "WidgetWidescreen": "Normal\/Breiðtjald" + "WidgetResolutions": "Skjáupplausnir" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/it.json b/plugins/UserSettings/lang/it.json index fde5a3771a..70d39f1544 100644 --- a/plugins/UserSettings/lang/it.json +++ b/plugins/UserSettings/lang/it.json @@ -5,7 +5,6 @@ "BrowserWithPluginsEnabled": "%1$s con plugin %2$s abilitati", "ColumnConfiguration": "Configurazione", "ColumnResolution": "Risoluzione", - "ColumnTypeOfScreen": "Tipo di schermo", "Configurations": "Configurazioni", "Language_aa": "afar", "Language_ab": "abkhazian", @@ -197,12 +196,10 @@ "Resolutions": "Risoluzioni", "ScreenTypes": "Tipi di schermo", "VisitorSettings": "Impostazioni visitatori", - "WideScreen": "Schermo panoramico", "WidgetGlobalVisitors": "Riepilogo configurazione visitatori", "WidgetGlobalVisitorsDocumentation": "Questo report mostra le configurazioni globali più comuni che i visitatori avevano. Una configurazione è la combinazione di un sistema operativo, un tipo browser e una risoluzione di schermo.", "WidgetPlugins": "Lista dei Plugin", "WidgetPluginsDocumentation": "Questo report mostra quali plugin del browser i visitatori avevano abilitato. Questa informazione potrebbe essere importante per la scelta del giusto modo di inviare i tuoi contenuti.", - "WidgetResolutions": "Risoluzione schermo", - "WidgetWidescreen": "Normale \/ Schermo Panoramico" + "WidgetResolutions": "Risoluzione schermo" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/ja.json b/plugins/UserSettings/lang/ja.json index e6dad90267..7e409d6a05 100644 --- a/plugins/UserSettings/lang/ja.json +++ b/plugins/UserSettings/lang/ja.json @@ -5,7 +5,6 @@ "BrowserWithPluginsEnabled": "%1$s のプラグイン %2$s は有効", "ColumnConfiguration": "環境設定", "ColumnResolution": "解像度", - "ColumnTypeOfScreen": "画面タイプ", "Configurations": "環境設定", "Language_aa": "アファル語", "Language_ab": "アブハズ語", @@ -196,12 +195,10 @@ "PluginDetectionDoesNotWorkInIE": "注意： Internet Explorer ではプラグインの検出が動作しません。 このリポートは、非 IE ブラウザのみに基づきます。", "Resolutions": "解像度", "VisitorSettings": "ビジターの環境", - "WideScreen": "ワイド画面", "WidgetGlobalVisitors": "ビジターの全般的な環境設定", "WidgetGlobalVisitorsDocumentation": "ビジターの最も一般的な利用環境についてのリポートです。オペレーティングシステム、ブラウザの種類と画面の解像度の組合せで表示します。", "WidgetPlugins": "プラグイン一覧", "WidgetPluginsDocumentation": "ビジターが利用しているブラウザのプラグインについてのリポートです。コンテンツの最適な表示方法を選択するために重要な情報です。", - "WidgetResolutions": "画面解像度", - "WidgetWidescreen": "ノーマル \/ ワイド画面" + "WidgetResolutions": "画面解像度" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/ka.json b/plugins/UserSettings/lang/ka.json index 1115b6c491..7dab7a6d23 100644 --- a/plugins/UserSettings/lang/ka.json +++ b/plugins/UserSettings/lang/ka.json @@ -2,7 +2,6 @@ "UserSettings": { "ColumnConfiguration": "კონფიგურაცია", "ColumnResolution": "რეზოლუცია", - "ColumnTypeOfScreen": "ეკრანის ტიპი", "Configurations": "გონფიგურაციები", "Language_aa": "აფარი", "Language_ab": "აფხაზური", @@ -166,10 +165,8 @@ "PluginDetectionDoesNotWorkInIE": "შენიშვნა: პლაგინების ამოცნობა არ ხდება ინტერნეტ ექსპლორერში. ეს რეპორტი მუშაოაბს მხოლოდ არა–IE ბრაუზერებზე.", "Resolutions": "რეზოლუციები", "VisitorSettings": "ვიზიტორის პარამეტრები", - "WideScreen": "ფართო ეკრანი", "WidgetGlobalVisitors": "ვიზიტორების გლობალური კონფიგურაცია", "WidgetPlugins": "პლაგინების სია", - "WidgetResolutions": "ეკრანის რეზოლუვიები", - "WidgetWidescreen": "ნორმალური \/ ფართოეკრანიანი" + "WidgetResolutions": "ეკრანის რეზოლუვიები" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/ko.json b/plugins/UserSettings/lang/ko.json index 74e141d5da..25a2077b83 100644 --- a/plugins/UserSettings/lang/ko.json +++ b/plugins/UserSettings/lang/ko.json @@ -3,7 +3,6 @@ "BrowserLanguage": "브라우저 언어", "ColumnConfiguration": "구성", "ColumnResolution": "해상도", - "ColumnTypeOfScreen": "스크린 타입", "Configurations": "구성", "Language_aa": "아파르어", "Language_ab": "압하스어", @@ -194,12 +193,10 @@ "PluginDetectionDoesNotWorkInIE": "참고: Internet Explorer에서는 플러그인 검색이 작동하지 않습니다. 이 보고서는 IE 브라우저가 아닌것에 기반합니다.", "Resolutions": "해상도", "VisitorSettings": "방문자 설정", - "WideScreen": "와이드 스크린", "WidgetGlobalVisitors": "글로벌 방문자 구성", "WidgetGlobalVisitorsDocumentation": "방문자의 가장 일반적인 사용 환경에 대한 보고서입니다. 운영 체제, 브라우저 종류와 화면 해상도의 조합으로 표시합니다.", "WidgetPlugins": "플러그인 목록", "WidgetPluginsDocumentation": "방문자가 사용하는 브라우저의 플러그인에 대한 보고서입니다. 컨텐츠에 대한 최적의 표시 방법을 선택하는 데 중요한 정보입니다.", - "WidgetResolutions": "스크린 해상도", - "WidgetWidescreen": "보통 \/ 와이드 스크린" + "WidgetResolutions": "스크린 해상도" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/lt.json b/plugins/UserSettings/lang/lt.json index 57f6444a93..321b8e4067 100644 --- a/plugins/UserSettings/lang/lt.json +++ b/plugins/UserSettings/lang/lt.json @@ -2,7 +2,6 @@ "UserSettings": { "ColumnConfiguration": "Konfigūracija", "ColumnResolution": "Ekrano raiška", - "ColumnTypeOfScreen": "Ekrano tipas", "Configurations": "Konfigūracijos", "Language_aa": "afarų", "Language_ab": "abchazų", @@ -193,10 +192,8 @@ "PluginDetectionDoesNotWorkInIE": "Pastaba: papildinio aptikimas neveikia Internet Explorer naršyklėje. Ši ataskaita bus sugeneruota tik kitose naršyklėse.", "Resolutions": "Ekranų raiškos", "VisitorSettings": "Lankytojų nustatymai", - "WideScreen": "Plačiaekranis", "WidgetGlobalVisitors": "Bendri lankytojų nustatymai", "WidgetPlugins": "Papildinių sąrašas", - "WidgetResolutions": "Ekrano raiška", - "WidgetWidescreen": "Normalus \/ Plačiaekranis" + "WidgetResolutions": "Ekrano raiška" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/lv.json b/plugins/UserSettings/lang/lv.json index a2ae06f067..30db114188 100644 --- a/plugins/UserSettings/lang/lv.json +++ b/plugins/UserSettings/lang/lv.json @@ -2,7 +2,6 @@ "UserSettings": { "ColumnConfiguration": "Konfigurācija", "ColumnResolution": "Ekrāna izšķirtspēja", - "ColumnTypeOfScreen": "Ekrāna tips", "Configurations": "Konfigurācijas", "Language_aa": "afāru", "Language_ab": "abhāzu", @@ -193,12 +192,10 @@ "PluginDetectionDoesNotWorkInIE": "Piezīme: spraudņu noteikšana nedarbojas Internet Explorer pārlūkā. Šī atskaite ir bāzēta tikai uz ne-IE pārlūkiem.", "Resolutions": "Ekrāna izšķirtspējas", "VisitorSettings": "Apmeklētāju iestatījumi", - "WideScreen": "Platekrāns", "WidgetGlobalVisitors": "Globālā apmeklētāju konfigurācija", "WidgetGlobalVisitorsDocumentation": "Šajā atskaitē redzamas visbiežāk izmantotās apmeklētāju konfigurācijas. Konfigurācija ir operētājsistēmas, pārlūka tipa un ekrāna izšķirtspējas kombinācija.", "WidgetPlugins": "Spraudņu saraksts", "WidgetPluginsDocumentation": "Šajā atskaitē ir redzami pārlūku spraudņi, kuri bija ieslēgti apmeklētāju pārlūkos. Šī informācija ir svarīga, lai izvēlētos vislabāko veidu kā piegādāt saturu apmeklētājiem.", - "WidgetResolutions": "Ekrāna izšķirtspējas", - "WidgetWidescreen": "Normāls \/ platekrāns" + "WidgetResolutions": "Ekrāna izšķirtspējas" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/nb.json b/plugins/UserSettings/lang/nb.json index 8bbde3cc74..3950648d83 100644 --- a/plugins/UserSettings/lang/nb.json +++ b/plugins/UserSettings/lang/nb.json @@ -2,7 +2,6 @@ "UserSettings": { "ColumnConfiguration": "Konfigurasjon", "ColumnResolution": "Oppløsning", - "ColumnTypeOfScreen": "Skjermtype", "Configurations": "Konfigurasjon", "Language_aa": "afar", "Language_ab": "abkhasisk", @@ -192,10 +191,8 @@ "PluginDescription": "Rapporterer forskjellige brukerinnstillinger: Nettleser, nettleserfamilie, operativsystem, tillegg, oppløsning, globale innstillinger.", "Resolutions": "Oppløsninger", "VisitorSettings": "Besøkendes innstillinger", - "WideScreen": "Widescreen", "WidgetGlobalVisitors": "Besøkendes konfigurasjon", "WidgetPlugins": "Liste over tillegg", - "WidgetResolutions": "Skjermoppløsninger", - "WidgetWidescreen": "Normal \/ Widescreen" + "WidgetResolutions": "Skjermoppløsninger" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/nl.json b/plugins/UserSettings/lang/nl.json index 42f668047b..1f90affe5a 100644 --- a/plugins/UserSettings/lang/nl.json +++ b/plugins/UserSettings/lang/nl.json @@ -5,7 +5,6 @@ "BrowserWithPluginsEnabled": "%1$s met plugins %2$s ingeschakeld", "ColumnConfiguration": "Configuratie", "ColumnResolution": "Resolutie", - "ColumnTypeOfScreen": "Schermtype", "Configurations": "Configuraties", "Language_aa": "Afar", "Language_ab": "Abchazisch", @@ -196,12 +195,10 @@ "PluginDetectionDoesNotWorkInIE": "Opmerking: plugin detectie werkt niet in Internet Explorer. Het rapport is alleen gebaseerd op andere browsers dan IE", "Resolutions": "Schermresoluties", "VisitorSettings": "Bezoekers Instellingen", - "WideScreen": "Breedbeeld", "WidgetGlobalVisitors": "Algemene configuratie", "WidgetGlobalVisitorsDocumentation": "Dit rapport toont de meest voorkomende configuraties die uw bezoekers hadden. Een configuratie is de combinatie van een besturingssysteem, een browser type en een schermresolutie.", "WidgetPlugins": "Geïnstalleerde plugins", "WidgetPluginsDocumentation": "Dit rapport laat zien welke browserplugins uw bezoekers haden geïnstalleerd. Deze informatie kan van belang zijn voor het kiezen van de juiste manier om uw content aan te bieden.", - "WidgetResolutions": "Schermresoluties", - "WidgetWidescreen": "Normaal\/Breedbeeld" + "WidgetResolutions": "Schermresoluties" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/nn.json b/plugins/UserSettings/lang/nn.json index f9f71b4c29..aa24a3f364 100644 --- a/plugins/UserSettings/lang/nn.json +++ b/plugins/UserSettings/lang/nn.json @@ -2,7 +2,6 @@ "UserSettings": { "ColumnConfiguration": "Konfigurasjon", "ColumnResolution": "Oppløysing", - "ColumnTypeOfScreen": "Type skjerm", "Configurations": "Konfigurasjonar", "Language_aa": "afar", "Language_ab": "abkhasisk", @@ -193,10 +192,8 @@ "PluginDetectionDoesNotWorkInIE": "Merk: Registrering av innstikk virkar ikkje i Internet Explorer. Denne rapporten er berre basert på andre nettlesarar enn IE.", "Resolutions": "Oppløysingar", "VisitorSettings": "Vitjarinnstillingar", - "WideScreen": "Breiskjerm", "WidgetGlobalVisitors": "Global vitjarkonfigurasjon", "WidgetPlugins": "Liste over innstikk", - "WidgetResolutions": "Skjermoppløysing", - "WidgetWidescreen": "Vanleg \/ Breiskjerm" + "WidgetResolutions": "Skjermoppløysing" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/pl.json b/plugins/UserSettings/lang/pl.json index 9879166993..69bc0e0122 100644 --- a/plugins/UserSettings/lang/pl.json +++ b/plugins/UserSettings/lang/pl.json @@ -3,7 +3,6 @@ "BrowserLanguage": "Język przeglądarki", "ColumnConfiguration": "Konfiguracja", "ColumnResolution": "Rozdzielczość", - "ColumnTypeOfScreen": "Typ ekranu", "Configurations": "Konfiguracje", "Language_aa": "afar", "Language_ab": "abchaski", @@ -194,10 +193,8 @@ "PluginDetectionDoesNotWorkInIE": "Uwaga: wykrywanie wtyczek nie działa w przypadku Internet Explorera. Raport ten pokaże tylko wyniki w oparciu o badanie innych przeglądarek, nie opartych na silniku IE.", "Resolutions": "Rozdzielczość", "VisitorSettings": "Konfiguracje użytkownika", - "WideScreen": "Ekran monitora", "WidgetGlobalVisitors": "Ogólna konfiguracja odwiedzających", "WidgetPlugins": "Lista wtyczek", - "WidgetResolutions": "Rozdzielczość ekranu", - "WidgetWidescreen": "Monitory klasyczne \/ panoramicznie" + "WidgetResolutions": "Rozdzielczość ekranu" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/pt-br.json b/plugins/UserSettings/lang/pt-br.json index 85b2947810..079ad711b4 100644 --- a/plugins/UserSettings/lang/pt-br.json +++ b/plugins/UserSettings/lang/pt-br.json @@ -5,7 +5,6 @@ "BrowserWithPluginsEnabled": "%1$s com os plugins %2$s ativados", "ColumnConfiguration": "Configuração", "ColumnResolution": "Resolução", - "ColumnTypeOfScreen": "Tipo de tela", "Configurations": "Configurações", "Language_aa": "afar", "Language_ab": "abcázio", @@ -196,12 +195,10 @@ "PluginDetectionDoesNotWorkInIE": "Nota: a detecção de plugins não funciona no Internet Explorer. Esse relatório é baseado apenas em navegadores não IE.", "Resolutions": "Resoluções", "VisitorSettings": "Configurações dos visitantes", - "WideScreen": "Wide Screen", "WidgetGlobalVisitors": "Configuração Global de Visitante", "WidgetGlobalVisitorsDocumentation": "Este relatório mostra as configurações mais comuns gerais que os visitantes tiveram. A configuração é a combinação de um sistema operacional, um tipo de navegador e uma resolução de tela.", "WidgetPlugins": "Lista de Plugins", "WidgetPluginsDocumentation": "Este relatório mostra quais plugins de navegador seus visitantes tinham ativado. Esta informação pode ser importante para escolher o caminho certo para levar o seu conteúdo.", - "WidgetResolutions": "Resoluções de Tela", - "WidgetWidescreen": "Normal \/ Widescreen" + "WidgetResolutions": "Resoluções de Tela" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/pt.json b/plugins/UserSettings/lang/pt.json index e063097002..a5017d4a16 100644 --- a/plugins/UserSettings/lang/pt.json +++ b/plugins/UserSettings/lang/pt.json @@ -2,7 +2,6 @@ "UserSettings": { "ColumnConfiguration": "Configuração", "ColumnResolution": "Resolução", - "ColumnTypeOfScreen": "Tipo de ecrã", "Configurations": "Configurações", "Language_aa": "afar", "Language_ab": "abcázio", @@ -193,12 +192,10 @@ "PluginDetectionDoesNotWorkInIE": "Nota: Detecção de plugins não funciona no Internet Explorer. Este relatório só se baseia em navegadores não-IE.", "Resolutions": "Resoluções", "VisitorSettings": "Definições do Visitante", - "WideScreen": "Ecrã Panorama", "WidgetGlobalVisitors": "Configuração global dos visitantes", "WidgetGlobalVisitorsDocumentation": "Este relatório mostra as configurações gerais mais comuns que os visitantes tiveram. Uma configuração é a combinação de um sistema operativo, um tipo de navegador e uma resolução de visualização.", "WidgetPlugins": "Lista de Plugins", "WidgetPluginsDocumentation": "Este relatório mostra quais os plugin que o navegador dos seus visitantes tinham. Esta informação pode ser importante para a escolha do caminho certo para distribuir o seu conteúdo.", - "WidgetResolutions": "Resoluções de Ecrã", - "WidgetWidescreen": "Normal \/ Ecrã panorâmico" + "WidgetResolutions": "Resoluções de Ecrã" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/ro.json b/plugins/UserSettings/lang/ro.json index 0cf3a68a38..e39b81caff 100644 --- a/plugins/UserSettings/lang/ro.json +++ b/plugins/UserSettings/lang/ro.json @@ -5,7 +5,6 @@ "BrowserWithPluginsEnabled": "%1$s cu plugin-uri %2$s activate", "ColumnConfiguration": "Configuraţia", "ColumnResolution": "Rezoluţie ecran", - "ColumnTypeOfScreen": "Tip ecran", "Configurations": "Configurare", "Language_aa": "Afar", "Language_ab": "abhază", @@ -196,12 +195,10 @@ "PluginDetectionDoesNotWorkInIE": "Notă: de detectare a plugin-uri nu funcționează în Internet Explorer. Acest raport se bazează doar pe browsere non-IE.", "Resolutions": "Rezolutii", "VisitorSettings": "Setări vizitatori", - "WideScreen": "Ecran extins", "WidgetGlobalVisitors": "Configurare vizitatori globala", "WidgetGlobalVisitorsDocumentation": "Acest raport arată cele mai comune configurații generale,pe care vizitatorii le au avut. O configurație este combinația dintre un sistem de operare, un tip de browser și o rezoluție a ecranului.", "WidgetPlugins": "Lista pluginurilor", "WidgetPluginsDocumentation": "Acest raport arată ce plugin-uri de browser-ul au activat vizitatorii. Aceste informație ar putea fi importanta pentru a alege modul corect de a livra conținut.", - "WidgetResolutions": "Rezolutii ecran", - "WidgetWidescreen": "Normal \/ Ecran extins" + "WidgetResolutions": "Rezolutii ecran" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/ru.json b/plugins/UserSettings/lang/ru.json index 193276735f..a55776ea0c 100644 --- a/plugins/UserSettings/lang/ru.json +++ b/plugins/UserSettings/lang/ru.json @@ -3,7 +3,6 @@ "BrowserLanguage": "Язык браузера", "ColumnConfiguration": "Конфигурация", "ColumnResolution": "Разрешение", - "ColumnTypeOfScreen": "Тип экрана", "Configurations": "По конфигурации", "Language_aa": "афар", "Language_ab": "абхазский", @@ -194,12 +193,10 @@ "PluginDetectionDoesNotWorkInIE": "Учтите: Определение плагинов не работает в Internet Explorer. Этот отчет содержит информацию о не-IE браузерах.", "Resolutions": "По разрешению мониторов", "VisitorSettings": "Настройки посетителей", - "WideScreen": "По ширине экрана", "WidgetGlobalVisitors": "Глобальная конфигурация", "WidgetGlobalVisitorsDocumentation": "Этот отчет показывает общую информацию по наиболее популяоным конфигурациям системы ваших посетителей. Конфигурация - это комбинация операционной системы, браузера и разрешения экрана.", "WidgetPlugins": "Список плагинов", "WidgetPluginsDocumentation": "Этот отчет показывается какие плагины посетители используют в своих браузерах. Эта информация может быть важна для того, чтобы посетители смогли видеть ваш контент должным образом.", - "WidgetResolutions": "По разрешению мониторов", - "WidgetWidescreen": "Нормальный \/ Широкоэкранный" + "WidgetResolutions": "По разрешению мониторов" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/sk.json b/plugins/UserSettings/lang/sk.json index 0c6e3e8c14..9874405ad0 100644 --- a/plugins/UserSettings/lang/sk.json +++ b/plugins/UserSettings/lang/sk.json @@ -2,7 +2,6 @@ "UserSettings": { "ColumnConfiguration": "Konfigurácia", "ColumnResolution": "Rozlíšenie", - "ColumnTypeOfScreen": "Typ obrazovky", "Configurations": "Konfigurácia", "Language_aa": "afarčina", "Language_ab": "abcházština", @@ -193,10 +192,8 @@ "PluginDetectionDoesNotWorkInIE": "Poznámka: Plugin detekcia nefunguje v Internet Exploreri. Táto správa je založená len na non-IE prehliadačov.", "Resolutions": "Rozlíšenie", "VisitorSettings": "Nastavenia návštevníkov", - "WideScreen": "Širokouhlá obrazovka", "WidgetGlobalVisitors": "Globálne konfigurácie návštevníkov", "WidgetPlugins": "Zoznam modulov", - "WidgetResolutions": "Rozlíšenie obrazovky", - "WidgetWidescreen": "Bežný\/Širokouhlý" + "WidgetResolutions": "Rozlíšenie obrazovky" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/sl.json b/plugins/UserSettings/lang/sl.json index b3735c4931..6a28d87223 100644 --- a/plugins/UserSettings/lang/sl.json +++ b/plugins/UserSettings/lang/sl.json @@ -5,7 +5,6 @@ "BrowserWithPluginsEnabled": "%1$s z omogočenimi vtičniki %2$s", "ColumnConfiguration": "Nastavitev", "ColumnResolution": "Resolucija", - "ColumnTypeOfScreen": "Tip zaslona", "Configurations": "Nastavitve", "Language_aa": "afarščina", "Language_ab": "abhaščina", @@ -194,7 +193,6 @@ "LanguageCode": "Šifra jezika", "Resolutions": "Resolucije", "VisitorSettings": "Nastavitve obiskovalcev", - "WideScreen": "Širok Zaslon", "WidgetPlugins": "Seznam Vtičnikov", "WidgetResolutions": "Resolucija zaslona" } diff --git a/plugins/UserSettings/lang/sq.json b/plugins/UserSettings/lang/sq.json index 5143332aab..3920246e68 100644 --- a/plugins/UserSettings/lang/sq.json +++ b/plugins/UserSettings/lang/sq.json @@ -2,7 +2,6 @@ "UserSettings": { "ColumnConfiguration": "Formësim", "ColumnResolution": "Qartësi", - "ColumnTypeOfScreen": "Lloj ekrani", "Configurations": "Formësime", "Language_af": "Afrikanisht", "Language_am": "Amharike", @@ -110,12 +109,10 @@ "PluginDetectionDoesNotWorkInIE": "Shënim: Zbulimi i shtojcave nuk funksionon nën Internet Explorer. Ky raport mund të kihet vetëm nën shfletuesa jo-IE.", "Resolutions": "Qartësi", "VisitorSettings": "Rregullimet për Vizitor", - "WideScreen": "Ekran së Gjeri", "WidgetGlobalVisitors": "Formësime globale vizitorësh", "WidgetGlobalVisitorsDocumentation": "Ky raport shfaq formësimet e përgjithshme më të rëndomta të përdorura nga vizitorët tuaj. Formësimi përmban të dhënat për sistemin operativ, llojin e shfletuesit dhe qartësinë e ekranit.", "WidgetPlugins": "Listë e Shtojcave", "WidgetPluginsDocumentation": "Ky raport tregon se cilat shtojca shfletuesi kanë të aktivizuara vizitorët tuaj. Ky informacion mund të jetë i vlefshëm për zgjedhjen e mënyrës më të përshtatshme për ofrimin e lëndës suaj.", - "WidgetResolutions": "Qartësi ekrani", - "WidgetWidescreen": "Normal \/ Ekran së gjeri" + "WidgetResolutions": "Qartësi ekrani" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/sr.json b/plugins/UserSettings/lang/sr.json index 8f8bcda0ed..289c2da551 100644 --- a/plugins/UserSettings/lang/sr.json +++ b/plugins/UserSettings/lang/sr.json @@ -5,7 +5,6 @@ "BrowserWithPluginsEnabled": "%1$s sa uključenim dodacima %2$s", "ColumnConfiguration": "Podešavanja", "ColumnResolution": "Rezolucija", - "ColumnTypeOfScreen": "Tip ekrana", "Configurations": "Podešavanja", "Language_aa": "Afar", "Language_ab": "Abhazijski", @@ -196,12 +195,10 @@ "PluginDetectionDoesNotWorkInIE": "Pažnja: detekcija dodataka ne radi kod Internet Explorera. Ovaj izveštaj se odnosi samo na brauzere koji nisu Internet Exlorer", "Resolutions": "Rezolucije", "VisitorSettings": "Parametri posetilaca", - "WideScreen": "Širok ekran", "WidgetGlobalVisitors": "Globalna podešavanja posetilaca", "WidgetGlobalVisitorsDocumentation": "Ovaj izveštaj prikazuje najčešća podešavanja vaših posetilaca. Pod podešavanjem podrazumevamo kombinaciju operativnog sistema, tipa brauzera i ekranske rezolucije.", "WidgetPlugins": "Lista dodataka", "WidgetPluginsDocumentation": "Ovaj izveštaj prikazuje koje dodatke za brauzere vaši posetioci imaju uključene. Ova informacija može biti od značaja prilikom odabira pravog načina prikaza sadržaja na vašem sajtu.", - "WidgetResolutions": "Rezolucije ekrana", - "WidgetWidescreen": "Standardan \/ Širok ekran" + "WidgetResolutions": "Rezolucije ekrana" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/sv.json b/plugins/UserSettings/lang/sv.json index 06f051a376..558b7c7dfd 100644 --- a/plugins/UserSettings/lang/sv.json +++ b/plugins/UserSettings/lang/sv.json @@ -5,7 +5,6 @@ "BrowserWithPluginsEnabled": "%1$s med plugins %2$s är aktiverad", "ColumnConfiguration": "Konfiguration", "ColumnResolution": "Skärmupplösning", - "ColumnTypeOfScreen": "Typ av skärm", "Configurations": "Konfiguration", "Language_aa": "Afar", "Language_ab": "Abchaziska", @@ -196,12 +195,10 @@ "PluginDetectionDoesNotWorkInIE": "Notering: Plugins upptäckt fungerar inte i Internet Explorer. Denna rapport är endast baserad på icke-IE webbläsare.", "Resolutions": "Skärmupplösning", "VisitorSettings": "Besökarinställningar", - "WideScreen": "Widescreen", "WidgetGlobalVisitors": "Global besökarkonfiguration", "WidgetGlobalVisitorsDocumentation": "Denna rapport visar de vanligaste övergripande konfigurationer som besökarna hade. En konfiguration är en kombination av ett operativsystem, en webbläsare och en skärmupplösning.", "WidgetPlugins": "Lista över plugins", "WidgetPluginsDocumentation": "Denna rapport visar vilka plugins i webbläsaren som besökarna hade aktiverat. Denna information kan vara viktig för att välja rätt sätt att leverera ditt innehåll.", - "WidgetResolutions": "Skärmupplösning", - "WidgetWidescreen": "Normal \/ Widescreen" + "WidgetResolutions": "Skärmupplösning" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/te.json b/plugins/UserSettings/lang/te.json index dc93295edd..9a69fd70c9 100644 --- a/plugins/UserSettings/lang/te.json +++ b/plugins/UserSettings/lang/te.json @@ -1,7 +1,6 @@ { "UserSettings": { "ColumnConfiguration": "స్వరూపణం", - "ColumnTypeOfScreen": "తెర యొక్క రకం", "Configurations": "స్వరూపణలు", "Language_aa": "అఫార్", "Language_ab": "అబ్ఖాజియన్", diff --git a/plugins/UserSettings/lang/th.json b/plugins/UserSettings/lang/th.json index 4f59bdf762..ee090e2165 100644 --- a/plugins/UserSettings/lang/th.json +++ b/plugins/UserSettings/lang/th.json @@ -2,7 +2,6 @@ "UserSettings": { "ColumnConfiguration": "การตั้งค่า", "ColumnResolution": "ความละเอียด", - "ColumnTypeOfScreen": "ชนิดของจอภาพ", "Configurations": "การกำหนดค่า", "Language_aa": "อะฟาร์", "Language_ab": "อับคาซ", @@ -193,10 +192,8 @@ "PluginDetectionDoesNotWorkInIE": "หมายเหตุ: ตรวจสอบปลั๊กอินไม่ทำงานใน Internet Explorer รายงานนี้จะอิงตามเฉพาะเบราว์เซอร์ที่ไม่ใช่ IE", "Resolutions": "ความละเอียด", "VisitorSettings": "การตั้งค่าของผู้เข้าชม", - "WideScreen": "ความกว้างหน้าจอ", "WidgetGlobalVisitors": "การตั้งค่าผู้เข้าชมโดยรวม", "WidgetPlugins": "รายการปลั้กอิน", - "WidgetResolutions": "ความละเอียดจอภาพ", - "WidgetWidescreen": "จอปกติ\/จอแบบกว้าง" + "WidgetResolutions": "ความละเอียดจอภาพ" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/tl.json b/plugins/UserSettings/lang/tl.json index 6488e5a6d6..19b42e9bf8 100644 --- a/plugins/UserSettings/lang/tl.json +++ b/plugins/UserSettings/lang/tl.json @@ -5,7 +5,6 @@ "BrowserWithPluginsEnabled": "%1$s na may mga plugin %2$s na naka-enable", "ColumnConfiguration": "Configuration", "ColumnResolution": "Resolusyon", - "ColumnTypeOfScreen": "Uri ng screen", "Configurations": "Configurations", "Language_aa": "Afar", "Language_ab": "Abkhazian", @@ -195,12 +194,10 @@ "PluginDetectionDoesNotWorkInIE": "Tandaan: Ang pagtingin ng Plugin ay hindi gumagana sa Internet Explorer. Ang ulat na ito ay batay lamang sa mga browser na hindi-IE.", "Resolutions": "Mga Resolution", "VisitorSettings": "Mga Setting ng bisita", - "WideScreen": "Wide Screen", "WidgetGlobalVisitors": "Configuration ng bisita", "WidgetGlobalVisitorsDocumentation": "Ang ulat na ito ay nagpapakita ng karaniwang pangkalahatang configuration na meron ang iyong bisita. Ang configuration ay binubuo ng operating system uri ng mga browser at screen resolution.", "WidgetPlugins": "Browser Plugins", "WidgetPluginsDocumentation": "Ang ulat na ito ay ipinapakita kung anong browser plugis ang gumagana sa iyong bisita. Ang impormasyon na ito may maaring mahalaga sa pagpili kung paanu ihahatid ang nilalaman nito.", - "WidgetResolutions": "Screen Resolution", - "WidgetWidescreen": "Normal \/ Widescreen" + "WidgetResolutions": "Screen Resolution" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/tr.json b/plugins/UserSettings/lang/tr.json index 705e962de1..c675a5e022 100644 --- a/plugins/UserSettings/lang/tr.json +++ b/plugins/UserSettings/lang/tr.json @@ -2,7 +2,6 @@ "UserSettings": { "ColumnConfiguration": "Konfigürasyon", "ColumnResolution": "Çözünürlük", - "ColumnTypeOfScreen": "Ekran seçimi", "Configurations": "Konfigürasyonları", "Language_aa": "Afar", "Language_ab": "Abazca", @@ -193,10 +192,8 @@ "PluginDetectionDoesNotWorkInIE": "Not: Hedeflenen eklenti Internet Explorer çalışmamaktadir. Bu not\/rapor sadece IE içindir.", "Resolutions": "Çözünürlükler", "VisitorSettings": "Ziyaretçi Ayarlari", - "WideScreen": "Geniş ekran", "WidgetGlobalVisitors": "Global ziyaretçi konfikasyonu", "WidgetPlugins": "Eklenti Listesi", - "WidgetResolutions": "Ekran çözünürlükleri", - "WidgetWidescreen": "Normal \/ Geniş ekran" + "WidgetResolutions": "Ekran çözünürlükleri" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/uk.json b/plugins/UserSettings/lang/uk.json index 227f33fc44..10ae7b655e 100644 --- a/plugins/UserSettings/lang/uk.json +++ b/plugins/UserSettings/lang/uk.json @@ -2,7 +2,6 @@ "UserSettings": { "ColumnConfiguration": "Конфігурація", "ColumnResolution": "Роздільна здатність", - "ColumnTypeOfScreen": "Тип екрану", "Configurations": "Конфігурації", "Language_aa": "афарська", "Language_ab": "абхазька", @@ -193,10 +192,8 @@ "PluginDetectionDoesNotWorkInIE": "Примітка: Визначення плагінів не працює в Internet Explorer. Цей звіт базується лише на не-IE веб-оглядачах.", "Resolutions": "Роздільні здатності", "VisitorSettings": "Налаштування відвідувача", - "WideScreen": "Широкоформатні", "WidgetGlobalVisitors": "Загальна конфігурація відвідувачів", "WidgetPlugins": "Список плагінів", - "WidgetResolutions": "Роздільні здатності", - "WidgetWidescreen": "Нормальний \/ Широкоформатний" + "WidgetResolutions": "Роздільні здатності" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/vi.json b/plugins/UserSettings/lang/vi.json index 440936dfc0..07ba3d51f7 100644 --- a/plugins/UserSettings/lang/vi.json +++ b/plugins/UserSettings/lang/vi.json @@ -5,7 +5,6 @@ "BrowserWithPluginsEnabled": "%1$s với plugin %2$s đã kích hoạt", "ColumnConfiguration": "Cấu hình", "ColumnResolution": "Độ phân giải", - "ColumnTypeOfScreen": "Loại màn hình", "Configurations": "cấu hình", "Language_aa": "Tiếng Afar", "Language_ab": "Tiếng Abkhazia", @@ -196,12 +195,10 @@ "PluginDetectionDoesNotWorkInIE": "Chú ý: Các Plugin phát hiện không làm việc trên Internet Explorer. Báo cáo này chỉ dựa trên trình duyệt không phải IE.", "Resolutions": "Độ phân giải", "VisitorSettings": "Thiết lập khách truy cập", - "WideScreen": "Màn hình rộng", "WidgetGlobalVisitors": "Cấu hình khách truy cập", "WidgetGlobalVisitorsDocumentation": "Báo cáo này cho thấy các cấu hình tổng thể phổ biến nhất mà khách truy cập của bạn đã có. Một cấu hình là sự kết hợp của một hệ điều hành, một loại trình duyệt và độ phân giải màn hình.", "WidgetPlugins": "Các Plugin trình duyệt", "WidgetPluginsDocumentation": "Báo cáo này cho thấy các plugin trình duyệt mà khách truy cập của bạn đã kích hoạt. Thông tin này có thể là quan trọng cho việc lựa chọn cách đúng để cung cấp nội dung của bạn.", - "WidgetResolutions": "Độ phân giải màn hình", - "WidgetWidescreen": "Loại thường\/ màn ảnh rộng" + "WidgetResolutions": "Độ phân giải màn hình" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/zh-cn.json b/plugins/UserSettings/lang/zh-cn.json index 8290a1e055..d176b16886 100644 --- a/plugins/UserSettings/lang/zh-cn.json +++ b/plugins/UserSettings/lang/zh-cn.json @@ -5,7 +5,6 @@ "BrowserWithPluginsEnabled": "%1$s 启用插件%2$s", "ColumnConfiguration": "客户端配置", "ColumnResolution": "分辨率", - "ColumnTypeOfScreen": "屏幕类型", "Configurations": "客户端配置", "Language_aa": "阿法文", "Language_ab": "阿布哈西亚文", @@ -196,12 +195,10 @@ "PluginDetectionDoesNotWorkInIE": "注意: 插件检查无法在 Internet Explorer 上运行。这个报表仅提供非 IE 浏览器。", "Resolutions": "分辨率", "VisitorSettings": "访客设置", - "WideScreen": "宽屏幕", "WidgetGlobalVisitors": "访客设置", "WidgetGlobalVisitorsDocumentation": "本报表显示您的访客最常用的系统配置。系统配置是操作系统、浏览器类型及显示器分辨率的组合。", "WidgetPlugins": "浏览器插件清单", "WidgetPluginsDocumentation": "本报表显示访客使用的浏览器插件，这可能对如何发布您的内容很重要。", - "WidgetResolutions": "画面分辨率", - "WidgetWidescreen": "传统屏幕 \/ 宽屏幕" + "WidgetResolutions": "画面分辨率" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/zh-tw.json b/plugins/UserSettings/lang/zh-tw.json index b759344110..6b9019f671 100644 --- a/plugins/UserSettings/lang/zh-tw.json +++ b/plugins/UserSettings/lang/zh-tw.json @@ -3,7 +3,6 @@ "BrowserLanguage": "瀏覽器語系", "ColumnConfiguration": "客戶端配置", "ColumnResolution": "解析度", - "ColumnTypeOfScreen": "螢幕類型", "Configurations": "客戶端配置", "Language_aa": "阿法文", "Language_ab": "阿布哈西亚文", @@ -194,11 +193,9 @@ "PluginDetectionDoesNotWorkInIE": "注意：外掛偵測無法在 Internet Explorer 上運作。這個報告僅提供非 IE 瀏覽器。", "Resolutions": "解析度", "VisitorSettings": "造訪者設定值", - "WideScreen": "寬螢幕", "WidgetGlobalVisitors": "全域訪客配置", "WidgetGlobalVisitorsDocumentation": "此報表列出貴站訪客最常見的設定配置。設定配置包含作業系統、瀏覽器、螢幕解析度等資訊。", "WidgetPlugins": "瀏覽器外掛清單", - "WidgetResolutions": "畫面解析度", - "WidgetWidescreen": "傳統螢幕 \/ 寬螢幕" + "WidgetResolutions": "畫面解析度" } }
\ No newline at end of file diff --git a/plugins/UserSettings/templates/index.twig b/plugins/UserSettings/templates/index.twig index 7b6d236d47..abf96de9e1 100644 --- a/plugins/UserSettings/templates/index.twig +++ b/plugins/UserSettings/templates/index.twig @@ -11,9 +11,6 @@ <h2 piwik-enriched-headline>{{ 'UserSettings_Resolutions'|translate }}</h2> {{ dataTableResolution|raw }} - <h2 piwik-enriched-headline>{{ 'UserSettings_ScreenTypes'|translate }}</h2> - {{ dataTableScreenType|raw }} - <h2 piwik-enriched-headline>{{ 'UserSettings_Configurations'|translate }}</h2> {{ dataTableConfiguration|raw }} </div> diff --git a/tests/PHPUnit/Integration/WidgetsListTest.php b/tests/PHPUnit/Integration/WidgetsListTest.php index cf1c778e84..baa3395058 100644 --- a/tests/PHPUnit/Integration/WidgetsListTest.php +++ b/tests/PHPUnit/Integration/WidgetsListTest.php @@ -41,7 +41,7 @@ class Core_WidgetsListTest extends IntegrationTestCase 'VisitsSummary_VisitsSummary' => 6, 'Live!' => 4, 'General_Visitors' => 12, - 'UserSettings_VisitorSettings' => 6, + 'UserSettings_VisitorSettings' => 5, 'General_Actions' => 10, 'Events_Events' => 3, 'Actions_SubmenuSitesearch' => 5, diff --git a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php index 4a9e4d2ff7..33678169ed 100755 --- a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php +++ b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php @@ -109,7 +109,7 @@ class OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest extends SystemTestCa $tests = array( // TODO Implement fix, then remove the +3 below 'archive_blob_2010_12' => ( ($expectedActionsBlobs+3) /*Actions*/ - + 5 /* UserSettings */ + + 4 /* UserSettings */ + 2 /* VisitTime */) * 3, /** 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 0ef089e70c..6140bf8214 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 @@ -84,10 +84,8 @@ <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -180,10 +178,8 @@ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -276,10 +272,8 @@ <browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon> <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -372,10 +366,8 @@ <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -468,10 +460,8 @@ <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -564,10 +554,8 @@ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -660,10 +648,8 @@ <browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -756,10 +742,8 @@ <browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon> <browserCode>AN</browserCode> <browserVersion /> - <screenType>unknown</screenType> <deviceType>Smartphone</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -852,10 +836,8 @@ <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> 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 7bc0f5a098..896b4d503f 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 @@ -193,10 +193,8 @@ <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion>UNK</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -307,10 +305,8 @@ <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>6.0</browserVersion> - <screenType>normal</screenType> <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -416,10 +412,8 @@ <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -539,10 +533,8 @@ <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -651,10 +643,8 @@ <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -751,10 +741,8 @@ <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion>UNK</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -857,10 +845,8 @@ <browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -947,10 +933,8 @@ <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion>UNK</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -1053,10 +1037,8 @@ <browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon> <browserCode>AN</browserCode> <browserVersion /> - <screenType>unknown</screenType> <deviceType>Smartphone</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> @@ -1153,10 +1135,8 @@ <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> - <screenType>unknown</screenType> <deviceType>Desktop</deviceType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> 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 58c15349b3..8e3799fa9e 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -56,9 +56,7 @@ <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -204,9 +202,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -329,9 +325,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -468,9 +462,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -593,9 +585,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -749,9 +739,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -874,9 +862,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1013,9 +999,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1138,9 +1122,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1294,9 +1276,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1419,9 +1399,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1558,9 +1536,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1697,9 +1673,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1814,9 +1788,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1939,9 +1911,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -2095,9 +2065,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -2251,9 +2219,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -2368,9 +2334,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -2493,9 +2457,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -2632,9 +2594,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -2771,9 +2731,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -2910,9 +2868,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -3041,9 +2997,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -3166,9 +3120,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -3291,9 +3243,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -3416,9 +3366,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -3541,9 +3489,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -3697,9 +3643,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -3853,9 +3797,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -4009,9 +3951,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -4157,9 +4097,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -4282,9 +4220,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -4407,9 +4343,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -4532,9 +4466,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -4657,9 +4589,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> 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 cabb71c501..a45e6b00b5 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -79,9 +79,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -181,9 +179,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -351,9 +347,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -453,9 +447,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -790,9 +782,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -892,9 +882,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> <pluginsIcons> <row> @@ -990,9 +978,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> <pluginsIcons> <row> @@ -1156,9 +1142,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> <pluginsIcons> <row> @@ -1254,9 +1238,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> <pluginsIcons> <row> @@ -1587,9 +1569,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> <pluginsIcons> <row> 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 cabb71c501..a45e6b00b5 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -79,9 +79,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -181,9 +179,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -351,9 +347,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -453,9 +447,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -790,9 +782,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -892,9 +882,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> <pluginsIcons> <row> @@ -990,9 +978,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> <pluginsIcons> <row> @@ -1156,9 +1142,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> <pluginsIcons> <row> @@ -1254,9 +1238,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> <pluginsIcons> <row> @@ -1587,9 +1569,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> <pluginsIcons> <row> 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 23cef7562d..93c0819d6c 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -95,9 +95,7 @@ <location>Raleigh, North Carolina, United States</location> <latitude>35.771999</latitude> <longitude>-78.639000</longitude> - <screenType>wide</screenType> <resolution>1366x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java</plugins> <pluginsIcons> <row> @@ -233,9 +231,7 @@ <location>Lake Forest, California, United States</location> <latitude>33.645000</latitude> <longitude>-117.679001</longitude> - <screenType>wide</screenType> <resolution>1536x864</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>17:33:27</visitLocalTime> @@ -346,9 +342,7 @@ <location>Germany</location> <latitude>51</latitude> <longitude>9</longitude> - <screenType>wide</screenType> <resolution>1920x1200</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java, quicktime, silverlight</plugins> <pluginsIcons> <row> @@ -492,9 +486,7 @@ <location>United States</location> <latitude>38</latitude> <longitude>-97</longitude> - <screenType>wide</screenType> <resolution>2880x1800</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java, quicktime</plugins> <pluginsIcons> <row> @@ -607,9 +599,7 @@ <location>Maaseik, Limburg, Belgium</location> <latitude>51.099998</latitude> <longitude>5.800000</longitude> - <screenType>wide</screenType> <resolution>1920x1080</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> @@ -733,9 +723,7 @@ <location>San Francisco, California, United States</location> <latitude>37.792000</latitude> <longitude>-122.408997</longitude> - <screenType>wide</screenType> <resolution>1360x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> <pluginsIcons> <row> @@ -866,9 +854,7 @@ <location>Nihon'odori, Kanagawa, Japan</location> <latitude>35.450001</latitude> <longitude>139.649994</longitude> - <screenType>wide</screenType> <resolution>2560x1440</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, java, quicktime</plugins> <pluginsIcons> <row> @@ -988,9 +974,7 @@ <location>Weilerswist, Nordrhein-Westfalen, Germany</location> <latitude>50.766998</latitude> <longitude>6.833000</longitude> - <screenType>mobile</screenType> <resolution>360x640</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/mobile.gif</screenTypeIcon> <plugins>flash</plugins> <pluginsIcons> <row> @@ -1102,9 +1086,7 @@ <location>Mainz, Rheinland-Pfalz, Germany</location> <latitude>50</latitude> <longitude>8.271000</longitude> - <screenType>wide</screenType> <resolution>2560x1440</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> <pluginsIcons> <row> @@ -1271,9 +1253,7 @@ <location>Moscow, Moscow City, Russian Federation</location> <latitude>55.751999</latitude> <longitude>37.616001</longitude> - <screenType>wide</screenType> <resolution>1920x1080</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1389,9 +1369,7 @@ <location>Esentepe, Rize, Turkey</location> <latitude>40.979000</latitude> <longitude>40.415001</longitude> - <screenType>wide</screenType> <resolution>1366x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> @@ -1515,9 +1493,7 @@ <location>Maaseik, Limburg, Belgium</location> <latitude>51.099998</latitude> <longitude>5.800000</longitude> - <screenType>wide</screenType> <resolution>1920x1080</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> @@ -1799,9 +1775,7 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>08:10:38</visitLocalTime> @@ -1915,9 +1889,7 @@ <location>Unknown</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -2032,9 +2004,7 @@ <location>Unknown</location> <latitude /> <longitude /> - <screenType>wide</screenType> <resolution>1280x800</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/wide.gif</screenTypeIcon> <plugins>pdf, flash, java, director, windowsmedia, gears</plugins> <pluginsIcons> <row> @@ -2165,9 +2135,7 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>20:15:41</visitLocalTime> @@ -2290,9 +2258,7 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>19:12:40</visitLocalTime> @@ -2422,9 +2388,7 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>18:10:38</visitLocalTime> @@ -2530,9 +2494,7 @@ <location>Ashburn, Virginia, United States</location> <latitude>39.043999</latitude> <longitude>-77.487999</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>17:48:08</visitLocalTime> @@ -2638,9 +2600,7 @@ <location>Ashburn, Virginia, United States</location> <latitude>39.043999</latitude> <longitude>-77.487999</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>17:48:07</visitLocalTime> @@ -2736,9 +2696,7 @@ <location>Australia</location> <latitude>-27</latitude> <longitude>133</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>17:46:03</visitLocalTime> @@ -2844,9 +2802,7 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>16:11:30</visitLocalTime> @@ -2952,9 +2908,7 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>16:10:38</visitLocalTime> @@ -3056,9 +3010,7 @@ <location>Unknown</location> <latitude /> <longitude /> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>15:31:05</visitLocalTime> @@ -3160,9 +3112,7 @@ <location>Unknown</location> <latitude /> <longitude /> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>13:49:46</visitLocalTime> @@ -3264,9 +3214,7 @@ <location>Brazil</location> <latitude>-10</latitude> <longitude>-55</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>20:22:08</visitLocalTime> @@ -3368,9 +3316,7 @@ <location>Brazil</location> <latitude>-10</latitude> <longitude>-55</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>20:21:28</visitLocalTime> @@ -3472,9 +3418,7 @@ <location>Brazil</location> <latitude>-10</latitude> <longitude>-55</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>20:21:03</visitLocalTime> @@ -3576,9 +3520,7 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>20:01:17</visitLocalTime> @@ -3680,9 +3622,7 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>19:59:50</visitLocalTime> @@ -3784,9 +3724,7 @@ <location>Unknown</location> <latitude /> <longitude /> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>18:03:40</visitLocalTime> @@ -3888,9 +3826,7 @@ <location>Unknown</location> <latitude /> <longitude /> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>21:00:42</visitLocalTime> @@ -3992,9 +3928,7 @@ <location>Unknown</location> <latitude /> <longitude /> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>20:56:45</visitLocalTime> @@ -4096,9 +4030,7 @@ <location>Ashburn, Virginia, United States</location> <latitude>39.043999</latitude> <longitude>-77.487999</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>13:49:48</visitLocalTime> @@ -4200,9 +4132,7 @@ <location>Ashburn, Virginia, United States</location> <latitude>39.043999</latitude> <longitude>-77.487999</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>13:48:20</visitLocalTime> @@ -4304,9 +4234,7 @@ <location>Ashburn, Virginia, United States</location> <latitude>39.043999</latitude> <longitude>-77.487999</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>13:48:07</visitLocalTime> @@ -4408,9 +4336,7 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>08:12:03</visitLocalTime> @@ -4512,9 +4438,7 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>08:11:56</visitLocalTime> @@ -4616,9 +4540,7 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>08:11:30</visitLocalTime> @@ -4720,9 +4642,7 @@ <location>Japan</location> <latitude>36</latitude> <longitude>138</longitude> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>08:10:38</visitLocalTime> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getScreenType_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getScreenType_month.xml deleted file mode 100644 index 2048a44e64..0000000000 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getScreenType_month.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>Unknown</label> - <nb_visits>25</nb_visits> - <nb_actions>28</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> - <bounce_count>23</bounce_count> - <nb_visits_converted>23</nb_visits_converted> - <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/screens/unknown.gif</logo> - </row> - <row> - <label>Normal</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> - <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/UserSettings/images/screens/normal.gif</logo> - </row> - <row> - <label>Wide</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> - <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/UserSettings/images/screens/wide.gif</logo> - </row> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml deleted file mode 100644 index 2048a44e64..0000000000 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>Unknown</label> - <nb_visits>25</nb_visits> - <nb_actions>28</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>305</sum_visit_length> - <bounce_count>23</bounce_count> - <nb_visits_converted>23</nb_visits_converted> - <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/UserSettings/images/screens/unknown.gif</logo> - </row> - <row> - <label>Normal</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> - <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/UserSettings/images/screens/normal.gif</logo> - </row> - <row> - <label>Wide</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> - <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/UserSettings/images/screens/wide.gif</logo> - </row> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_IPv6__UserCountry.getLocationFromIP.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_IPv6__UserCountry.getLocationFromIP.xml index 3d25ea7471..35dda9286a 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_IPv6__UserCountry.getLocationFromIP.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_IPv6__UserCountry.getLocationFromIP.xml @@ -13,4 +13,4 @@ <country_name>United States</country_name> <ip>2001:db8:85a3:0:0:8a2e:370:7334</ip> </row> -</result> +</result>
\ No newline at end of file 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 5f234ed9c5..0879f6fb5b 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 @@ -102,10 +102,8 @@ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> - <screenType>normal</screenType> <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -225,10 +223,8 @@ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> - <screenType>normal</screenType> <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -348,10 +344,8 @@ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> - <screenType>normal</screenType> <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -471,10 +465,8 @@ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> - <screenType>normal</screenType> <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -625,10 +617,8 @@ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> - <screenType>normal</screenType> <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -779,10 +769,8 @@ <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> - <screenType>normal</screenType> <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -925,10 +913,8 @@ <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> <browserVersion>UNK</browserVersion> - <screenType>normal</screenType> <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> 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 8e034ec059..d252d03f5d 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 @@ -66,9 +66,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -220,9 +218,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -343,9 +339,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -497,9 +491,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -620,9 +612,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -774,9 +764,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -889,9 +877,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> 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 c6ff4bfdff..2975b07bcb 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 @@ -56,9 +56,7 @@ <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -204,9 +202,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -329,9 +325,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -468,9 +462,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -593,9 +585,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -749,9 +739,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -874,9 +862,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> 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 9c5c5cc080..759645d39d 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 @@ -97,9 +97,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -222,9 +220,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -378,9 +374,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -517,9 +511,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -642,9 +634,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -767,9 +757,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -882,9 +870,7 @@ <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> 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 c6ff4bfdff..2975b07bcb 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 @@ -56,9 +56,7 @@ <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -204,9 +202,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -329,9 +325,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -468,9 +462,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -593,9 +585,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -749,9 +739,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -874,9 +862,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> 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 6bc6d4b5aa..bd23daaa04 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -56,9 +56,7 @@ <referrerUrl>http://google.com/?q=Wikileaks FTW</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -204,9 +202,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -329,9 +325,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -468,9 +462,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -593,9 +585,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -749,9 +739,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -874,9 +862,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1013,9 +999,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1138,9 +1122,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -1294,9 +1276,7 @@ <referrerUrl /> <referrerSearchEngineUrl /> <referrerSearchEngineIcon /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getScreenType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getScreenType_day.xml deleted file mode 100644 index f1acb38cb9..0000000000 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getScreenType_day.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>Normal</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>8</nb_actions> - <max_actions>7</max_actions> - <sum_visit_length>1621</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/screens/normal.gif</logo> - </row> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getWideScreen_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getWideScreen_day.xml deleted file mode 100644 index f1acb38cb9..0000000000 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getWideScreen_day.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>Normal</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>8</nb_actions> - <max_actions>7</max_actions> - <sum_visit_length>1621</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/screens/normal.gif</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 849af36fed..6649f123d9 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 @@ -85,9 +85,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -273,9 +271,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getScreenType_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getScreenType_day.xml deleted file mode 100644 index 1aa955af66..0000000000 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getScreenType_day.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>Normal</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>9</nb_actions> - <nb_users>0</nb_users> - <max_actions>8</max_actions> - <sum_visit_length>1621</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/screens/normal.gif</logo> - </row> -</result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml deleted file mode 100644 index 1aa955af66..0000000000 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>Normal</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>9</nb_actions> - <nb_users>0</nb_users> - <max_actions>8</max_actions> - <sum_visit_length>1621</sum_visit_length> - <bounce_count>1</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/UserSettings/images/screens/normal.gif</logo> - </row> -</result>
\ No newline at end of file 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 8173b17251..9b0149ac2a 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 @@ -74,9 +74,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -181,9 +179,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> 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 dfaee585ef..4eb429a763 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 @@ -79,9 +79,7 @@ <location>Unknown</location> <latitude /> <longitude /> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>10:00:00</visitLocalTime> @@ -172,9 +170,7 @@ <location>Unknown</location> <latitude /> <longitude /> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>11:00:00</visitLocalTime> @@ -265,9 +261,7 @@ <location>Unknown</location> <latitude /> <longitude /> - <screenType>unknown</screenType> <resolution>unknown</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> <pluginsIcons /> <visitLocalTime>12:00:00</visitLocalTime> 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 e0516433ba..17d9192ba4 100644 --- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml @@ -74,9 +74,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv index a6f8e9e9fe..67b84fe8b9 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv @@ -89,11 +89,6 @@ Realplayer,0,0% Silverlight,0,0% Windowsmedia,0,0% -Normal / Widescreen -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Dual,9,41,0%,4.6,00:13:21,11% -Normal,1,2,0%,2,00:06:01,0% - Visitor Configuration label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Unknown / Unknown / 800x300,8,40,0%,5,00:15:01,0% @@ -327,16 +322,16 @@ Device brand label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Unknown,10,43,0%,4.3,00:12:37,10% -Device model -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,10,43,0%,4.3,00:12:37,10% - Browser version label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Unknown,8,40,0%,5,00:15:01,0% Firefox 3.6,1,2,0%,2,00:06:01,0% Opera 9.63,1,1,0%,1,00:00:00,100% +Device model +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,10,43,0%,4.3,00:12:37,10% + Operating System families label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Unknown,8,40,0%,5,00:15:01,0% 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 560e7ebe33..8ca1417d42 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 @@ -55,11 +55,6 @@ </a> </li> <li> - <a href="#UserSettings_getScreenType" style="text-decoration:none; color: rgb(68,68,68);"> - Normal / Widescreen - </a> - </li> - <li> <a href="#UserSettings_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);"> Visitor Configuration </a> @@ -2124,99 +2119,6 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="UserSettings_getScreenType" style="color: rgb(126,115,99); font-size: 11pt;"> - Normal / Widescreen -</h2> - - <img alt="" - src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAANHklEQVR4nO3dSW+bd37A8Yf7Tm2WLNlxvNCTxBOnzSSZeKbFtGgPBYoCBeZQFEWP8xoKFH0BvfYV9NhjC/TQWw49FB0UaC7tOJPFimPZkmVtliiKpLj2oEJRZNn6e6FISZ/PISD1kPaPDOjnq2djrN/vRwAAx4kPewAA4HQQDQBAENEAAAQRDQBAENEAAAQRDQBAENEAAAQRDf+vUqkc+cMjf/7iZwHAmSQajjE/Px++VEMAcIYlhz3ACfn7f/zvQz/5u199cvDu/Px8pVI5GAGH7gLAOXdeouGbh9V2u71/N5VKLS4uXr58+dgnPlsS+7cPdcbeov0H7C09+ODXewUAMGTnJRqiKKrX6/u3x8bGlpaWQqLhoBcERHRUQ9huAcBZ4piG7x3cNhCyjn+pCFAMAJx2ouEl7FVF4NGOL/VgABh952j3RD6ff/0/ZG+DwV4KBG6KCHwwAIy48xINv/zjytLi4rEP299DEXKmZfgmh8gxDQCcfuclGv78D65G0dXX/ENeasWvEgA4Y85LNLwRz55FeeQJFM978MkMCQADEuv3+8OeAQA4BZw9AQAEEQ0AQBDRAAAEEQ0AQBDRAAAEEQ0AQBDXaQAG69lrp7psCZxSZyEaXEMJRpwPJoysQ1+e8OJV6qmPhkNXa3bxZgAItLfS3A+FY1eppz4agNFncyCMppf9PIoGYLAO/atkcyCcXs6eAACCiAYAIIhoAAbr2VMugVPKMQ3AYB08NjtyICScZrF+vz/sGV6Xf48A4BUc2hB4bOKfhWgAAE6AYxoAgCCiAQAIIhoAgCCiAQAIIhoAgCCiAQAIcnai4fPPPx/2CMCL+JDCiDv2Q3p2ogEAGCjRAAAEEQ0AQBDRAAAEEQ0AQBDRAAAEEQ0AQJDksAd4k/7p3+4OewTguZaXN79c9iHl7PvrP3t/2CMMypmKhn/+7OthjwC80G+qw54ABu4MR4PdEwBAENEAAAQRDQBAENEAAAQRDQBAENEAAAQRDQBAENEAAAQRDQBAENEAAAQRDQBAENEAAAQRDQBAENEAAAQRDQBAENEAAAQRDQBAENEAAAQ5ldHQaDQajcawpwCA8yU57AGO12g0trZ3thutRqPebTd26zu12nZ9p37prUvv37qdy+WGPSAAnAujHg07O7W7X/z21/8zv1CNYlFnKl1/eyo7VipUVzbv3783NTF1/fqNYc8IAOfCqEdDdXPrycr63YX19cyVD35886Nr6duXk/l0YmVl7bPP/n11feXtt68mEolhjwkAZ98QjmmoVCrhD04kE8Vi8eLctSg7XYtny9OzmcJ4P54ujk8UC6WlxYftdntwowIA+15lS8Ohtf78/PwbGuYIyVQ66u7OjGe+rneiKFqvtydzuW6zl2p3x2ZufHvvq+r2djabHdwAAPDKDq4xB7q6PBmvuHvi4CuvVCoDeiMajUajubO1vR7vpiYTzfWtqS/uV7vNXj7R7bXqzX7qaXWn2dwdxF8NAK/p0PpxcKvLE/MGjmmYn5/feyOOfHf2IyvwnWp3Og8fLS2trD7d3t5YW+22G73deiYzVkp3Vx7ee9S8kN3NTxYSrdrTzZXFQi6bisde/yUAAMca+IGQ+60QWFiNRuM//vO/fv3l/W6sMFFIvfPWbOX61VSuX7v3YOG7+XTxan8rs/lgdXF97YNb796684eTFy4M+BUAAFE0gmdPxOOJ7NhENJUbm3vnoxulO5VcPrWTTrQy2d7yV99MdTY/vf47W81S4uvWWD71zo3rmUxm2CMDwLkw8Gh4qXMl9mQy6XS6u91sdOLj3XS2FXU71U5hbG56cjw9PplMpTK7qUyp/O2DhY82twqF4iDGBoDXdHAf/dkw2Gg4uEsi8I3r9br9Tqfb7q5u1B5utd/eisbS+Wa9HW+1c8VSY3OhUbvY3m01641r126WxicGOT4AvJZDh/oNcZI34g1Ew5EHK7zyWxOLxQr5fCEXX1nY/urRVqrfeaucTkRRvtUojM2srKwvfHtvfGL8J+9/8O6t94qF/GuPDwADdwZOnYheORqOPPH00LkSh86eCB0okShm05PZRm9rofE0VstPtaNMf7c+//jByvLCxPjEh3fuXLp8qVwuJ5Mjd0AGABz0sqcQjrhXWe++4JUfXLR3+9kHv/iNy+VyF2cuFL958OlcP91dHG/U67V2bWV5ZWX5F3/0i2s3rt+4etWXVAFwKpyNVtg3ir+sX5ia+OjaxZl88sni448qlxLp+NPNyfL93M0b1959771hTwcA59QoRkO5VPr57//e/fvf3ktkSqlsPWqVS9mJfDbW6Q57NAA4v4bwhVWBpi5Mb7V2Gv1WrN/dWH2SzqQvX7827KEA4PwaxS0Ne8ql0oc/+eCrr76JoujKW5Vr1665JAMADNHoRkMURTcrN29Wbg57CgAgikZ59wQAMFJEAwAQRDQAAEFEAwAQRDQAAEFEAwAQRDQAAEFEAwAQRDQAAEFEAwAQRDQAAEFEAwAQRDQAAEFEAwAQRDQAAEFEAwAQRDQAAEFEAwAQJDnsAd6kv/rTW8MeAXiuxaWly5cuDXsK4NWdqWj4iz95b9gjAM/1+ec7H3/sQwqnmN0TAEAQ0QAABBENAEAQ0QAABBENAEAQ0QAABBENAEAQ0QAABBENAEAQ0QAABBENAEAQ0QAABBENAECQM/Utl+1Ob9gjvKJUUr0BMOrOVDT85d/867BHeEV/+6uffXp7bthTAMCL+AUXAAgiGgCAIKIBAAgiGgCAIKIBAAgiGgCAIKIBAAgiGgCAIKIBAAgiGgCAIKIBAAgiGgCAIKIBAAgiGgCAIKIBAAgiGgCAIKIBAAgiGgCAIKIBAAiSHPYAh/X7/b0b7Xa71+u3O51up9PtdqrV6ubW06gfm52dnZ6eTiQSURTFYrGhDgsA58jIRcP2dm27Xt9ptDa2a7Wdne3NzbXVlXY7kY1qyVQyHo+vrCx//PEnk5NTigEATtLIRcP/fvHban330fp2rdWLoiifTk1fmLs4nsvn06lUfGNjY+XJ6nff3S8UitlsdtjDAsA5MoRoqFQq8/Pzz1u6vPR4YvbKer3WTI2Xy8WxiXzl0tiPLiZjUSeKolIpubHx5OGjB5cvX5mdnT3BqQHgvPv+QMhKpVKpVA4uO3T3ZLRbjVQy0U+Xm6kLrcyFWH4sWyzUeqlerNOL17OFeLaQebKyura+1u12T368E/Ds/wgAGAUjd/ZEMpnsdlq5bKream81uo1Wv92PRVG004nX2ondWCGTmak2esvLa53OGYyGF2+GAYAh+sHuifn5+SNXWgd/8d1/zP5/Dy3av33ouYHrwtnZ2XZ3t5TLNNbrjVh+qpDe3IlyiXSv02l3k1EUJSYuF2dq1Wq12Wxms5mXe7kjTzEAMLKOP6bhUEbsRcDBHx7sg2dvH7n0BcbGxxYeLZayxSja3WxGj2v9+2utTjedisWjbjeKonY7KmWTi48Xnzx5Mj4+Fv5SAYDXcXj3xKGNB88zuF+Ix0pjURQVU5lULL7dbC/Vdr94XP1itfpgs768VXu6udmsb+ezyV6/vbq2OqAZAIBnHbGl4Xk7KV7Nyx7TVyyV0slMK2rnYu1WbaMapdf6/VQ/2cnEC1GrEO22dzabO9VCLlMsld7IhABAiMGecnloh0XIU5LJZCIR7zeq44nmVK9RivKX45lyYytZ7+zWt1Y3nvR6u9PTF3783q13bl4e5OwAwA8cHQ2BOykGIZ1Oz8yMzT9Y+tFMsZCJsv12ovs0H4+l4rFOqvO0WR2fnPj5nZ9evXo9k8kNZUIAOJ+O39LwglMkXva5ITKZdLk42ah+ubax0NrtpDPJK2/NzcxMd7vdzc2tZms2Hovlc/l8LhePn8HLSO+/XXs3nEwBwOj4PhoOrZ8O3g1cdOTtZ1d7x64Ip2em37/9/r1v7j189CibThaKxW4vqjeanW63VCyura8vLS3Nzc2dyctIqwQARtbIffdEFEXZbPbdd96dmZ65e/c3vV6vXC4lEulEIpHPZavpnafVjXg8vvctlwDAiRm5K0LuSaVS5XJ5bu5SLl8qFEr5fL5cLvf6saXFxUQyNzc3l0qlhj0jAJwvo7ilYU82m714cXZ17fHdu486nU6tVqvVasVi8Wd3PpmbuzTs6QDg3BndaIiiaGJi/MPf/enCwoPl5cel8fFLF2evXHmrXC7bzAAAJ2/koiEW+8E5EeVy6fbt27dv3x7WPADAnhE9pgEAGDWiAQAIIhoAgCCiAQAIIhoAgCCiAQAIIhoAgCCiAQAIIhoAgCCiAQAIIhoAgCCiAQAIIhoAgCCiAQAIIhoAgCCiAQAIIhoAgCCiAQAIkhz2AG/Sv/zDL4c9AgCcWbY0AABBRAMAEEQ0AABBRAMAEEQ0AABBRAMAEEQ0AABBRAMAECTW7/eHPQMAcArY0gAABBENAEAQ0QAABBENAEAQ0QAABBENAEAQ0QAABBENAECQ/wMkj1J1qZNpZwAAAABJRU5ErkJggg==" - height="200" - width="700"/> - - <br/> - <br/> - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Type of screen - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/screens/dual.gif'> - - Dual </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 9 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 41 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 4.56 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:13:21 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 11.11% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style="background-color: rgb(249,250,250)"> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/screens/normal.gif'> - - Normal </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:06:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> <h2 id="UserSettings_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;"> Visitor Configuration </h2> 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 3454389180..89c97c7ba3 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 @@ -55,11 +55,6 @@ </a> </li> <li> - <a href="#UserSettings_getScreenType" style="text-decoration:none; color: rgb(68,68,68);"> - Normal / Widescreen - </a> - </li> - <li> <a href="#UserSettings_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);"> Visitor Configuration </a> @@ -290,13 +285,13 @@ </a> </li> <li> - <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);"> - Device model + <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);"> + Browser version </a> </li> <li> - <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);"> - Browser version + <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);"> + Device model </a> </li> <li> @@ -2107,93 +2102,6 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="UserSettings_getScreenType" style="color: rgb(126,115,99); font-size: 11pt;"> - Normal / Widescreen -</h2> - - - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Type of screen - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/screens/dual.gif'> - - Dual </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 9 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 41 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 4.6 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:13:21 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 11% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style="background-color: rgb(249,250,250)"> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/screens/normal.gif'> - - Normal </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:06:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> <h2 id="UserSettings_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;"> Visitor Configuration </h2> @@ -4775,66 +4683,6 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;"> - Device model -</h2> - - - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Device model - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - Unknown </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 10 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 43 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 4.3 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:12:37 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 10% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> <h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(126,115,99); font-size: 11pt;"> Browser version </h2> @@ -4947,6 +4795,66 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> +<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;"> + Device model +</h2> + + + + <table style="border-collapse:collapse; margin-left: 5px;"> + <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> + <th style="padding: 6px 0;"> + Device model + </th> + <th style="padding: 6px 0;"> + Visits + </th> + <th style="padding: 6px 0;"> + Actions + </th> + <th style="padding: 6px 0;"> + Actions per Visit + </th> + <th style="padding: 6px 0;"> + Avg. Time on Website + </th> + <th style="padding: 6px 0;"> + Bounce Rate + </th> + <th style="padding: 6px 0;"> + Conversion Rate + </th> + </thead> + <tbody> + + <tr style=""> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + Unknown </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 10 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 43 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 4.3 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 00:12:37 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 10% + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 0% + </td> + </tr> + </tbody> + </table> + <br/> + <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> + Back to top + </a> <h2 id="DevicesDetection_getOsFamilies" style="color: rgb(126,115,99); font-size: 11pt;"> Operating System families </h2> 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 28c0b57395..f92c6594f1 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_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml index 72a5b780f3..90ebe565a7 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -239,34 +239,6 @@ </row> <row> <category>Visitor Settings</category> - <name>Normal / Widescreen</name> - <module>UserSettings</module> - <action>getScreenType</action> - <dimension>Type of screen</dimension> - <metrics> - <nb_visits>Visits</nb_visits> - <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> - <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> - </metrics> - <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> - <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> - <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> - </metricsDocumentation> - <processedMetrics> - <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> - <avg_time_on_site>Avg. Time on Website</avg_time_on_site> - <bounce_rate>Bounce Rate</bounce_rate> - <conversion_rate>Conversion Rate</conversion_rate> - </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getScreenType&period=day&date=2009-01-04</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getScreenType&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> - <uniqueId>UserSettings_getScreenType</uniqueId> - </row> - <row> - <category>Visitor Settings</category> <name>Visitor Configuration</name> <module>UserSettings</module> <action>getConfiguration</action> @@ -1893,10 +1865,10 @@ </row> <row> <category>Visitor Devices</category> - <name>Browser version</name> + <name>Device model</name> <module>DevicesDetection</module> - <action>getBrowserVersions</action> - <dimension>Browser version</dimension> + <action>getModel</action> + <dimension>Device model</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -1915,16 +1887,16 @@ <bounce_rate>Bounce Rate</bounce_rate> <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserVersions&period=day&date=2009-01-04</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserVersions&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> - <uniqueId>DevicesDetection_getBrowserVersions</uniqueId> + <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getModel&period=day&date=2009-01-04</imageGraphUrl> + <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getModel&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> + <uniqueId>DevicesDetection_getModel</uniqueId> </row> <row> <category>Visitor Devices</category> - <name>Device model</name> + <name>Browser version</name> <module>DevicesDetection</module> - <action>getModel</action> - <dimension>Device model</dimension> + <action>getBrowserVersions</action> + <dimension>Browser version</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -1943,9 +1915,9 @@ <bounce_rate>Bounce Rate</bounce_rate> <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getModel&period=day&date=2009-01-04</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getModel&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> - <uniqueId>DevicesDetection_getModel</uniqueId> + <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserVersions&period=day&date=2009-01-04</imageGraphUrl> + <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserVersions&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> + <uniqueId>DevicesDetection_getBrowserVersions</uniqueId> </row> <row> <category>Visitor Devices</category> 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 27a8a409e0..346c1542db 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 a6103ff862..76d48bc7b6 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 @@ -112,9 +112,7 @@ <location>Poland</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -323,9 +321,7 @@ <location>Poland</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> 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 de1db7a777..5ff6e58fba 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -188,9 +188,7 @@ <location>Poland</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -518,9 +516,7 @@ <location>Poland</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -734,9 +730,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>normal</screenType> <resolution>1024x768</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv index 5610bff163..4fe00e7866 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv @@ -88,10 +88,6 @@ Realplayer,0,0% Silverlight,0,0% Windowsmedia,0,0% -Normal / Widescreen -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Normal,5,16,80%,3.2,00:22:49,20% - Visitor Configuration label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Windows XP / Firefox / 1024x768,5,16,80%,3.2,00:22:49,20% @@ -482,14 +478,14 @@ Device brand label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Unknown,5,16,80%,3.2,00:22:49,20% -Browser version -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Firefox 3.6,5,16,80%,3.2,00:22:49,20% - Device model label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Unknown,5,16,80%,3.2,00:22:49,20% +Browser version +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Firefox 3.6,5,16,80%,3.2,00:22:49,20% + Operating System families label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Windows,5,16,80%,3.2,00:22:49,20% 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 7861e2ab4e..dd359fb284 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 @@ -55,11 +55,6 @@ </a> </li> <li> - <a href="#UserSettings_getScreenType" style="text-decoration:none; color: rgb(68,68,68);"> - Normal / Widescreen - </a> - </li> - <li> <a href="#UserSettings_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);"> Visitor Configuration </a> @@ -2161,74 +2156,6 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="UserSettings_getScreenType" style="color: rgb(126,115,99); font-size: 11pt;"> - Normal / Widescreen -</h2> - - <img alt="" - src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAJSUlEQVR4nO3dy25cBxnA8TP38dzsJLVjx42iyG0DNBKIpiosYNEHQOIBWLFHYsOCB0DseAKegi2PQFYQQGpN2jS2c3EcZzy+zuWwMHJdx7G/ENtnPPP7LaKZOWeiz7FOzt/nMs6laZoAAJwmn/UAAMDlIBoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaPifhYWFY1889vWT3wUAI0k0nGJxcTG+VEMAMMKKWQ9wQf7w578deeX3v753+Oni4uLCwsLhCDjyFADG3LhEwxfftLvd7sHTUqm0tLQ0Pz9/6htfL4mDx0c6Y3/RwQr7Sw+v/G5fAQBkbFyiIUmSra2tg8eTk5PLy8uRaDjshIBIjmsIxy0AGCWuafjW4WMDkX38W0WAYgDgshMNb2G/KoJXO77VygAw/Mbo9EStVnv3v2T/gMF+CgQPRQRXBoAhNy7R8MvPF5aXlk5d7eAMReROy/ghh8Q1DQBcfuMSDb/4+a0kufWOf8lb7fhVAgAjZlyi4Uy8fhflsTdQvGnlixkSAM5JLk3TrGcAAC4Bd08AACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBkFD4R0gcvwpCzkcKlcPhDjY9d4dJHw5Ff8eA3PsCwsZHCpRDZNp2eAM6XRIDhF6z5S3+kAQB4d5HTiKIBuAinnisFshU5jSgagItw8B+Qaxrg8nJNAwAQIhqA83X4RClwqeXSNM16hnflFnAYcjZSGH6R7XQUogEAuABOTwAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgJDRiYb79+9nPQJwEhspDLlTN9LRiQYA4FyJBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQUsx6gLP0+OlG1iMAb7T6qmsj5cK8f72Z9QgjaKSi4Td//GvWIwAn+stK1hMwLv70u89vzU1mPcWocXoCAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACCkmPUAR6Vpuv+g2+0OBmm31+v3ev1+r91ur796maS52dnZ6enpQqGQJEkul8t0WAAYI0MXDRsbnY2trc3tvbWNTmdzc2N9ffX5s263UE06xVIxn88/e/bkk0/uXb16TTEAwEUaumj4+z//1d7affxio7M3SJKkVi5Nvzd3fWqiViuXSvm1tbVnT59/9dXDer1RrVazHhYAxkgG0bCwsLC4uPimpU+WV67M3nyx1dkpTbVajckrtYUbkx9eL+aSXpIkzWZxbe3pN4+/np+/OTs7e4FTA8C4+zYaFhYWkiQ5vDs/ee9+Trp726ViIS23dorXqpVGrlaqNuqdwaBe2Elye9V6vlqvfPWfJ6svVqenp4vFoTtSAsDw2N+1HXbx+7VRMnQ73WKx2O/tTVRLK1vd3HZ/e6/YTXNJkmz28mlS2M3VK5WZ9vbykyerH37QFw0AnEwlnKHv7HQXFxePPbpwuNQO1jn488iig8dH3hv8ts3Oznb7u82JyvaLre1c7Vq9vL6ZTBTKg16v2y8mSVK4Mt+Y6bTb7Z2dnWq18nZfLgDw/zr9J/UjGbEfAYdfPNwHrz8+dukJJqcmHz1ealYbSbK7vpOsdNKHq3u9frmUyyf9fpIk3W7SrBaXVpaePn06NTUZ/1IBGENHfrjNcJIRcDQa3nSw4fXVzmmgyeZkkiw1SpVSrrux013u5Msr3Y1eeaqcVga7lbSX627XqsUXaff56vM7dz46pzEAGAFH9laZXKs3So450hDshqDXL0I5WaPZLBcre0l3Itfd66y1k/JqmpbSYq+Sryd79WS3u7m+s9muT1QazeaZTAgARJzvhYRHTlhE3lIsFguFfLrdnirsXBtsN5PafL7S2n5V3Ortbr16vvZ0MNidnn7vB9/7/kcfzJ/n7ADAdxwfDUeucLxI5XJ5ZmZy8evlD2ca9UpSTbuF/staPlfK53ql3sud9tTVKz/97NNbt25XKhOZTAjAZeF8xNk6/UjDCbdIvO17IyqVcqtxdbv979W1R3u7vXKlePP9uZmZ6X6/v77+amdvNp/L1SZqtYmJfN7HSANwktd3YRkOMwK+jYYj/5SHnwYXHfv49e/Qqd+z6Znpj+9+/OUXX37z+HG1XKw3Gv1BsrW90+v3m43G6osXy8vLc3NzPkYagFMJhTM0jB+OVK1W73x0Z2Z65sGDfwwGg1arWSiUC4VCbaLaLm++bK/l8/n933IJAFyYfNYDHK9UKrVarbm5GxO1Zr3erNVqrVZrkOaWl5YKxYm5ublSqZT1jAAwXobxSMO+arV6/frs89WVBw8e93q9TqfT6XQajcZPPrs3N3cj6+kAYOwMbzQkSXLlytSPfvjpo0dfP3my0pyaunF99ubN91utlsMMAHDxhi4acrnv3BPRajXv3r179+7drOYBAPYN6TUNAMCwEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAISIBgAgRDQAACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAhogEACBENAECIaAAAQkQDABAiGgCAENEAAIQUsx7gLP32V/eyHgF4o4cPH96+fTvrKRgXt+Ymsx5hBI1UNPzsxzezHgF4o1r67BMbKVxmTk8AACGiAQAIEQ0AQIhoAABCRAMAECIaAIAQ0QAAhIgGACBENAAAIaIBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACE5NI0zXoGAOAScKQBAAgRDQBAiGgAAEJEAwAQIhoAgBDRAACEiAYAIEQ0AAAh/wXWOrLZRow6vAAAAABJRU5ErkJggg==" - height="200" - width="700"/> - - <br/> - <br/> - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Type of screen - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/screens/normal.gif'> - - Normal </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 16 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 3.2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:22:49 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 20% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 80% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> <h2 id="UserSettings_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;"> Visitor Configuration </h2> 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 9bcbc71028..cf266ddbcc 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 @@ -55,11 +55,6 @@ </a> </li> <li> - <a href="#UserSettings_getScreenType" style="text-decoration:none; color: rgb(68,68,68);"> - Normal / Widescreen - </a> - </li> - <li> <a href="#UserSettings_getConfiguration" style="text-decoration:none; color: rgb(68,68,68);"> Visitor Configuration </a> @@ -350,13 +345,13 @@ </a> </li> <li> - <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);"> - Browser version + <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);"> + Device model </a> </li> <li> - <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);"> - Device model + <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);"> + Browser version </a> </li> <li> @@ -2144,68 +2139,6 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="UserSettings_getScreenType" style="color: rgb(126,115,99); font-size: 11pt;"> - Normal / Widescreen -</h2> - - - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Type of screen - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/screens/normal.gif'> - - Normal </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 16 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 3.2 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:22:49 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 20% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 80% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> <h2 id="UserSettings_getConfiguration" style="color: rgb(126,115,99); font-size: 11pt;"> Visitor Configuration </h2> @@ -6381,8 +6314,8 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(126,115,99); font-size: 11pt;"> - Browser version +<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;"> + Device model </h2> @@ -6390,7 +6323,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Browser version + Device model </th> <th style="padding: 6px 0;"> Visits @@ -6415,9 +6348,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/browsers/FF.gif'> - - Firefox 3.6 </td> + Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -6443,8 +6374,8 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;"> - Device model +<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(126,115,99); font-size: 11pt;"> + Browser version </h2> @@ -6452,7 +6383,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Device model + Browser version </th> <th style="padding: 6px 0;"> Visits @@ -6477,7 +6408,9 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - Unknown </td> + <img src='plugins/UserSettings/images/browsers/FF.gif'> + + Firefox 3.6 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> 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 1a69564d4d..a13ae92d35 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_noVisit_PeriodIsLast__UserSettings.getScreenType_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_day.xml deleted file mode 100644 index 106f23f16b..0000000000 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_day.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result date="2009-01-04" /> - <result date="2009-01-05" /> - <result date="2009-01-06" /> - <result date="2009-01-07" /> - <result date="2009-01-08" /> - <result date="2009-01-09" /> - <result date="2009-01-10" /> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_week.xml deleted file mode 100644 index 5cfb246edc..0000000000 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_week.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result date="From 2008-12-29 to 2009-01-04" /> - <result date="From 2009-01-05 to 2009-01-11" /> - <result date="From 2009-01-12 to 2009-01-18" /> - <result date="From 2009-01-19 to 2009-01-25" /> - <result date="From 2009-01-26 to 2009-02-01" /> - <result date="From 2009-02-02 to 2009-02-08" /> - <result date="From 2009-02-09 to 2009-02-15" /> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_day.xml deleted file mode 100644 index 106f23f16b..0000000000 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_day.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result date="2009-01-04" /> - <result date="2009-01-05" /> - <result date="2009-01-06" /> - <result date="2009-01-07" /> - <result date="2009-01-08" /> - <result date="2009-01-09" /> - <result date="2009-01-10" /> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_week.xml deleted file mode 100644 index 5cfb246edc..0000000000 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_week.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<results> - <result date="From 2008-12-29 to 2009-01-04" /> - <result date="From 2009-01-05 to 2009-01-11" /> - <result date="From 2009-01-12 to 2009-01-18" /> - <result date="From 2009-01-19 to 2009-01-25" /> - <result date="From 2009-01-26 to 2009-02-01" /> - <result date="From 2009-02-02 to 2009-02-08" /> - <result date="From 2009-02-09 to 2009-02-15" /> -</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getScreenType_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getScreenType_day.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getScreenType_day.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getWideScreen_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getWideScreen_day.xml deleted file mode 100644 index c234bed59e..0000000000 --- a/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getWideScreen_day.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<result />
\ 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 a4a21e48af..b48064a09c 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 @@ -82,9 +82,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>dual</screenType> <resolution>1111x222</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -197,9 +195,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>dual</screenType> <resolution>1111x222</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -372,9 +368,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>dual</screenType> <resolution>1111x222</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> 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 a4a21e48af..b48064a09c 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 @@ -82,9 +82,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>dual</screenType> <resolution>1111x222</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -197,9 +195,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>dual</screenType> <resolution>1111x222</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -372,9 +368,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>dual</screenType> <resolution>1111x222</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> 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 b1e550645e..60e389c7ab 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 @@ -125,9 +125,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>dual</screenType> <resolution>1111x222</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> @@ -241,9 +239,7 @@ <location>France</location> <latitude /> <longitude /> - <screenType>dual</screenType> <resolution>1111x222</resolution> - <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> <pluginsIcons> <row> diff --git a/tests/PHPUnit/Unit/DeprecatedMethodsTest.php b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php index 7b5bad19d8..ff6884e62b 100644 --- a/tests/PHPUnit/Unit/DeprecatedMethodsTest.php +++ b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php @@ -62,7 +62,6 @@ class DeprecatedMethodsTest extends \PHPUnit_Framework_TestCase $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getOSFamily', $validTill); $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getBrowserType', $validTill); $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getMobileVsDesktop', $validTill); - $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getWideScreen', $validTill); $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\UserSettings', 'mapDeprecatedActions', $validTill); $this->assertDeprecatedMethodIsRemovedInPiwik3('\Piwik\Menu\MenuAbstract', 'add'); |