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:
authorThomas Steur <tsteur@users.noreply.github.com>2018-12-21 08:37:14 +0300
committerdiosmosis <diosmosis@users.noreply.github.com>2018-12-21 08:37:14 +0300
commit4c2016ab8087e2b216b58f271e3477f14a1dd5a7 (patch)
tree3b0696c16d9ae657e4938e05ad4de0f8b5566ca1 /plugins/UsersManager
parentdc0fa8f0835036da5ed47ac72800fbc60a6f39f4 (diff)
improve ie11 support (#13893)
Diffstat (limited to 'plugins/UsersManager')
-rw-r--r--plugins/UsersManager/angularjs/capabilities-edit/capabilities-edit.component.html2
-rw-r--r--plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.html2
-rw-r--r--plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.html12
-rw-r--r--plugins/UsersManager/templates/userSettings.twig2
4 files changed, 9 insertions, 9 deletions
diff --git a/plugins/UsersManager/angularjs/capabilities-edit/capabilities-edit.component.html b/plugins/UsersManager/angularjs/capabilities-edit/capabilities-edit.component.html
index 0e47dcc8b5..acb0b5cf79 100644
--- a/plugins/UsersManager/angularjs/capabilities-edit/capabilities-edit.component.html
+++ b/plugins/UsersManager/angularjs/capabilities-edit/capabilities-edit.component.html
@@ -23,7 +23,7 @@
ng-change="$ctrl.onToggleCapability(true)"
ng-model="$ctrl.capabilityToAddOrRemoveId"
options="$ctrl.availableCapabilitiesGrouped"
- disabled="$ctrl.isBusy"
+ data-disabled="$ctrl.isBusy"
ng-if="$ctrl.availableCapabilitiesGrouped.length"
class="addCapability"
>
diff --git a/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.html b/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.html
index af89d73862..e35cfac6f6 100644
--- a/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.html
+++ b/plugins/UsersManager/angularjs/paged-users-list/paged-users-list.component.html
@@ -157,7 +157,7 @@
ng-model="user.role"
options="user.login != 'anonymous' ? $ctrl.accessLevels : $ctrl.anonymousAccessLevels"
ng-change="$ctrl.userToChange = user; $ctrl.roleToChangeTo = user.role; $ctrl.previousRole = '{{ user.role }}'; $ctrl.showAccessChangeConfirm();"
- disabled="user.role == 'superuser'"
+ data-disabled="user.role == 'superuser'"
></div>
</td>
<td id="email" ng-if="$ctrl.currentUserRole == 'superuser'">{{ user.email }}</td>
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 bd897b607a..6100e99380 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
@@ -44,7 +44,7 @@
ng-model="$ctrl.user.login"
title="Username"
maxlength="100"
- disabled="$ctrl.isSavingUserInfo || !$ctrl.isAdd"
+ data-disabled="$ctrl.isSavingUserInfo || !$ctrl.isAdd"
>
</div>
@@ -54,7 +54,7 @@
name="user_password"
ng-model="$ctrl.user.password"
title="Password"
- disabled="$ctrl.isSavingUserInfo || ($ctrl.currentUserRole != 'superuser' && !$ctrl.isAdd)"
+ data-disabled="$ctrl.isSavingUserInfo || ($ctrl.currentUserRole != 'superuser' && !$ctrl.isAdd)"
>
</div>
@@ -65,7 +65,7 @@
ng-model="$ctrl.user.email"
title="Email"
maxlength="100"
- disabled="$ctrl.isSavingUserInfo || ($ctrl.currentUserRole != 'superuser' && !$ctrl.isAdd)"
+ data-disabled="$ctrl.isSavingUserInfo || ($ctrl.currentUserRole != 'superuser' && !$ctrl.isAdd)"
ng-if="$ctrl.currentUserRole == 'superuser' || $ctrl.isAdd"
>
</div>
@@ -76,7 +76,7 @@
name="user_site"
ng-model="$ctrl.firstSiteAccess"
title="First website permission"
- disabled="$ctrl.isSavingUserInfo"
+ data-disabled="$ctrl.isSavingUserInfo"
ng-if="$ctrl.isAdd"
ui-control-attributes="{ onlySitesWithAdminAccess: true }"
ng-attr-inline-help="{{:: 'UsersManager_FirstSiteInlineHelp'|translate }}"
@@ -87,7 +87,7 @@
saving="$ctrl.isSavingUserInfo"
onconfirm="$ctrl.saveUserInfo()"
ng-value="$ctrl.getSaveButtonLabel()"
- disabled="$ctrl.isAdd && (!$ctrl.firstSiteAccess || !$ctrl.firstSiteAccess.id)"
+ data-disabled="$ctrl.isAdd && (!$ctrl.firstSiteAccess || !$ctrl.firstSiteAccess.id)"
ng-if="$ctrl.currentUserRole == 'superuser' || $ctrl.isAdd"
></div>
@@ -123,7 +123,7 @@
ng-model="$ctrl.user.superuser_access"
ng-attr-title="{{:: 'UsersManager_HasSuperUserAccess'|translate }}"
ng-click="$ctrl.confirmSuperUserChange()"
- disabled="$ctrl.isSavingUserInfo"
+ data-disabled="$ctrl.isSavingUserInfo"
>
</div>
diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig
index 224d4866e1..a701f06766 100644
--- a/plugins/UsersManager/templates/userSettings.twig
+++ b/plugins/UsersManager/templates/userSettings.twig
@@ -15,7 +15,7 @@
<div piwik-field uicontrol="text" name="username"
title="{{ 'General_Username'|translate|e('html_attr') }}"
- value="{{ userLogin }}" disabled="true"
+ value="{{ userLogin }}" data-disabled="true"
ng-model="personalSettings.username"
inline-help="{{ 'UsersManager_YourUsernameCannotBeChanged'|translate|e('html_attr') }}">
</div>