diff options
| author | Thomas Steur <tsteur@users.noreply.github.com> | 2016-08-29 04:30:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-29 04:30:52 +0300 |
| commit | 0c9c30b731ccbacf47e154b9f7a590af49e3d799 (patch) | |
| tree | c5cf2f6437bb2ee7f3675350ee4b0b6acbbae7d3 /tests/PHPUnit/System | |
| parent | bfdf0bed670f247bf9b1d466e3bcf651e98ab634 (diff) | |
Better UI for Piwik 3, more responsive, faster, lots of other fixes (#10397)
* improved ui and responsiveness
* improve rss widget
* commit changes for ui again, got lost after the last commit
* fix more tests
* restoring files
* fix fonts
* fix more tests
* more test fixes
* fix some system tests
* fix tests
* fix system and ui tests
* fix updater tests
* make a page as loaded once the callback is called
* enable verbose
* more verbose output
* enable phantomjs debug flag
* debug should be a phantomjs option
* trying to fix installation tests
* fixes #10173 to not compile css files as less
* trying to minimize js/css requests to hopefully prevent random ui test fails
* disable verbose mode
* fix updater and installation
* lots of bugfixes and ui tweaks
* fix reset dashboard
* various bugfixes
* fix integration tests
* fix text color
* hoping to fix installation tests this way
* cache css/js resources for an hour, should speed up tests and prevent some random issues
* we need to avoid installing plugins multiple times at the same time when requesting resources
* finally getting the colors right again
* fix most tests, more tests for theme
* use an h2 element for titles for better accessibility
* fix headline color
* use actual theme text color (piwik-black)
* fix small font size was applied on all p elements
* fix tests
* now improving all the datatables
* trying to ignore images for visitor log
* Revert "trying to ignore images for visitor log"
This reverts commit ad1ff7267aae14ad905bef130e956c8593c4fb22.
* fix tests
* fix we had always ignored a max label width
* trying to fix file permissions
* fix more file permissions
* Improved plugins update API (#10028)
* refs #7983 let plugins add or remove fields to websites and better settings api
* * Hide CorePluginsAdmin API methods
* More documentation
* Added some more tests
* improved updates API for plugins
* better error code as duplicate column cannot really happen when not actually renaming a colum
Conflicts:
core/Updates/3.0.0-b1.php
plugins/CoreUpdater/Commands/Update/CliUpdateObserver.php
* fix DB field piwik_log_visit.location_provider too small (#10003)
* fixes #9564 fix DB field piwik_log_visit.location_provider too small
* use new plugins updater API
* DB field piwik_log_visit.visit_total_actions too small (#10002)
* fixes #9565 DB field piwik_log_visit.visit_total_actions too small
* change type of some db columns that are too small
* fix tests (#10040)
Conflicts:
plugins/CoreAdminHome/Menu.php
plugins/Goals/Menu.php
plugins/MobileMessaging/Menu.php
plugins/SitesManager/Menu.php
plugins/UsersManager/Menu.php
tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
* fix more file permissions
* repair more file permissions
* repair more file permissions
* trying to make ui tests work again, the table was missing
* fix some encoding issues
* cross browser fixes and usability improvement
* move back the config icon, need to find a better solution later
* more cross browser fixes
* bugfixes
* fix ui tests
* fix encoding issue
* fix various issues with the ui tests when a test gets aborted
* also skip this visitor log test when aborted
* there were 3 css files that were loaded separately, merge them instead into one css
* forgot to add the actual manifest
* do not add manifest if custom logo is specified
* load font css files first as it was before merging them into big css
* fix link icon was not aligned anymore
* minor fixes
* setting it back to 4px
* in popovers the font variable was always ignored and a different font loaded
* forgot to update screenshots
* fix remaining tests
* this should fix an update error
* added 3 new widgets system check, system summary and plugin updates
* tweak new widgets content
* no page reload when changing date or segment
* in admin home show only enabled widgets
* refs #10295 use getMockBuilder instead of deprecated getMock
* fix some ui tests
* fix various bugs
* fix more tests
* fix ui tests
* add a space between loading image and loading message
* fix docs so they appear on developer.piwik.org
* improved documentation
* introduce new Widget::renderTemplate method for consistency with controllers
* remove no longer needed files
* testing system fonts
* fix strong was not really bold
* more useful system summary
* remove ubuntu font
* fix most tests and removed most em elements
* fix tests
* fix headline was very thin
* update submodule
* update submodules
* update submodule
* fix failing ui tests
* update submodules
Diffstat (limited to 'tests/PHPUnit/System')
11 files changed, 897 insertions, 464 deletions
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml index 5bf91acc3d..bbb174f08e 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml @@ -1,7 +1,52 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <pluginName>CoreUpdater</pluginName> + <title>Update settings</title> + <settings> + <row> + <name>release_channel</name> + <title /> + <value>latest_stable</value> + <defaultValue>latest_stable</defaultValue> + <type>string</type> + <uiControl>radio</uiControl> + <uiControlAttributes> + </uiControlAttributes> + <availableValues> + <latest_stable>Latest stable release (Recommended)</latest_stable> + <latest_beta>Latest beta release</latest_beta> + <latest_2x_stable>Latest stable 2.X (Long Term Support version)</latest_2x_stable> + <latest_2x_beta>Latest beta 2.X (Long Term Support version)</latest_2x_beta> + </availableValues> + <description /> + <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=http://piwik.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=http%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> + <introduction>Release channel</introduction> + <condition /> + </row> + <row> + <name>enable_plugin_update_communication</name> + <title /> + <value>0</value> + <defaultValue>0</defaultValue> + <type>boolean</type> + <uiControl>radio</uiControl> + <uiControlAttributes> + </uiControlAttributes> + <availableValues> + <row key="1">Yes</row> + <row key="0">No (Default)</row> + </availableValues> + <description /> + <inlineHelp>An email will be sent to Super Users when there is a new version available for a plugin.</inlineHelp> + <introduction>Send an email when a plugin update is available</introduction> + <condition /> + </row> + </settings> + </row> + <row> <pluginName>ExampleSettingsPlugin</pluginName> + <title>ExampleSettingsPlugin</title> <settings> <row> <name>metric</name> @@ -19,7 +64,7 @@ </availableValues> <description>Choose the metric that should be displayed in the browser tab</description> <inlineHelp /> - <introduction>Only Super Users can change the following settings:</introduction> + <introduction /> <condition /> </row> <row> @@ -85,6 +130,7 @@ Another line</defaultValue> </row> <row> <pluginName>AnonymousPiwikUsageMeasurement</pluginName> + <title>AnonymousPiwikUsageMeasurement</title> <settings> <row> <name>canUserOptOut</name> @@ -197,8 +243,41 @@ Another line</defaultValue> </row> <row> <pluginName>QueuedTracking</pluginName> + <title>QueuedTracking</title> <settings> <row> + <name>useSentinelBackend</name> + <title>Enable Redis Sentinel'</title> + <value>0</value> + <defaultValue>0</defaultValue> + <type>boolean</type> + <uiControl>checkbox</uiControl> + <uiControlAttributes> + <size>3</size> + </uiControlAttributes> + <availableValues /> + <description /> + <inlineHelp>If enabled, the Redis Sentinel feature will be used. Make sure to update host and port if needed. Once you have enabled and saved the change, you will be able to specify multiple hosts and ports comma separated.</inlineHelp> + <introduction /> + <condition /> + </row> + <row> + <name>sentinelMasterName</name> + <title>Redis Sentinel Master name</title> + <value>mymaster</value> + <defaultValue>mymaster</defaultValue> + <type>string</type> + <uiControl>text</uiControl> + <uiControlAttributes> + <size>200</size> + </uiControlAttributes> + <availableValues /> + <description /> + <inlineHelp>The sentinel master name only needs to be configured if Sentinel is enabled.</inlineHelp> + <introduction /> + <condition /> + </row> + <row> <name>redisHost</name> <title>Redis host</title> <value>127.0.0.1</value> @@ -206,11 +285,11 @@ Another line</defaultValue> <type>string</type> <uiControl>text</uiControl> <uiControlAttributes> - <size>300</size> + <size>500</size> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Remote host of the Redis server. Max 300 characters are allowed.</inlineHelp> + <inlineHelp>Remote host of the Redis server. Max 500 characters are allowed.</inlineHelp> <introduction /> <condition /> </row> @@ -219,10 +298,10 @@ Another line</defaultValue> <title>Redis port</title> <value>6379</value> <defaultValue>6379</defaultValue> - <type>integer</type> + <type>string</type> <uiControl>text</uiControl> <uiControlAttributes> - <size>5</size> + <size>100</size> </uiControlAttributes> <availableValues /> <description /> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getUserSettings.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getUserSettings.xml index 0d18c736bb..151e26bdc7 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getUserSettings.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getUserSettings.xml @@ -2,6 +2,7 @@ <result> <row> <pluginName>ExampleSettingsPlugin</pluginName> + <title>ExampleSettingsPlugin</title> <settings> <row> <name>autoRefresh</name> @@ -57,6 +58,7 @@ </row> <row> <pluginName>AnonymousPiwikUsageMeasurement</pluginName> + <title>AnonymousPiwikUsageMeasurement</title> <settings> <row> <name>userTrackingEnabled</name> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml index 5bf91acc3d..bbb174f08e 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml @@ -1,7 +1,52 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <pluginName>CoreUpdater</pluginName> + <title>Update settings</title> + <settings> + <row> + <name>release_channel</name> + <title /> + <value>latest_stable</value> + <defaultValue>latest_stable</defaultValue> + <type>string</type> + <uiControl>radio</uiControl> + <uiControlAttributes> + </uiControlAttributes> + <availableValues> + <latest_stable>Latest stable release (Recommended)</latest_stable> + <latest_beta>Latest beta release</latest_beta> + <latest_2x_stable>Latest stable 2.X (Long Term Support version)</latest_2x_stable> + <latest_2x_beta>Latest beta 2.X (Long Term Support version)</latest_2x_beta> + </availableValues> + <description /> + <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=http://piwik.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=http%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> + <introduction>Release channel</introduction> + <condition /> + </row> + <row> + <name>enable_plugin_update_communication</name> + <title /> + <value>0</value> + <defaultValue>0</defaultValue> + <type>boolean</type> + <uiControl>radio</uiControl> + <uiControlAttributes> + </uiControlAttributes> + <availableValues> + <row key="1">Yes</row> + <row key="0">No (Default)</row> + </availableValues> + <description /> + <inlineHelp>An email will be sent to Super Users when there is a new version available for a plugin.</inlineHelp> + <introduction>Send an email when a plugin update is available</introduction> + <condition /> + </row> + </settings> + </row> + <row> <pluginName>ExampleSettingsPlugin</pluginName> + <title>ExampleSettingsPlugin</title> <settings> <row> <name>metric</name> @@ -19,7 +64,7 @@ </availableValues> <description>Choose the metric that should be displayed in the browser tab</description> <inlineHelp /> - <introduction>Only Super Users can change the following settings:</introduction> + <introduction /> <condition /> </row> <row> @@ -85,6 +130,7 @@ Another line</defaultValue> </row> <row> <pluginName>AnonymousPiwikUsageMeasurement</pluginName> + <title>AnonymousPiwikUsageMeasurement</title> <settings> <row> <name>canUserOptOut</name> @@ -197,8 +243,41 @@ Another line</defaultValue> </row> <row> <pluginName>QueuedTracking</pluginName> + <title>QueuedTracking</title> <settings> <row> + <name>useSentinelBackend</name> + <title>Enable Redis Sentinel'</title> + <value>0</value> + <defaultValue>0</defaultValue> + <type>boolean</type> + <uiControl>checkbox</uiControl> + <uiControlAttributes> + <size>3</size> + </uiControlAttributes> + <availableValues /> + <description /> + <inlineHelp>If enabled, the Redis Sentinel feature will be used. Make sure to update host and port if needed. Once you have enabled and saved the change, you will be able to specify multiple hosts and ports comma separated.</inlineHelp> + <introduction /> + <condition /> + </row> + <row> + <name>sentinelMasterName</name> + <title>Redis Sentinel Master name</title> + <value>mymaster</value> + <defaultValue>mymaster</defaultValue> + <type>string</type> + <uiControl>text</uiControl> + <uiControlAttributes> + <size>200</size> + </uiControlAttributes> + <availableValues /> + <description /> + <inlineHelp>The sentinel master name only needs to be configured if Sentinel is enabled.</inlineHelp> + <introduction /> + <condition /> + </row> + <row> <name>redisHost</name> <title>Redis host</title> <value>127.0.0.1</value> @@ -206,11 +285,11 @@ Another line</defaultValue> <type>string</type> <uiControl>text</uiControl> <uiControlAttributes> - <size>300</size> + <size>500</size> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Remote host of the Redis server. Max 300 characters are allowed.</inlineHelp> + <inlineHelp>Remote host of the Redis server. Max 500 characters are allowed.</inlineHelp> <introduction /> <condition /> </row> @@ -219,10 +298,10 @@ Another line</defaultValue> <title>Redis port</title> <value>6379</value> <defaultValue>6379</defaultValue> - <type>integer</type> + <type>string</type> <uiControl>text</uiControl> <uiControlAttributes> - <size>5</size> + <size>100</size> </uiControlAttributes> <availableValues /> <description /> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getUserSettings.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getUserSettings.xml index 0d18c736bb..151e26bdc7 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getUserSettings.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getUserSettings.xml @@ -2,6 +2,7 @@ <result> <row> <pluginName>ExampleSettingsPlugin</pluginName> + <title>ExampleSettingsPlugin</title> <settings> <row> <name>autoRefresh</name> @@ -57,6 +58,7 @@ </row> <row> <pluginName>AnonymousPiwikUsageMeasurement</pluginName> + <title>AnonymousPiwikUsageMeasurement</title> <settings> <row> <name>userTrackingEnabled</name> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml index eb12eef5d2..4015aad321 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml @@ -8,6 +8,7 @@ <settings> <row> <pluginName>WebsiteMeasurable</pluginName> + <title>WebsiteMeasurable</title> <settings> <row> <name>urls</name> @@ -212,6 +213,7 @@ </row> <row> <pluginName>ExampleSettingsPlugin</pluginName> + <title>ExampleSettingsPlugin</title> <settings> <row> <name>contact_email</name> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml index 69c2cb87cf..f3518e6424 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml @@ -556,11 +556,10 @@ <action>getNumberOfVisitsPerVisitDuration</action> <order>115</order> <parameters> - <viewDataTable>cloud</viewDataTable> <module>VisitorInterest</module> <action>getNumberOfVisitsPerVisitDuration</action> </parameters> - <uniqueId>widgetVisitorInterestgetNumberOfVisitsPerVisitDurationviewDataTablecloud</uniqueId> + <uniqueId>widgetVisitorInterestgetNumberOfVisitsPerVisitDuration</uniqueId> <viewDataTable>cloud</viewDataTable> <isReport>1</isReport> </row> @@ -570,11 +569,10 @@ <action>getNumberOfVisitsPerPage</action> <order>120</order> <parameters> - <viewDataTable>cloud</viewDataTable> <module>VisitorInterest</module> <action>getNumberOfVisitsPerPage</action> </parameters> - <uniqueId>widgetVisitorInterestgetNumberOfVisitsPerPageviewDataTablecloud</uniqueId> + <uniqueId>widgetVisitorInterestgetNumberOfVisitsPerPage</uniqueId> <viewDataTable>cloud</viewDataTable> <isReport>1</isReport> </row> @@ -721,11 +719,10 @@ <action>getBrowserEngines</action> <order>110</order> <parameters> - <viewDataTable>graphPie</viewDataTable> <module>DevicesDetection</module> <action>getBrowserEngines</action> </parameters> - <uniqueId>widgetDevicesDetectiongetBrowserEnginesviewDataTablegraphPie</uniqueId> + <uniqueId>widgetDevicesDetectiongetBrowserEngines</uniqueId> <viewDataTable>graphPie</viewDataTable> <isReport>1</isReport> </row> @@ -966,11 +963,10 @@ <action>getVisitInformationPerLocalTime</action> <order>115</order> <parameters> - <viewDataTable>graphVerticalBar</viewDataTable> <module>VisitTime</module> <action>getVisitInformationPerLocalTime</action> </parameters> - <uniqueId>widgetVisitTimegetVisitInformationPerLocalTimeviewDataTablegraphVerticalBar</uniqueId> + <uniqueId>widgetVisitTimegetVisitInformationPerLocalTime</uniqueId> <viewDataTable>graphVerticalBar</viewDataTable> <isReport>1</isReport> </row> @@ -980,11 +976,10 @@ <action>getVisitInformationPerServerTime</action> <order>120</order> <parameters> - <viewDataTable>graphVerticalBar</viewDataTable> <module>VisitTime</module> <action>getVisitInformationPerServerTime</action> </parameters> - <uniqueId>widgetVisitTimegetVisitInformationPerServerTimeviewDataTablegraphVerticalBar</uniqueId> + <uniqueId>widgetVisitTimegetVisitInformationPerServerTime</uniqueId> <viewDataTable>graphVerticalBar</viewDataTable> <isReport>1</isReport> </row> @@ -994,11 +989,10 @@ <action>getByDayOfWeek</action> <order>125</order> <parameters> - <viewDataTable>graphVerticalBar</viewDataTable> <module>VisitTime</module> <action>getByDayOfWeek</action> </parameters> - <uniqueId>widgetVisitTimegetByDayOfWeekviewDataTablegraphVerticalBar</uniqueId> + <uniqueId>widgetVisitTimegetByDayOfWeek</uniqueId> <viewDataTable>graphVerticalBar</viewDataTable> <isReport>1</isReport> </row> @@ -1140,11 +1134,10 @@ <action>getReferrerType</action> <order>101</order> <parameters> - <viewDataTable>tableAllColumns</viewDataTable> <module>Referrers</module> <action>getReferrerType</action> </parameters> - <uniqueId>widgetReferrersgetReferrerTypeviewDataTabletableAllColumns</uniqueId> + <uniqueId>widgetReferrersgetReferrerType</uniqueId> <viewDataTable>tableAllColumns</viewDataTable> <isReport>1</isReport> </row> @@ -1154,11 +1147,10 @@ <action>getAll</action> <order>102</order> <parameters> - <viewDataTable>tableAllColumns</viewDataTable> <module>Referrers</module> <action>getAll</action> </parameters> - <uniqueId>widgetReferrersgetAllviewDataTabletableAllColumns</uniqueId> + <uniqueId>widgetReferrersgetAll</uniqueId> <viewDataTable>tableAllColumns</viewDataTable> <isReport>1</isReport> </row> @@ -1317,11 +1309,10 @@ <action>getSocials</action> <order>111</order> <parameters> - <viewDataTable>graphPie</viewDataTable> <module>Referrers</module> <action>getSocials</action> </parameters> - <uniqueId>widgetReferrersgetSocialsviewDataTablegraphPie</uniqueId> + <uniqueId>widgetReferrersgetSocials</uniqueId> <viewDataTable>graphPie</viewDataTable> <isReport>1</isReport> </row> @@ -1478,13 +1469,14 @@ <action>getCustomVariables</action> <order>301</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>CustomVariables</module> <action>getCustomVariables</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>1</idGoal> </parameters> - <uniqueId>widgetCustomVariablesgetCustomVariablesviewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId> + <uniqueId>widgetCustomVariablesgetCustomVariablesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -1505,13 +1497,14 @@ <action>getVisitInformationPerServerTime</action> <order>302</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>VisitTime</module> <action>getVisitInformationPerServerTime</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>1</idGoal> </parameters> - <uniqueId>widgetVisitTimegetVisitInformationPerServerTimeviewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId> + <uniqueId>widgetVisitTimegetVisitInformationPerServerTimeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -1532,13 +1525,14 @@ <action>getCountry</action> <order>201</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>UserCountry</module> <action>getCountry</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>1</idGoal> </parameters> - <uniqueId>widgetUserCountrygetCountryviewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId> + <uniqueId>widgetUserCountrygetCountryforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -1559,13 +1553,14 @@ <action>getContinent</action> <order>202</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>UserCountry</module> <action>getContinent</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>1</idGoal> </parameters> - <uniqueId>widgetUserCountrygetContinentviewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId> + <uniqueId>widgetUserCountrygetContinentforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -1586,13 +1581,14 @@ <action>getRegion</action> <order>203</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>UserCountry</module> <action>getRegion</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>1</idGoal> </parameters> - <uniqueId>widgetUserCountrygetRegionviewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId> + <uniqueId>widgetUserCountrygetRegionforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -1613,13 +1609,14 @@ <action>getCity</action> <order>204</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>UserCountry</module> <action>getCity</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>1</idGoal> </parameters> - <uniqueId>widgetUserCountrygetCityviewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId> + <uniqueId>widgetUserCountrygetCityforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -1640,13 +1637,14 @@ <action>getReferrerType</action> <order>1</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>Referrers</module> <action>getReferrerType</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>1</idGoal> </parameters> - <uniqueId>widgetReferrersgetReferrerTypeviewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId> + <uniqueId>widgetReferrersgetReferrerTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -1667,13 +1665,14 @@ <action>getKeywords</action> <order>2</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>Referrers</module> <action>getKeywords</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>1</idGoal> </parameters> - <uniqueId>widgetReferrersgetKeywordsviewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId> + <uniqueId>widgetReferrersgetKeywordsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -1694,13 +1693,14 @@ <action>getSearchEngines</action> <order>3</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>Referrers</module> <action>getSearchEngines</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>1</idGoal> </parameters> - <uniqueId>widgetReferrersgetSearchEnginesviewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId> + <uniqueId>widgetReferrersgetSearchEnginesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -1721,13 +1721,14 @@ <action>getWebsites</action> <order>4</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>Referrers</module> <action>getWebsites</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>1</idGoal> </parameters> - <uniqueId>widgetReferrersgetWebsitesviewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId> + <uniqueId>widgetReferrersgetWebsitesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -1748,13 +1749,14 @@ <action>getCampaigns</action> <order>5</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>Referrers</module> <action>getCampaigns</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>1</idGoal> </parameters> - <uniqueId>widgetReferrersgetCampaignsviewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId> + <uniqueId>widgetReferrersgetCampaignsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal1</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -1775,12 +1777,14 @@ <action>getVisitsUntilConversion</action> <order>101</order> <parameters> + <forceView>1</forceView> + <viewDataTable>table</viewDataTable> <module>Goals</module> <action>getVisitsUntilConversion</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>1</idGoal> </parameters> - <uniqueId>widgetGoalsgetVisitsUntilConversiondocumentationForGoalsPage1idGoal1</uniqueId> + <uniqueId>widgetGoalsgetVisitsUntilConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoal1</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -1801,12 +1805,14 @@ <action>getDaysToConversion</action> <order>102</order> <parameters> + <forceView>1</forceView> + <viewDataTable>table</viewDataTable> <module>Goals</module> <action>getDaysToConversion</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>1</idGoal> </parameters> - <uniqueId>widgetGoalsgetDaysToConversiondocumentationForGoalsPage1idGoal1</uniqueId> + <uniqueId>widgetGoalsgetDaysToConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoal1</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -1965,13 +1971,14 @@ <action>getCustomVariables</action> <order>301</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>CustomVariables</module> <action>getCustomVariables</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>2</idGoal> </parameters> - <uniqueId>widgetCustomVariablesgetCustomVariablesviewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId> + <uniqueId>widgetCustomVariablesgetCustomVariablesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -1992,13 +1999,14 @@ <action>getVisitInformationPerServerTime</action> <order>302</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>VisitTime</module> <action>getVisitInformationPerServerTime</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>2</idGoal> </parameters> - <uniqueId>widgetVisitTimegetVisitInformationPerServerTimeviewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId> + <uniqueId>widgetVisitTimegetVisitInformationPerServerTimeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -2019,13 +2027,14 @@ <action>getCountry</action> <order>201</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>UserCountry</module> <action>getCountry</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>2</idGoal> </parameters> - <uniqueId>widgetUserCountrygetCountryviewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId> + <uniqueId>widgetUserCountrygetCountryforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -2046,13 +2055,14 @@ <action>getContinent</action> <order>202</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>UserCountry</module> <action>getContinent</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>2</idGoal> </parameters> - <uniqueId>widgetUserCountrygetContinentviewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId> + <uniqueId>widgetUserCountrygetContinentforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -2073,13 +2083,14 @@ <action>getRegion</action> <order>203</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>UserCountry</module> <action>getRegion</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>2</idGoal> </parameters> - <uniqueId>widgetUserCountrygetRegionviewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId> + <uniqueId>widgetUserCountrygetRegionforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -2100,13 +2111,14 @@ <action>getCity</action> <order>204</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>UserCountry</module> <action>getCity</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>2</idGoal> </parameters> - <uniqueId>widgetUserCountrygetCityviewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId> + <uniqueId>widgetUserCountrygetCityforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -2127,13 +2139,14 @@ <action>getReferrerType</action> <order>1</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>Referrers</module> <action>getReferrerType</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>2</idGoal> </parameters> - <uniqueId>widgetReferrersgetReferrerTypeviewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId> + <uniqueId>widgetReferrersgetReferrerTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -2154,13 +2167,14 @@ <action>getKeywords</action> <order>2</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>Referrers</module> <action>getKeywords</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>2</idGoal> </parameters> - <uniqueId>widgetReferrersgetKeywordsviewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId> + <uniqueId>widgetReferrersgetKeywordsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -2181,13 +2195,14 @@ <action>getSearchEngines</action> <order>3</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>Referrers</module> <action>getSearchEngines</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>2</idGoal> </parameters> - <uniqueId>widgetReferrersgetSearchEnginesviewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId> + <uniqueId>widgetReferrersgetSearchEnginesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -2208,13 +2223,14 @@ <action>getWebsites</action> <order>4</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>Referrers</module> <action>getWebsites</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>2</idGoal> </parameters> - <uniqueId>widgetReferrersgetWebsitesviewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId> + <uniqueId>widgetReferrersgetWebsitesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -2235,13 +2251,14 @@ <action>getCampaigns</action> <order>5</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>Referrers</module> <action>getCampaigns</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>2</idGoal> </parameters> - <uniqueId>widgetReferrersgetCampaignsviewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId> + <uniqueId>widgetReferrersgetCampaignsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal2</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -2262,12 +2279,14 @@ <action>getVisitsUntilConversion</action> <order>101</order> <parameters> + <forceView>1</forceView> + <viewDataTable>table</viewDataTable> <module>Goals</module> <action>getVisitsUntilConversion</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>2</idGoal> </parameters> - <uniqueId>widgetGoalsgetVisitsUntilConversiondocumentationForGoalsPage1idGoal2</uniqueId> + <uniqueId>widgetGoalsgetVisitsUntilConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoal2</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -2288,12 +2307,14 @@ <action>getDaysToConversion</action> <order>102</order> <parameters> + <forceView>1</forceView> + <viewDataTable>table</viewDataTable> <module>Goals</module> <action>getDaysToConversion</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>2</idGoal> </parameters> - <uniqueId>widgetGoalsgetDaysToConversiondocumentationForGoalsPage1idGoal2</uniqueId> + <uniqueId>widgetGoalsgetDaysToConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoal2</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -2452,13 +2473,14 @@ <action>getCustomVariables</action> <order>301</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>CustomVariables</module> <action>getCustomVariables</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>3</idGoal> </parameters> - <uniqueId>widgetCustomVariablesgetCustomVariablesviewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId> + <uniqueId>widgetCustomVariablesgetCustomVariablesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -2479,13 +2501,14 @@ <action>getVisitInformationPerServerTime</action> <order>302</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>VisitTime</module> <action>getVisitInformationPerServerTime</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>3</idGoal> </parameters> - <uniqueId>widgetVisitTimegetVisitInformationPerServerTimeviewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId> + <uniqueId>widgetVisitTimegetVisitInformationPerServerTimeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -2506,13 +2529,14 @@ <action>getCountry</action> <order>201</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>UserCountry</module> <action>getCountry</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>3</idGoal> </parameters> - <uniqueId>widgetUserCountrygetCountryviewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId> + <uniqueId>widgetUserCountrygetCountryforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -2533,13 +2557,14 @@ <action>getContinent</action> <order>202</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>UserCountry</module> <action>getContinent</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>3</idGoal> </parameters> - <uniqueId>widgetUserCountrygetContinentviewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId> + <uniqueId>widgetUserCountrygetContinentforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -2560,13 +2585,14 @@ <action>getRegion</action> <order>203</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>UserCountry</module> <action>getRegion</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>3</idGoal> </parameters> - <uniqueId>widgetUserCountrygetRegionviewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId> + <uniqueId>widgetUserCountrygetRegionforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -2587,13 +2613,14 @@ <action>getCity</action> <order>204</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>UserCountry</module> <action>getCity</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>3</idGoal> </parameters> - <uniqueId>widgetUserCountrygetCityviewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId> + <uniqueId>widgetUserCountrygetCityforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -2614,13 +2641,14 @@ <action>getReferrerType</action> <order>1</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>Referrers</module> <action>getReferrerType</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>3</idGoal> </parameters> - <uniqueId>widgetReferrersgetReferrerTypeviewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId> + <uniqueId>widgetReferrersgetReferrerTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -2641,13 +2669,14 @@ <action>getKeywords</action> <order>2</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>Referrers</module> <action>getKeywords</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>3</idGoal> </parameters> - <uniqueId>widgetReferrersgetKeywordsviewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId> + <uniqueId>widgetReferrersgetKeywordsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -2668,13 +2697,14 @@ <action>getSearchEngines</action> <order>3</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>Referrers</module> <action>getSearchEngines</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>3</idGoal> </parameters> - <uniqueId>widgetReferrersgetSearchEnginesviewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId> + <uniqueId>widgetReferrersgetSearchEnginesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -2695,13 +2725,14 @@ <action>getWebsites</action> <order>4</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>Referrers</module> <action>getWebsites</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>3</idGoal> </parameters> - <uniqueId>widgetReferrersgetWebsitesviewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId> + <uniqueId>widgetReferrersgetWebsitesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -2722,13 +2753,14 @@ <action>getCampaigns</action> <order>5</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>Referrers</module> <action>getCampaigns</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>3</idGoal> </parameters> - <uniqueId>widgetReferrersgetCampaignsviewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId> + <uniqueId>widgetReferrersgetCampaignsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal3</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -2749,12 +2781,14 @@ <action>getVisitsUntilConversion</action> <order>101</order> <parameters> + <forceView>1</forceView> + <viewDataTable>table</viewDataTable> <module>Goals</module> <action>getVisitsUntilConversion</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>3</idGoal> </parameters> - <uniqueId>widgetGoalsgetVisitsUntilConversiondocumentationForGoalsPage1idGoal3</uniqueId> + <uniqueId>widgetGoalsgetVisitsUntilConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoal3</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -2775,12 +2809,14 @@ <action>getDaysToConversion</action> <order>102</order> <parameters> + <forceView>1</forceView> + <viewDataTable>table</viewDataTable> <module>Goals</module> <action>getDaysToConversion</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>3</idGoal> </parameters> - <uniqueId>widgetGoalsgetDaysToConversiondocumentationForGoalsPage1idGoal3</uniqueId> + <uniqueId>widgetGoalsgetDaysToConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoal3</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -2992,13 +3028,14 @@ <action>getCustomVariables</action> <order>301</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>CustomVariables</module> <action>getCustomVariables</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>0</idGoal> </parameters> - <uniqueId>widgetCustomVariablesgetCustomVariablesviewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId> + <uniqueId>widgetCustomVariablesgetCustomVariablesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -3019,13 +3056,14 @@ <action>getVisitInformationPerServerTime</action> <order>302</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>VisitTime</module> <action>getVisitInformationPerServerTime</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>0</idGoal> </parameters> - <uniqueId>widgetVisitTimegetVisitInformationPerServerTimeviewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId> + <uniqueId>widgetVisitTimegetVisitInformationPerServerTimeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -3046,13 +3084,14 @@ <action>getCountry</action> <order>201</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>UserCountry</module> <action>getCountry</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>0</idGoal> </parameters> - <uniqueId>widgetUserCountrygetCountryviewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId> + <uniqueId>widgetUserCountrygetCountryforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -3073,13 +3112,14 @@ <action>getContinent</action> <order>202</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>UserCountry</module> <action>getContinent</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>0</idGoal> </parameters> - <uniqueId>widgetUserCountrygetContinentviewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId> + <uniqueId>widgetUserCountrygetContinentforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -3100,13 +3140,14 @@ <action>getRegion</action> <order>203</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>UserCountry</module> <action>getRegion</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>0</idGoal> </parameters> - <uniqueId>widgetUserCountrygetRegionviewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId> + <uniqueId>widgetUserCountrygetRegionforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -3127,13 +3168,14 @@ <action>getCity</action> <order>204</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>UserCountry</module> <action>getCity</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>0</idGoal> </parameters> - <uniqueId>widgetUserCountrygetCityviewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId> + <uniqueId>widgetUserCountrygetCityforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -3154,13 +3196,14 @@ <action>getReferrerType</action> <order>1</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>Referrers</module> <action>getReferrerType</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>0</idGoal> </parameters> - <uniqueId>widgetReferrersgetReferrerTypeviewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId> + <uniqueId>widgetReferrersgetReferrerTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -3181,13 +3224,14 @@ <action>getKeywords</action> <order>2</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>Referrers</module> <action>getKeywords</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>0</idGoal> </parameters> - <uniqueId>widgetReferrersgetKeywordsviewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId> + <uniqueId>widgetReferrersgetKeywordsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -3208,13 +3252,14 @@ <action>getSearchEngines</action> <order>3</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>Referrers</module> <action>getSearchEngines</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>0</idGoal> </parameters> - <uniqueId>widgetReferrersgetSearchEnginesviewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId> + <uniqueId>widgetReferrersgetSearchEnginesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -3235,13 +3280,14 @@ <action>getWebsites</action> <order>4</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>Referrers</module> <action>getWebsites</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>0</idGoal> </parameters> - <uniqueId>widgetReferrersgetWebsitesviewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId> + <uniqueId>widgetReferrersgetWebsitesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -3262,13 +3308,14 @@ <action>getCampaigns</action> <order>5</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>Referrers</module> <action>getCampaigns</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>0</idGoal> </parameters> - <uniqueId>widgetReferrersgetCampaignsviewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId> + <uniqueId>widgetReferrersgetCampaignsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoal0</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -3289,12 +3336,14 @@ <action>getVisitsUntilConversion</action> <order>101</order> <parameters> + <forceView>1</forceView> + <viewDataTable>table</viewDataTable> <module>Goals</module> <action>getVisitsUntilConversion</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>0</idGoal> </parameters> - <uniqueId>widgetGoalsgetVisitsUntilConversiondocumentationForGoalsPage1idGoal0</uniqueId> + <uniqueId>widgetGoalsgetVisitsUntilConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoal0</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -3315,12 +3364,14 @@ <action>getDaysToConversion</action> <order>102</order> <parameters> + <forceView>1</forceView> + <viewDataTable>table</viewDataTable> <module>Goals</module> <action>getDaysToConversion</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>0</idGoal> </parameters> - <uniqueId>widgetGoalsgetDaysToConversiondocumentationForGoalsPage1idGoal0</uniqueId> + <uniqueId>widgetGoalsgetDaysToConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoal0</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -3648,13 +3699,14 @@ <action>getCustomVariables</action> <order>301</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>CustomVariables</module> <action>getCustomVariables</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>ecommerceOrder</idGoal> </parameters> - <uniqueId>widgetCustomVariablesgetCustomVariablesviewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> + <uniqueId>widgetCustomVariablesgetCustomVariablesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -3675,13 +3727,14 @@ <action>getVisitInformationPerServerTime</action> <order>302</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>VisitTime</module> <action>getVisitInformationPerServerTime</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>ecommerceOrder</idGoal> </parameters> - <uniqueId>widgetVisitTimegetVisitInformationPerServerTimeviewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> + <uniqueId>widgetVisitTimegetVisitInformationPerServerTimeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -3702,13 +3755,14 @@ <action>getCountry</action> <order>201</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>UserCountry</module> <action>getCountry</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>ecommerceOrder</idGoal> </parameters> - <uniqueId>widgetUserCountrygetCountryviewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> + <uniqueId>widgetUserCountrygetCountryforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -3729,13 +3783,14 @@ <action>getContinent</action> <order>202</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>UserCountry</module> <action>getContinent</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>ecommerceOrder</idGoal> </parameters> - <uniqueId>widgetUserCountrygetContinentviewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> + <uniqueId>widgetUserCountrygetContinentforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -3756,13 +3811,14 @@ <action>getRegion</action> <order>203</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>UserCountry</module> <action>getRegion</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>ecommerceOrder</idGoal> </parameters> - <uniqueId>widgetUserCountrygetRegionviewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> + <uniqueId>widgetUserCountrygetRegionforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -3783,13 +3839,14 @@ <action>getCity</action> <order>204</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>UserCountry</module> <action>getCity</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>ecommerceOrder</idGoal> </parameters> - <uniqueId>widgetUserCountrygetCityviewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> + <uniqueId>widgetUserCountrygetCityforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -3810,13 +3867,14 @@ <action>getReferrerType</action> <order>1</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>Referrers</module> <action>getReferrerType</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>ecommerceOrder</idGoal> </parameters> - <uniqueId>widgetReferrersgetReferrerTypeviewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> + <uniqueId>widgetReferrersgetReferrerTypeforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -3837,13 +3895,14 @@ <action>getKeywords</action> <order>2</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>Referrers</module> <action>getKeywords</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>ecommerceOrder</idGoal> </parameters> - <uniqueId>widgetReferrersgetKeywordsviewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> + <uniqueId>widgetReferrersgetKeywordsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -3864,13 +3923,14 @@ <action>getSearchEngines</action> <order>3</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>Referrers</module> <action>getSearchEngines</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>ecommerceOrder</idGoal> </parameters> - <uniqueId>widgetReferrersgetSearchEnginesviewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> + <uniqueId>widgetReferrersgetSearchEnginesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -3891,13 +3951,14 @@ <action>getWebsites</action> <order>4</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>Referrers</module> <action>getWebsites</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>ecommerceOrder</idGoal> </parameters> - <uniqueId>widgetReferrersgetWebsitesviewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> + <uniqueId>widgetReferrersgetWebsitesforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -3918,13 +3979,14 @@ <action>getCampaigns</action> <order>5</order> <parameters> + <forceView>1</forceView> <viewDataTable>tableGoals</viewDataTable> <module>Referrers</module> <action>getCampaigns</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>ecommerceOrder</idGoal> </parameters> - <uniqueId>widgetReferrersgetCampaignsviewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> + <uniqueId>widgetReferrersgetCampaignsforceView1viewDataTabletableGoalsdocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> <viewDataTable>tableGoals</viewDataTable> <isReport>1</isReport> </row> @@ -3945,12 +4007,14 @@ <action>getVisitsUntilConversion</action> <order>101</order> <parameters> + <forceView>1</forceView> + <viewDataTable>table</viewDataTable> <module>Goals</module> <action>getVisitsUntilConversion</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>ecommerceOrder</idGoal> </parameters> - <uniqueId>widgetGoalsgetVisitsUntilConversiondocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> + <uniqueId>widgetGoalsgetVisitsUntilConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -3971,12 +4035,14 @@ <action>getDaysToConversion</action> <order>102</order> <parameters> + <forceView>1</forceView> + <viewDataTable>table</viewDataTable> <module>Goals</module> <action>getDaysToConversion</action> <documentationForGoalsPage>1</documentationForGoalsPage> <idGoal>ecommerceOrder</idGoal> </parameters> - <uniqueId>widgetGoalsgetDaysToConversiondocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> + <uniqueId>widgetGoalsgetDaysToConversionforceView1viewDataTabletabledocumentationForGoalsPage1idGoalecommerceOrder</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -4161,11 +4227,10 @@ <action>getPlanetRatios</action> <order>212</order> <parameters> - <viewDataTable>graphPie</viewDataTable> <module>ExampleUI</module> <action>getPlanetRatios</action> </parameters> - <uniqueId>widgetExampleUIgetPlanetRatiosviewDataTablegraphPie</uniqueId> + <uniqueId>widgetExampleUIgetPlanetRatios</uniqueId> <viewDataTable>graphPie</viewDataTable> <isReport>1</isReport> </row> @@ -4206,11 +4271,10 @@ <action>getPlanetRatiosWithLogos</action> <order>213</order> <parameters> - <viewDataTable>cloud</viewDataTable> <module>ExampleUI</module> <action>getPlanetRatiosWithLogos</action> </parameters> - <uniqueId>widgetExampleUIgetPlanetRatiosWithLogosviewDataTablecloud</uniqueId> + <uniqueId>widgetExampleUIgetPlanetRatiosWithLogos</uniqueId> <viewDataTable>cloud</viewDataTable> <isReport>1</isReport> </row> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml index 16b269c1bb..ead3c57fb7 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml @@ -334,7 +334,7 @@ <isReport>1</isReport> </row> <row> - <name>Operating System families</name> + <name>Browser engines</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -347,14 +347,14 @@ <order>20</order> </subcategory> <module>DevicesDetection</module> - <action>getOsFamilies</action> - <order>108</order> + <action>getBrowserEngines</action> + <order>110</order> <parameters> <module>DevicesDetection</module> - <action>getOsFamilies</action> + <action>getBrowserEngines</action> </parameters> - <uniqueId>widgetDevicesDetectiongetOsFamilies</uniqueId> - <viewDataTable>table</viewDataTable> + <uniqueId>widgetDevicesDetectiongetBrowserEngines</uniqueId> + <viewDataTable>graphPie</viewDataTable> <isReport>1</isReport> </row> <row> @@ -433,7 +433,7 @@ </widgets> </row> <row> - <name>Browser engines</name> + <name>Browser Plugins</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -445,20 +445,19 @@ <name>Software</name> <order>20</order> </subcategory> - <module>DevicesDetection</module> - <action>getBrowserEngines</action> - <order>110</order> + <module>DevicePlugins</module> + <action>getPlugin</action> + <order>113</order> <parameters> - <viewDataTable>graphPie</viewDataTable> - <module>DevicesDetection</module> - <action>getBrowserEngines</action> + <module>DevicePlugins</module> + <action>getPlugin</action> </parameters> - <uniqueId>widgetDevicesDetectiongetBrowserEnginesviewDataTablegraphPie</uniqueId> - <viewDataTable>graphPie</viewDataTable> + <uniqueId>widgetDevicePluginsgetPlugin</uniqueId> + <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Browser Plugins</name> + <name>Operating System families</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -470,19 +469,19 @@ <name>Software</name> <order>20</order> </subcategory> - <module>DevicePlugins</module> - <action>getPlugin</action> - <order>113</order> + <module>DevicesDetection</module> + <action>getOsFamilies</action> + <order>108</order> <parameters> - <module>DevicePlugins</module> - <action>getPlugin</action> + <module>DevicesDetection</module> + <action>getOsFamilies</action> </parameters> - <uniqueId>widgetDevicePluginsgetPlugin</uniqueId> + <uniqueId>widgetDevicesDetectiongetOsFamilies</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Visitor Map</name> + <name>Browser language</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -494,14 +493,16 @@ <name>Locations</name> <order>25</order> </subcategory> - <module>UserCountryMap</module> - <action>visitorMap</action> - <order>1</order> + <module>UserLanguage</module> + <action>getLanguage</action> + <order>108</order> <parameters> - <module>UserCountryMap</module> - <action>visitorMap</action> + <module>UserLanguage</module> + <action>getLanguage</action> </parameters> - <uniqueId>widgetUserCountryMapvisitorMap</uniqueId> + <uniqueId>widgetUserLanguagegetLanguage</uniqueId> + <viewDataTable>table</viewDataTable> + <isReport>1</isReport> </row> <row> <name>City</name> @@ -528,7 +529,7 @@ <isReport>1</isReport> </row> <row> - <name>Browser language</name> + <name>Region</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -540,19 +541,19 @@ <name>Locations</name> <order>25</order> </subcategory> - <module>UserLanguage</module> - <action>getLanguage</action> - <order>108</order> + <module>UserCountry</module> + <action>getRegion</action> + <order>107</order> <parameters> - <module>UserLanguage</module> - <action>getLanguage</action> + <module>UserCountry</module> + <action>getRegion</action> </parameters> - <uniqueId>widgetUserLanguagegetLanguage</uniqueId> + <uniqueId>widgetUserCountrygetRegion</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Region</name> + <name>Continent</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -565,18 +566,18 @@ <order>25</order> </subcategory> <module>UserCountry</module> - <action>getRegion</action> - <order>107</order> + <action>getContinent</action> + <order>106</order> <parameters> <module>UserCountry</module> - <action>getRegion</action> + <action>getContinent</action> </parameters> - <uniqueId>widgetUserCountrygetRegion</uniqueId> + <uniqueId>widgetUserCountrygetContinent</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Continent</name> + <name>Visitor Map</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -588,16 +589,14 @@ <name>Locations</name> <order>25</order> </subcategory> - <module>UserCountry</module> - <action>getContinent</action> - <order>106</order> + <module>UserCountryMap</module> + <action>visitorMap</action> + <order>1</order> <parameters> - <module>UserCountry</module> - <action>getContinent</action> + <module>UserCountryMap</module> + <action>visitorMap</action> </parameters> - <uniqueId>widgetUserCountrygetContinent</uniqueId> - <viewDataTable>table</viewDataTable> - <isReport>1</isReport> + <uniqueId>widgetUserCountryMapvisitorMap</uniqueId> </row> <row> <name>Country</name> @@ -648,7 +647,7 @@ <isReport>1</isReport> </row> <row> - <name>Visits by Days Since Last Visit</name> + <name>Frequency Overview</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -660,19 +659,47 @@ <name>Engagement</name> <order>30</order> </subcategory> - <module>VisitorInterest</module> - <action>getNumberOfVisitsByDaysSinceLast</action> - <order>130</order> + <module>VisitFrequency</module> + <action>get</action> + <order>2</order> <parameters> - <module>VisitorInterest</module> - <action>getNumberOfVisitsByDaysSinceLast</action> + <forceView>1</forceView> + <viewDataTable>sparklines</viewDataTable> + <module>VisitFrequency</module> + <action>get</action> </parameters> - <uniqueId>widgetVisitorInterestgetNumberOfVisitsByDaysSinceLast</uniqueId> - <viewDataTable>table</viewDataTable> + <uniqueId>widgetVisitFrequencygetforceView1viewDataTablesparklines</uniqueId> + <viewDataTable>sparklines</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Visits per visit duration</name> + <name>Returning Visits Over Time</name> + <category> + <id>General_Visitors</id> + <name>Visitors</name> + <order>5</order> + <icon>icon-reporting-visitors</icon> + </category> + <subcategory> + <id>VisitorInterest_Engagement</id> + <name>Engagement</name> + <order>30</order> + </subcategory> + <module>VisitFrequency</module> + <action>getEvolutionGraph</action> + <order>1</order> + <parameters> + <forceView>1</forceView> + <viewDataTable>graphEvolution</viewDataTable> + <module>VisitFrequency</module> + <action>getEvolutionGraph</action> + </parameters> + <uniqueId>widgetVisitFrequencygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId> + <viewDataTable>graphEvolution</viewDataTable> + <isReport>1</isReport> + </row> + <row> + <name>Visits by Days Since Last Visit</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -685,15 +712,14 @@ <order>30</order> </subcategory> <module>VisitorInterest</module> - <action>getNumberOfVisitsPerVisitDuration</action> - <order>115</order> + <action>getNumberOfVisitsByDaysSinceLast</action> + <order>130</order> <parameters> - <viewDataTable>cloud</viewDataTable> <module>VisitorInterest</module> - <action>getNumberOfVisitsPerVisitDuration</action> + <action>getNumberOfVisitsByDaysSinceLast</action> </parameters> - <uniqueId>widgetVisitorInterestgetNumberOfVisitsPerVisitDurationviewDataTablecloud</uniqueId> - <viewDataTable>cloud</viewDataTable> + <uniqueId>widgetVisitorInterestgetNumberOfVisitsByDaysSinceLast</uniqueId> + <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> @@ -713,16 +739,15 @@ <action>getNumberOfVisitsPerPage</action> <order>120</order> <parameters> - <viewDataTable>cloud</viewDataTable> <module>VisitorInterest</module> <action>getNumberOfVisitsPerPage</action> </parameters> - <uniqueId>widgetVisitorInterestgetNumberOfVisitsPerPageviewDataTablecloud</uniqueId> + <uniqueId>widgetVisitorInterestgetNumberOfVisitsPerPage</uniqueId> <viewDataTable>cloud</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Returning Visits Over Time</name> + <name>Visits by Visit Number</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -734,17 +759,15 @@ <name>Engagement</name> <order>30</order> </subcategory> - <module>VisitFrequency</module> - <action>getEvolutionGraph</action> - <order>1</order> + <module>VisitorInterest</module> + <action>getNumberOfVisitsByVisitCount</action> + <order>125</order> <parameters> - <forceView>1</forceView> - <viewDataTable>graphEvolution</viewDataTable> - <module>VisitFrequency</module> - <action>getEvolutionGraph</action> + <module>VisitorInterest</module> + <action>getNumberOfVisitsByVisitCount</action> </parameters> - <uniqueId>widgetVisitFrequencygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId> - <viewDataTable>graphEvolution</viewDataTable> + <uniqueId>widgetVisitorInterestgetNumberOfVisitsByVisitCount</uniqueId> + <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> @@ -766,7 +789,7 @@ <uniqueId>widgetLivegetVisitorProfilePopup</uniqueId> </row> <row> - <name>Frequency Overview</name> + <name>Visits per visit duration</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -778,21 +801,19 @@ <name>Engagement</name> <order>30</order> </subcategory> - <module>VisitFrequency</module> - <action>get</action> - <order>2</order> + <module>VisitorInterest</module> + <action>getNumberOfVisitsPerVisitDuration</action> + <order>115</order> <parameters> - <forceView>1</forceView> - <viewDataTable>sparklines</viewDataTable> - <module>VisitFrequency</module> - <action>get</action> + <module>VisitorInterest</module> + <action>getNumberOfVisitsPerVisitDuration</action> </parameters> - <uniqueId>widgetVisitFrequencygetforceView1viewDataTablesparklines</uniqueId> - <viewDataTable>sparklines</viewDataTable> + <uniqueId>widgetVisitorInterestgetNumberOfVisitsPerVisitDuration</uniqueId> + <viewDataTable>cloud</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Visits by Visit Number</name> + <name>Visits by Day of Week</name> <category> <id>General_Visitors</id> <name>Visitors</name> @@ -800,19 +821,19 @@ <icon>icon-reporting-visitors</icon> </category> <subcategory> - <id>VisitorInterest_Engagement</id> - <name>Engagement</name> - <order>30</order> + <id>VisitTime_SubmenuTimes</id> + <name>Times</name> + <order>35</order> </subcategory> - <module>VisitorInterest</module> - <action>getNumberOfVisitsByVisitCount</action> + <module>VisitTime</module> + <action>getByDayOfWeek</action> <order>125</order> <parameters> - <module>VisitorInterest</module> - <action>getNumberOfVisitsByVisitCount</action> + <module>VisitTime</module> + <action>getByDayOfWeek</action> </parameters> - <uniqueId>widgetVisitorInterestgetNumberOfVisitsByVisitCount</uniqueId> - <viewDataTable>table</viewDataTable> + <uniqueId>widgetVisitTimegetByDayOfWeek</uniqueId> + <viewDataTable>graphVerticalBar</viewDataTable> <isReport>1</isReport> </row> <row> @@ -832,11 +853,10 @@ <action>getVisitInformationPerLocalTime</action> <order>115</order> <parameters> - <viewDataTable>graphVerticalBar</viewDataTable> <module>VisitTime</module> <action>getVisitInformationPerLocalTime</action> </parameters> - <uniqueId>widgetVisitTimegetVisitInformationPerLocalTimeviewDataTablegraphVerticalBar</uniqueId> + <uniqueId>widgetVisitTimegetVisitInformationPerLocalTime</uniqueId> <viewDataTable>graphVerticalBar</viewDataTable> <isReport>1</isReport> </row> @@ -857,36 +877,10 @@ <action>getVisitInformationPerServerTime</action> <order>120</order> <parameters> - <viewDataTable>graphVerticalBar</viewDataTable> <module>VisitTime</module> <action>getVisitInformationPerServerTime</action> </parameters> - <uniqueId>widgetVisitTimegetVisitInformationPerServerTimeviewDataTablegraphVerticalBar</uniqueId> - <viewDataTable>graphVerticalBar</viewDataTable> - <isReport>1</isReport> - </row> - <row> - <name>Visits by Day of Week</name> - <category> - <id>General_Visitors</id> - <name>Visitors</name> - <order>5</order> - <icon>icon-reporting-visitors</icon> - </category> - <subcategory> - <id>VisitTime_SubmenuTimes</id> - <name>Times</name> - <order>35</order> - </subcategory> - <module>VisitTime</module> - <action>getByDayOfWeek</action> - <order>125</order> - <parameters> - <viewDataTable>graphVerticalBar</viewDataTable> - <module>VisitTime</module> - <action>getByDayOfWeek</action> - </parameters> - <uniqueId>widgetVisitTimegetByDayOfWeekviewDataTablegraphVerticalBar</uniqueId> + <uniqueId>widgetVisitTimegetVisitInformationPerServerTime</uniqueId> <viewDataTable>graphVerticalBar</viewDataTable> <isReport>1</isReport> </row> @@ -937,7 +931,7 @@ <isReport>1</isReport> </row> <row> - <name>Entry pages</name> + <name>Entry Page Titles</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -950,18 +944,18 @@ <order>10</order> </subcategory> <module>Actions</module> - <action>getEntryPageUrls</action> - <order>103</order> + <action>getEntryPageTitles</action> + <order>106</order> <parameters> <module>Actions</module> - <action>getEntryPageUrls</action> + <action>getEntryPageTitles</action> </parameters> - <uniqueId>widgetActionsgetEntryPageUrls</uniqueId> + <uniqueId>widgetActionsgetEntryPageTitles</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Entry Page Titles</name> + <name>Entry pages</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -974,18 +968,18 @@ <order>10</order> </subcategory> <module>Actions</module> - <action>getEntryPageTitles</action> - <order>106</order> + <action>getEntryPageUrls</action> + <order>103</order> <parameters> <module>Actions</module> - <action>getEntryPageTitles</action> + <action>getEntryPageUrls</action> </parameters> - <uniqueId>widgetActionsgetEntryPageTitles</uniqueId> + <uniqueId>widgetActionsgetEntryPageUrls</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Exit page titles</name> + <name>Exit pages</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -998,18 +992,18 @@ <order>15</order> </subcategory> <module>Actions</module> - <action>getExitPageTitles</action> - <order>107</order> + <action>getExitPageUrls</action> + <order>104</order> <parameters> <module>Actions</module> - <action>getExitPageTitles</action> + <action>getExitPageUrls</action> </parameters> - <uniqueId>widgetActionsgetExitPageTitles</uniqueId> + <uniqueId>widgetActionsgetExitPageUrls</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Exit pages</name> + <name>Exit page titles</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1022,13 +1016,13 @@ <order>15</order> </subcategory> <module>Actions</module> - <action>getExitPageUrls</action> - <order>104</order> + <action>getExitPageTitles</action> + <order>107</order> <parameters> <module>Actions</module> - <action>getExitPageUrls</action> + <action>getExitPageTitles</action> </parameters> - <uniqueId>widgetActionsgetExitPageUrls</uniqueId> + <uniqueId>widgetActionsgetExitPageTitles</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -1057,7 +1051,7 @@ <isReport>1</isReport> </row> <row> - <name>Pages Following a Site Search</name> + <name>Page Titles Following a Site Search</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1070,18 +1064,18 @@ <order>25</order> </subcategory> <module>Actions</module> - <action>getPageUrlsFollowingSiteSearch</action> - <order>116</order> + <action>getPageTitlesFollowingSiteSearch</action> + <order>119</order> <parameters> <module>Actions</module> - <action>getPageUrlsFollowingSiteSearch</action> + <action>getPageTitlesFollowingSiteSearch</action> </parameters> - <uniqueId>widgetActionsgetPageUrlsFollowingSiteSearch</uniqueId> + <uniqueId>widgetActionsgetPageTitlesFollowingSiteSearch</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Site Search Keywords</name> + <name>Search Keywords with No Results</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1094,18 +1088,18 @@ <order>25</order> </subcategory> <module>Actions</module> - <action>getSiteSearchKeywords</action> - <order>115</order> + <action>getSiteSearchNoResultKeywords</action> + <order>118</order> <parameters> <module>Actions</module> - <action>getSiteSearchKeywords</action> + <action>getSiteSearchNoResultKeywords</action> </parameters> - <uniqueId>widgetActionsgetSiteSearchKeywords</uniqueId> + <uniqueId>widgetActionsgetSiteSearchNoResultKeywords</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Page Titles Following a Site Search</name> + <name>Pages Following a Site Search</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1118,18 +1112,18 @@ <order>25</order> </subcategory> <module>Actions</module> - <action>getPageTitlesFollowingSiteSearch</action> - <order>119</order> + <action>getPageUrlsFollowingSiteSearch</action> + <order>116</order> <parameters> <module>Actions</module> - <action>getPageTitlesFollowingSiteSearch</action> + <action>getPageUrlsFollowingSiteSearch</action> </parameters> - <uniqueId>widgetActionsgetPageTitlesFollowingSiteSearch</uniqueId> + <uniqueId>widgetActionsgetPageUrlsFollowingSiteSearch</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Search Keywords with No Results</name> + <name>Site Search Keywords</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1142,13 +1136,13 @@ <order>25</order> </subcategory> <module>Actions</module> - <action>getSiteSearchNoResultKeywords</action> - <order>118</order> + <action>getSiteSearchKeywords</action> + <order>115</order> <parameters> <module>Actions</module> - <action>getSiteSearchNoResultKeywords</action> + <action>getSiteSearchKeywords</action> </parameters> - <uniqueId>widgetActionsgetSiteSearchNoResultKeywords</uniqueId> + <uniqueId>widgetActionsgetSiteSearchKeywords</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -1225,7 +1219,7 @@ <isReport>1</isReport> </row> <row> - <name>Event Names</name> + <name>Event Actions</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1238,19 +1232,19 @@ <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> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Event Categories</name> + <name>Event Names</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1263,19 +1257,19 @@ <order>40</order> </subcategory> <module>Events</module> - <action>getCategory</action> - <order>100</order> + <action>getName</action> + <order>102</order> <parameters> <module>Events</module> - <action>getCategory</action> + <action>getName</action> <secondaryDimension>eventAction</secondaryDimension> </parameters> - <uniqueId>widgetEventsgetCategorysecondaryDimensioneventAction</uniqueId> + <uniqueId>widgetEventsgetNamesecondaryDimensioneventAction</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Event Actions</name> + <name>Event Categories</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1288,19 +1282,19 @@ <order>40</order> </subcategory> <module>Events</module> - <action>getAction</action> - <order>101</order> + <action>getCategory</action> + <order>100</order> <parameters> <module>Events</module> - <action>getAction</action> - <secondaryDimension>eventName</secondaryDimension> + <action>getCategory</action> + <secondaryDimension>eventAction</secondaryDimension> </parameters> - <uniqueId>widgetEventsgetActionsecondaryDimensioneventName</uniqueId> + <uniqueId>widgetEventsgetCategorysecondaryDimensioneventAction</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Event Actions</name> + <name>Event Names</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1313,19 +1307,19 @@ <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> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Event Names</name> + <name>Event Categories</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1338,19 +1332,19 @@ <order>40</order> </subcategory> <module>Events</module> - <action>getName</action> - <order>102</order> + <action>getCategory</action> + <order>100</order> <parameters> <module>Events</module> - <action>getName</action> + <action>getCategory</action> <secondaryDimension>eventAction</secondaryDimension> </parameters> - <uniqueId>widgetEventsgetNamesecondaryDimensioneventAction</uniqueId> + <uniqueId>widgetEventsgetCategorysecondaryDimensioneventAction</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Event Categories</name> + <name>Event Actions</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1363,19 +1357,19 @@ <order>40</order> </subcategory> <module>Events</module> - <action>getCategory</action> - <order>100</order> + <action>getAction</action> + <order>101</order> <parameters> <module>Events</module> - <action>getCategory</action> - <secondaryDimension>eventAction</secondaryDimension> + <action>getAction</action> + <secondaryDimension>eventName</secondaryDimension> </parameters> - <uniqueId>widgetEventsgetCategorysecondaryDimensioneventAction</uniqueId> + <uniqueId>widgetEventsgetActionsecondaryDimensioneventName</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Content Piece</name> + <name>Content Name</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1388,13 +1382,13 @@ <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> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -1447,7 +1441,7 @@ <isReport>1</isReport> </row> <row> - <name>Content Name</name> + <name>Content Piece</name> <category> <id>General_Actions</id> <name>Actions</name> @@ -1460,18 +1454,18 @@ <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> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Referrer Types</name> + <name>Referrers</name> <category> <id>Referrers_Referrers</id> <name>Referrers</name> @@ -1484,19 +1478,18 @@ <order>5</order> </subcategory> <module>Referrers</module> - <action>getReferrerType</action> - <order>101</order> + <action>getAll</action> + <order>102</order> <parameters> - <viewDataTable>tableAllColumns</viewDataTable> <module>Referrers</module> - <action>getReferrerType</action> + <action>getAll</action> </parameters> - <uniqueId>widgetReferrersgetReferrerTypeviewDataTabletableAllColumns</uniqueId> + <uniqueId>widgetReferrersgetAll</uniqueId> <viewDataTable>tableAllColumns</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Referrers</name> + <name>Referrer Types</name> <category> <id>Referrers_Referrers</id> <name>Referrers</name> @@ -1509,19 +1502,18 @@ <order>5</order> </subcategory> <module>Referrers</module> - <action>getAll</action> - <order>102</order> + <action>getReferrerType</action> + <order>101</order> <parameters> - <viewDataTable>tableAllColumns</viewDataTable> <module>Referrers</module> - <action>getAll</action> + <action>getReferrerType</action> </parameters> - <uniqueId>widgetReferrersgetAllviewDataTabletableAllColumns</uniqueId> + <uniqueId>widgetReferrersgetReferrerType</uniqueId> <viewDataTable>tableAllColumns</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Keywords</name> + <name>Search Engines</name> <category> <id>Referrers_Referrers</id> <name>Referrers</name> @@ -1534,18 +1526,18 @@ <order>10</order> </subcategory> <module>Referrers</module> - <action>getKeywords</action> - <order>103</order> + <action>getSearchEngines</action> + <order>107</order> <parameters> <module>Referrers</module> - <action>getKeywords</action> + <action>getSearchEngines</action> </parameters> - <uniqueId>widgetReferrersgetKeywords</uniqueId> + <uniqueId>widgetReferrersgetSearchEngines</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Search Engines</name> + <name>Keywords</name> <category> <id>Referrers_Referrers</id> <name>Referrers</name> @@ -1558,13 +1550,13 @@ <order>10</order> </subcategory> <module>Referrers</module> - <action>getSearchEngines</action> - <order>107</order> + <action>getKeywords</action> + <order>103</order> <parameters> <module>Referrers</module> - <action>getSearchEngines</action> + <action>getKeywords</action> </parameters> - <uniqueId>widgetReferrersgetSearchEngines</uniqueId> + <uniqueId>widgetReferrersgetKeywords</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -1609,11 +1601,10 @@ <action>getSocials</action> <order>111</order> <parameters> - <viewDataTable>graphPie</viewDataTable> <module>Referrers</module> <action>getSocials</action> </parameters> - <uniqueId>widgetReferrersgetSocialsviewDataTablegraphPie</uniqueId> + <uniqueId>widgetReferrersgetSocials</uniqueId> <viewDataTable>graphPie</viewDataTable> <isReport>1</isReport> </row> @@ -1775,7 +1766,7 @@ <uniqueId>widgetEcommercegetEcommerceLog</uniqueId> </row> <row> - <name>Product SKU</name> + <name>Product Category</name> <category> <id>Goals_Ecommerce</id> <name>Ecommerce</name> @@ -1788,18 +1779,18 @@ <order>10</order> </subcategory> <module>Goals</module> - <action>getItemsSku</action> - <order>130</order> + <action>getItemsCategory</action> + <order>132</order> <parameters> <module>Goals</module> - <action>getItemsSku</action> + <action>getItemsCategory</action> </parameters> - <uniqueId>widgetGoalsgetItemsSku</uniqueId> + <uniqueId>widgetGoalsgetItemsCategory</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Product Name</name> + <name>Product SKU</name> <category> <id>Goals_Ecommerce</id> <name>Ecommerce</name> @@ -1812,18 +1803,18 @@ <order>10</order> </subcategory> <module>Goals</module> - <action>getItemsName</action> - <order>131</order> + <action>getItemsSku</action> + <order>130</order> <parameters> <module>Goals</module> - <action>getItemsName</action> + <action>getItemsSku</action> </parameters> - <uniqueId>widgetGoalsgetItemsName</uniqueId> + <uniqueId>widgetGoalsgetItemsSku</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Product Category</name> + <name>Product SKU</name> <category> <id>Goals_Ecommerce</id> <name>Ecommerce</name> @@ -1836,13 +1827,13 @@ <order>10</order> </subcategory> <module>Goals</module> - <action>getItemsCategory</action> - <order>132</order> + <action>getItemsSku</action> + <order>130</order> <parameters> <module>Goals</module> - <action>getItemsCategory</action> + <action>getItemsSku</action> </parameters> - <uniqueId>widgetGoalsgetItemsCategory</uniqueId> + <uniqueId>widgetGoalsgetItemsSku</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -1871,7 +1862,7 @@ <isReport>1</isReport> </row> <row> - <name>Product SKU</name> + <name>Product Name</name> <category> <id>Goals_Ecommerce</id> <name>Ecommerce</name> @@ -1884,13 +1875,13 @@ <order>10</order> </subcategory> <module>Goals</module> - <action>getItemsSku</action> - <order>130</order> + <action>getItemsName</action> + <order>131</order> <parameters> <module>Goals</module> - <action>getItemsSku</action> + <action>getItemsName</action> </parameters> - <uniqueId>widgetGoalsgetItemsSku</uniqueId> + <uniqueId>widgetGoalsgetItemsName</uniqueId> <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> @@ -2421,7 +2412,7 @@ </widgets> </row> <row> - <name>Data tables</name> + <name>Advanced tag cloud: with logos and links</name> <category> <id>ExampleUI_UiFramework</id> <name>UI Framework</name> @@ -2429,19 +2420,19 @@ <icon /> </category> <subcategory> - <id>ExampleUI_GetTemperaturesDataTable</id> - <name>Data tables</name> + <id>Tag clouds</id> + <name>Tag clouds</name> <order>99</order> </subcategory> <module>ExampleUI</module> - <action>getTemperatures</action> - <order>210</order> + <action>getPlanetRatiosWithLogos</action> + <order>213</order> <parameters> <module>ExampleUI</module> - <action>getTemperatures</action> + <action>getPlanetRatiosWithLogos</action> </parameters> - <uniqueId>widgetExampleUIgetTemperatures</uniqueId> - <viewDataTable>table</viewDataTable> + <uniqueId>widgetExampleUIgetPlanetRatiosWithLogos</uniqueId> + <viewDataTable>cloud</viewDataTable> <isReport>1</isReport> </row> <row> @@ -2453,21 +2444,19 @@ <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> - <viewDataTable>graphVerticalBar</viewDataTable> + <uniqueId>widgetExampleUIgetTemperatures</uniqueId> + <viewDataTable>table</viewDataTable> <isReport>1</isReport> </row> <row> @@ -2553,7 +2542,7 @@ <isReport>1</isReport> </row> <row> - <name>Advanced tag cloud: with logos and links</name> + <name>Data tables</name> <category> <id>ExampleUI_UiFramework</id> <name>UI Framework</name> @@ -2561,24 +2550,25 @@ <icon /> </category> <subcategory> - <id>Tag clouds</id> - <name>Tag clouds</name> + <id>Bar graph</id> + <name>Bar graph</name> <order>99</order> </subcategory> <module>ExampleUI</module> - <action>getPlanetRatiosWithLogos</action> - <order>213</order> + <action>getTemperatures</action> + <order>210</order> <parameters> - <viewDataTable>cloud</viewDataTable> + <forceView>1</forceView> + <viewDataTable>graphVerticalBar</viewDataTable> <module>ExampleUI</module> - <action>getPlanetRatiosWithLogos</action> + <action>getTemperatures</action> </parameters> - <uniqueId>widgetExampleUIgetPlanetRatiosWithLogosviewDataTablecloud</uniqueId> - <viewDataTable>cloud</viewDataTable> + <uniqueId>widgetExampleUIgetTemperaturesforceView1viewDataTablegraphVerticalBar</uniqueId> + <viewDataTable>graphVerticalBar</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Simple tag cloud</name> + <name>Pie graph</name> <category> <id>ExampleUI_UiFramework</id> <name>UI Framework</name> @@ -2586,25 +2576,23 @@ <icon /> </category> <subcategory> - <id>Tag clouds</id> - <name>Tag clouds</name> + <id>Pie graph</id> + <name>Pie graph</name> <order>99</order> </subcategory> <module>ExampleUI</module> <action>getPlanetRatios</action> - <order>5</order> + <order>212</order> <parameters> - <forceView>1</forceView> - <viewDataTable>cloud</viewDataTable> <module>ExampleUI</module> <action>getPlanetRatios</action> </parameters> - <uniqueId>widgetExampleUIgetPlanetRatiosforceView1viewDataTablecloud</uniqueId> - <viewDataTable>cloud</viewDataTable> + <uniqueId>widgetExampleUIgetPlanetRatios</uniqueId> + <viewDataTable>graphPie</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Pie graph</name> + <name>Simple tag cloud</name> <category> <id>ExampleUI_UiFramework</id> <name>UI Framework</name> @@ -2612,24 +2600,25 @@ <icon /> </category> <subcategory> - <id>Pie graph</id> - <name>Pie graph</name> + <id>Tag clouds</id> + <name>Tag clouds</name> <order>99</order> </subcategory> <module>ExampleUI</module> <action>getPlanetRatios</action> - <order>212</order> + <order>5</order> <parameters> - <viewDataTable>graphPie</viewDataTable> + <forceView>1</forceView> + <viewDataTable>cloud</viewDataTable> <module>ExampleUI</module> <action>getPlanetRatios</action> </parameters> - <uniqueId>widgetExampleUIgetPlanetRatiosviewDataTablegraphPie</uniqueId> - <viewDataTable>graphPie</viewDataTable> + <uniqueId>widgetExampleUIgetPlanetRatiosforceView1viewDataTablecloud</uniqueId> + <viewDataTable>cloud</viewDataTable> <isReport>1</isReport> </row> <row> - <name>Piwik PRO Blog</name> + <name>Support Piwik!</name> <category> <id>About Piwik</id> <name>About Piwik</name> @@ -2637,50 +2626,32 @@ <icon /> </category> <subcategory /> - <module>PiwikPro</module> - <action>rssPiwikPro</action> - <order>99</order> - <parameters> - <module>PiwikPro</module> - <action>rssPiwikPro</action> - </parameters> - <uniqueId>widgetPiwikProrssPiwikPro</uniqueId> - </row> - <row> - <name>SEO Rankings</name> - <category> - <id>SEO</id> - <name>SEO</name> - <order>99</order> - <icon /> - </category> - <subcategory /> - <module>SEO</module> - <action>getRank</action> - <order>99</order> + <module>CoreHome</module> + <action>getDonateForm</action> + <order>5</order> <parameters> - <module>SEO</module> - <action>getRank</action> + <module>CoreHome</module> + <action>getDonateForm</action> </parameters> - <uniqueId>widgetSEOgetRank</uniqueId> + <uniqueId>widgetCoreHomegetDonateForm</uniqueId> </row> <row> - <name>Insights Overview</name> + <name>Piwik PRO: Advanced Analytics & Services</name> <category> - <id>Insights_WidgetCategory</id> - <name>Insights</name> + <id>About Piwik</id> + <name>About Piwik</name> <order>99</order> <icon /> </category> <subcategory /> - <module>Insights</module> - <action>getInsightsOverview</action> + <module>PiwikPro</module> + <action>promoPiwikPro</action> <order>99</order> <parameters> - <module>Insights</module> - <action>getInsightsOverview</action> + <module>PiwikPro</module> + <action>promoPiwikPro</action> </parameters> - <uniqueId>widgetInsightsgetInsightsOverview</uniqueId> + <uniqueId>widgetPiwikPropromoPiwikPro</uniqueId> </row> <row> <name>Welcome!</name> @@ -2719,7 +2690,7 @@ <uniqueId>widgetReferrersgetKeywordsForPage</uniqueId> </row> <row> - <name>Support Piwik!</name> + <name>Piwik.org Blog</name> <category> <id>About Piwik</id> <name>About Piwik</name> @@ -2727,32 +2698,50 @@ <icon /> </category> <subcategory /> - <module>CoreHome</module> - <action>getDonateForm</action> - <order>5</order> + <module>ExampleRssWidget</module> + <action>rssPiwik</action> + <order>99</order> <parameters> - <module>CoreHome</module> - <action>getDonateForm</action> + <module>ExampleRssWidget</module> + <action>rssPiwik</action> </parameters> - <uniqueId>widgetCoreHomegetDonateForm</uniqueId> + <uniqueId>widgetExampleRssWidgetrssPiwik</uniqueId> </row> <row> - <name>Example Widget Name</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>ExamplePlugin</module> - <action>myExampleWidget</action> + <module>Insights</module> + <action>getInsightsOverview</action> <order>99</order> <parameters> - <module>ExamplePlugin</module> - <action>myExampleWidget</action> + <module>Insights</module> + <action>getInsightsOverview</action> </parameters> - <uniqueId>widgetExamplePluginmyExampleWidget</uniqueId> + <uniqueId>widgetInsightsgetInsightsOverview</uniqueId> + </row> + <row> + <name>SEO Rankings</name> + <category> + <id>SEO</id> + <name>SEO</name> + <order>99</order> + <icon /> + </category> + <subcategory /> + <module>SEO</module> + <action>getRank</action> + <order>99</order> + <parameters> + <module>SEO</module> + <action>getRank</action> + </parameters> + <uniqueId>widgetSEOgetRank</uniqueId> </row> <row> <name>Movers and Shakers</name> @@ -2773,7 +2762,25 @@ <uniqueId>widgetInsightsgetOverallMoversAndShakers</uniqueId> </row> <row> - <name>Piwik PRO: Advanced Analytics & Services</name> + <name>Piwik Changelog</name> + <category> + <id>About Piwik</id> + <name>About Piwik</name> + <order>99</order> + <icon /> + </category> + <subcategory /> + <module>ExampleRssWidget</module> + <action>rssChangelog</action> + <order>99</order> + <parameters> + <module>ExampleRssWidget</module> + <action>rssChangelog</action> + </parameters> + <uniqueId>widgetExampleRssWidgetrssChangelog</uniqueId> + </row> + <row> + <name>Piwik PRO Blog</name> <category> <id>About Piwik</id> <name>About Piwik</name> @@ -2782,16 +2789,16 @@ </category> <subcategory /> <module>PiwikPro</module> - <action>promoPiwikPro</action> + <action>rssPiwikPro</action> <order>99</order> <parameters> <module>PiwikPro</module> - <action>promoPiwikPro</action> + <action>rssPiwikPro</action> </parameters> - <uniqueId>widgetPiwikPropromoPiwikPro</uniqueId> + <uniqueId>widgetPiwikProrssPiwikPro</uniqueId> </row> <row> - <name>Piwik.org Blog</name> + <name>System Check</name> <category> <id>About Piwik</id> <name>About Piwik</name> @@ -2799,17 +2806,17 @@ <icon /> </category> <subcategory /> - <module>ExampleRssWidget</module> - <action>rssPiwik</action> - <order>99</order> + <module>Installation</module> + <action>getSystemCheck</action> + <order>16</order> <parameters> - <module>ExampleRssWidget</module> - <action>rssPiwik</action> + <module>Installation</module> + <action>getSystemCheck</action> </parameters> - <uniqueId>widgetExampleRssWidgetrssPiwik</uniqueId> + <uniqueId>widgetInstallationgetSystemCheck</uniqueId> </row> <row> - <name>Piwik Changelog</name> + <name>System Summary</name> <category> <id>About Piwik</id> <name>About Piwik</name> @@ -2817,13 +2824,49 @@ <icon /> </category> <subcategory /> - <module>ExampleRssWidget</module> - <action>rssChangelog</action> + <module>CoreHome</module> + <action>getSystemSummary</action> + <order>15</order> + <parameters> + <module>CoreHome</module> + <action>getSystemSummary</action> + </parameters> + <uniqueId>widgetCoreHomegetSystemSummary</uniqueId> + </row> + <row> + <name>Latest Piwik Plugin Updates</name> + <category> + <id>About Piwik</id> + <name>About Piwik</name> + <order>99</order> + <icon /> + </category> + <subcategory /> + <module>CorePluginsAdmin</module> + <action>getNewPlugins</action> + <order>19</order> + <parameters> + <module>CorePluginsAdmin</module> + <action>getNewPlugins</action> + </parameters> + <uniqueId>widgetCorePluginsAdmingetNewPlugins</uniqueId> + </row> + <row> + <name>Example Widget Name</name> + <category> + <id>About Piwik</id> + <name>About Piwik</name> + <order>99</order> + <icon /> + </category> + <subcategory /> + <module>ExamplePlugin</module> + <action>myExampleWidget</action> <order>99</order> <parameters> - <module>ExampleRssWidget</module> - <action>rssChangelog</action> + <module>ExamplePlugin</module> + <action>myExampleWidget</action> </parameters> - <uniqueId>widgetExampleRssWidgetrssChangelog</uniqueId> + <uniqueId>widgetExamplePluginmyExampleWidget</uniqueId> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml index 5bf91acc3d..bbb174f08e 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml @@ -1,7 +1,52 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <pluginName>CoreUpdater</pluginName> + <title>Update settings</title> + <settings> + <row> + <name>release_channel</name> + <title /> + <value>latest_stable</value> + <defaultValue>latest_stable</defaultValue> + <type>string</type> + <uiControl>radio</uiControl> + <uiControlAttributes> + </uiControlAttributes> + <availableValues> + <latest_stable>Latest stable release (Recommended)</latest_stable> + <latest_beta>Latest beta release</latest_beta> + <latest_2x_stable>Latest stable 2.X (Long Term Support version)</latest_2x_stable> + <latest_2x_beta>Latest beta 2.X (Long Term Support version)</latest_2x_beta> + </availableValues> + <description /> + <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=http://piwik.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=http%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> + <introduction>Release channel</introduction> + <condition /> + </row> + <row> + <name>enable_plugin_update_communication</name> + <title /> + <value>0</value> + <defaultValue>0</defaultValue> + <type>boolean</type> + <uiControl>radio</uiControl> + <uiControlAttributes> + </uiControlAttributes> + <availableValues> + <row key="1">Yes</row> + <row key="0">No (Default)</row> + </availableValues> + <description /> + <inlineHelp>An email will be sent to Super Users when there is a new version available for a plugin.</inlineHelp> + <introduction>Send an email when a plugin update is available</introduction> + <condition /> + </row> + </settings> + </row> + <row> <pluginName>ExampleSettingsPlugin</pluginName> + <title>ExampleSettingsPlugin</title> <settings> <row> <name>metric</name> @@ -19,7 +64,7 @@ </availableValues> <description>Choose the metric that should be displayed in the browser tab</description> <inlineHelp /> - <introduction>Only Super Users can change the following settings:</introduction> + <introduction /> <condition /> </row> <row> @@ -85,6 +130,7 @@ Another line</defaultValue> </row> <row> <pluginName>AnonymousPiwikUsageMeasurement</pluginName> + <title>AnonymousPiwikUsageMeasurement</title> <settings> <row> <name>canUserOptOut</name> @@ -197,8 +243,41 @@ Another line</defaultValue> </row> <row> <pluginName>QueuedTracking</pluginName> + <title>QueuedTracking</title> <settings> <row> + <name>useSentinelBackend</name> + <title>Enable Redis Sentinel'</title> + <value>0</value> + <defaultValue>0</defaultValue> + <type>boolean</type> + <uiControl>checkbox</uiControl> + <uiControlAttributes> + <size>3</size> + </uiControlAttributes> + <availableValues /> + <description /> + <inlineHelp>If enabled, the Redis Sentinel feature will be used. Make sure to update host and port if needed. Once you have enabled and saved the change, you will be able to specify multiple hosts and ports comma separated.</inlineHelp> + <introduction /> + <condition /> + </row> + <row> + <name>sentinelMasterName</name> + <title>Redis Sentinel Master name</title> + <value>mymaster</value> + <defaultValue>mymaster</defaultValue> + <type>string</type> + <uiControl>text</uiControl> + <uiControlAttributes> + <size>200</size> + </uiControlAttributes> + <availableValues /> + <description /> + <inlineHelp>The sentinel master name only needs to be configured if Sentinel is enabled.</inlineHelp> + <introduction /> + <condition /> + </row> + <row> <name>redisHost</name> <title>Redis host</title> <value>127.0.0.1</value> @@ -206,11 +285,11 @@ Another line</defaultValue> <type>string</type> <uiControl>text</uiControl> <uiControlAttributes> - <size>300</size> + <size>500</size> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Remote host of the Redis server. Max 300 characters are allowed.</inlineHelp> + <inlineHelp>Remote host of the Redis server. Max 500 characters are allowed.</inlineHelp> <introduction /> <condition /> </row> @@ -219,10 +298,10 @@ Another line</defaultValue> <title>Redis port</title> <value>6379</value> <defaultValue>6379</defaultValue> - <type>integer</type> + <type>string</type> <uiControl>text</uiControl> <uiControlAttributes> - <size>5</size> + <size>100</size> </uiControlAttributes> <availableValues /> <description /> diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getUserSettings.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getUserSettings.xml index 0d18c736bb..151e26bdc7 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getUserSettings.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getUserSettings.xml @@ -2,6 +2,7 @@ <result> <row> <pluginName>ExampleSettingsPlugin</pluginName> + <title>ExampleSettingsPlugin</title> <settings> <row> <name>autoRefresh</name> @@ -57,6 +58,7 @@ </row> <row> <pluginName>AnonymousPiwikUsageMeasurement</pluginName> + <title>AnonymousPiwikUsageMeasurement</title> <settings> <row> <name>userTrackingEnabled</name> diff --git a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml index 5bf91acc3d..bbb174f08e 100644 --- a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml @@ -1,7 +1,52 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <pluginName>CoreUpdater</pluginName> + <title>Update settings</title> + <settings> + <row> + <name>release_channel</name> + <title /> + <value>latest_stable</value> + <defaultValue>latest_stable</defaultValue> + <type>string</type> + <uiControl>radio</uiControl> + <uiControlAttributes> + </uiControlAttributes> + <availableValues> + <latest_stable>Latest stable release (Recommended)</latest_stable> + <latest_beta>Latest beta release</latest_beta> + <latest_2x_stable>Latest stable 2.X (Long Term Support version)</latest_2x_stable> + <latest_2x_beta>Latest beta 2.X (Long Term Support version)</latest_2x_beta> + </availableValues> + <description /> + <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=http://piwik.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=http%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> + <introduction>Release channel</introduction> + <condition /> + </row> + <row> + <name>enable_plugin_update_communication</name> + <title /> + <value>0</value> + <defaultValue>0</defaultValue> + <type>boolean</type> + <uiControl>radio</uiControl> + <uiControlAttributes> + </uiControlAttributes> + <availableValues> + <row key="1">Yes</row> + <row key="0">No (Default)</row> + </availableValues> + <description /> + <inlineHelp>An email will be sent to Super Users when there is a new version available for a plugin.</inlineHelp> + <introduction>Send an email when a plugin update is available</introduction> + <condition /> + </row> + </settings> + </row> + <row> <pluginName>ExampleSettingsPlugin</pluginName> + <title>ExampleSettingsPlugin</title> <settings> <row> <name>metric</name> @@ -19,7 +64,7 @@ </availableValues> <description>Choose the metric that should be displayed in the browser tab</description> <inlineHelp /> - <introduction>Only Super Users can change the following settings:</introduction> + <introduction /> <condition /> </row> <row> @@ -85,6 +130,7 @@ Another line</defaultValue> </row> <row> <pluginName>AnonymousPiwikUsageMeasurement</pluginName> + <title>AnonymousPiwikUsageMeasurement</title> <settings> <row> <name>canUserOptOut</name> @@ -197,8 +243,41 @@ Another line</defaultValue> </row> <row> <pluginName>QueuedTracking</pluginName> + <title>QueuedTracking</title> <settings> <row> + <name>useSentinelBackend</name> + <title>Enable Redis Sentinel'</title> + <value>0</value> + <defaultValue>0</defaultValue> + <type>boolean</type> + <uiControl>checkbox</uiControl> + <uiControlAttributes> + <size>3</size> + </uiControlAttributes> + <availableValues /> + <description /> + <inlineHelp>If enabled, the Redis Sentinel feature will be used. Make sure to update host and port if needed. Once you have enabled and saved the change, you will be able to specify multiple hosts and ports comma separated.</inlineHelp> + <introduction /> + <condition /> + </row> + <row> + <name>sentinelMasterName</name> + <title>Redis Sentinel Master name</title> + <value>mymaster</value> + <defaultValue>mymaster</defaultValue> + <type>string</type> + <uiControl>text</uiControl> + <uiControlAttributes> + <size>200</size> + </uiControlAttributes> + <availableValues /> + <description /> + <inlineHelp>The sentinel master name only needs to be configured if Sentinel is enabled.</inlineHelp> + <introduction /> + <condition /> + </row> + <row> <name>redisHost</name> <title>Redis host</title> <value>127.0.0.1</value> @@ -206,11 +285,11 @@ Another line</defaultValue> <type>string</type> <uiControl>text</uiControl> <uiControlAttributes> - <size>300</size> + <size>500</size> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Remote host of the Redis server. Max 300 characters are allowed.</inlineHelp> + <inlineHelp>Remote host of the Redis server. Max 500 characters are allowed.</inlineHelp> <introduction /> <condition /> </row> @@ -219,10 +298,10 @@ Another line</defaultValue> <title>Redis port</title> <value>6379</value> <defaultValue>6379</defaultValue> - <type>integer</type> + <type>string</type> <uiControl>text</uiControl> <uiControlAttributes> - <size>5</size> + <size>100</size> </uiControlAttributes> <availableValues /> <description /> diff --git a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getUserSettings.xml b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getUserSettings.xml index 0d18c736bb..151e26bdc7 100644 --- a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getUserSettings.xml +++ b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getUserSettings.xml @@ -2,6 +2,7 @@ <result> <row> <pluginName>ExampleSettingsPlugin</pluginName> + <title>ExampleSettingsPlugin</title> <settings> <row> <name>autoRefresh</name> @@ -57,6 +58,7 @@ </row> <row> <pluginName>AnonymousPiwikUsageMeasurement</pluginName> + <title>AnonymousPiwikUsageMeasurement</title> <settings> <row> <name>userTrackingEnabled</name> |