diff options
author | Matthieu Aubry <mattab@users.noreply.github.com> | 2016-12-06 15:19:48 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-06 15:19:48 +0300 |
commit | b1c09fa5123155ab9cd79342a4a0cef42e80de7f (patch) | |
tree | 06541e0c5bd079a8904fb3d2f82bfaf9155bda46 | |
parent | 46eafa8ab66d9d7bc785dc6697b8c3168c9d4145 (diff) | |
parent | d96661e2bd8e54c1ef022cc88e95d133d3f6c615 (diff) |
Merge pull request #10974 from piwik/3.x-dev3.0.0-rc1
Release Piwik 3.0.0-rc1
37 files changed, 554 insertions, 270 deletions
diff --git a/core/Translation/Translator.php b/core/Translation/Translator.php index af2ae597f2..98b3759f3b 100644 --- a/core/Translation/Translator.php +++ b/core/Translation/Translator.php @@ -84,7 +84,7 @@ class Translator } if (count($args) == 0) { - return $translationId; + return str_replace('%%', '%', $translationId); } return vsprintf($translationId, $args); } diff --git a/core/Version.php b/core/Version.php index d7a1318045..ab4135b6b7 100644 --- a/core/Version.php +++ b/core/Version.php @@ -20,7 +20,7 @@ final class Version * The current Piwik version. * @var string */ - const VERSION = '3.0.0-b5'; + const VERSION = '3.0.0-rc1'; public function isStableVersion($version) { diff --git a/lang/en.json b/lang/en.json index ab7e7dcc9c..ce3caaa2fe 100644 --- a/lang/en.json +++ b/lang/en.json @@ -70,7 +70,7 @@ "ColumnPageBounceRateDocumentation": "The percentage of visits that started on this page and left the website straight away.", "ColumnPageviews": "Pageviews", "ColumnPageviewsDocumentation": "The number of times this page was visited.", - "ColumnPercentageVisits": "% Visits", + "ColumnPercentageVisits": "%% Visits", "ColumnRevenue": "Revenue", "ColumnSumVisitLength": "Total time spent by visitors (in seconds)", "ColumnTotalPageviews": "Total Pageviews", diff --git a/plugins/API/templates/listAllAPI.twig b/plugins/API/templates/listAllAPI.twig index 258b74c49d..9aa2685881 100644 --- a/plugins/API/templates/listAllAPI.twig +++ b/plugins/API/templates/listAllAPI.twig @@ -20,7 +20,7 @@ <div piwik-content-block content-title="{{ 'API_UserAuthentication'|translate|e('html_attr') }}"> <p> {{ 'API_UsingTokenAuth'|translate('','',"")|raw }}<br/> - <pre piwik-select-on-focus id='token_auth'>&token_auth=<strong>{{ token_auth }}</strong></pre><br/> + <pre piwik-select-on-focus id='token_auth'>&token_auth=<strong piwik-show-sensitive-data="{{ token_auth }}" data-click-element-selector="#token_auth"></strong></pre><br/> {{ 'API_KeepTokenSecret'|translate('<b>','</b>')|raw }}<br /> {{ 'API_ChangeTokenHint'|translate('<a href="' ~ linkTo({ 'module': 'UsersManager', diff --git a/plugins/Actions/lang/en.json b/plugins/Actions/lang/en.json index c31dc264ec..27c9b2f72f 100644 --- a/plugins/Actions/lang/en.json +++ b/plugins/Actions/lang/en.json @@ -18,7 +18,7 @@ "ColumnSearchCategory": "Search Category", "ColumnSearches": "Searches", "ColumnSearchesDocumentation": "The number of visits that searched for this keyword on your website's search engine.", - "ColumnSearchExits": "% Search Exits", + "ColumnSearchExits": "%% Search Exits", "ColumnSearchExitsDocumentation": "The percentage of visits that left the website after searching for this Keyword on your Site Search engine.", "ColumnSearchResultsCount": "Search Results Count", "ColumnSiteSearchKeywords": "Unique Keywords", diff --git a/plugins/CoreAdminHome/templates/home.twig b/plugins/CoreAdminHome/templates/home.twig index aaf5afc5ba..d938a1d809 100644 --- a/plugins/CoreAdminHome/templates/home.twig +++ b/plugins/CoreAdminHome/templates/home.twig @@ -35,6 +35,7 @@ {% endif %} {% if isMarketplaceEnabled %} + <div piwik-widget-loader='{"module":"Marketplace","action":"getPremiumFeatures"}'></div> <div piwik-widget-loader='{"module":"Marketplace","action":"getNewPlugins", "isAdminPage": "1"}'></div> {% endif %} diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php index f5a1a594bc..7a221bc7db 100644 --- a/plugins/CoreHome/CoreHome.php +++ b/plugins/CoreHome/CoreHome.php @@ -155,6 +155,7 @@ class CoreHome extends \Piwik\Plugin $jsFiles[] = "plugins/CoreHome/angularjs/common/directives/directive.module.js"; $jsFiles[] = "plugins/CoreHome/angularjs/common/directives/attributes.js"; $jsFiles[] = "plugins/CoreHome/angularjs/common/directives/field-condition.js"; + $jsFiles[] = "plugins/CoreHome/angularjs/common/directives/show-sensitive-data.js"; $jsFiles[] = "plugins/CoreHome/angularjs/common/directives/autocomplete-matched.js"; $jsFiles[] = "plugins/CoreHome/angularjs/common/directives/focus-anywhere-but-here.js"; $jsFiles[] = "plugins/CoreHome/angularjs/common/directives/ignore-click.js"; @@ -255,6 +256,7 @@ class CoreHome extends \Piwik\Plugin $translationKeys[] = 'General_MultiSitesSummary'; $translationKeys[] = 'General_SearchNoResults'; $translationKeys[] = 'CoreHome_ChooseX'; + $translationKeys[] = 'CoreHome_ClickToSeeFullInformation'; $translationKeys[] = 'CoreHome_YouAreUsingTheLatestVersion'; $translationKeys[] = 'CoreHome_IncludeRowsWithLowPopulation'; $translationKeys[] = 'CoreHome_ExcludeRowsWithLowPopulation'; diff --git a/plugins/CoreHome/angularjs/common/directives/show-sensitive-data.js b/plugins/CoreHome/angularjs/common/directives/show-sensitive-data.js new file mode 100644 index 0000000000..1744f9e622 --- /dev/null +++ b/plugins/CoreHome/angularjs/common/directives/show-sensitive-data.js @@ -0,0 +1,59 @@ +/*! + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + */ + +/** + * Handles visibility of sensitive data. By default data will be shown replaced with stars (*) + * On click on the element the full data will be shown + * + * Configuration attributes: + * data-show-characters number of characters to show in clear text (defaults to 6) + * data-click-element-selector selector for element that will show the full data on click (defaults to element) + * + * Example: + * <div piwik-show-sensitive-date="some text"></div> + */ +(function () { + angular.module('piwikApp.directive').directive('piwikShowSensitiveData', piwikShowSensitiveData); + + function piwikShowSensitiveData(){ + return { + restrict: 'A', + link: function(scope, element, attr) { + + var sensitiveData = attr.piwikShowSensitiveData || attr.text(); + var showCharacters = attr.showCharacters || 6; + var clickElement = attr.clickElementSelector || element; + + var protectedData = ''; + if (showCharacters > 0) { + protectedData += sensitiveData.substr(0, showCharacters); + } + protectedData += sensitiveData.substr(showCharacters).replace(/./g, '*'); + element.html(protectedData); + + function onClickHandler(event) { + element.html(sensitiveData); + $(clickElement).css({ + cursor: '' + }); + $(clickElement).tooltip("destroy"); + } + + $(clickElement).tooltip({ + content: _pk_translate('CoreHome_ClickToSeeFullInformation'), + items: '*', + track: true + }); + + $(clickElement).one('click', onClickHandler); + $(clickElement).css({ + cursor: 'pointer' + }) + } + }; + } +})(); diff --git a/plugins/CoreHome/lang/en.json b/plugins/CoreHome/lang/en.json index 808250348e..57c5071c4a 100644 --- a/plugins/CoreHome/lang/en.json +++ b/plugins/CoreHome/lang/en.json @@ -5,6 +5,7 @@ "CheckForUpdates": "Check for updates", "CheckPiwikOut": "Check Piwik out!", "ClickToEditX": "Click to edit %s", + "ClickToSeeFullInformation": "Click to see the full information", "CloseSearch": "Close search", "CloseWidgetDirections": "You can close this widget by clicking on the 'X' icon at the top of the widget.", "ChooseX": "Choose %1$s", diff --git a/plugins/CoreHome/templates/getSystemSummary.twig b/plugins/CoreHome/templates/getSystemSummary.twig index 75cdf0a935..264162c180 100644 --- a/plugins/CoreHome/templates/getSystemSummary.twig +++ b/plugins/CoreHome/templates/getSystemSummary.twig @@ -14,7 +14,7 @@ </div> <div> <span>{{ 'CoreHome_SystemSummaryPiwikVersion'|translate }}:</span> - <span>{{ piwikVersion }}</span> + <span class="piwik-version">{{ piwikVersion }}</span> </div> <div> <span>{{ 'CoreHome_SystemSummaryMysqlVersion'|translate }}:</span> diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts -Subproject 49ae454fd7eae39e07300c83e0dff40dda2e427 +Subproject 8c861c9084a25dc36e1176496598a175a1619ee diff --git a/plugins/Installation/templates/getSystemCheckWidget.twig b/plugins/Installation/templates/getSystemCheckWidget.twig index 7f10dc06e1..5f1d9f8385 100644 --- a/plugins/Installation/templates/getSystemCheckWidget.twig +++ b/plugins/Installation/templates/getSystemCheckWidget.twig @@ -4,7 +4,7 @@ {% endif %} {% if numErrors %} - <p class="system-errors"><span class="icon-error"></span> {{ 'General_Errors'|translate }}:</p> + <p class="system-errors"><span class="icon-error"></span> {{ 'General_Errors'|translate }}</p> <ul> {% for error in errors %} <li title="{{ error.getLongErrorMessage|e('html_attr') }}">{{ error.getLabel }}</li> @@ -20,7 +20,7 @@ <br /> {% endif %} - <span class="icon-warning"></span> {{ 'General_Warnings'|translate }}: + <span class="icon-warning"></span> {{ 'General_Warnings'|translate }} </p> <ul> {% for warning in warnings %} diff --git a/plugins/LanguagesManager/Test/Integration/LanguagesManagerTest.php b/plugins/LanguagesManager/Test/Integration/LanguagesManagerTest.php index 0ff66919ce..59124a79cd 100755 --- a/plugins/LanguagesManager/Test/Integration/LanguagesManagerTest.php +++ b/plugins/LanguagesManager/Test/Integration/LanguagesManagerTest.php @@ -156,6 +156,32 @@ class LanguagesManagerTest extends \PHPUnit_Framework_TestCase } /** + * check all english translations do not contain unescaped % symbols + * + * @group Plugins + * @group numbered2 + */ + function testTranslationsUseEscapedPercentSigns() + { + Cache::flushAll(); + $translator = StaticContainer::get('Piwik\Translation\Translator'); + $translator->reset(); + Translate::loadAllTranslations(); + $translations = $translator->getAllTranslations(); + foreach ($translations AS $plugin => $pluginTranslations) { + if ($plugin == 'Intl') { + continue; // skip generated stuff + } + foreach ($pluginTranslations as $key => $pluginTranslation) { + $pluginTranslation = preg_replace('/(%(?:[1-9]\$)?[a-z])/', '', $pluginTranslation); // remove placeholders + $pluginTranslation = str_replace('%%', '', $pluginTranslation); // remove already escaped symbols + $this->assertEquals(0, substr_count($pluginTranslation, '%'), + sprintf('%s.%s must use escaped %% symbols', $plugin, $key)); + } + } + } + + /** * test English short name for language * * @group Plugins diff --git a/plugins/Marketplace/Widgets/GetNewPlugins.php b/plugins/Marketplace/Widgets/GetNewPlugins.php index 6079c1a8e8..8ffc54b856 100644 --- a/plugins/Marketplace/Widgets/GetNewPlugins.php +++ b/plugins/Marketplace/Widgets/GetNewPlugins.php @@ -10,6 +10,7 @@ namespace Piwik\Plugins\Marketplace\Widgets; use Piwik\Common; use Piwik\Plugins\Marketplace\Api\Client; +use Piwik\Plugins\Marketplace\Input\PurchaseType; use Piwik\Plugins\Marketplace\Input\Sort; use Piwik\Widget\Widget; use Piwik\Widget\WidgetConfig; @@ -43,7 +44,7 @@ class GetNewPlugins extends Widget $template = 'getNewPlugins'; } - $plugins = $this->marketplaceApiClient->searchForPlugins('', '', Sort::METHOD_LAST_UPDATED, ''); + $plugins = $this->marketplaceApiClient->searchForPlugins('', '', Sort::METHOD_LAST_UPDATED, PurchaseType::TYPE_ALL); return $this->renderTemplate($template, array( 'plugins' => array_splice($plugins, 0, 3) diff --git a/plugins/Marketplace/Widgets/GetPremiumFeatures.php b/plugins/Marketplace/Widgets/GetPremiumFeatures.php new file mode 100644 index 0000000000..4e777a218f --- /dev/null +++ b/plugins/Marketplace/Widgets/GetPremiumFeatures.php @@ -0,0 +1,56 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ +namespace Piwik\Plugins\Marketplace\Widgets; + +use Piwik\Common; +use Piwik\Piwik; +use Piwik\Plugin; +use Piwik\Plugins\Marketplace\Api\Client; +use Piwik\Plugins\Marketplace\Input\PurchaseType; +use Piwik\Plugins\Marketplace\Input\Sort; +use Piwik\Widget\Widget; +use Piwik\Widget\WidgetConfig; + +class GetPremiumFeatures extends Widget +{ + /** + * @var Client + */ + private $marketplaceApiClient; + + public function __construct(Client $marketplaceApiClient) + { + $this->marketplaceApiClient = $marketplaceApiClient; + } + + public static function configure(WidgetConfig $config) + { + $config->setCategoryId('About Piwik'); + $config->setName(Piwik::translate('Marketplace_PaidPlugins')); + $config->setOrder(20); + } + + public function render() + { + $template = 'getPremiumFeatures'; + + $plugins = $this->marketplaceApiClient->searchForPlugins('', '', Sort::METHOD_LAST_UPDATED, PurchaseType::TYPE_PAID); + + if (empty($plugins)) { + $plugins = array(); + } else { + $plugins = array_splice($plugins, 0, 20); + } + + return $this->renderTemplate($template, array( + 'plugins' => $plugins + )); + } + +}
\ No newline at end of file diff --git a/plugins/Marketplace/stylesheets/marketplace-widget.less b/plugins/Marketplace/stylesheets/marketplace-widget.less index 3438983825..33508cdb24 100644 --- a/plugins/Marketplace/stylesheets/marketplace-widget.less +++ b/plugins/Marketplace/stylesheets/marketplace-widget.less @@ -4,6 +4,25 @@ } } +.getPremiumFeatures { + h3 { + margin-top: 0; + } + .pluginBody { + margin-bottom: 32px; + display: inline-block; + + .pluginMoreDetails { + line-height:3em; + } + } + + .row { + margin-left: -12px; + margin-right: -12px; + } +} + .getNewPlugins { .pluginName { cursor: pointer; diff --git a/plugins/Marketplace/templates/getNewPlugins.twig b/plugins/Marketplace/templates/getNewPlugins.twig index 0c68e552e3..9808a72ce6 100644 --- a/plugins/Marketplace/templates/getNewPlugins.twig +++ b/plugins/Marketplace/templates/getNewPlugins.twig @@ -3,7 +3,7 @@ {% for plugin in plugins %} <div class="col s12"> - <h3 class="pluginName" piwik-plugin-name="{{ plugin.name|e('html_attr') }}">{{ plugin.name }}</h3> + <h3 class="pluginName" piwik-plugin-name="{{ plugin.name|e('html_attr') }}">{{ plugin.displayName }}</h3> <span> {{ plugin.description }} <br /> @@ -16,7 +16,7 @@ </div> <div class="widgetBody"> - <a href="{{ linkTo({'module': 'CorePluginsAdmin', 'action': 'marketplace'}) }}" + <a href="{{ linkTo({'module': 'Marketplace', 'action': 'overview'}) }}" >{{ 'CorePluginsAdmin_ViewAllMarketplacePlugins'|translate }}</a> </div> </div>
\ No newline at end of file diff --git a/plugins/Marketplace/templates/getNewPluginsAdmin.twig b/plugins/Marketplace/templates/getNewPluginsAdmin.twig index b929a48430..1e3d60f647 100644 --- a/plugins/Marketplace/templates/getNewPluginsAdmin.twig +++ b/plugins/Marketplace/templates/getNewPluginsAdmin.twig @@ -5,7 +5,7 @@ <h3 class="pluginName" title="{{ plugin.description|e('html_attr') }}" - piwik-plugin-name="{{ plugin.name|e('html_attr') }}">{{ plugin.name }}</h3> + piwik-plugin-name="{{ plugin.name|e('html_attr') }}">{{ plugin.displayName }}</h3> <p class="description" title="{{ plugin.description|e('html_attr') }}">{{ plugin.description }}</p> @@ -20,7 +20,7 @@ </div> <div class="widgetBody"> - <a href="{{ linkTo({'module': 'CorePluginsAdmin', 'action': 'marketplace'}) }}" + <a href="{{ linkTo({'module': 'Marketplace', 'action': 'overview'}) }}" >{{ 'CorePluginsAdmin_ViewAllMarketplacePlugins'|translate }}</a> </div> diff --git a/plugins/Marketplace/templates/getPremiumFeatures.twig b/plugins/Marketplace/templates/getPremiumFeatures.twig new file mode 100644 index 0000000000..fa0fe83744 --- /dev/null +++ b/plugins/Marketplace/templates/getPremiumFeatures.twig @@ -0,0 +1,23 @@ +<div class="getNewPlugins getPremiumFeatures widgetBody"> + <div class="row"> + {% for plugin in plugins %} + <div class="col s12 m4"> + + <h3 class="pluginName" piwik-plugin-name="{{ plugin.name|e('html_attr') }}">{{ plugin.displayName }}</h3> + <span class="pluginBody"> + {{ plugin.description }} + <br /> + <a href="javascript:;" class="pluginMoreDetails" piwik-plugin-name="{{ plugin.name|e('html_attr') }}">{{ 'General_MoreDetails'|translate }}</a> + </span> + </div> + {% if loop.index % 3 == 0 %} + </div><div class="row"> + {% endif %} + {% endfor %} + </div> + + <div class="widgetBody"> + <a href="{{ linkTo({'module': 'Marketplace', 'action': 'overview', 'show': 'premium'}) }}" + >{{ 'CorePluginsAdmin_ViewAllMarketplacePlugins'|translate }}</a> + </div> +</div>
\ No newline at end of file diff --git a/plugins/SegmentEditor/javascripts/Segmentation.js b/plugins/SegmentEditor/javascripts/Segmentation.js index 28280a1a5d..7930ae8c0e 100644 --- a/plugins/SegmentEditor/javascripts/Segmentation.js +++ b/plugins/SegmentEditor/javascripts/Segmentation.js @@ -1278,28 +1278,7 @@ $(document).ready(function() { segmentDefinition = cleanupSegmentDefinition(segmentDefinition); segmentDefinition = encodeURIComponent(segmentDefinition); - if (piwikHelper.isAngularRenderingThePage()) { - - angular.element(document).injector().invoke(function ($location, $rootScope) { - var $search = $location.search(); - - if (segmentDefinition !== $search.segment) { - // eg when using back button the date might be actually already changed in the URL and we do not - // want to change the URL again - $search.segment = segmentDefinition.replace(/%$/, '%25').replace(/%([^\d].)/g, "%25$1"); - $location.search($search); - setTimeout(function () { - try { - $rootScope.$apply(); - } catch (e) {} - }, 1); - } - - }); - return false; - } else { - return broadcast.propagateNewPage('segment=' + segmentDefinition, true); - } + return broadcast.propagateNewPage('segment=' + segmentDefinition, true); }; this.changeSegmentList = function () {}; diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig index 2824262acd..34a2b5a75a 100644 --- a/plugins/UsersManager/templates/userSettings.twig +++ b/plugins/UsersManager/templates/userSettings.twig @@ -109,7 +109,7 @@ <div piwik-content-block content-title="{{ 'UsersManager_TokenAuth'|translate|e('html_attr') }}"> - <pre piwik-select-on-focus id="token_auth_user">{{ userTokenAuth }}</pre> + <pre piwik-select-on-focus id="token_auth_user" piwik-show-sensitive-data="{{ userTokenAuth }}"></pre> <p>{{ 'UsersManager_TokenRegenerateLogoutWarning'|translate }}</p> <button class="btn btn-link" diff --git a/plugins/Widgetize/tests/System/WidgetTest.php b/plugins/Widgetize/tests/System/WidgetTest.php index af99759c77..e0ff947bf7 100644 --- a/plugins/Widgetize/tests/System/WidgetTest.php +++ b/plugins/Widgetize/tests/System/WidgetTest.php @@ -12,7 +12,6 @@ use Piwik\Container\StaticContainer; use Piwik\Http\ControllerResolver; use Piwik\Piwik; use Piwik\Plugins\API; -use Piwik\Plugins\Goals; use Piwik\Plugins\Widgetize\tests\Fixtures\WidgetizeFixture; use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Widget\WidgetsList; @@ -993,6 +992,14 @@ class WidgetTest extends SystemTestCase 'action' => 'getNewPlugins', ), ), array ( + 'name' => 'Premium Features', + 'uniqueId' => 'widgetMarketplacegetPremiumFeatures', + 'parameters' => + array ( + 'module' => 'Marketplace', + 'action' => 'getPremiumFeatures', + ), + ), array ( 'name' => 'System Check', 'uniqueId' => 'widgetInstallationgetSystemCheck', 'parameters' => diff --git a/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php b/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php index 154dc70c2b..1f6afab1b8 100644 --- a/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php +++ b/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php @@ -135,7 +135,8 @@ class TwoSitesTwoVisitorsDifferentDays extends Fixture // Temporary, until we implement 1st party cookies in PiwikTracker $visitorB->DEBUG_APPEND_URL .= '&_idvc=2&_viewts=' . Date::factory($dateTime)->getTimestamp(); - $visitorB->setUrlReferrer('http://referrer.com/Other_Page.htm'); + $protocol = (0 === $days % 2) ? 'http' : 'https'; + $visitorB->setUrlReferrer($protocol . '://referrer.com/Other_Page.htm'); if( in_array($days, array(2,3,4,$daysToGenerateVisitsFor-1)) ) { $visitorB->setUrl( self::URL_IS_GOAL_WITH_CAMPAIGN_PARAMETERS ); } else { diff --git a/tests/PHPUnit/Integration/WidgetsListTest.php b/tests/PHPUnit/Integration/WidgetsListTest.php index ed80293143..f4c335a037 100644 --- a/tests/PHPUnit/Integration/WidgetsListTest.php +++ b/tests/PHPUnit/Integration/WidgetsListTest.php @@ -49,7 +49,7 @@ class WidgetsListTest extends IntegrationTestCase 'Insights_WidgetCategory' => 2, 'ExampleUI_UiFramework' => 8, 'Referrers_Referrers' => 9, - 'About Piwik' => 9, + 'About Piwik' => 10, ); // number of main categories $this->assertEquals(count($numberOfWidgets), count($widgetsPerCategory)); diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml index 68cf105bb4..ff3cbc07e8 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_day.xml @@ -72,7 +72,7 @@ <segment>referrerName==referrer.com</segment> <subtable> <row> - <label>http://referrer.com/Other_Page.htm</label> + <label>https://referrer.com/Other_Page.htm</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml index cb53e090a5..36c4c50326 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml @@ -16,13 +16,13 @@ <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> - <nb_visits>4</nb_visits> - <nb_actions>20</nb_actions> + <nb_visits>2</nb_visits> + <nb_actions>10</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>3604</sum_visit_length> + <sum_visit_length>1802</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> @@ -36,6 +36,17 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> + <row> + <label>https://referrer.com/Other_Page.htm</label> + <nb_visits>2</nb_visits> + <nb_actions>10</nb_actions> + <max_actions>5</max_actions> + <sum_visit_length>1802</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + </row> </subtable> </row> </result> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml index db9b40253c..90f843905d 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml @@ -42,14 +42,25 @@ <segment>referrerName==referrer.com</segment> <subtable> <row> + <label>https://referrer.com/Other_Page.htm</label> + <nb_visits>2</nb_visits> + <nb_actions>10</nb_actions> + <max_actions>5</max_actions> + <sum_visit_length>1802</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + </row> + <row> <label>http://referrer.com/Other_Page.htm</label> - <nb_visits>3</nb_visits> - <nb_actions>15</nb_actions> + <nb_visits>1</nb_visits> + <nb_actions>5</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>2703</sum_visit_length> + <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml index a20510ef16..84b2c7494b 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml @@ -16,13 +16,13 @@ <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> - <nb_visits>4</nb_visits> - <nb_actions>20</nb_actions> + <nb_visits>2</nb_visits> + <nb_actions>10</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>3604</sum_visit_length> + <sum_visit_length>1802</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> @@ -36,6 +36,17 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> + <row> + <label>https://referrer.com/Other_Page.htm</label> + <nb_visits>2</nb_visits> + <nb_actions>10</nb_actions> + <max_actions>5</max_actions> + <sum_visit_length>1802</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + </row> </subtable> </row> </result> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml index 67bf4d2ac5..a850f5d23a 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_day.xml @@ -71,7 +71,7 @@ <segment>referrerName==referrer.com</segment> <subtable> <row> - <label>http://referrer.com/Other_Page.htm</label> + <label>https://referrer.com/Other_Page.htm</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml index d04b442b1c..8e1330a381 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml @@ -15,13 +15,13 @@ <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> - <nb_visits>4</nb_visits> - <nb_actions>20</nb_actions> + <nb_visits>2</nb_visits> + <nb_actions>10</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>3604</sum_visit_length> + <sum_visit_length>1802</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> @@ -35,6 +35,17 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> + <row> + <label>https://referrer.com/Other_Page.htm</label> + <nb_visits>2</nb_visits> + <nb_actions>10</nb_actions> + <max_actions>5</max_actions> + <sum_visit_length>1802</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + </row> </subtable> </row> </result> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml index 52dd01afe4..ca8b4bed53 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml @@ -41,14 +41,25 @@ <segment>referrerName==referrer.com</segment> <subtable> <row> + <label>https://referrer.com/Other_Page.htm</label> + <nb_visits>2</nb_visits> + <nb_actions>10</nb_actions> + <max_actions>5</max_actions> + <sum_visit_length>1802</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + </row> + <row> <label>http://referrer.com/Other_Page.htm</label> - <nb_visits>3</nb_visits> - <nb_actions>15</nb_actions> + <nb_visits>1</nb_visits> + <nb_actions>5</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>2703</sum_visit_length> + <sum_visit_length>901</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml index c80e5068c0..38f2a0bf84 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml @@ -15,13 +15,13 @@ <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> - <nb_visits>4</nb_visits> - <nb_actions>20</nb_actions> + <nb_visits>2</nb_visits> + <nb_actions>10</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>3604</sum_visit_length> + <sum_visit_length>1802</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> @@ -35,6 +35,17 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> </row> + <row> + <label>https://referrer.com/Other_Page.htm</label> + <nb_visits>2</nb_visits> + <nb_actions>10</nb_actions> + <max_actions>5</max_actions> + <sum_visit_length>1802</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> + </row> </subtable> </row> </result> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv index 893c2dbf6f..38078f4bb9 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv @@ -334,7 +334,8 @@ No data available Websites label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue -referrer.com/Other_Page.htm,4,20,5,00:15:01,0%,$ 0 +referrer.com/Other_Page.htm,2,10,5,00:15:01,0%,$ 0 +referrer.com/Other_Page.htm,2,10,5,00:15:01,0%,$ 0 referrer.com/page.htm?param=valuewith some spaces,2,2,1,00:00:00,100%,$ 0 Social Networks 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 06bf981720..1cd91a523e 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 @@ -5033,10 +5033,10 @@ referrer.com/Other_Page.htm </a> </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 4 + 2 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - 20 + 10 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 5 @@ -5054,6 +5054,31 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + <a style="color: rgb(13,13,13);" href='https://referrer.com/Other_Page.htm'> + referrer.com/Other_Page.htm </a> + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 2 + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 10 + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 5 + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 00:15:01 + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + 0% + </td> + <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> + $ 0 + </td> + </tr> + + <tr style="background-color: rgb(242,242,242);line-height: 22px;"> + <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> <a style="color: rgb(13,13,13);" href='http://referrer.com/page.htm?param=valuewith some spaces'> referrer.com/page.htm?param=valuewith some spaces </a> </td> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml index 2607e36f1d..aeb906def4 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml @@ -822,7 +822,7 @@ <isWide>0</isWide> </row> <row> - <name>Visits per visit duration</name> + <name>Visits per number of pages</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -835,19 +835,19 @@ <order>30</order> </subcategory> <module>VisitorInterest</module> - <action>getNumberOfVisitsPerVisitDuration</action> - <order>115</order> + <action>getNumberOfVisitsPerPage</action> + <order>120</order> <parameters> <module>VisitorInterest</module> - <action>getNumberOfVisitsPerVisitDuration</action> + <action>getNumberOfVisitsPerPage</action> </parameters> - <uniqueId>widgetVisitorInterestgetNumberOfVisitsPerVisitDuration</uniqueId> + <uniqueId>widgetVisitorInterestgetNumberOfVisitsPerPage</uniqueId> <isWide>0</isWide> <viewDataTable>cloud</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Visits per number of pages</name> + <name>Visits per visit duration</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -860,19 +860,19 @@ <order>30</order> </subcategory> <module>VisitorInterest</module> - <action>getNumberOfVisitsPerPage</action> - <order>120</order> + <action>getNumberOfVisitsPerVisitDuration</action> + <order>115</order> <parameters> <module>VisitorInterest</module> - <action>getNumberOfVisitsPerPage</action> + <action>getNumberOfVisitsPerVisitDuration</action> </parameters> - <uniqueId>widgetVisitorInterestgetNumberOfVisitsPerPage</uniqueId> + <uniqueId>widgetVisitorInterestgetNumberOfVisitsPerVisitDuration</uniqueId> <isWide>0</isWide> <viewDataTable>cloud</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Visits per server time</name> + <name>Visits by Day of Week</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -885,13 +885,13 @@ <order>35</order> </subcategory> <module>VisitTime</module> - <action>getVisitInformationPerServerTime</action> - <order>120</order> + <action>getByDayOfWeek</action> + <order>125</order> <parameters> <module>VisitTime</module> - <action>getVisitInformationPerServerTime</action> + <action>getByDayOfWeek</action> </parameters> - <uniqueId>widgetVisitTimegetVisitInformationPerServerTime</uniqueId> + <uniqueId>widgetVisitTimegetByDayOfWeek</uniqueId> <isWide>0</isWide> <viewDataTable>graphVerticalBar</viewDataTable> <isReport>1</isReport> @@ -922,7 +922,7 @@ <isReport>1</isReport> </row> <row> - <name>Visits by Day of Week</name> + <name>Visits per server time</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -935,13 +935,13 @@ <order>35</order> </subcategory> <module>VisitTime</module> - <action>getByDayOfWeek</action> - <order>125</order> + <action>getVisitInformationPerServerTime</action> + <order>120</order> <parameters> <module>VisitTime</module> - <action>getByDayOfWeek</action> + <action>getVisitInformationPerServerTime</action> </parameters> - <uniqueId>widgetVisitTimegetByDayOfWeek</uniqueId> + <uniqueId>widgetVisitTimegetVisitInformationPerServerTime</uniqueId> <isWide>0</isWide> <viewDataTable>graphVerticalBar</viewDataTable> <isReport>1</isReport> @@ -1120,7 +1120,7 @@ <isReport>1</isReport> </row> <row> - <name>Search Keywords with No Results</name> + <name>Page Titles Following a Site Search</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1133,19 +1133,19 @@ <order>25</order> </subcategory> <module>Actions</module> - <action>getSiteSearchNoResultKeywords</action> - <order>118</order> + <action>getPageTitlesFollowingSiteSearch</action> + <order>119</order> <parameters> <module>Actions</module> - <action>getSiteSearchNoResultKeywords</action> + <action>getPageTitlesFollowingSiteSearch</action> </parameters> - <uniqueId>widgetActionsgetSiteSearchNoResultKeywords</uniqueId> + <uniqueId>widgetActionsgetPageTitlesFollowingSiteSearch</uniqueId> <isWide>0</isWide> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Pages Following a Site Search</name> + <name>Search Keywords with No Results</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1158,19 +1158,19 @@ <order>25</order> </subcategory> <module>Actions</module> - <action>getPageUrlsFollowingSiteSearch</action> - <order>116</order> + <action>getSiteSearchNoResultKeywords</action> + <order>118</order> <parameters> <module>Actions</module> - <action>getPageUrlsFollowingSiteSearch</action> + <action>getSiteSearchNoResultKeywords</action> </parameters> - <uniqueId>widgetActionsgetPageUrlsFollowingSiteSearch</uniqueId> + <uniqueId>widgetActionsgetSiteSearchNoResultKeywords</uniqueId> <isWide>0</isWide> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Site Search Keywords</name> + <name>Pages Following a Site Search</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1183,19 +1183,19 @@ <order>25</order> </subcategory> <module>Actions</module> - <action>getSiteSearchKeywords</action> - <order>115</order> + <action>getPageUrlsFollowingSiteSearch</action> + <order>116</order> <parameters> <module>Actions</module> - <action>getSiteSearchKeywords</action> + <action>getPageUrlsFollowingSiteSearch</action> </parameters> - <uniqueId>widgetActionsgetSiteSearchKeywords</uniqueId> + <uniqueId>widgetActionsgetPageUrlsFollowingSiteSearch</uniqueId> <isWide>0</isWide> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Page Titles Following a Site Search</name> + <name>Site Search Keywords</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1208,13 +1208,13 @@ <order>25</order> </subcategory> <module>Actions</module> - <action>getPageTitlesFollowingSiteSearch</action> - <order>119</order> + <action>getSiteSearchKeywords</action> + <order>115</order> <parameters> <module>Actions</module> - <action>getPageTitlesFollowingSiteSearch</action> + <action>getSiteSearchKeywords</action> </parameters> - <uniqueId>widgetActionsgetPageTitlesFollowingSiteSearch</uniqueId> + <uniqueId>widgetActionsgetSiteSearchKeywords</uniqueId> <isWide>0</isWide> <viewDataTable>table</viewDataTable> <isReport>1</isReport> @@ -1373,7 +1373,7 @@ <isReport>1</isReport> </row> <row> - <name>Event Actions</name> + <name>Event Names</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1386,14 +1386,14 @@ <order>40</order> </subcategory> <module>Events</module> - <action>getAction</action> - <order>101</order> + <action>getName</action> + <order>102</order> <parameters> <module>Events</module> - <action>getAction</action> - <secondaryDimension>eventName</secondaryDimension> + <action>getName</action> + <secondaryDimension>eventAction</secondaryDimension> </parameters> - <uniqueId>widgetEventsgetActionsecondaryDimensioneventName</uniqueId> + <uniqueId>widgetEventsgetNamesecondaryDimensioneventAction</uniqueId> <isWide>0</isWide> <viewDataTable>table</viewDataTable> <isReport>1</isReport> @@ -1425,7 +1425,7 @@ <isReport>1</isReport> </row> <row> - <name>Event Names</name> + <name>Event Actions</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1438,20 +1438,20 @@ <order>40</order> </subcategory> <module>Events</module> - <action>getName</action> - <order>102</order> + <action>getAction</action> + <order>101</order> <parameters> <module>Events</module> - <action>getName</action> - <secondaryDimension>eventAction</secondaryDimension> + <action>getAction</action> + <secondaryDimension>eventName</secondaryDimension> </parameters> - <uniqueId>widgetEventsgetNamesecondaryDimensioneventAction</uniqueId> + <uniqueId>widgetEventsgetActionsecondaryDimensioneventName</uniqueId> <isWide>0</isWide> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Content Piece</name> + <name>Content Name</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1464,19 +1464,19 @@ <order>45</order> </subcategory> <module>Contents</module> - <action>getContentPieces</action> - <order>136</order> + <action>getContentNames</action> + <order>135</order> <parameters> <module>Contents</module> - <action>getContentPieces</action> + <action>getContentNames</action> </parameters> - <uniqueId>widgetContentsgetContentPieces</uniqueId> + <uniqueId>widgetContentsgetContentNames</uniqueId> <isWide>0</isWide> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Content Piece</name> + <name>Content Name</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1489,19 +1489,19 @@ <order>45</order> </subcategory> <module>Contents</module> - <action>getContentPieces</action> - <order>136</order> + <action>getContentNames</action> + <order>135</order> <parameters> <module>Contents</module> - <action>getContentPieces</action> + <action>getContentNames</action> </parameters> - <uniqueId>widgetContentsgetContentPieces</uniqueId> + <uniqueId>widgetContentsgetContentNames</uniqueId> <isWide>0</isWide> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Content Name</name> + <name>Content Piece</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1514,19 +1514,19 @@ <order>45</order> </subcategory> <module>Contents</module> - <action>getContentNames</action> - <order>135</order> + <action>getContentPieces</action> + <order>136</order> <parameters> <module>Contents</module> - <action>getContentNames</action> + <action>getContentPieces</action> </parameters> - <uniqueId>widgetContentsgetContentNames</uniqueId> + <uniqueId>widgetContentsgetContentPieces</uniqueId> <isWide>0</isWide> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Content Name</name> + <name>Content Piece</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1539,13 +1539,13 @@ <order>45</order> </subcategory> <module>Contents</module> - <action>getContentNames</action> - <order>135</order> + <action>getContentPieces</action> + <order>136</order> <parameters> <module>Contents</module> - <action>getContentNames</action> + <action>getContentPieces</action> </parameters> - <uniqueId>widgetContentsgetContentNames</uniqueId> + <uniqueId>widgetContentsgetContentPieces</uniqueId> <isWide>0</isWide> <viewDataTable>table</viewDataTable> <isReport>1</isReport> @@ -1651,7 +1651,7 @@ <isReport>1</isReport> </row> <row> - <name>Websites</name> + <name>Social Networks</name> <category> <id>Referrers_Referrers</id> <name>Referrers</name> @@ -1664,19 +1664,19 @@ <order>15</order> </subcategory> <module>Referrers</module> - <action>getWebsites</action> - <order>105</order> + <action>getSocials</action> + <order>111</order> <parameters> <module>Referrers</module> - <action>getWebsites</action> + <action>getSocials</action> </parameters> - <uniqueId>widgetReferrersgetWebsites</uniqueId> + <uniqueId>widgetReferrersgetSocials</uniqueId> <isWide>0</isWide> - <viewDataTable>table</viewDataTable> + <viewDataTable>graphPie</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Social Networks</name> + <name>Websites</name> <category> <id>Referrers_Referrers</id> <name>Referrers</name> @@ -1689,15 +1689,15 @@ <order>15</order> </subcategory> <module>Referrers</module> - <action>getSocials</action> - <order>111</order> + <action>getWebsites</action> + <order>105</order> <parameters> <module>Referrers</module> - <action>getSocials</action> + <action>getWebsites</action> </parameters> - <uniqueId>widgetReferrersgetSocials</uniqueId> + <uniqueId>widgetReferrersgetWebsites</uniqueId> <isWide>0</isWide> - <viewDataTable>graphPie</viewDataTable> + <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> @@ -1964,7 +1964,7 @@ <isReport>1</isReport> </row> <row> - <name>Product Name</name> + <name>Product Category</name> <category> <id>Goals_Ecommerce</id> <name>Ecommerce</name> @@ -1977,19 +1977,19 @@ <order>10</order> </subcategory> <module>Goals</module> - <action>getItemsName</action> - <order>131</order> + <action>getItemsCategory</action> + <order>132</order> <parameters> <module>Goals</module> - <action>getItemsName</action> + <action>getItemsCategory</action> </parameters> - <uniqueId>widgetGoalsgetItemsName</uniqueId> + <uniqueId>widgetGoalsgetItemsCategory</uniqueId> <isWide>0</isWide> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Product Category</name> + <name>Product Name</name> <category> <id>Goals_Ecommerce</id> <name>Ecommerce</name> @@ -2002,13 +2002,13 @@ <order>10</order> </subcategory> <module>Goals</module> - <action>getItemsCategory</action> - <order>132</order> + <action>getItemsName</action> + <order>131</order> <parameters> <module>Goals</module> - <action>getItemsCategory</action> + <action>getItemsName</action> </parameters> - <uniqueId>widgetGoalsgetItemsCategory</uniqueId> + <uniqueId>widgetGoalsgetItemsName</uniqueId> <isWide>0</isWide> <viewDataTable>table</viewDataTable> <isReport>1</isReport> @@ -2534,31 +2534,6 @@ </widgets> </row> <row> - <name>Data tables</name> - <category> - <id>ExampleUI_UiFramework</id> - <name>UI Framework</name> - <order>90</order> - <icon /> - </category> - <subcategory> - <id>ExampleUI_GetTemperaturesDataTable</id> - <name>Data tables</name> - <order>99</order> - </subcategory> - <module>ExampleUI</module> - <action>getTemperatures</action> - <order>210</order> - <parameters> - <module>ExampleUI</module> - <action>getTemperatures</action> - </parameters> - <uniqueId>widgetExampleUIgetTemperatures</uniqueId> - <isWide>0</isWide> - <viewDataTable>table</viewDataTable> - <isReport>1</isReport> - </row> - <row> <name>Advanced tag cloud: with logos and links</name> <category> <id>ExampleUI_UiFramework</id> @@ -2592,22 +2567,20 @@ <icon /> </category> <subcategory> - <id>Bar graph</id> - <name>Bar graph</name> + <id>ExampleUI_GetTemperaturesDataTable</id> + <name>Data tables</name> <order>99</order> </subcategory> <module>ExampleUI</module> <action>getTemperatures</action> <order>210</order> <parameters> - <forceView>1</forceView> - <viewDataTable>graphVerticalBar</viewDataTable> <module>ExampleUI</module> <action>getTemperatures</action> </parameters> - <uniqueId>widgetExampleUIgetTemperaturesforceView1viewDataTablegraphVerticalBar</uniqueId> + <uniqueId>widgetExampleUIgetTemperatures</uniqueId> <isWide>0</isWide> - <viewDataTable>graphVerticalBar</viewDataTable> + <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> @@ -2696,6 +2669,33 @@ <isReport>1</isReport> </row> <row> + <name>Data tables</name> + <category> + <id>ExampleUI_UiFramework</id> + <name>UI Framework</name> + <order>90</order> + <icon /> + </category> + <subcategory> + <id>Bar graph</id> + <name>Bar graph</name> + <order>99</order> + </subcategory> + <module>ExampleUI</module> + <action>getTemperatures</action> + <order>210</order> + <parameters> + <forceView>1</forceView> + <viewDataTable>graphVerticalBar</viewDataTable> + <module>ExampleUI</module> + <action>getTemperatures</action> + </parameters> + <uniqueId>widgetExampleUIgetTemperaturesforceView1viewDataTablegraphVerticalBar</uniqueId> + <isWide>0</isWide> + <viewDataTable>graphVerticalBar</viewDataTable> + <isReport>1</isReport> + </row> + <row> <name>Pie graph</name> <category> <id>ExampleUI_UiFramework</id> @@ -2748,7 +2748,7 @@ <isReport>1</isReport> </row> <row> - <name>Piwik.org Blog</name> + <name>System Summary</name> <category> <id>About Piwik</id> <name>About Piwik</name> @@ -2756,14 +2756,33 @@ <icon /> </category> <subcategory /> - <module>RssWidget</module> - <action>rssPiwik</action> + <module>CoreHome</module> + <action>getSystemSummary</action> + <order>15</order> + <parameters> + <module>CoreHome</module> + <action>getSystemSummary</action> + </parameters> + <uniqueId>widgetCoreHomegetSystemSummary</uniqueId> + <isWide>0</isWide> + </row> + <row> + <name>Premium Products & Services for Piwik</name> + <category> + <id>About Piwik</id> + <name>About Piwik</name> + <order>99</order> + <icon /> + </category> + <subcategory /> + <module>ProfessionalServices</module> + <action>promoServices</action> <order>99</order> <parameters> - <module>RssWidget</module> - <action>rssPiwik</action> + <module>ProfessionalServices</module> + <action>promoServices</action> </parameters> - <uniqueId>widgetRssWidgetrssPiwik</uniqueId> + <uniqueId>widgetProfessionalServicespromoServices</uniqueId> <isWide>0</isWide> </row> <row> @@ -2786,26 +2805,26 @@ <isWide>0</isWide> </row> <row> - <name>SEO Rankings</name> + <name>Piwik Changelog</name> <category> - <id>SEO</id> - <name>SEO</name> + <id>About Piwik</id> + <name>About Piwik</name> <order>99</order> <icon /> </category> <subcategory /> - <module>SEO</module> - <action>getRank</action> + <module>RssWidget</module> + <action>rssChangelog</action> <order>99</order> <parameters> - <module>SEO</module> - <action>getRank</action> + <module>RssWidget</module> + <action>rssChangelog</action> </parameters> - <uniqueId>widgetSEOgetRank</uniqueId> + <uniqueId>widgetRssWidgetrssChangelog</uniqueId> <isWide>0</isWide> </row> <row> - <name>System Check</name> + <name>Welcome!</name> <category> <id>About Piwik</id> <name>About Piwik</name> @@ -2813,18 +2832,18 @@ <icon /> </category> <subcategory /> - <module>Installation</module> - <action>getSystemCheck</action> - <order>16</order> + <module>CoreHome</module> + <action>getPromoVideo</action> + <order>10</order> <parameters> - <module>Installation</module> - <action>getSystemCheck</action> + <module>CoreHome</module> + <action>getPromoVideo</action> </parameters> - <uniqueId>widgetInstallationgetSystemCheck</uniqueId> + <uniqueId>widgetCoreHomegetPromoVideo</uniqueId> <isWide>0</isWide> </row> <row> - <name>Support Piwik!</name> + <name>Latest Marketplace Updates</name> <category> <id>About Piwik</id> <name>About Piwik</name> @@ -2832,18 +2851,18 @@ <icon /> </category> <subcategory /> - <module>CoreHome</module> - <action>getDonateForm</action> - <order>5</order> + <module>Marketplace</module> + <action>getNewPlugins</action> + <order>19</order> <parameters> - <module>CoreHome</module> - <action>getDonateForm</action> + <module>Marketplace</module> + <action>getNewPlugins</action> </parameters> - <uniqueId>widgetCoreHomegetDonateForm</uniqueId> + <uniqueId>widgetMarketplacegetNewPlugins</uniqueId> <isWide>0</isWide> </row> <row> - <name>Piwik Changelog</name> + <name>Piwik.org Blog</name> <category> <id>About Piwik</id> <name>About Piwik</name> @@ -2852,17 +2871,17 @@ </category> <subcategory /> <module>RssWidget</module> - <action>rssChangelog</action> + <action>rssPiwik</action> <order>99</order> <parameters> <module>RssWidget</module> - <action>rssChangelog</action> + <action>rssPiwik</action> </parameters> - <uniqueId>widgetRssWidgetrssChangelog</uniqueId> + <uniqueId>widgetRssWidgetrssPiwik</uniqueId> <isWide>0</isWide> </row> <row> - <name>Premium Products & Services for Piwik</name> + <name>Premium Features</name> <category> <id>About Piwik</id> <name>About Piwik</name> @@ -2870,18 +2889,18 @@ <icon /> </category> <subcategory /> - <module>ProfessionalServices</module> - <action>promoServices</action> - <order>99</order> + <module>Marketplace</module> + <action>getPremiumFeatures</action> + <order>20</order> <parameters> - <module>ProfessionalServices</module> - <action>promoServices</action> + <module>Marketplace</module> + <action>getPremiumFeatures</action> </parameters> - <uniqueId>widgetProfessionalServicespromoServices</uniqueId> + <uniqueId>widgetMarketplacegetPremiumFeatures</uniqueId> <isWide>0</isWide> </row> <row> - <name>System Summary</name> + <name>System Check</name> <category> <id>About Piwik</id> <name>About Piwik</name> @@ -2889,18 +2908,18 @@ <icon /> </category> <subcategory /> - <module>CoreHome</module> - <action>getSystemSummary</action> - <order>15</order> + <module>Installation</module> + <action>getSystemCheck</action> + <order>16</order> <parameters> - <module>CoreHome</module> - <action>getSystemSummary</action> + <module>Installation</module> + <action>getSystemCheck</action> </parameters> - <uniqueId>widgetCoreHomegetSystemSummary</uniqueId> + <uniqueId>widgetInstallationgetSystemCheck</uniqueId> <isWide>0</isWide> </row> <row> - <name>Latest Marketplace Updates</name> + <name>Support Piwik!</name> <category> <id>About Piwik</id> <name>About Piwik</name> @@ -2908,33 +2927,33 @@ <icon /> </category> <subcategory /> - <module>Marketplace</module> - <action>getNewPlugins</action> - <order>19</order> + <module>CoreHome</module> + <action>getDonateForm</action> + <order>5</order> <parameters> - <module>Marketplace</module> - <action>getNewPlugins</action> + <module>CoreHome</module> + <action>getDonateForm</action> </parameters> - <uniqueId>widgetMarketplacegetNewPlugins</uniqueId> + <uniqueId>widgetCoreHomegetDonateForm</uniqueId> <isWide>0</isWide> </row> <row> - <name>Welcome!</name> + <name>Insights Overview</name> <category> - <id>About Piwik</id> - <name>About Piwik</name> + <id>Insights_WidgetCategory</id> + <name>Insights</name> <order>99</order> <icon /> </category> <subcategory /> - <module>CoreHome</module> - <action>getPromoVideo</action> - <order>10</order> + <module>Insights</module> + <action>getInsightsOverview</action> + <order>99</order> <parameters> - <module>CoreHome</module> - <action>getPromoVideo</action> + <module>Insights</module> + <action>getInsightsOverview</action> </parameters> - <uniqueId>widgetCoreHomegetPromoVideo</uniqueId> + <uniqueId>widgetInsightsgetInsightsOverview</uniqueId> <isWide>0</isWide> </row> <row> @@ -2957,7 +2976,7 @@ <isWide>0</isWide> </row> <row> - <name>Insights Overview</name> + <name>Movers and Shakers</name> <category> <id>Insights_WidgetCategory</id> <name>Insights</name> @@ -2966,32 +2985,32 @@ </category> <subcategory /> <module>Insights</module> - <action>getInsightsOverview</action> + <action>getOverallMoversAndShakers</action> <order>99</order> <parameters> <module>Insights</module> - <action>getInsightsOverview</action> + <action>getOverallMoversAndShakers</action> </parameters> - <uniqueId>widgetInsightsgetInsightsOverview</uniqueId> + <uniqueId>widgetInsightsgetOverallMoversAndShakers</uniqueId> <isWide>0</isWide> </row> <row> - <name>Movers and Shakers</name> + <name>SEO Rankings</name> <category> - <id>Insights_WidgetCategory</id> - <name>Insights</name> + <id>SEO</id> + <name>SEO</name> <order>99</order> <icon /> </category> <subcategory /> - <module>Insights</module> - <action>getOverallMoversAndShakers</action> + <module>SEO</module> + <action>getRank</action> <order>99</order> <parameters> - <module>Insights</module> - <action>getOverallMoversAndShakers</action> + <module>SEO</module> + <action>getRank</action> </parameters> - <uniqueId>widgetInsightsgetOverallMoversAndShakers</uniqueId> + <uniqueId>widgetSEOgetRank</uniqueId> <isWide>0</isWide> </row> </result>
\ No newline at end of file diff --git a/tests/UI/specs/UIIntegration_spec.js b/tests/UI/specs/UIIntegration_spec.js index 9e7ed5dd12..b3e51288af 100644 --- a/tests/UI/specs/UIIntegration_spec.js +++ b/tests/UI/specs/UIIntegration_spec.js @@ -602,9 +602,6 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? it('should load the API listing page correctly', function (done) { expect.screenshot('api_listing').to.be.captureSelector('.pageWrap', function (page) { page.load("?" + generalParams + "&module=API&action=listAllAPI"); - page.evaluate(function () { // remove token_auth since it can change on each test run - $('span#token_auth>strong').text('dummytokenauth'); - }); }, done); }); diff --git a/tests/resources/screenshot-override/override.css b/tests/resources/screenshot-override/override.css index 59b296f8e3..05325edefb 100644 --- a/tests/resources/screenshot-override/override.css +++ b/tests/resources/screenshot-override/override.css @@ -10,6 +10,7 @@ display:none; } +span.piwik-version, span.plugin-version { visibility:hidden; } |