From 8a25a5f180586a932ca8c7985adad1c5312551f0 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Fri, 28 Nov 2014 15:06:51 +0100 Subject: [PATCH] removed screen type report and widget --- CHANGELOG.md | 2 +- core/API/Request.php | 8 +- ...ontents__Live.getLastVisitsDetails_day.xml | 4 - ...tents__Live.getLastVisitsDetails_month.xml | 4 - ...onMatch__Live.getLastVisitsDetails_day.xml | 4 - ...etMatch__Live.getLastVisitsDetails_day.xml | 4 - ...ceMatch__Live.getLastVisitsDetails_day.xml | 4 - plugins/CoreHome/javascripts/dataTable.js | 2 +- ...temTest__Live.getLastVisitsDetails_day.xml | 2 - .../templates/_dataTableViz_visitorLog.twig | 2 +- plugins/UserSettings/API.php | 16 --- plugins/UserSettings/Archiver.php | 16 +-- plugins/UserSettings/Columns/TypeOfScreen.php | 20 ---- plugins/UserSettings/Controller.php | 2 - .../UserSettings/Reports/GetScreenType.php | 37 ------- plugins/UserSettings/UserSettings.php | 6 -- plugins/UserSettings/Visitor.php | 21 ---- plugins/UserSettings/functions.php | 37 ------- plugins/UserSettings/lang/am.json | 3 +- plugins/UserSettings/lang/ar.json | 3 +- plugins/UserSettings/lang/be.json | 3 +- plugins/UserSettings/lang/bg.json | 3 +- plugins/UserSettings/lang/ca.json | 3 +- plugins/UserSettings/lang/cs.json | 3 +- plugins/UserSettings/lang/da.json | 3 +- plugins/UserSettings/lang/de.json | 3 +- plugins/UserSettings/lang/el.json | 3 +- plugins/UserSettings/lang/en.json | 4 +- plugins/UserSettings/lang/es.json | 3 +- plugins/UserSettings/lang/et.json | 3 +- plugins/UserSettings/lang/eu.json | 3 +- plugins/UserSettings/lang/fa.json | 3 +- plugins/UserSettings/lang/fi.json | 3 +- plugins/UserSettings/lang/fr.json | 3 +- plugins/UserSettings/lang/gl.json | 3 +- plugins/UserSettings/lang/hu.json | 3 +- plugins/UserSettings/lang/id.json | 3 +- plugins/UserSettings/lang/is.json | 3 +- plugins/UserSettings/lang/it.json | 3 +- plugins/UserSettings/lang/ja.json | 3 +- plugins/UserSettings/lang/ka.json | 3 +- plugins/UserSettings/lang/ko.json | 3 +- plugins/UserSettings/lang/lt.json | 3 +- plugins/UserSettings/lang/lv.json | 3 +- plugins/UserSettings/lang/nb.json | 3 +- plugins/UserSettings/lang/nl.json | 3 +- plugins/UserSettings/lang/nn.json | 3 +- plugins/UserSettings/lang/pl.json | 3 +- plugins/UserSettings/lang/pt-br.json | 3 +- plugins/UserSettings/lang/pt.json | 3 +- plugins/UserSettings/lang/ro.json | 3 +- plugins/UserSettings/lang/ru.json | 3 +- plugins/UserSettings/lang/sk.json | 3 +- plugins/UserSettings/lang/sq.json | 3 +- plugins/UserSettings/lang/sr.json | 3 +- plugins/UserSettings/lang/sv.json | 3 +- plugins/UserSettings/lang/th.json | 3 +- plugins/UserSettings/lang/tl.json | 3 +- plugins/UserSettings/lang/tr.json | 3 +- plugins/UserSettings/lang/uk.json | 3 +- plugins/UserSettings/lang/vi.json | 3 +- plugins/UserSettings/lang/zh-cn.json | 3 +- plugins/UserSettings/lang/zh-tw.json | 3 +- plugins/UserSettings/templates/index.twig | 3 - ...Options__Live.getLastVisitsDetails_day.xml | 18 ---- ...ptions__Live.getLastVisitsDetails_year.xml | 20 ---- ...ITest__Live.getLastVisitsDetails_range.xml | 70 ------------- ...mEvents__Live.getLastVisitsDetails_day.xml | 20 ---- ...vents__Live.getLastVisitsDetails_month.xml | 20 ---- ...tLogs__Live.getLastVisitsDetails_range.xml | 80 -------------- ...Logs__UserSettings.getScreenType_month.xml | 39 ------- ...Logs__UserSettings.getWideScreen_month.xml | 39 ------- ...rtAsc__Live.getLastVisitsDetails_month.xml | 14 --- ...itAsc__Live.getLastVisitsDetails_month.xml | 14 --- ...Visit__Live.getLastVisitsDetails_month.xml | 14 --- ...Count__Live.getLastVisitsDetails_month.xml | 14 --- ...tDesc__Live.getLastVisitsDetails_month.xml | 14 --- ...eTest__Live.getLastVisitsDetails_month.xml | 20 ---- ...Visits__UserSettings.getScreenType_day.xml | 14 --- ...Visits__UserSettings.getWideScreen_day.xml | 14 --- ...Support__Live.getLastVisitsDetails_day.xml | 4 - ...upport__UserSettings.getScreenType_day.xml | 15 --- ...upport__UserSettings.getWideScreen_day.xml | 15 --- ...ecified__Live.getLastVisitsDetails_day.xml | 4 - ...eDays__Live.getLastVisitsDetails_month.xml | 6 -- ...nesTest__Live.getLastVisitsDetails_day.xml | 2 - ...Reports.generateReport_month.original.html | 98 ------------------ ...Reports.generateReport_month.original.html | 92 ---------------- ...ortMetadata__API.getReportMetadata_day.xml | 28 ----- ...vExport__Live.getLastVisitsDetails_day.csv | Bin 7680 -> 7328 bytes ...Ordered__Live.getLastVisitsDetails_day.xml | 4 - ...thItems__Live.getLastVisitsDetails_day.xml | 6 -- ...dReports.generateReport_week.original.html | 73 ------------- ...dReports.generateReport_week.original.html | 67 ------------ ...IsLast__UserSettings.getScreenType_day.xml | 10 -- ...sLast__UserSettings.getScreenType_week.xml | 10 -- ...IsLast__UserSettings.getWideScreen_day.xml | 10 -- ...sLast__UserSettings.getWideScreen_week.xml | 10 -- ...oVisit__UserSettings.getScreenType_day.xml | 2 - ...oVisit__UserSettings.getWideScreen_day.xml | 2 - ...tadataAndNormalAPI__Live.getLastVisits.xml | 6 -- ...alAPI__Live.getLastVisitsDetails_range.xml | 6 -- ...taAndNormalAPI__Live.getVisitorProfile.xml | 4 - tests/PHPUnit/Unit/DeprecatedMethodsTest.php | 1 - 104 files changed, 53 insertions(+), 1176 deletions(-) delete mode 100644 plugins/UserSettings/Columns/TypeOfScreen.php delete mode 100644 plugins/UserSettings/Reports/GetScreenType.php delete mode 100644 tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getScreenType_month.xml delete mode 100644 tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml delete mode 100644 tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getScreenType_day.xml delete mode 100644 tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getWideScreen_day.xml delete mode 100644 tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getScreenType_day.xml delete mode 100644 tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml delete mode 100644 tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_day.xml delete mode 100644 tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_week.xml delete mode 100644 tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_day.xml delete mode 100644 tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_week.xml delete mode 100644 tests/PHPUnit/System/expected/test_noVisit__UserSettings.getScreenType_day.xml delete mode 100644 tests/PHPUnit/System/expected/test_noVisit__UserSettings.getWideScreen_day.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index 999388087dc..2fa668aead3 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 979f1299d0b..23677e45fb0 100644 --- a/core/API/Request.php +++ b/core/API/Request.php @@ -46,7 +46,7 @@ * * **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 @@ * **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 @@ public static function getRequestArrayFromString($request, $defaultRequest = nul * 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 6c8c8875f00..7b62e398c20 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 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -177,9 +175,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif director 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 6c8c8875f00..7b62e398c20 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 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -177,9 +175,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif director 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 6c8c8875f00..7b62e398c20 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 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -177,9 +175,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif director 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 6c8c8875f00..7b62e398c20 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 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -177,9 +175,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif director 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 6c8c8875f00..7b62e398c20 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 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -177,9 +175,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif director diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js index ac59e4ff2be..99607433481 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 1fbae717c6e..da580cc910c 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 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java diff --git a/plugins/Live/templates/_dataTableViz_visitorLog.twig b/plugins/Live/templates/_dataTableViz_visitorLog.twig index cf0460501a5..c355b700f1d 100644 --- a/plugins/Live/templates/_dataTableViz_visitorLog.twig +++ b/plugins/Live/templates/_dataTableViz_visitorLog.twig @@ -36,7 +36,7 @@ {% endif %} {% if visitor.getColumn('operatingSystemIcon') %}  {% endif %} + title="{{ visitor.getColumn('operatingSystem') }}, {{ visitor.getColumn('resolution') }}"/>{% endif %} {% if visitor.getColumn('visitorTypeIcon') %} {% if visitor.getColumn('visitorTypeIcon') %} - 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 fed904de7d9..740e5d4d945 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 @@ public function aggregateMultipleReports() $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 @@ protected function aggregateByConfiguration() $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 @@ protected function aggregateByResolution() 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 cdbc796ab24..00000000000 --- a/plugins/UserSettings/Columns/TypeOfScreen.php +++ /dev/null @@ -1,20 +0,0 @@ -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 1b33d0dc4ca..00000000000 --- a/plugins/UserSettings/Reports/GetScreenType.php +++ /dev/null @@ -1,37 +0,0 @@ -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 d36ce093b6f..81584705449 100644 --- a/plugins/UserSettings/UserSettings.php +++ b/plugins/UserSettings/UserSettings.php @@ -52,19 +52,13 @@ public function mapDeprecatedActions(&$module, &$action, &$parameters) $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 03e2bd958a1..33f3528487b 100644 --- a/plugins/UserSettings/Visitor.php +++ b/plugins/UserSettings/Visitor.php @@ -63,15 +63,6 @@ function getPluginIcons() 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 @@ function getResolution() 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 e367ff8bc98..eaab5557c7c 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 b3e6ceefe55..50942cf0323 100644 --- a/plugins/UserSettings/lang/am.json +++ b/plugins/UserSettings/lang/am.json @@ -169,7 +169,6 @@ "WidgetGlobalVisitors": "የሁሉም ጎብኚዎች ውቅረት", "WidgetOperatingSystems": "ስርዓተ ክወናዎች", "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 9709b1ed09c..8eeeac62a40 100644 --- a/plugins/UserSettings/lang/ar.json +++ b/plugins/UserSettings/lang/ar.json @@ -202,7 +202,6 @@ "WidgetGlobalVisitors": "الإعدادات العامة للزوار", "WidgetOperatingSystems": "أنظمة التشغيل", "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 afe7fdc13e0..20c273bcefb 100644 --- a/plugins/UserSettings/lang/be.json +++ b/plugins/UserSettings/lang/be.json @@ -136,7 +136,6 @@ "WidgetOperatingSystems": "Аперацыйныя сістэмы", "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 6f37689f603..bd08b3b48cf 100644 --- a/plugins/UserSettings/lang/bg.json +++ b/plugins/UserSettings/lang/bg.json @@ -211,7 +211,6 @@ "WidgetOperatingSystems": "Операционни системи", "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 a9b19df9d0c..abbcac1a970 100644 --- a/plugins/UserSettings/lang/ca.json +++ b/plugins/UserSettings/lang/ca.json @@ -208,7 +208,6 @@ "WidgetOperatingSystems": "Sistemes operatius", "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 933fde91322..f05e89bd839 100644 --- a/plugins/UserSettings/lang/cs.json +++ b/plugins/UserSettings/lang/cs.json @@ -211,7 +211,6 @@ "WidgetOperatingSystems": "Operační systémy", "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 a0e18f69c6a..bc8cbd084cb 100644 --- a/plugins/UserSettings/lang/da.json +++ b/plugins/UserSettings/lang/da.json @@ -211,7 +211,6 @@ "WidgetOperatingSystems": "Operativsystem", "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 9113d2b41bb..5e7a5ea12b1 100644 --- a/plugins/UserSettings/lang/de.json +++ b/plugins/UserSettings/lang/de.json @@ -211,7 +211,6 @@ "WidgetOperatingSystems": "Betriebssysteme", "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 4189b0b336e..ccf27a06394 100644 --- a/plugins/UserSettings/lang/el.json +++ b/plugins/UserSettings/lang/el.json @@ -211,7 +211,6 @@ "WidgetOperatingSystems": "Λειτουργικά συστήματα", "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 0057f454e93..e271613dd20 100644 --- a/plugins/UserSettings/lang/en.json +++ b/plugins/UserSettings/lang/en.json @@ -10,7 +10,6 @@ "ColumnOperatingSystem": "Operating system", "ColumnResolution": "Resolution", "ColumnTypeOfScreen": "Type of screen", - "ScreenTypes": "Screen types", "Configurations": "Configurations", "GamingConsole": "Gaming Console", "Language_aa": "Afar", @@ -212,7 +211,6 @@ "WidgetOperatingSystems": "Operating System", "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 151c54cae04..669f9a17ee3 100644 --- a/plugins/UserSettings/lang/es.json +++ b/plugins/UserSettings/lang/es.json @@ -211,7 +211,6 @@ "WidgetOperatingSystems": "Sistemas operativos", "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 f2c9d38bf6d..4f70f02b2f8 100644 --- a/plugins/UserSettings/lang/et.json +++ b/plugins/UserSettings/lang/et.json @@ -205,7 +205,6 @@ "WidgetGlobalVisitors": "Kohalike külastajate seaded", "WidgetOperatingSystems": "Operatsioonisüsteemid", "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 7fc63dc7009..3f140ae7231 100644 --- a/plugins/UserSettings/lang/eu.json +++ b/plugins/UserSettings/lang/eu.json @@ -162,7 +162,6 @@ "WidgetGlobalVisitors": "Bisitarien konfigurazioa", "WidgetOperatingSystems": "Sistema eragileak", "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 04c0c954234..6728d12b8db 100644 --- a/plugins/UserSettings/lang/fa.json +++ b/plugins/UserSettings/lang/fa.json @@ -210,7 +210,6 @@ "WidgetOperatingSystems": "سیستم عامل ها", "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 3de8453929b..cba8e6d3824 100644 --- a/plugins/UserSettings/lang/fi.json +++ b/plugins/UserSettings/lang/fi.json @@ -211,7 +211,6 @@ "WidgetOperatingSystems": "Käyttöjärjestelmät", "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 7697f2a1e2b..885bcf14655 100644 --- a/plugins/UserSettings/lang/fr.json +++ b/plugins/UserSettings/lang/fr.json @@ -211,7 +211,6 @@ "WidgetOperatingSystems": "Systèmes d'exploitation", "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 8f3822ca548..f28e20627e6 100644 --- a/plugins/UserSettings/lang/gl.json +++ b/plugins/UserSettings/lang/gl.json @@ -157,7 +157,6 @@ "WidgetGlobalVisitors": "Configuración global de visitantes", "WidgetOperatingSystems": "Sistemas Operativos", "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/hu.json b/plugins/UserSettings/lang/hu.json index e9d1e42105c..796028af09d 100644 --- a/plugins/UserSettings/lang/hu.json +++ b/plugins/UserSettings/lang/hu.json @@ -203,7 +203,6 @@ "WidgetGlobalVisitors": "Globális látogatói beállítások", "WidgetOperatingSystems": "Operációs rendszerek", "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 f877d25b00f..e51070d5333 100644 --- a/plugins/UserSettings/lang/id.json +++ b/plugins/UserSettings/lang/id.json @@ -211,7 +211,6 @@ "WidgetOperatingSystems": "Sistem Operasi", "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 88618b0ef99..3e2e8228526 100644 --- a/plugins/UserSettings/lang/is.json +++ b/plugins/UserSettings/lang/is.json @@ -203,7 +203,6 @@ "WidgetGlobalVisitors": "Altæk gestastilling", "WidgetOperatingSystems": "Stýrikerfi", "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 f9e7d8601ea..3f5a470f7ee 100644 --- a/plugins/UserSettings/lang/it.json +++ b/plugins/UserSettings/lang/it.json @@ -211,7 +211,6 @@ "WidgetOperatingSystems": "Sistemi Operativi", "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 38b1667c0e7..289ab6af2a0 100644 --- a/plugins/UserSettings/lang/ja.json +++ b/plugins/UserSettings/lang/ja.json @@ -211,7 +211,6 @@ "WidgetOperatingSystems": "オペレーティングシステム", "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 7823afc29f7..ba4e21f84b9 100644 --- a/plugins/UserSettings/lang/ka.json +++ b/plugins/UserSettings/lang/ka.json @@ -176,7 +176,6 @@ "WidgetGlobalVisitors": "ვიზიტორების გლობალური კონფიგურაცია", "WidgetOperatingSystems": "ოპერაციული სისტემები", "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 b633b52cda5..4716189f4c9 100644 --- a/plugins/UserSettings/lang/ko.json +++ b/plugins/UserSettings/lang/ko.json @@ -209,7 +209,6 @@ "WidgetOperatingSystems": "운영체제", "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 8fbc5a92aa0..d04c838bac7 100644 --- a/plugins/UserSettings/lang/lt.json +++ b/plugins/UserSettings/lang/lt.json @@ -203,7 +203,6 @@ "WidgetGlobalVisitors": "Bendri lankytojų nustatymai", "WidgetOperatingSystems": "Operacinės sistemos", "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 65e783596c7..c8c91b76405 100644 --- a/plugins/UserSettings/lang/lv.json +++ b/plugins/UserSettings/lang/lv.json @@ -206,7 +206,6 @@ "WidgetOperatingSystems": "Operētājsistēmas", "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 248c25fc80b..4fe2867f421 100644 --- a/plugins/UserSettings/lang/nb.json +++ b/plugins/UserSettings/lang/nb.json @@ -202,7 +202,6 @@ "WidgetGlobalVisitors": "Besøkendes konfigurasjon", "WidgetOperatingSystems": "Operativsystemer", "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 4ffd7a5e9ad..686d77ccfc0 100644 --- a/plugins/UserSettings/lang/nl.json +++ b/plugins/UserSettings/lang/nl.json @@ -211,7 +211,6 @@ "WidgetOperatingSystems": "Besturings systemen", "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 72645a61a3b..8f82b4d176d 100644 --- a/plugins/UserSettings/lang/nn.json +++ b/plugins/UserSettings/lang/nn.json @@ -203,7 +203,6 @@ "WidgetGlobalVisitors": "Global vitjarkonfigurasjon", "WidgetOperatingSystems": "Operativsystem", "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 adbbdee582e..aa555d7593f 100644 --- a/plugins/UserSettings/lang/pl.json +++ b/plugins/UserSettings/lang/pl.json @@ -206,7 +206,6 @@ "WidgetGlobalVisitors": "Ogólna konfiguracja odwiedzających", "WidgetOperatingSystems": "Systemy operacyjne", "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 e8f1c8a5370..f7a6bfd62ab 100644 --- a/plugins/UserSettings/lang/pt-br.json +++ b/plugins/UserSettings/lang/pt-br.json @@ -211,7 +211,6 @@ "WidgetOperatingSystems": "Sistemas Operacionais", "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 693af9b8dbd..926fb573c3b 100644 --- a/plugins/UserSettings/lang/pt.json +++ b/plugins/UserSettings/lang/pt.json @@ -206,7 +206,6 @@ "WidgetOperatingSystems": "Sistemas operativos", "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 9418cd1fd80..faed64a013f 100644 --- a/plugins/UserSettings/lang/ro.json +++ b/plugins/UserSettings/lang/ro.json @@ -211,7 +211,6 @@ "WidgetOperatingSystems": "Sisteme operare", "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 f1a5c1e1c3a..a90bf07e5fb 100644 --- a/plugins/UserSettings/lang/ru.json +++ b/plugins/UserSettings/lang/ru.json @@ -209,7 +209,6 @@ "WidgetOperatingSystems": "Операционные системы", "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 eb66969c7a4..91b92d81f2a 100644 --- a/plugins/UserSettings/lang/sk.json +++ b/plugins/UserSettings/lang/sk.json @@ -203,7 +203,6 @@ "WidgetGlobalVisitors": "Globálne konfigurácie návštevníkov", "WidgetOperatingSystems": "Operačné systémy", "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/sq.json b/plugins/UserSettings/lang/sq.json index 6e457c2a6fe..e9d32fa65ae 100644 --- a/plugins/UserSettings/lang/sq.json +++ b/plugins/UserSettings/lang/sq.json @@ -123,7 +123,6 @@ "WidgetOperatingSystems": "Sisteme operativë", "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 2f2d0cfbf6c..b472e210d72 100644 --- a/plugins/UserSettings/lang/sr.json +++ b/plugins/UserSettings/lang/sr.json @@ -211,7 +211,6 @@ "WidgetOperatingSystems": "Operativni sistemi", "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 3d59030ee14..e62e076977c 100644 --- a/plugins/UserSettings/lang/sv.json +++ b/plugins/UserSettings/lang/sv.json @@ -211,7 +211,6 @@ "WidgetOperatingSystems": "Operativsystem", "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/th.json b/plugins/UserSettings/lang/th.json index 2813976ca89..e6c968db2b5 100644 --- a/plugins/UserSettings/lang/th.json +++ b/plugins/UserSettings/lang/th.json @@ -203,7 +203,6 @@ "WidgetGlobalVisitors": "การตั้งค่าผู้เข้าชมโดยรวม", "WidgetOperatingSystems": "ระบบปฎิบัติการ", "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 f7f2d6f9ebf..084b22f7276 100644 --- a/plugins/UserSettings/lang/tl.json +++ b/plugins/UserSettings/lang/tl.json @@ -209,7 +209,6 @@ "WidgetOperatingSystems": "Operating System", "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 7d33de6d4f8..67a230087ab 100644 --- a/plugins/UserSettings/lang/tr.json +++ b/plugins/UserSettings/lang/tr.json @@ -203,7 +203,6 @@ "WidgetGlobalVisitors": "Global ziyaretçi konfikasyonu", "WidgetOperatingSystems": "İşletim sistemleri", "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 32c3420a862..ba144206935 100644 --- a/plugins/UserSettings/lang/uk.json +++ b/plugins/UserSettings/lang/uk.json @@ -203,7 +203,6 @@ "WidgetGlobalVisitors": "Загальна конфігурація відвідувачів", "WidgetOperatingSystems": "Операційні системи", "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 3e96fdfcf18..98d66346bfe 100644 --- a/plugins/UserSettings/lang/vi.json +++ b/plugins/UserSettings/lang/vi.json @@ -211,7 +211,6 @@ "WidgetOperatingSystems": "Hệ điều 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 1cb6b20a188..968d7b30b5d 100644 --- a/plugins/UserSettings/lang/zh-cn.json +++ b/plugins/UserSettings/lang/zh-cn.json @@ -211,7 +211,6 @@ "WidgetOperatingSystems": "操作系统", "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 ad0493589cf..74b1c8736fb 100644 --- a/plugins/UserSettings/lang/zh-tw.json +++ b/plugins/UserSettings/lang/zh-tw.json @@ -206,7 +206,6 @@ "WidgetGlobalVisitorsDocumentation": "此報表列出貴站訪客最常見的設定配置。設定配置包含作業系統、瀏覽器、螢幕解析度等資訊。", "WidgetOperatingSystems": "作業系統", "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 7b6d236d47f..abf96de9e10 100644 --- a/plugins/UserSettings/templates/index.twig +++ b/plugins/UserSettings/templates/index.twig @@ -11,9 +11,6 @@

{{ 'UserSettings_Resolutions'|translate }}

{{ dataTableResolution|raw }} -

{{ 'UserSettings_ScreenTypes'|translate }}

- {{ dataTableScreenType|raw }} -

{{ 'UserSettings_Configurations'|translate }}

{{ dataTableConfiguration|raw }} 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 0ef089e70cc..6140bf82145 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 @@ plugins/UserSettings/images/browsers/CH.gif CH 19.0 - unknown Desktop unknown - plugins/UserSettings/images/screens/unknown.gif @@ -180,10 +178,8 @@ plugins/UserSettings/images/browsers/FF.gif FF 6.0 - unknown Desktop unknown - plugins/UserSettings/images/screens/unknown.gif @@ -276,10 +272,8 @@ plugins/UserSettings/images/browsers/CH.gif CH 19.0 - unknown Desktop unknown - plugins/UserSettings/images/screens/unknown.gif @@ -372,10 +366,8 @@ plugins/UserSettings/images/browsers/EP.gif EP 2.30 - unknown Desktop unknown - plugins/UserSettings/images/screens/unknown.gif @@ -468,10 +460,8 @@ plugins/UserSettings/images/browsers/IE.gif IE 9.0 - unknown Desktop unknown - plugins/UserSettings/images/screens/unknown.gif @@ -564,10 +554,8 @@ plugins/UserSettings/images/browsers/FF.gif FF 6.0 - unknown Desktop unknown - plugins/UserSettings/images/screens/unknown.gif @@ -660,10 +648,8 @@ plugins/UserSettings/images/browsers/EP.gif EP 2.30 - unknown Desktop unknown - plugins/UserSettings/images/screens/unknown.gif @@ -756,10 +742,8 @@ plugins/UserSettings/images/browsers/AN.gif AN - unknown Smartphone unknown - plugins/UserSettings/images/screens/unknown.gif @@ -852,10 +836,8 @@ plugins/UserSettings/images/browsers/UNK.gif RM 0.9 - unknown Desktop unknown - plugins/UserSettings/images/screens/unknown.gif 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 7bc0f5a0987..896b4d503fb 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 @@ plugins/UserSettings/images/browsers/UNK.gif UNK UNK - unknown Desktop unknown - plugins/UserSettings/images/screens/unknown.gif @@ -307,10 +305,8 @@ plugins/UserSettings/images/browsers/IE.gif IE 6.0 - normal Desktop 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -416,10 +412,8 @@ plugins/UserSettings/images/browsers/UNK.gif RM 0.9 - unknown Desktop unknown - plugins/UserSettings/images/screens/unknown.gif @@ -539,10 +533,8 @@ plugins/UserSettings/images/browsers/UNK.gif RM 0.9 - unknown Desktop unknown - plugins/UserSettings/images/screens/unknown.gif @@ -651,10 +643,8 @@ plugins/UserSettings/images/browsers/UNK.gif RM 0.9 - unknown Desktop unknown - plugins/UserSettings/images/screens/unknown.gif @@ -751,10 +741,8 @@ plugins/UserSettings/images/browsers/UNK.gif UNK UNK - unknown Desktop unknown - plugins/UserSettings/images/screens/unknown.gif @@ -857,10 +845,8 @@ plugins/UserSettings/images/browsers/IE.gif IE 9.0 - unknown Desktop unknown - plugins/UserSettings/images/screens/unknown.gif @@ -947,10 +933,8 @@ plugins/UserSettings/images/browsers/UNK.gif UNK UNK - unknown Desktop unknown - plugins/UserSettings/images/screens/unknown.gif @@ -1053,10 +1037,8 @@ plugins/UserSettings/images/browsers/AN.gif AN - unknown Smartphone unknown - plugins/UserSettings/images/screens/unknown.gif @@ -1153,10 +1135,8 @@ plugins/UserSettings/images/browsers/UNK.gif RM 0.9 - unknown Desktop unknown - plugins/UserSettings/images/screens/unknown.gif 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 58c15349b31..8e3799fa9ee 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 @@ http://google.com/?q=Wikileaks FTW http://google.com plugins/Referrers/images/searchEngines/google.com.png - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -204,9 +202,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -329,9 +325,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -468,9 +462,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -593,9 +585,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -749,9 +739,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -874,9 +862,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -1013,9 +999,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -1138,9 +1122,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -1294,9 +1276,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -1419,9 +1399,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -1558,9 +1536,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -1697,9 +1673,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -1814,9 +1788,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -1939,9 +1911,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -2095,9 +2065,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -2251,9 +2219,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -2368,9 +2334,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -2493,9 +2457,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -2632,9 +2594,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -2771,9 +2731,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -2910,9 +2868,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -3041,9 +2997,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -3166,9 +3120,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -3291,9 +3243,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -3416,9 +3366,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -3541,9 +3489,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -3697,9 +3643,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -3853,9 +3797,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -4009,9 +3951,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -4157,9 +4097,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -4282,9 +4220,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -4407,9 +4343,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -4532,9 +4466,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -4657,9 +4589,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java 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 cabb71c501e..a45e6b00b5f 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 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -181,9 +179,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -351,9 +347,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -453,9 +447,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -790,9 +782,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -892,9 +882,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif director @@ -990,9 +978,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif director @@ -1156,9 +1142,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif director @@ -1254,9 +1238,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif director @@ -1587,9 +1569,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif director 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 cabb71c501e..a45e6b00b5f 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 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -181,9 +179,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -351,9 +347,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -453,9 +447,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -790,9 +782,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -892,9 +882,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif director @@ -990,9 +978,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif director @@ -1156,9 +1142,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif director @@ -1254,9 +1238,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif director @@ -1587,9 +1569,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif director 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 23cef7562db..93c0819d6cf 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 @@ Raleigh, North Carolina, United States 35.771999 -78.639000 - wide 1366x768 - plugins/UserSettings/images/screens/wide.gif pdf, flash, java @@ -233,9 +231,7 @@ Lake Forest, California, United States 33.645000 -117.679001 - wide 1536x864 - plugins/UserSettings/images/screens/wide.gif 17:33:27 @@ -346,9 +342,7 @@ Germany 51 9 - wide 1920x1200 - plugins/UserSettings/images/screens/wide.gif pdf, flash, java, quicktime, silverlight @@ -492,9 +486,7 @@ United States 38 -97 - wide 2880x1800 - plugins/UserSettings/images/screens/wide.gif pdf, flash, java, quicktime @@ -607,9 +599,7 @@ Maaseik, Limburg, Belgium 51.099998 5.800000 - wide 1920x1080 - plugins/UserSettings/images/screens/wide.gif pdf, flash, java, silverlight @@ -733,9 +723,7 @@ San Francisco, California, United States 37.792000 -122.408997 - wide 1360x768 - plugins/UserSettings/images/screens/wide.gif pdf, flash, java, quicktime, windowsmedia, silverlight @@ -866,9 +854,7 @@ Nihon'odori, Kanagawa, Japan 35.450001 139.649994 - wide 2560x1440 - plugins/UserSettings/images/screens/wide.gif pdf, java, quicktime @@ -988,9 +974,7 @@ Weilerswist, Nordrhein-Westfalen, Germany 50.766998 6.833000 - mobile 360x640 - plugins/UserSettings/images/screens/mobile.gif flash @@ -1102,9 +1086,7 @@ Mainz, Rheinland-Pfalz, Germany 50 8.271000 - wide 2560x1440 - plugins/UserSettings/images/screens/wide.gif pdf, flash, java, quicktime, windowsmedia, silverlight @@ -1271,9 +1253,7 @@ Moscow, Moscow City, Russian Federation 55.751999 37.616001 - wide 1920x1080 - plugins/UserSettings/images/screens/wide.gif flash, java @@ -1389,9 +1369,7 @@ Esentepe, Rize, Turkey 40.979000 40.415001 - wide 1366x768 - plugins/UserSettings/images/screens/wide.gif pdf, flash, java, silverlight @@ -1515,9 +1493,7 @@ Maaseik, Limburg, Belgium 51.099998 5.800000 - wide 1920x1080 - plugins/UserSettings/images/screens/wide.gif pdf, flash, java, silverlight @@ -1799,9 +1775,7 @@ Japan 36 138 - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 08:10:38 @@ -1915,9 +1889,7 @@ Unknown - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -2032,9 +2004,7 @@ Unknown - wide 1280x800 - plugins/UserSettings/images/screens/wide.gif pdf, flash, java, director, windowsmedia, gears @@ -2165,9 +2135,7 @@ Japan 36 138 - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 20:15:41 @@ -2290,9 +2258,7 @@ Japan 36 138 - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 19:12:40 @@ -2422,9 +2388,7 @@ Japan 36 138 - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 18:10:38 @@ -2530,9 +2494,7 @@ Ashburn, Virginia, United States 39.043999 -77.487999 - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 17:48:08 @@ -2638,9 +2600,7 @@ Ashburn, Virginia, United States 39.043999 -77.487999 - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 17:48:07 @@ -2736,9 +2696,7 @@ Australia -27 133 - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 17:46:03 @@ -2844,9 +2802,7 @@ Japan 36 138 - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 16:11:30 @@ -2952,9 +2908,7 @@ Japan 36 138 - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 16:10:38 @@ -3056,9 +3010,7 @@ Unknown - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 15:31:05 @@ -3160,9 +3112,7 @@ Unknown - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 13:49:46 @@ -3264,9 +3214,7 @@ Brazil -10 -55 - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 20:22:08 @@ -3368,9 +3316,7 @@ Brazil -10 -55 - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 20:21:28 @@ -3472,9 +3418,7 @@ Brazil -10 -55 - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 20:21:03 @@ -3576,9 +3520,7 @@ Japan 36 138 - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 20:01:17 @@ -3680,9 +3622,7 @@ Japan 36 138 - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 19:59:50 @@ -3784,9 +3724,7 @@ Unknown - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 18:03:40 @@ -3888,9 +3826,7 @@ Unknown - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 21:00:42 @@ -3992,9 +3928,7 @@ Unknown - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 20:56:45 @@ -4096,9 +4030,7 @@ Ashburn, Virginia, United States 39.043999 -77.487999 - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 13:49:48 @@ -4200,9 +4132,7 @@ Ashburn, Virginia, United States 39.043999 -77.487999 - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 13:48:20 @@ -4304,9 +4234,7 @@ Ashburn, Virginia, United States 39.043999 -77.487999 - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 13:48:07 @@ -4408,9 +4336,7 @@ Japan 36 138 - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 08:12:03 @@ -4512,9 +4438,7 @@ Japan 36 138 - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 08:11:56 @@ -4616,9 +4540,7 @@ Japan 36 138 - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 08:11:30 @@ -4720,9 +4642,7 @@ Japan 36 138 - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 08:10:38 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 2048a44e64d..00000000000 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getScreenType_month.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - 25 - 28 - 3 - 305 - 23 - 23 - 25 - 0 - plugins/UserSettings/images/screens/unknown.gif - - - - 1 - 1 - 1 - 0 - 1 - 1 - 1 - 0 - plugins/UserSettings/images/screens/normal.gif - - - - 1 - 1 - 1 - 0 - 1 - 1 - 1 - 0 - plugins/UserSettings/images/screens/wide.gif - - \ 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 2048a44e64d..00000000000 --- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - 25 - 28 - 3 - 305 - 23 - 23 - 25 - 0 - plugins/UserSettings/images/screens/unknown.gif - - - - 1 - 1 - 1 - 0 - 1 - 1 - 1 - 0 - plugins/UserSettings/images/screens/normal.gif - - - - 1 - 1 - 1 - 0 - 1 - 1 - 1 - 0 - plugins/UserSettings/images/screens/wide.gif - - \ 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 5f234ed9c57..0879f6fb5b8 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 @@ plugins/UserSettings/images/browsers/FF.gif FF 3.6 - normal Desktop 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -225,10 +223,8 @@ plugins/UserSettings/images/browsers/FF.gif FF 3.6 - normal Desktop 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -348,10 +344,8 @@ plugins/UserSettings/images/browsers/FF.gif FF 3.6 - normal Desktop 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -471,10 +465,8 @@ plugins/UserSettings/images/browsers/FF.gif FF 3.6 - normal Desktop 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -625,10 +617,8 @@ plugins/UserSettings/images/browsers/FF.gif FF 3.6 - normal Desktop 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -779,10 +769,8 @@ plugins/UserSettings/images/browsers/FF.gif FF 3.6 - normal Desktop 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -925,10 +913,8 @@ plugins/UserSettings/images/browsers/UNK.gif UNK UNK - normal Desktop 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java 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 8e034ec0593..d252d03f5d2 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 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -220,9 +218,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -343,9 +339,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -497,9 +491,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -620,9 +612,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -774,9 +764,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -889,9 +877,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java 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 c6ff4bfdff2..2975b07bcb9 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 @@ http://google.com/?q=Wikileaks FTW http://google.com plugins/Referrers/images/searchEngines/google.com.png - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -204,9 +202,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -329,9 +325,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -468,9 +462,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -593,9 +585,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -749,9 +739,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -874,9 +862,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java 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 9c5c5cc080b..759645d39df 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 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -222,9 +220,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -378,9 +374,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -517,9 +511,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -642,9 +634,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -767,9 +757,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -882,9 +870,7 @@ http://google.com/?q=Wikileaks FTW http://google.com plugins/Referrers/images/searchEngines/google.com.png - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java 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 c6ff4bfdff2..2975b07bcb9 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 @@ http://google.com/?q=Wikileaks FTW http://google.com plugins/Referrers/images/searchEngines/google.com.png - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -204,9 +202,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -329,9 +325,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -468,9 +462,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -593,9 +585,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -749,9 +739,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -874,9 +862,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java 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 6bc6d4b5aa3..bd23daaa042 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 @@ http://google.com/?q=Wikileaks FTW http://google.com plugins/Referrers/images/searchEngines/google.com.png - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -204,9 +202,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -329,9 +325,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -468,9 +462,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -593,9 +585,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -749,9 +739,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -874,9 +862,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -1013,9 +999,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -1138,9 +1122,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -1294,9 +1276,7 @@ - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java 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 f1acb38cb94..00000000000 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getScreenType_day.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - 1 - 2 - 8 - 7 - 1621 - 1 - 2 - plugins/UserSettings/images/screens/normal.gif - - \ 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 f1acb38cb94..00000000000 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserSettings.getWideScreen_day.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - 1 - 2 - 8 - 7 - 1621 - 1 - 2 - plugins/UserSettings/images/screens/normal.gif - - \ 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 849af36fed0..6649f123d99 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 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -273,9 +271,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java 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 1aa955af66a..00000000000 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getScreenType_day.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - 1 - 2 - 9 - 0 - 8 - 1621 - 1 - 2 - plugins/UserSettings/images/screens/normal.gif - - \ 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 1aa955af66a..00000000000 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getWideScreen_day.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - 1 - 2 - 9 - 0 - 8 - 1621 - 1 - 2 - plugins/UserSettings/images/screens/normal.gif - - \ 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 8173b172510..9b0149ac2a0 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 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -181,9 +179,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java 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 dfaee585ef3..4eb429a7633 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 @@ Unknown - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 10:00:00 @@ -172,9 +170,7 @@ Unknown - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 11:00:00 @@ -265,9 +261,7 @@ Unknown - unknown unknown - plugins/UserSettings/images/screens/unknown.gif 12:00:00 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 e0516433ba8..17d9192ba42 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 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java 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 560e7ebe33a..8ca1417d42f 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 @@ -53,11 +53,6 @@

Browser Plugins - -
  • - - Normal / Widescreen -
  • @@ -2124,99 +2119,6 @@

    Back to top -

    - Normal / Widescreen -

    - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -  Type of screen   - -  Visits   - -  Actions   - -  Actions per Visit   - -  Avg. Time on Website   - -  Bounce Rate   - -  Conversion Rate   -
    - -   - Dual - 9 - - 41 - - 4.56 - - 00:13:21 - - 11.11% - - 0% -
    - -   - Normal - 1 - - 2 - - 2 - - 00:06:01 - - 0% - - 0% -
    -
    - - Back to top -

    Visitor Configuration

    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 34543891804..1023f2402f2 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 @@ -53,11 +53,6 @@

    Browser Plugins -

    • -
  • - - Normal / Widescreen -
  • @@ -2107,93 +2102,6 @@

    Back to top -

    - Normal / Widescreen -

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -  Type of screen   - -  Visits   - -  Actions   - -  Actions per Visit   - -  Avg. Time on Website   - -  Bounce Rate   - -  Conversion Rate   -
    - -   - Dual - 9 - - 41 - - 4.6 - - 00:13:21 - - 11% - - 0% -
    - -   - Normal - 1 - - 2 - - 2 - - 00:06:01 - - 0% - - 0% -
    -
    - - Back to top -

    Visitor Configuration

    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 72a5b780f30..eff0ec8836c 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -237,34 +237,6 @@ index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getPlugin&period=day&date=2009-01-04 UserSettings_getPlugin - - Visitor Settings - Normal / Widescreen - UserSettings - getScreenType - Type of screen - - Visits - Unique visitors - Actions - Users - - - 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. - 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. - The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks. - 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'). - - - Actions per Visit - Avg. Time on Website - Bounce Rate - Conversion Rate - - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getScreenType&period=day&date=2009-01-04 - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getScreenType&period=day&date=2008-12-06,2009-01-04 - UserSettings_getScreenType - Visitor Settings Visitor Configuration diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv index 27a8a409e0ca14971fed9c4754f549a38e991539..346c1542dbf3c6c843ee17754e575ec5c71d7ca7 100644 GIT binary patch delta 57 zcmZp$Szx(g0{i4;>|&GKIQTZdV7FkKyhTcAvw}1WgsHpvu*Qieo^ z90nZ*Lny3ZFap8Jj#Ae0$XbgT^ci5P^%&9_G8xh~pBLt5+|0$ljfG-!?z2*C1UuvA IBT{!50a@TWpa1{> 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 a6103ff8622..76d48bc7b6e 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 @@ Poland - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -323,9 +321,7 @@ Poland - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java 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 de1db7a777a..5ff6e58fbae 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 @@ Poland - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -518,9 +516,7 @@ Poland - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java @@ -734,9 +730,7 @@ France - normal 1024x768 - plugins/UserSettings/images/screens/normal.gif flash, java 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 7861e2ab4e0..dd359fb284a 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 @@ -53,11 +53,6 @@

    Browser Plugins -

    • -
  • - - Normal / Widescreen -
  • @@ -2161,74 +2156,6 @@

    Back to top -

    - Normal / Widescreen -

    - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - -
    -  Type of screen   - -  Visits   - -  Actions   - -  Actions per Visit   - -  Avg. Time on Website   - -  Bounce Rate   - -  Conversion Rate   -
    - -   - Normal - 5 - - 16 - - 3.2 - - 00:22:49 - - 20% - - 80% -
    -
    - - Back to top -

    Visitor Configuration

    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 9bcbc710283..b47e49d44ca 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 @@ -53,11 +53,6 @@

    Browser Plugins -

    • -
  • - - Normal / Widescreen -
  • @@ -2144,68 +2139,6 @@

    Back to top -

    - Normal / Widescreen -

    - - - - - - - - - - - - - - - - - - - - - - - - - -
    -  Type of screen   - -  Visits   - -  Actions   - -  Actions per Visit   - -  Avg. Time on Website   - -  Bounce Rate   - -  Conversion Rate   -
    - -   - Normal - 5 - - 16 - - 3.2 - - 00:22:49 - - 20% - - 80% -
    -
    - - Back to top -

    Visitor Configuration

    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 106f23f16bb..00000000000 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_day.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ 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 5cfb246edc1..00000000000 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getScreenType_week.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ 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 106f23f16bb..00000000000 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_day.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ 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 5cfb246edc1..00000000000 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserSettings.getWideScreen_week.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ 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 c234bed59e9..00000000000 --- a/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getScreenType_day.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ 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 c234bed59e9..00000000000 --- a/tests/PHPUnit/System/expected/test_noVisit__UserSettings.getWideScreen_day.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ 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 a4a21e48af0..b48064a09c9 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 @@ France - dual 1111x222 - plugins/UserSettings/images/screens/dual.gif flash, java @@ -197,9 +195,7 @@ France - dual 1111x222 - plugins/UserSettings/images/screens/dual.gif flash, java @@ -372,9 +368,7 @@ France - dual 1111x222 - plugins/UserSettings/images/screens/dual.gif flash, java 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 a4a21e48af0..b48064a09c9 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 @@ France - dual 1111x222 - plugins/UserSettings/images/screens/dual.gif flash, java @@ -197,9 +195,7 @@ France - dual 1111x222 - plugins/UserSettings/images/screens/dual.gif flash, java @@ -372,9 +368,7 @@ France - dual 1111x222 - plugins/UserSettings/images/screens/dual.gif flash, java 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 b1e550645e2..60e389c7ab0 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 @@ France - dual 1111x222 - plugins/UserSettings/images/screens/dual.gif flash, java @@ -241,9 +239,7 @@ France - dual 1111x222 - plugins/UserSettings/images/screens/dual.gif flash, java diff --git a/tests/PHPUnit/Unit/DeprecatedMethodsTest.php b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php index 7b5bad19d8c..ff6884e62b0 100644 --- a/tests/PHPUnit/Unit/DeprecatedMethodsTest.php +++ b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php @@ -62,7 +62,6 @@ public function test_version2_0_4() $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');