Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@matomo.org>2019-04-12 00:03:03 +0300
committerThomas Steur <tsteur@users.noreply.github.com>2019-04-12 00:03:03 +0300
commit49766472e7d3c658ceae76d8f0f58f7403a2f0f7 (patch)
treeea184e8c4598b2faa1afb8809b7a076f12396e69 /plugins/PrivacyManager
parent5ed09086f99b6656cc3227ded3c146b05046577e (diff)
Avoid browser tooltips for piwik fields (#13931)
by using data-title attribute instead of title
Diffstat (limited to 'plugins/PrivacyManager')
-rw-r--r--plugins/PrivacyManager/angularjs/anonymize-log-data/anonymize-log-data.directive.html6
-rw-r--r--plugins/PrivacyManager/templates/privacySettings.twig32
2 files changed, 19 insertions, 19 deletions
diff --git a/plugins/PrivacyManager/angularjs/anonymize-log-data/anonymize-log-data.directive.html b/plugins/PrivacyManager/angularjs/anonymize-log-data/anonymize-log-data.directive.html
index 7526609549..37062f5d23 100644
--- a/plugins/PrivacyManager/angularjs/anonymize-log-data/anonymize-log-data.directive.html
+++ b/plugins/PrivacyManager/angularjs/anonymize-log-data/anonymize-log-data.directive.html
@@ -35,20 +35,20 @@
</div>
<div piwik-field uicontrol="checkbox" name="anonymizeIp"
- title="Anonymize IP"
+ data-title="Anonymize IP"
ng-model="anonymizeLogData.anonymizeIp"
introduction="Visit"
inline-help="This action cannot be undone. If enabled, for all visits during this duration the IP will be anonymized by at least 2 bytes, for example '192.168.xxx.xxx'. If you have currently configured to anonymize by 3 bytes, then this setting will be respected and all IPs will be anonymized by 3 bytes.">
</div>
<div piwik-field uicontrol="checkbox" name="anonymizeLocation"
- title="Anonymize Location"
+ data-title="Anonymize Location"
ng-model="anonymizeLogData.anonymizeLocation"
inline-help="This action cannot be undone. Re-evaluates the location based on the anonymized IP (at least 2 bytes of the IP will be anonymized).">
</div>
<div piwik-field uicontrol="checkbox" name="anonymizeTheUserId"
- title="Replace User ID with a pseudonym"
+ data-title="Replace User ID with a pseudonym"
ng-model="anonymizeLogData.anonymizeUserId"
inline-help="When you enable this option, the User ID will be replaced by a pseudonym to avoid directly storing and displaying personally identifiable information such as an email address. In technical terms: given your User ID, Matomo will process the User ID pseudonym using a salted hash function.<br/><br/><em>Note: replacing with a pseudonym is not the same as anonymisation. In GDPR terms: the User ID pseudonym still counts as personal data. The original User ID could still be identified if certain additional information is available (which only Matomo and your data processor has access to).</em>">
</div>
diff --git a/plugins/PrivacyManager/templates/privacySettings.twig b/plugins/PrivacyManager/templates/privacySettings.twig
index 829bb46d6f..abeecc782e 100644
--- a/plugins/PrivacyManager/templates/privacySettings.twig
+++ b/plugins/PrivacyManager/templates/privacySettings.twig
@@ -19,7 +19,7 @@
<div piwik-field uicontrol="checkbox" name="anonymizeIpSettings"
ng-model="anonymizeIp.enabled"
- title="{{ 'PrivacyManager_UseAnonymizeIp'|translate|e('html_attr') }}"
+ data-title="{{ 'PrivacyManager_UseAnonymizeIp'|translate|e('html_attr') }}"
value="{{ anonymizeIP.enabled }}"
inline-help="{{ 'PrivacyManager_AnonymizeIpInlineHelp'|translate|e('html_attr') }} {{ 'PrivacyManager_AnonymizeIpDescription'|translate|e('html_attr') }}">
</div>
@@ -27,7 +27,7 @@
<div ng-show="anonymizeIp.enabled">
<div piwik-field uicontrol="radio" name="maskLength"
ng-model="anonymizeIp.maskLength"
- title="{{ 'PrivacyManager_AnonymizeIpMaskLengtDescription'|translate|e('html_attr') }}"
+ data-title="{{ 'PrivacyManager_AnonymizeIpMaskLengtDescription'|translate|e('html_attr') }}"
value="{{ anonymizeIP.maskLength }}"
options="{{ maskLengthOptions|json_encode }}"
inline-help="{{ 'PrivacyManager_GeolocationAnonymizeIpNote'|translate|e('html_attr') }}">
@@ -35,7 +35,7 @@
<div piwik-field uicontrol="radio" name="useAnonymizedIpForVisitEnrichment"
ng-model="anonymizeIp.useAnonymizedIpForVisitEnrichment"
- title="{{ 'PrivacyManager_UseAnonymizedIpForVisitEnrichment'|translate|e('html_attr') }}"
+ data-title="{{ 'PrivacyManager_UseAnonymizedIpForVisitEnrichment'|translate|e('html_attr') }}"
value="{% if anonymizeIP.useAnonymizedIpForVisitEnrichment %}1{% else %}0{% endif %}"
options="{{ useAnonymizedIpForVisitEnrichmentOptions|json_encode }}"
inline-help="{{ 'PrivacyManager_UseAnonymizedIpForVisitEnrichmentNote'|translate|e('html_attr') }}">
@@ -44,14 +44,14 @@
<div piwik-field uicontrol="checkbox" name="anonymizeUserId"
ng-model="anonymizeIp.anonymizeUserId"
- title="{{ 'PrivacyManager_PseudonymizeUserId'|translate|e('html_attr') }}"
+ data-title="{{ 'PrivacyManager_PseudonymizeUserId'|translate|e('html_attr') }}"
value="{{ anonymizeIP.anonymizeUserId }}"
inline-help="{{ 'PrivacyManager_PseudonymizeUserIdNote'|translate|e('html_attr') }}<br/><br/><em>{{ 'PrivacyManager_PseudonymizeUserIdNote2'|translate|e('html_attr') }}</em>">
</div>
<div piwik-field uicontrol="checkbox" name="anonymizeOrderId"
ng-model="anonymizeIp.anonymizeOrderId"
- title="{{ 'PrivacyManager_UseAnonymizeOrderId'|translate|e('html_attr') }}"
+ data-title="{{ 'PrivacyManager_UseAnonymizeOrderId'|translate|e('html_attr') }}"
value="{{ anonymizeIP.anonymizeOrderId }}"
inline-help="{{ 'PrivacyManager_AnonymizeOrderIdNote'|translate|e('html_attr') }}">
</div>
@@ -92,7 +92,7 @@
<div piwik-field uicontrol="checkbox" name="deleteEnable"
ng-model="deleteOldLogs.enabled"
ng-change="deleteOldLogs.reloadDbStats()"
- title="{{ 'PrivacyManager_UseDeleteLog'|translate|e('html_attr') }}"
+ data-title="{{ 'PrivacyManager_UseDeleteLog'|translate|e('html_attr') }}"
value="{{ deleteData.config.delete_logs_enable }}"
inline-help="{{ 'PrivacyManager_DeleteRawDataInfo'|translate|e('html_attr') }}">
</div>
@@ -108,7 +108,7 @@
<div piwik-field uicontrol="text" name="deleteOlderThan"
ng-model="deleteOldLogs.deleteOlderThan"
ng-change="deleteOldLogs.reloadDbStats()"
- title="{{ 'PrivacyManager_DeleteLogsOlderThan'|translate|e('html_attr') }} ({{ 'Intl_PeriodDays'|translate }})"
+ data-title="{{ 'PrivacyManager_DeleteLogsOlderThan'|translate|e('html_attr') }} ({{ 'Intl_PeriodDays'|translate }})"
value="{{ deleteData.config.delete_logs_older_than }}"
inline-help="{{ 'PrivacyManager_LeastDaysInput'|translate("1")|e('html_attr') }}">
</div>
@@ -130,7 +130,7 @@
<div piwik-field uicontrol="checkbox" name="deleteReportsEnable"
ng-model="deleteReports.enabled"
ng-change="deleteReports.reloadDbStats()"
- title="{{ 'PrivacyManager_UseDeleteReports'|translate|e('html_attr') }}"
+ data-title="{{ 'PrivacyManager_UseDeleteReports'|translate|e('html_attr') }}"
value="{{ deleteData.config.delete_reports_enable }}"
inline-help="{{ 'PrivacyManager_DeleteAggregateReportsDetailedInfo'|translate|e('html_attr') }}">
</div>
@@ -150,7 +150,7 @@
<div piwik-field uicontrol="text" name="deleteReportsOlderThan"
ng-model="deleteReports.deleteOlderThan"
ng-change="deleteReports.reloadDbStats()"
- title="{{ 'PrivacyManager_DeleteReportsOlderThan'|translate|e('html_attr') }} ({{ 'Intl_PeriodMonths'|translate }})"
+ data-title="{{ 'PrivacyManager_DeleteReportsOlderThan'|translate|e('html_attr') }} ({{ 'Intl_PeriodMonths'|translate }})"
value="{{ deleteData.config.delete_reports_older_than }}"
inline-help="{{ 'PrivacyManager_LeastMonthsInput'|translate("1")|e('html_attr') }}">
</div>
@@ -158,7 +158,7 @@
<div piwik-field uicontrol="checkbox" name="deleteReportsKeepBasic"
ng-model="deleteReports.keepBasic"
ng-change="deleteReports.reloadDbStats()"
- title="{{ 'PrivacyManager_KeepBasicMetrics'|translate|e('html_attr') }} ({{ 'General_Recommended'|translate|e('html_attr') }})"
+ data-title="{{ 'PrivacyManager_KeepBasicMetrics'|translate|e('html_attr') }} ({{ 'General_Recommended'|translate|e('html_attr') }})"
value="{{ deleteData.config.delete_reports_keep_basic_metrics }}"
inline-help="{{ 'PrivacyManager_KeepBasicMetricsReportsDetailedInfo'|translate|e('html_attr') }}">
</div>
@@ -171,31 +171,31 @@
<div piwik-field uicontrol="checkbox" name="deleteReportsKeepDay"
ng-model="deleteReports.keepDataForDay"
ng-change="deleteReports.reloadDbStats()"
- title="{{ 'General_DailyReports'|translate|e('html_attr') }}"
+ data-title="{{ 'General_DailyReports'|translate|e('html_attr') }}"
value="{{ deleteData.config.delete_reports_keep_day_reports }}">
</div>
<div piwik-field uicontrol="checkbox" name="deleteReportsKeepWeek"
ng-model="deleteReports.keepDataForWeek"
ng-change="deleteReports.reloadDbStats()"
- title="{{ 'General_WeeklyReports'|translate|e('html_attr') }}"
+ data-title="{{ 'General_WeeklyReports'|translate|e('html_attr') }}"
value="{{ deleteData.config.delete_reports_keep_week_reports }}">
</div>
<div piwik-field uicontrol="checkbox" name="deleteReportsKeepMonth"
ng-model="deleteReports.keepDataForMonth"
ng-change="deleteReports.reloadDbStats()"
- title="{{ 'General_MonthlyReports'|translate|e('html_attr') }} ({{ 'General_Recommended'|translate|e('html_attr') }})"
+ data-title="{{ 'General_MonthlyReports'|translate|e('html_attr') }} ({{ 'General_Recommended'|translate|e('html_attr') }})"
value="{{ deleteData.config.delete_reports_keep_month_reports }}">
</div>
<div piwik-field uicontrol="checkbox" name="deleteReportsKeepYear"
ng-model="deleteReports.keepDataForYear"
ng-change="deleteReports.reloadDbStats()"
- title="{{ 'General_YearlyReports'|translate|e('html_attr') }} ({{ 'General_Recommended'|translate|e('html_attr') }})"
+ data-title="{{ 'General_YearlyReports'|translate|e('html_attr') }} ({{ 'General_Recommended'|translate|e('html_attr') }})"
value="{{ deleteData.config.delete_reports_keep_year_reports }}">
</div>
<div piwik-field uicontrol="checkbox" name="deleteReportsKeepRange"
ng-model="deleteReports.keepDataForRange"
ng-change="deleteReports.reloadDbStats()"
- title="{{ 'General_RangeReports'|translate|e('html_attr') }}"
+ data-title="{{ 'General_RangeReports'|translate|e('html_attr') }}"
value="{{ deleteData.config.delete_reports_keep_range_reports }}">
</div>
<div piwik-field uicontrol="checkbox" name="deleteReportsKeepSegments"
@@ -245,7 +245,7 @@
<div piwik-field uicontrol="select" name="deleteLowestInterval"
ng-model="reportDeletionSchedule.deleteLowestInterval"
options="{{ scheduleDeletionOptions|json_encode }}"
- title="{{ 'PrivacyManager_DeleteDataInterval'|translate|e('html_attr') }}"
+ data-title="{{ 'PrivacyManager_DeleteDataInterval'|translate|e('html_attr') }}"
value="{{ deleteData.config.delete_logs_schedule_lowest_interval }}"
inline-help="#deleteSchedulingSettingsInlineHelp">
</div>