diff options
author | Stefan Giehl <stefan@matomo.org> | 2019-04-12 00:03:03 +0300 |
---|---|---|
committer | Thomas Steur <tsteur@users.noreply.github.com> | 2019-04-12 00:03:03 +0300 |
commit | 49766472e7d3c658ceae76d8f0f58f7403a2f0f7 (patch) | |
tree | ea184e8c4598b2faa1afb8809b7a076f12396e69 /plugins/UsersManager | |
parent | 5ed09086f99b6656cc3227ded3c146b05046577e (diff) |
Avoid browser tooltips for piwik fields (#13931)
by using data-title attribute instead of title
Diffstat (limited to 'plugins/UsersManager')
-rw-r--r-- | plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.html | 8 | ||||
-rw-r--r-- | plugins/UsersManager/templates/userSettings.twig | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.html b/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.html index 6100e99380..a92fbd4b95 100644 --- a/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.html +++ b/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.html @@ -42,7 +42,7 @@ uicontrol="text" name="user_login" ng-model="$ctrl.user.login" - title="Username" + data-title="Username" maxlength="100" data-disabled="$ctrl.isSavingUserInfo || !$ctrl.isAdd" > @@ -53,7 +53,7 @@ uicontrol="password" name="user_password" ng-model="$ctrl.user.password" - title="Password" + data-title="Password" data-disabled="$ctrl.isSavingUserInfo || ($ctrl.currentUserRole != 'superuser' && !$ctrl.isAdd)" > </div> @@ -63,7 +63,7 @@ uicontrol="text" name="user_email" ng-model="$ctrl.user.email" - title="Email" + data-title="Email" maxlength="100" data-disabled="$ctrl.isSavingUserInfo || ($ctrl.currentUserRole != 'superuser' && !$ctrl.isAdd)" ng-if="$ctrl.currentUserRole == 'superuser' || $ctrl.isAdd" @@ -75,7 +75,7 @@ uicontrol="site" name="user_site" ng-model="$ctrl.firstSiteAccess" - title="First website permission" + data-title="First website permission" data-disabled="$ctrl.isSavingUserInfo" ng-if="$ctrl.isAdd" ui-control-attributes="{ onlySitesWithAdminAccess: true }" diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig index a701f06766..72ac592a29 100644 --- a/plugins/UsersManager/templates/userSettings.twig +++ b/plugins/UsersManager/templates/userSettings.twig @@ -14,7 +14,7 @@ <form id="userSettingsTable" piwik-form ng-controller="PersonalSettingsController as personalSettings"> <div piwik-field uicontrol="text" name="username" - title="{{ 'General_Username'|translate|e('html_attr') }}" + data-title="{{ 'General_Username'|translate|e('html_attr') }}" value="{{ userLogin }}" data-disabled="true" ng-model="personalSettings.username" inline-help="{{ 'UsersManager_YourUsernameCannotBeChanged'|translate|e('html_attr') }}"> @@ -24,7 +24,7 @@ ng-model="personalSettings.email" ng-change="personalSettings.requirePasswordConfirmation()" maxlength="100" - title="{{ 'UsersManager_Email'|translate|e('html_attr') }}" + data-title="{{ 'UsersManager_Email'|translate|e('html_attr') }}" value="{{ userEmail }}"> </div> @@ -35,7 +35,7 @@ <div piwik-field uicontrol="select" name="language" ng-model="personalSettings.language" - title="{{ 'General_Language'|translate|e('html_attr') }}" + data-title="{{ 'General_Language'|translate|e('html_attr') }}" options="{{ languageOptions|json_encode }}" inline-help="#languageHelp" value="{{ currentLanguageCode }}"> @@ -43,14 +43,14 @@ <div piwik-field uicontrol="select" name="timeformat" ng-model="personalSettings.timeformat" - title="{{ 'General_TimeFormat'|translate|e('html_attr') }}" + data-title="{{ 'General_TimeFormat'|translate|e('html_attr') }}" value="{{ currentTimeformat }}" options="{{ timeFormats|json_encode }}"> </div> <div piwik-field uicontrol="radio" name="defaultReport" ng-model="personalSettings.defaultReport" introduction="{{ 'UsersManager_ReportToLoadByDefault'|translate|e('html_attr') }}" - title="{{ 'General_AllWebsitesDashboard'|translate|e('html_attr') }}" + data-title="{{ 'General_AllWebsitesDashboard'|translate|e('html_attr') }}" value="{{ defaultReport }}" options="{{ defaultReportOptions|json_encode }}"> </div> @@ -78,14 +78,14 @@ ng-model="personalSettings.password" ng-change="personalSettings.requirePasswordConfirmation()" introduction="{{ 'General_ChangePassword'|translate|e('html_attr') }}" - title="{{ 'Login_NewPassword'|translate|e('html_attr') }}" + data-title="{{ 'Login_NewPassword'|translate|e('html_attr') }}" value="" inline-help="{{ 'UsersManager_IfYouWouldLikeToChangeThePasswordTypeANewOne'|translate|e('html_attr') }}"> </div> <div piwik-field uicontrol="password" name="passwordBis" autocomplete="off" ng-model="personalSettings.passwordBis" ng-change="personalSettings.requirePasswordConfirmation()" - title="{{ 'Login_NewPasswordRepeat'|translate|e('html_attr') }}" + data-title="{{ 'Login_NewPasswordRepeat'|translate|e('html_attr') }}" value="" inline-help="{{ 'UsersManager_TypeYourPasswordAgain'|translate|e('html_attr') }}"> </div> {% endif %} @@ -107,7 +107,7 @@ <div piwik-field uicontrol="password" name="currentPassword" autocomplete="off" ng-model="personalSettings.passwordCurrent" full-width="true" - title="{{ 'UsersManager_YourCurrentPassword'|translate|e('html_attr') }}" + data-title="{{ 'UsersManager_YourCurrentPassword'|translate|e('html_attr') }}" value=""> </div> </div> |