diff options
15 files changed, 39 insertions, 39 deletions
diff --git a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig index 257150c54e..24bd8af753 100644 --- a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig +++ b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig @@ -65,7 +65,7 @@ <div piwik-field uicontrol="checkbox" name="javascript-tracking-all-subdomains" ng-model="jsTrackingCode.trackAllSubdomains" ng-change="jsTrackingCode.updateTrackingCode()" - disabled="jsTrackingCode.isLoading" + data-disabled="jsTrackingCode.isLoading" introduction="{{ 'General_Options'|translate|e('html_attr') }}" title="{{ ('CoreAdminHome_JSTracking_MergeSubdomains'|translate ~ " <span class='current-site-name'></span>")|e('html_attr') }}" value="" inline-help="#jsTrackAllSubdomainsInlineHelp"> @@ -79,7 +79,7 @@ <div piwik-field uicontrol="checkbox" name="javascript-tracking-group-by-domain" ng-model="jsTrackingCode.groupByDomain" ng-change="jsTrackingCode.updateTrackingCode()" - disabled="jsTrackingCode.isLoading" + data-disabled="jsTrackingCode.isLoading" title="{{ 'CoreAdminHome_JSTracking_GroupPageTitlesByDomain'|translate|e('html_attr') }}" value="" inline-help="#jsTrackGroupByDomainInlineHelp"> </div> @@ -92,7 +92,7 @@ <div piwik-field uicontrol="checkbox" name="javascript-tracking-all-aliases" ng-model="jsTrackingCode.trackAllAliases" ng-change="jsTrackingCode.updateTrackingCode()" - disabled="jsTrackingCode.isLoading" + data-disabled="jsTrackingCode.isLoading" title="{{ ('CoreAdminHome_JSTracking_MergeAliases'|translate ~ " <span class='current-site-name'></span>")|e('html_attr') }}" value="" inline-help="#jsTrackAllAliasesInlineHelp"> </div> @@ -100,7 +100,7 @@ <div piwik-field uicontrol="checkbox" name="javascript-tracking-noscript" ng-model="jsTrackingCode.trackNoScript" ng-change="jsTrackingCode.updateTrackingCode()" - disabled="jsTrackingCode.isLoading" + data-disabled="jsTrackingCode.isLoading" title="{{ 'CoreAdminHome_JSTracking_TrackNoScript'|translate|e('html_attr') }}" value="" inline-help=""> </div> @@ -122,7 +122,7 @@ <div piwik-field uicontrol="checkbox" name="javascript-tracking-visitor-cv-check" ng-model="jsTrackingCode.trackCustomVars" ng-change="jsTrackingCode.updateTrackingCode()" - disabled="jsTrackingCode.isLoading" + data-disabled="jsTrackingCode.isLoading" title="{{ 'CoreAdminHome_JSTracking_VisitorCustomVars'|translate|e('html_attr') }}" value="" inline-help="{{ 'CoreAdminHome_JSTracking_VisitorCustomVarsDesc'|translate|e('html_attr') }}"> </div> @@ -169,7 +169,7 @@ <div piwik-field uicontrol="checkbox" name="javascript-tracking-cross-domain" ng-model="jsTrackingCode.crossDomain" ng-change="jsTrackingCode.updateTrackingCode();jsTrackingCode.onCrossDomainToggle();" - disabled="jsTrackingCode.isLoading || !jsTrackingCode.hasManySiteUrls" + data-disabled="jsTrackingCode.isLoading || !jsTrackingCode.hasManySiteUrls" title="{{ 'CoreAdminHome_JSTracking_EnableCrossDomainLinking'|translate|e('html_attr') }}" value="" inline-help="#jsCrossDomain"> </div> @@ -186,7 +186,7 @@ <div piwik-field uicontrol="checkbox" name="javascript-tracking-do-not-track" ng-model="jsTrackingCode.doNotTrack" ng-change="jsTrackingCode.updateTrackingCode() " - disabled="jsTrackingCode.isLoading" + data-disabled="jsTrackingCode.isLoading" title="{{ 'CoreAdminHome_JSTracking_EnableDoNotTrack'|translate|e('html_attr') }}" value="" inline-help="#jsDoNotTrackInlineHelp"> </div> @@ -194,7 +194,7 @@ {# disable all cookies options #} <div piwik-field uicontrol="checkbox" name="javascript-tracking-disable-cookies" ng-model="jsTrackingCode.disableCookies" - disabled="jsTrackingCode.isLoading" + data-disabled="jsTrackingCode.isLoading" ng-change="jsTrackingCode.updateTrackingCode()" title="{{ 'CoreAdminHome_JSTracking_DisableCookies'|translate|e('html_attr') }}" value="" inline-help="{{ 'CoreAdminHome_JSTracking_DisableCookiesDesc'|translate|e('html_attr') }}"> @@ -207,7 +207,7 @@ <div piwik-field uicontrol="checkbox" name="custom-campaign-query-params-check" ng-model="jsTrackingCode.useCustomCampaignParams" - disabled="jsTrackingCode.isLoading" + data-disabled="jsTrackingCode.isLoading" ng-change="jsTrackingCode.updateTrackingCode()" title="{{ 'CoreAdminHome_JSTracking_CustomCampaignQueryParam'|translate|e('html_attr') }}" value="" inline-help="#jsTrackCampaignParamsInlineHelp"> @@ -219,7 +219,7 @@ <div piwik-field uicontrol="text" name="custom-campaign-name-query-param" ng-model="jsTrackingCode.customCampaignName" ng-change="jsTrackingCode.updateTrackingCode()" - disabled="jsTrackingCode.isLoading" + data-disabled="jsTrackingCode.isLoading" title="{{ 'CoreAdminHome_JSTracking_CampaignNameParam'|translate|e('html_attr') }}" value=""> </div> @@ -230,7 +230,7 @@ <div piwik-field uicontrol="text" name="custom-campaign-keyword-query-param" ng-model="jsTrackingCode.customCampaignKeyword" ng-change="jsTrackingCode.updateTrackingCode()" - disabled="jsTrackingCode.isLoading" + data-disabled="jsTrackingCode.isLoading" title="{{ 'CoreAdminHome_JSTracking_CampaignKwdParam'|translate|e('html_attr') }}" value=""> </div> @@ -280,7 +280,7 @@ <div piwik-field uicontrol="text" name="image-tracker-action-name" ng-model="imageTrackingCode.pageName" ng-change="imageTrackingCode.updateTrackingCode()" - disabled="imageTrackingCode.isLoading" + data-disabled="imageTrackingCode.isLoading" introduction="{{ 'General_Options'|translate|e('html_attr') }}" title="{{ 'Actions_ColumnPageName'|translate|e('html_attr') }}" value=""> @@ -290,7 +290,7 @@ <div piwik-field uicontrol="checkbox" name="image-tracking-goal-check" ng-model="imageTrackingCode.trackGoal" ng-change="imageTrackingCode.updateTrackingCode()" - disabled="imageTrackingCode.isLoading" + data-disabled="imageTrackingCode.isLoading" title="{{ 'CoreAdminHome_TrackAGoal'|translate|e('html_attr') }}" value=""> </div> @@ -301,7 +301,7 @@ <div class="col s12 m6"> <div piwik-field uicontrol="select" name="image-tracker-goal" options="imageTrackingCode.allGoals" - disabled="imageTrackingCode.isLoading" + data-disabled="imageTrackingCode.isLoading" ng-model="imageTrackingCode.trackIdGoal" full-width="true" ng-change="imageTrackingCode.updateTrackingCode()" @@ -312,7 +312,7 @@ <div piwik-field uicontrol="text" name="image-revenue" ng-model="imageTrackingCode.revenue" ng-change="imageTrackingCode.updateTrackingCode()" - disabled="imageTrackingCode.isLoading" + data-disabled="imageTrackingCode.isLoading" full-width="true" title="{{ 'CoreAdminHome_WithOptionalRevenue'|translate|e('html_attr') }} <span class='site-currency'></span>" value=""> diff --git a/plugins/CorePluginsAdmin/angularjs/field/field.directive.js b/plugins/CorePluginsAdmin/angularjs/field/field.directive.js index e64179fc43..82bce0899d 100644 --- a/plugins/CorePluginsAdmin/angularjs/field/field.directive.js +++ b/plugins/CorePluginsAdmin/angularjs/field/field.directive.js @@ -20,7 +20,7 @@ * placeholder="" * rows="3" * autocomplete="off" - * disabled="true" + * data-disabled="true" * full-width="true" * templateFile=""></div> * diff --git a/plugins/Marketplace/templates/licenseform.twig b/plugins/Marketplace/templates/licenseform.twig index cbf31bb83e..9e5b9ab596 100644 --- a/plugins/Marketplace/templates/licenseform.twig +++ b/plugins/Marketplace/templates/licenseform.twig @@ -9,7 +9,7 @@ <div piwik-save-button class="valign" onconfirm="licenseController.updateLicense()" - disabled="!licenseController.enableUpdate" + data-disabled="!licenseController.enableUpdate" value="{% if hasLicenseKey %}{{ 'CoreUpdater_UpdateTitle'|translate|e('html_attr') }}{% else %}{{ 'Marketplace_ActivateLicenseKey'|translate|e('html_attr') }}{% endif %}" id="submit_license_key"></div> {% endset %} diff --git a/plugins/MobileMessaging/templates/index.twig b/plugins/MobileMessaging/templates/index.twig index 253a7148ee..0eadeee0a2 100644 --- a/plugins/MobileMessaging/templates/index.twig +++ b/plugins/MobileMessaging/templates/index.twig @@ -92,7 +92,7 @@ </div> <div class="addNumber left valign-wrapper"> <div piwik-save-button - disabled="!managePhoneNumber.canAddNumber || managePhoneNumber.isAddingPhonenumber" + data-disabled="!managePhoneNumber.canAddNumber || managePhoneNumber.isAddingPhonenumber" onconfirm="managePhoneNumber.addPhoneNumber()" class="valign" value='{{ 'General_Add'|translate }}'></div> </div> @@ -130,14 +130,14 @@ <div piwik-save-button ng-hide="managePhoneNumber.isActivated[{{ loop.index }}]" value='{{ 'MobileMessaging_Settings_ValidatePhoneNumber'|translate }}' - disabled="!managePhoneNumber.validationCode[{{ loop.index }}] || managePhoneNumber.isChangingPhoneNumber" + data-disabled="!managePhoneNumber.validationCode[{{ loop.index }}] || managePhoneNumber.isChangingPhoneNumber" onconfirm='managePhoneNumber.validateActivationCode({{ phoneNumber|json_encode }}, {{ loop.index }})' ></div> {% endif %} <div piwik-save-button value='{{ 'General_Remove'|translate }}' - disabled="managePhoneNumber.isChangingPhoneNumber" + data-disabled="managePhoneNumber.isChangingPhoneNumber" onconfirm="managePhoneNumber.removePhoneNumber({{ phoneNumber|json_encode }})" ></div> </div> diff --git a/plugins/MobileMessaging/templates/macros.twig b/plugins/MobileMessaging/templates/macros.twig index 3ea8c8948f..6bb5a49d5e 100644 --- a/plugins/MobileMessaging/templates/macros.twig +++ b/plugins/MobileMessaging/templates/macros.twig @@ -39,7 +39,7 @@ ></div> <div piwik-save-button id='apiAccountSubmit' - disabled="!manageProvider.canBeUpdated" + data-disabled="!manageProvider.canBeUpdated" saving="manageProvider.isUpdatingAccount" onconfirm="manageProvider.updateAccount()"></div> diff --git a/plugins/Morpheus/templates/demo.twig b/plugins/Morpheus/templates/demo.twig index 210fb9a47c..cafd56ae01 100644 --- a/plugins/Morpheus/templates/demo.twig +++ b/plugins/Morpheus/templates/demo.twig @@ -307,7 +307,7 @@ </div> <div piwik-field uicontrol="text" name="alias" title="Disabeld text field" - disabled="true" + data-disabled="true" placeholder="This value cannot be changed" inline-help="#complexHelpText"> </div> @@ -420,7 +420,7 @@ <div piwik-save-button></div> <div piwik-save-button onconfirm="myController.save()" - disabled="myController.isDisabled" + data-disabled="myController.isDisabled" value="Changed button text" saving="myController.isLoading"> </div> 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 239ab96718..7526609549 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 @@ -130,7 +130,7 @@ <div piwik-save-button class="anonymizePastData" onconfirm="anonymizeLogData.scheduleAnonymization()" - disabled="!anonymizeLogData.anonymizeIp && !anonymizeLogData.anonymizeLocation && !anonymizeLogData.selectedVisitColumns && !anonymizeLogData.selectedActionColumns" + data-disabled="!anonymizeLogData.anonymizeIp && !anonymizeLogData.anonymizeLocation && !anonymizeLogData.selectedVisitColumns && !anonymizeLogData.selectedActionColumns" value="Anonymize past data for the selected site and time"> </div> diff --git a/plugins/PrivacyManager/angularjs/manage-gdpr/managegdpr.directive.html b/plugins/PrivacyManager/angularjs/manage-gdpr/managegdpr.directive.html index f4f24781ec..860573a8e6 100644 --- a/plugins/PrivacyManager/angularjs/manage-gdpr/managegdpr.directive.html +++ b/plugins/PrivacyManager/angularjs/manage-gdpr/managegdpr.directive.html @@ -45,7 +45,7 @@ <div piwik-save-button class="findDataSubjects" onconfirm="manageGdpr.findDataSubjects()" - disabled="!manageGdpr.segment_filter" + data-disabled="!manageGdpr.segment_filter" value="Find matching data subjects" saving="manageGdpr.isLoading"> </div> @@ -120,13 +120,13 @@ <div piwik-save-button class="exportDataSubjects" onconfirm="manageGdpr.exportDataSubject()" - disabled="!manageGdpr.hasActiveDataSubjects()" + data-disabled="!manageGdpr.hasActiveDataSubjects()" value="Export selected visits"> </div> <div piwik-save-button class="deleteDataSubjects" onconfirm="manageGdpr.deleteDataSubject()" - disabled="!manageGdpr.hasActiveDataSubjects() || manageGdpr.isDeleting" + data-disabled="!manageGdpr.hasActiveDataSubjects() || manageGdpr.isDeleting" value="Delete selected visits"> </div> </div> diff --git a/plugins/Referrers/angularjs/campaign-builder/campaign-builder.directive.html b/plugins/Referrers/angularjs/campaign-builder/campaign-builder.directive.html index d80de154b7..65e1608392 100644 --- a/plugins/Referrers/angularjs/campaign-builder/campaign-builder.directive.html +++ b/plugins/Referrers/angularjs/campaign-builder/campaign-builder.directive.html @@ -43,7 +43,7 @@ <div piwik-save-button class="generateCampaignUrl" onconfirm="campaignBuilder.generateUrl()" - disabled="!campaignBuilder.websiteUrl || !campaignBuilder.campaignName" + data-disabled="!campaignBuilder.websiteUrl || !campaignBuilder.campaignName" value="{{ 'Referrers_GenerateUrl'|translate }}"> </div> <div piwik-save-button diff --git a/plugins/ScheduledReports/templates/_addReport.twig b/plugins/ScheduledReports/templates/_addReport.twig index 5e87105cc9..9de8df56ba 100644 --- a/plugins/ScheduledReports/templates/_addReport.twig +++ b/plugins/ScheduledReports/templates/_addReport.twig @@ -7,7 +7,7 @@ <div piwik-field uicontrol="text" name="website" title="{{ 'General_Website'|translate|e('html_attr') }}" - disabled="true" + data-disabled="true" value="{{ siteName|rawSafeDecoded }}"> </div> diff --git a/plugins/Transitions/templates/transitions.twig b/plugins/Transitions/templates/transitions.twig index 8bb6657361..02cc0ae90e 100644 --- a/plugins/Transitions/templates/transitions.twig +++ b/plugins/Transitions/templates/transitions.twig @@ -20,7 +20,7 @@ ng-change="transitionSwitcher.onActionNameChange(transitionSwitcher.actionName)" title="{{ 'Transitions_TopX'|translate(100)|e('html_attr') }}" full-width="true" - disabled="!transitionSwitcher.isEnabled" + data-disabled="!transitionSwitcher.isEnabled" options='transitionSwitcher.actionNameOptions'> </div> </div> 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> |