diff --git a/src/addons/calendar/pages/edit-event/edit-event.html b/src/addons/calendar/pages/edit-event/edit-event.html index a926b9025..a61fcb899 100644 --- a/src/addons/calendar/pages/edit-event/edit-event.html +++ b/src/addons/calendar/pages/edit-event/edit-event.html @@ -43,7 +43,7 @@

{{eventTypes[0].name | translate }}

+ [cancelText]="'core.cancel' | translate" [interfaceOptions]="{header: 'addon.calendar.eventkind' | translate}"> {{ type.name | translate }} @@ -56,7 +56,7 @@

{{ 'core.category' | translate }}

+ [cancelText]="'core.cancel' | translate" [interfaceOptions]="{header: 'core.category' | translate}"> {{ category.name }} @@ -69,7 +69,7 @@

{{ 'core.course' | translate }}

+ [cancelText]="'core.cancel' | translate" [interfaceOptions]="{header: 'core.course' | translate}"> {{ course.fullname }} @@ -82,7 +82,8 @@

{{ 'core.course' | translate }}

+ [cancelText]="'core.cancel' | translate" (ionChange)="groupCourseSelected()" + [interfaceOptions]="{header: 'core.course' | translate}"> {{ course.fullname }} @@ -100,7 +101,7 @@

{{ 'core.group' | translate }}

+ [cancelText]="'core.cancel' | translate" [interfaceOptions]="{header: 'core.group' | translate}"> {{ group.name }} diff --git a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html index ff9381b49..121bc492d 100644 --- a/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html +++ b/src/addons/mod/assign/components/submission/addon-mod-assign-submission.html @@ -296,6 +296,7 @@

{{ 'addon.mod_assign.grade' | translate }}

{{grade.label}} @@ -309,7 +310,8 @@

{{ outcome.name }}

+ interface="action-sheet" [disabled]="gradeInfo!.disabled" [cancelText]="'core.cancel' | translate" + [interfaceOptions]="{header: outcome.name }"> {{grade.label}} diff --git a/src/addons/mod/data/components/search/search.html b/src/addons/mod/data/components/search/search.html index 01aaddd81..e6e05364e 100644 --- a/src/addons/mod/data/components/search/search.html +++ b/src/addons/mod/data/components/search/search.html @@ -26,7 +26,7 @@ {{ 'core.sortby' | translate }} + [cancelText]="'core.cancel' | translate" [interfaceOptions]="{header: 'core.sortby' | translate}"> {{field.name}} diff --git a/src/addons/mod/data/fields/checkbox/component/addon-mod-data-field-checkbox.html b/src/addons/mod/data/fields/checkbox/component/addon-mod-data-field-checkbox.html index 9bfe1c173..1081bbda9 100644 --- a/src/addons/mod/data/fields/checkbox/component/addon-mod-data-field-checkbox.html +++ b/src/addons/mod/data/fields/checkbox/component/addon-mod-data-field-checkbox.html @@ -1,7 +1,8 @@ + [cancelText]="'core.cancel' | translate" [okText]="'core.ok' | translate" [interfaceOptions]="{header: field.name}" + interface="alert"> {{option.key}} diff --git a/src/addons/mod/data/fields/menu/component/addon-mod-data-field-menu.html b/src/addons/mod/data/fields/menu/component/addon-mod-data-field-menu.html index 327531cac..a3b12a099 100644 --- a/src/addons/mod/data/fields/menu/component/addon-mod-data-field-menu.html +++ b/src/addons/mod/data/fields/menu/component/addon-mod-data-field-menu.html @@ -1,7 +1,7 @@ + [cancelText]="'core.cancel' | translate" [interfaceOptions]="{header: field.name}" interface="action-sheet"> {{ 'addon.mod_data.menuchoose' | translate }} {{option}} diff --git a/src/addons/mod/data/fields/multimenu/component/addon-mod-data-field-multimenu.html b/src/addons/mod/data/fields/multimenu/component/addon-mod-data-field-multimenu.html index 56a062c1c..a1c003849 100644 --- a/src/addons/mod/data/fields/multimenu/component/addon-mod-data-field-multimenu.html +++ b/src/addons/mod/data/fields/multimenu/component/addon-mod-data-field-multimenu.html @@ -1,7 +1,8 @@ + [cancelText]="'core.cancel' | translate" [okText]="'core.ok' | translate" [interfaceOptions]="{header: field.name}" + interface="alert"> {{option.key}} diff --git a/src/addons/mod/data/fields/radiobutton/component/addon-mod-data-field-radiobutton.html b/src/addons/mod/data/fields/radiobutton/component/addon-mod-data-field-radiobutton.html index 75e003b7c..31e37921b 100644 --- a/src/addons/mod/data/fields/radiobutton/component/addon-mod-data-field-radiobutton.html +++ b/src/addons/mod/data/fields/radiobutton/component/addon-mod-data-field-radiobutton.html @@ -1,7 +1,8 @@ + [cancelText]="'core.cancel' | translate" [okText]="'core.ok' | translate" [interfaceOptions]="{header: field.name}" + interface="alert"> {{ 'addon.mod_data.menuchoose' | translate }} {{option}} diff --git a/src/addons/mod/feedback/pages/form/form.html b/src/addons/mod/feedback/pages/form/form.html index 628c45560..5b417b796 100644 --- a/src/addons/mod/feedback/pages/form/form.html +++ b/src/addons/mod/feedback/pages/form/form.html @@ -62,7 +62,7 @@ + [cancelText]="'core.cancel' | translate" [interfaceOptions]="{header: item.name}"> diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.html b/src/addons/mod/forum/pages/new-discussion/new-discussion.html index eec395e24..ef312563b 100644 --- a/src/addons/mod/forum/pages/new-discussion/new-discussion.html +++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.html @@ -49,7 +49,7 @@ {{ 'addon.mod_forum.group' | translate }} + [cancelText]="'core.cancel' | translate" (ionChange)="calculateGroupName()"> diff --git a/src/addons/mod/glossary/pages/edit/edit.html b/src/addons/mod/glossary/pages/edit/edit.html index 0af9d5629..f3f9eca83 100644 --- a/src/addons/mod/glossary/pages/edit/edit.html +++ b/src/addons/mod/glossary/pages/edit/edit.html @@ -32,7 +32,7 @@ {{ 'addon.mod_glossary.categories' | translate }} {{ category.name }} diff --git a/src/addons/mod/lesson/pages/player/player.html b/src/addons/mod/lesson/pages/player/player.html index 3a524b170..00187eb49 100644 --- a/src/addons/mod/lesson/pages/player/player.html +++ b/src/addons/mod/lesson/pages/player/player.html @@ -143,7 +143,8 @@

- + {{option.label}} diff --git a/src/addons/mod/lesson/pages/user-retake/user-retake.html b/src/addons/mod/lesson/pages/user-retake/user-retake.html index f55593aae..c11ce5186 100644 --- a/src/addons/mod/lesson/pages/user-retake/user-retake.html +++ b/src/addons/mod/lesson/pages/user-retake/user-retake.html @@ -28,7 +28,8 @@ {{ 'addon.mod_lesson.attemptheader' | translate }} - {{retake.label}} diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html index cf3931781..63640e0e2 100644 --- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html +++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html @@ -113,7 +113,8 @@ {{ 'addon.mod_scorm.organizations' | translate }} - {{ org.title }} diff --git a/src/addons/mod/survey/components/index/addon-mod-survey-index.html b/src/addons/mod/survey/components/index/addon-mod-survey-index.html index a081f8459..69078724f 100644 --- a/src/addons/mod/survey/components/index/addon-mod-survey-index.html +++ b/src/addons/mod/survey/components/index/addon-mod-survey-index.html @@ -68,7 +68,8 @@ + [name]="question.name" [cancelText]="'core.cancel' | translate" + [interfaceOptions]="{header: question.text}"> {{ 'core.choose' | translate }} {{option}} @@ -90,7 +91,7 @@ + [cancelText]="'core.cancel' | translate" [interfaceOptions]="{header: question.text}"> {{ 'core.choose' | translate }} diff --git a/src/addons/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html b/src/addons/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html index 49b3c5fdd..ec6884d67 100644 --- a/src/addons/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html +++ b/src/addons/mod/workshop/assessment/accumulative/component/addon-mod-workshop-assessment-strategy-accumulative.html @@ -14,7 +14,8 @@
+ translate : {'$a': field.dimtitle }}" [(ngModel)]="selectedValues[n].grade" [cancelText]="'core.cancel' | translate" + interface="action-sheet"> {{grade.label}} diff --git a/src/addons/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html b/src/addons/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html index 160f9e4f0..73bb0ac69 100644 --- a/src/addons/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html +++ b/src/addons/mod/workshop/components/assessment-strategy/addon-mod-workshop-assessment-strategy.html @@ -45,7 +45,7 @@ {{ 'addon.mod_workshop.assessmentweight' | translate }}
- {{w}} diff --git a/src/addons/mod/workshop/pages/assessment/assessment.html b/src/addons/mod/workshop/pages/assessment/assessment.html index cde179e45..1720982e5 100644 --- a/src/addons/mod/workshop/pages/assessment/assessment.html +++ b/src/addons/mod/workshop/pages/assessment/assessment.html @@ -66,7 +66,7 @@ {{ 'addon.mod_workshop.assessmentweight' | translate }}
- {{ w }} @@ -79,7 +79,7 @@
{{ 'addon.mod_workshop.gradinggradeover' | translate }} - {{grade.label}} diff --git a/src/addons/mod/workshop/pages/submission/submission.html b/src/addons/mod/workshop/pages/submission/submission.html index b435c4d83..c0aece919 100644 --- a/src/addons/mod/workshop/pages/submission/submission.html +++ b/src/addons/mod/workshop/pages/submission/submission.html @@ -118,7 +118,7 @@ {{ 'addon.mod_workshop.gradeover' | translate }} - {{grade.label}} diff --git a/src/addons/qtype/calculated/component/addon-qtype-calculated.html b/src/addons/qtype/calculated/component/addon-qtype-calculated.html index 2e2a5ee1d..68dde2517 100644 --- a/src/addons/qtype/calculated/component/addon-qtype-calculated.html +++ b/src/addons/qtype/calculated/component/addon-qtype-calculated.html @@ -50,7 +50,7 @@ + [cancelText]="'core.cancel' | translate" [interfaceOptions]="{header: 'addon.mod_quiz.unit' | translate}"> {{option.label}} diff --git a/src/addons/qtype/match/component/addon-qtype-match.html b/src/addons/qtype/match/component/addon-qtype-match.html index 57aa5e79a..eed4cf9bf 100644 --- a/src/addons/qtype/match/component/addon-qtype-match.html +++ b/src/addons/qtype/match/component/addon-qtype-match.html @@ -17,6 +17,7 @@ {{option.label}} diff --git a/src/addons/userprofilefield/menu/component/addon-user-profile-field-menu.html b/src/addons/userprofilefield/menu/component/addon-user-profile-field-menu.html index 28246420c..2abaebba9 100644 --- a/src/addons/userprofilefield/menu/component/addon-user-profile-field-menu.html +++ b/src/addons/userprofilefield/menu/component/addon-user-profile-field-menu.html @@ -24,7 +24,7 @@ + [cancelText]="'core.cancel' | translate" [interfaceOptions]="{header: field.name}"> {{ 'core.choosedots' | translate }} {{option}} diff --git a/src/core/components/group-selector/group-selector.html b/src/core/components/group-selector/group-selector.html index 9d0b927bd..2becbbc0a 100644 --- a/src/core/components/group-selector/group-selector.html +++ b/src/core/components/group-selector/group-selector.html @@ -12,7 +12,7 @@ {{'core.groupsvisible' | translate }} + [cancelText]="'core.cancel' | translate" [interfaceOptions]="{header: 'core.group' | translate}"> diff --git a/src/core/components/site-picker/core-site-picker.html b/src/core/components/site-picker/core-site-picker.html index 5e66a7a32..5b94e6291 100644 --- a/src/core/components/site-picker/core-site-picker.html +++ b/src/core/components/site-picker/core-site-picker.html @@ -1,7 +1,7 @@ {{ 'core.site' | translate }} + [cancelText]="'core.cancel' | translate" [interfaceOptions]="{header: 'core.site' | translate}"> {{ site.fullNameAndSiteName }} diff --git a/src/core/features/login/pages/email-signup/email-signup.html b/src/core/features/login/pages/email-signup/email-signup.html index 21e53f78b..b1bafd6f5 100644 --- a/src/core/features/login/pages/email-signup/email-signup.html +++ b/src/core/features/login/pages/email-signup/email-signup.html @@ -54,7 +54,8 @@ {{ 'core.wheredoyoulive' | translate }} - + {{ 'core.login.selectacountry' | translate }} {{country.name}} @@ -160,8 +161,8 @@ {{ 'core.user.country' | translate }} - - + {{ 'core.login.selectacountry' | translate }} {{country.name}} diff --git a/src/core/features/rating/components/rate/core-rating-rate.html b/src/core/features/rating/components/rate/core-rating-rate.html index fdcb93e50..96faa9540 100644 --- a/src/core/features/rating/components/rate/core-rating-rate.html +++ b/src/core/features/rating/components/rate/core-rating-rate.html @@ -1,7 +1,8 @@ {{ 'core.rating.rating' | translate }} + [cancelText]="'core.cancel' | translate" [disabled]="!item!.canrate" + [interfaceOptions]="{header: 'core.rating.rating' | translate}"> {{ scaleItem.name }} diff --git a/src/core/features/reminders/components/set-reminder-custom/set-reminder-custom.html b/src/core/features/reminders/components/set-reminder-custom/set-reminder-custom.html index a3b7baf4e..a4f4216d0 100644 --- a/src/core/features/reminders/components/set-reminder-custom/set-reminder-custom.html +++ b/src/core/features/reminders/components/set-reminder-custom/set-reminder-custom.html @@ -16,7 +16,7 @@ {{ 'core.reminders.units' | translate }} + slot="end" [cancelText]="'core.cancel' | translate" [interfaceOptions]="{header: 'core.reminders.units' | translate}"> {{ option.label | translate }} diff --git a/src/core/features/settings/pages/general/general.html b/src/core/features/settings/pages/general/general.html index 6be8e054e..1c4ad5f7a 100644 --- a/src/core/features/settings/pages/general/general.html +++ b/src/core/features/settings/pages/general/general.html @@ -16,7 +16,7 @@

{{ 'core.settings.language' | translate }}

+ [cancelText]="'core.cancel' | translate" [interfaceOptions]="{header: 'core.settings.language' | translate}"> {{ entry.name }}
@@ -41,7 +41,8 @@

{{ 'core.settings.forcedsetting' | translate }}

+ [cancelText]="'core.cancel' | translate" [disabled]="colorSchemeDisabled" + [interfaceOptions]="{header: 'core.settings.colorscheme' | translate}"> {{ 'core.settings.colorscheme-' + scheme | translate }}