diff options
9 files changed, 42 insertions, 42 deletions
diff --git a/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png b/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png index 0b4b8ad96d..946407d4c8 100644 --- a/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png +++ b/plugins/IntranetMeasurable/tests/UI/expected-screenshots/IntranetMeasurable_intranet_create.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc82d19a990194c727a088aed4dd2c9ba99734f9806bfe33b5c894be4e718b54 -size 260758 +oid sha256:7e4ac1b4f6062ecf0c3f675b58b859d8d1caef1b8eabb8214d4d8a325e00697e +size 295334 diff --git a/plugins/Live/tests/UI/DeactivatedFeatures_spec.js b/plugins/Live/tests/UI/DeactivatedFeatures_spec.js index d5febac4b9..508dfbe26f 100644 --- a/plugins/Live/tests/UI/DeactivatedFeatures_spec.js +++ b/plugins/Live/tests/UI/DeactivatedFeatures_spec.js @@ -256,10 +256,10 @@ describe("DeactivatedFeatures", function () { await page.goto("?module=CoreAdminHome&action=generalSettings"); await page.waitForNetworkIdle(); - const log = await page.$('#LivePluginSettings #activate_visitor_log'); + const log = await page.$('#LivePluginSettings #disable_visitor_log'); expect(log).to.be.ok; - const profile = await page.$('#LivePluginSettings #activate_visitor_profile'); + const profile = await page.$('#LivePluginSettings #disable_visitor_profile'); expect(profile).to.be.ok; }); @@ -268,10 +268,10 @@ describe("DeactivatedFeatures", function () { await page.reload(); await page.waitForNetworkIdle(); - const log = await page.$('#LivePluginSettings #activate_visitor_log'); + const log = await page.$('#LivePluginSettings #disable_visitor_log'); expect(log).to.be.not.ok; - const profile = await page.$('#LivePluginSettings #activate_visitor_profile'); + const profile = await page.$('#LivePluginSettings #disable_visitor_profile'); expect(profile).to.be.not.ok; }); @@ -281,10 +281,10 @@ describe("DeactivatedFeatures", function () { await page.click('[idsite="1"] .icon-edit'); await page.waitForNetworkIdle(); - const log = await page.$('[idsite="1"] #activate_visitor_log'); + const log = await page.$('[idsite="1"] #disable_visitor_log'); expect(log).to.be.ok; - const profile = await page.$('[idsite="1"] #activate_visitor_profile'); + const profile = await page.$('[idsite="1"] #disable_visitor_profile'); expect(profile).to.be.ok; }); @@ -295,10 +295,10 @@ describe("DeactivatedFeatures", function () { await page.click('[idsite="1"] .icon-edit'); await page.waitForNetworkIdle(); - const log = await page.$('[idsite="1"] #activate_visitor_log'); + const log = await page.$('[idsite="1"] #disable_visitor_log'); expect(log).to.be.not.ok; - const profile = await page.$('[idsite="1"] #activate_visitor_profile'); + const profile = await page.$('[idsite="1"] #disable_visitor_profile'); expect(profile).to.be.not.ok; }); diff --git a/plugins/PrivacyManager/angularjs/manage-gdpr/managegdpr.directive.html b/plugins/PrivacyManager/angularjs/manage-gdpr/managegdpr.directive.html index bb922e6162..79c4ba7fec 100644 --- a/plugins/PrivacyManager/angularjs/manage-gdpr/managegdpr.directive.html +++ b/plugins/PrivacyManager/angularjs/manage-gdpr/managegdpr.directive.html @@ -80,7 +80,7 @@ <th>{{ 'General_VisitorIP'|translate }}</th> <th>{{ 'General_UserId'|translate }}</th> <th>{{ 'General_Details'|translate }}</th> - <th ng-show="managerGdpr.profileEnabled">{{ 'General_Action'|translate }}</th> + <th ng-show="manageGdpr.profileEnabled">{{ 'General_Action'|translate }}</th> </tr> </thead> <tbody> @@ -105,7 +105,7 @@ <span title="{{ dataSubject.browser }} {{ dataSubject.browserFamilyDescription }}"><img height="16" ng-src="{{ dataSubject.browserIcon }}"></span> <span title="{{ dataSubject.country }} {{ dataSubject.region }}"><img height="16" ng-src="{{ dataSubject.countryFlag }}"></span> </td> - <td ng-show="managerGdpr.profileEnabled"><a class="visitorLogTooltip" title="View visitor profile" ng-click="manageGdpr.showProfile(dataSubject.visitorId, dataSubject.idSite)"> + <td ng-show="manageGdpr.profileEnabled"><a class="visitorLogTooltip" title="View visitor profile" ng-click="manageGdpr.showProfile(dataSubject.visitorId, dataSubject.idSite)"> <img src="plugins/Live/images/visitorProfileLaunch.png"> <span>{{ 'Live_ViewVisitorProfile'|translate }}</span> </a></td> </tr> diff --git a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml index c9e85a2f5c..0fd12d6bff 100644 --- a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml +++ b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml @@ -223,36 +223,36 @@ https://www.example.org/</placeholder> <title>Live</title> <settings> <row> - <name>activate_visitor_log</name> - <title>Enable visits log</title> - <value>1</value> - <defaultValue>1</defaultValue> + <name>disable_visitor_log</name> + <title>Disable visits log & visitor profile</title> + <value>0</value> + <defaultValue>0</defaultValue> <type>boolean</type> <uiControl>checkbox</uiControl> <uiControlAttributes> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp /> + <inlineHelp>Here you can disable the visits log and visitor profile feature. This will also disable features that depend on such like the ecommerce log, the segmented visits log, the realtime map or the realtime widget. This might be required to comply with your local privacy laws/guidelines.</inlineHelp> <templateFile /> <introduction /> <condition /> </row> <row> - <name>activate_visitor_profile</name> - <title>Enable visitor profile</title> - <value>1</value> - <defaultValue>1</defaultValue> + <name>disable_visitor_profile</name> + <title>Disable visitor profile only</title> + <value>0</value> + <defaultValue>0</defaultValue> <type>boolean</type> <uiControl>checkbox</uiControl> <uiControlAttributes> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp /> + <inlineHelp>Here you can disable the visitor profile feature. All visits log related features will remain working.</inlineHelp> <templateFile /> <introduction /> - <condition>activate_visitor_log==1</condition> + <condition>disable_visitor_log==0</condition> </row> </settings> </row> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml index 064562f5cf..380f802785 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getAvailableMeasurableTypes.xml @@ -511,36 +511,36 @@ https://www.example.org/</placeholder> <title>Live</title> <settings> <row> - <name>activate_visitor_log</name> - <title>Enable visits log</title> - <value>1</value> - <defaultValue>1</defaultValue> + <name>disable_visitor_log</name> + <title>Disable visits log & visitor profile</title> + <value>0</value> + <defaultValue>0</defaultValue> <type>boolean</type> <uiControl>checkbox</uiControl> <uiControlAttributes> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp /> + <inlineHelp>Here you can disable the visits log and visitor profile feature. This will also disable features that depend on such like the ecommerce log, the segmented visits log, the realtime map or the realtime widget. This might be required to comply with your local privacy laws/guidelines.</inlineHelp> <templateFile /> <introduction /> <condition /> </row> <row> - <name>activate_visitor_profile</name> - <title>Enable visitor profile</title> - <value>1</value> - <defaultValue>1</defaultValue> + <name>disable_visitor_profile</name> + <title>Disable visitor profile only</title> + <value>0</value> + <defaultValue>0</defaultValue> <type>boolean</type> <uiControl>checkbox</uiControl> <uiControlAttributes> </uiControlAttributes> <availableValues /> <description /> - <inlineHelp /> + <inlineHelp>Here you can disable the visitor profile feature. All visits log related features will remain working.</inlineHelp> <templateFile /> <introduction /> - <condition>activate_visitor_log==1</condition> + <condition>disable_visitor_log==0</condition> </row> </settings> </row> diff --git a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png index 02f4224737..b7762124a8 100644 --- a/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png +++ b/tests/UI/expected-screenshots/MeasurableManager_add_measurable_view.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e8cb6cadc0a2c81c8acd6f072f52f1f8a4f445843cb4f7642446380bba1804a -size 447579 +oid sha256:bf5607d3659f13c612d520e55342efb42521804cd378d6983ebfb161c59ba5b7 +size 482292 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png index 84b60458c7..79509b6c7c 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:683ff5d0c15c73d0b3375f1e0b2d0b77b514c6557bb9aabb45b69562da4f3c5c -size 4499185 +oid sha256:3f26847063d6ad9ceebab4926950436701967720b20fac6464339619170c8cf8 +size 4525767 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png index f0d83c503d..c836879baf 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_settings_general.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:901e095c16b5a42a8bf8e79c56cf2cd189851b7566a3237206347d76b893d149 -size 1056481 +oid sha256:aa032010b15b7a447e2b0249add3ebe95f96f58320f4cf434810fa2af0dc09a7 +size 1091254 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png index 5129aa171d..4d4fb9bad3 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_api_listing.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2fd70e0ad744d39781f3a8ce5b469d47ae48dbd7402a7a565dcd1af024186094 -size 4946409 +oid sha256:fee2c39a422fa433231a64895fadda0f60717f18d89ef417db33ec29d8b43641 +size 4954872 |
