From ff92f8111ed50215742c8aa31d09fe3ae328c6bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Fri, 24 Nov 2023 13:34:54 +0100 Subject: [PATCH] MOBIE-3947 lint: Fix self closing tags --- .../pages/issued-badge/issued-badge.html | 7 +- .../badges/pages/user-badges/user-badges.html | 7 +- .../addon-block-activitymodules.html | 3 +- .../myoverview/addon-block-myoverview.html | 22 +++--- .../addon-block-recentlyaccessedcourses.html | 8 +-- .../addon-block-recentlyaccesseditems.html | 13 ++-- .../addon-block-sitemainmenu.html | 4 +- .../addon-block-starredcourses.html | 8 +-- .../events/addon-block-timeline-events.html | 17 ++--- .../timeline/addon-block-timeline.html | 8 +-- src/addons/blog/pages/entries/entries.html | 31 ++++---- .../calendar/addon-calendar-calendar.html | 20 +++--- .../calendar/components/filter/filter.html | 12 ++-- .../addon-calendar-upcoming-events.html | 17 +++-- src/addons/calendar/pages/day/day.html | 37 +++++----- .../calendar/pages/edit-event/edit-event.html | 47 ++++++------- src/addons/calendar/pages/event/event.html | 46 +++++------- src/addons/calendar/pages/index/index.html | 27 ++++--- .../calendar/pages/settings/settings.html | 2 +- .../pages/competencies/competencies.html | 10 ++- .../pages/competency/competency.html | 35 ++++------ .../competencysummary/competencysummary.html | 16 ++--- .../coursecompetencies.html | 44 +++++------- src/addons/competency/pages/plan/plan.html | 21 +++--- .../competency/pages/planlist/planlist.html | 11 ++- .../coursecompletion/pages/report/report.html | 22 +++--- .../airnotifier/pages/devices/devices.html | 7 +- .../conversation-info/conversation-info.html | 18 ++--- .../messages/pages/contacts-35/contacts.html | 14 ++-- .../messages/pages/contacts/contacts.html | 36 ++++------ .../messages/pages/discussion/discussion.html | 56 ++++++--------- .../pages/discussions-35/discussions.html | 28 ++++---- .../group-conversations.html | 63 ++++++++--------- src/addons/messages/pages/search/search.html | 29 ++++---- .../messages/pages/settings/settings.html | 25 +++---- .../edit-feedback-modal.html | 5 +- .../addon-mod-assign-feedback-plugin.html | 6 +- .../index/addon-mod-assign-index.html | 16 ++--- .../addon-mod-assign-submission-plugin.html | 6 +- .../addon-mod-assign-submission.html | 51 ++++++-------- .../addon-mod-assign-feedback-comments.html | 10 ++- .../addon-mod-assign-feedback-editpdf.html | 4 +- .../addon-mod-assign-feedback-file.html | 4 +- src/addons/mod/assign/pages/edit/edit.html | 22 +++--- src/addons/mod/assign/pages/index/index.html | 13 ++-- .../submission-list/submission-list.html | 20 +++--- .../submission-review/submission-review.html | 12 ++-- .../addon-mod-assign-submission-comments.html | 3 +- .../addon-mod-assign-submission-file.html | 5 +- ...ddon-mod-assign-submission-onlinetext.html | 6 +- .../components/index/index.html | 23 +++--- .../bigbluebuttonbn/pages/index/index.html | 13 ++-- .../index/addon-mod-book-index.html | 11 ++- src/addons/mod/book/components/toc/toc.html | 6 +- .../mod/book/pages/contents/contents.html | 18 +++-- src/addons/mod/book/pages/index/index.html | 14 ++-- .../index/addon-mod-chat-index.html | 10 ++- .../components/users-modal/users-modal.html | 8 +-- src/addons/mod/chat/pages/chat/chat.html | 31 ++++---- src/addons/mod/chat/pages/index/index.html | 13 ++-- .../session-messages/session-messages.html | 21 +++--- .../mod/chat/pages/sessions/sessions.html | 12 ++-- .../index/addon-mod-choice-index.html | 44 +++++------- src/addons/mod/choice/pages/index/index.html | 13 ++-- .../action/addon-mod-data-action.html | 21 +++--- .../components/actionsmenu/actionsmenu.html | 2 +- .../addon-mod-data-field-plugin.html | 2 +- .../index/addon-mod-data-index.html | 40 +++++------ .../mod/data/components/search/search.html | 15 ++-- .../addon-mod-data-field-checkbox.html | 7 +- .../component/addon-mod-data-field-date.html | 8 +-- .../component/addon-mod-data-field-file.html | 9 ++- .../addon-mod-data-field-latlong.html | 10 +-- .../component/addon-mod-data-field-menu.html | 2 +- .../addon-mod-data-field-multimenu.html | 7 +- .../addon-mod-data-field-number.html | 4 +- .../addon-mod-data-field-picture.html | 10 ++- .../addon-mod-data-field-radiobutton.html | 2 +- .../component/addon-mod-data-field-text.html | 4 +- .../addon-mod-data-field-textarea.html | 10 ++- .../component/addon-mod-data-field-url.html | 4 +- src/addons/mod/data/pages/edit/edit.html | 12 ++-- src/addons/mod/data/pages/entry/entry.html | 33 ++++----- src/addons/mod/data/pages/index/index.html | 14 ++-- .../index/addon-mod-feedback-index.html | 41 +++++------ .../mod/feedback/pages/attempt/attempt.html | 14 ++-- .../mod/feedback/pages/attempts/attempts.html | 14 ++-- src/addons/mod/feedback/pages/form/form.html | 54 ++++++-------- .../mod/feedback/pages/index/index.html | 13 ++-- .../pages/nonrespondents/nonrespondents.html | 12 ++-- .../index/addon-mod-folder-index.html | 14 ++-- src/addons/mod/folder/pages/index/index.html | 14 ++-- .../discussion-options-menu.html | 18 ++--- .../mod/forum/components/index/index.html | 58 +++++++-------- .../post-options-menu/post-options-menu.html | 6 +- .../mod/forum/components/post/post.html | 61 ++++++---------- .../sort-order-selector.html | 2 +- .../forum/pages/discussion/discussion.html | 70 +++++++------------ src/addons/mod/forum/pages/index/index.html | 11 ++- .../pages/new-discussion/new-discussion.html | 32 ++++----- src/addons/mod/forum/pages/search/search.html | 14 ++-- .../index/addon-mod-glossary-index.html | 33 ++++----- .../addon-mod-glossary-mode-picker.html | 2 +- src/addons/mod/glossary/pages/edit/edit.html | 24 +++---- .../mod/glossary/pages/entry/entry.html | 44 +++++------- .../mod/glossary/pages/index/index.html | 12 ++-- .../index/addon-mod-h5pactivity-index.html | 25 +++---- .../attempt-results/attempt-results.html | 45 +++++------- .../mod/h5pactivity/pages/index/index.html | 14 ++-- .../pages/user-attempts/user-attempts.html | 25 +++---- .../pages/users-attempts/users-attempts.html | 15 ++-- .../index/addon-mod-imscp-index.html | 8 +-- src/addons/mod/imscp/components/toc/toc.html | 2 +- src/addons/mod/imscp/pages/index/index.html | 11 ++- src/addons/mod/imscp/pages/view/view.html | 14 ++-- .../index/addon-mod-lesson-index.html | 39 +++++------ .../components/menu-modal/menu-modal.html | 10 ++- src/addons/mod/lesson/pages/index/index.html | 15 ++-- .../mod/lesson/pages/player/player.html | 64 +++++++---------- .../lesson/pages/user-retake/user-retake.html | 45 +++++------- .../components/index/addon-mod-lti-index.html | 10 ++- src/addons/mod/lti/pages/index/index.html | 13 ++-- .../index/addon-mod-page-index.html | 14 ++-- src/addons/mod/page/pages/index/index.html | 14 ++-- .../addon-mod-quiz-access-password.html | 3 +- .../index/addon-mod-quiz-index.html | 18 ++--- .../navigation-modal/navigation-modal.html | 16 ++--- .../preflight-modal/preflight-modal.html | 4 +- .../mod/quiz/pages/attempt/attempt.html | 12 ++-- src/addons/mod/quiz/pages/index/index.html | 13 ++-- src/addons/mod/quiz/pages/player/player.html | 24 +++---- src/addons/mod/quiz/pages/review/review.html | 16 ++--- .../index/addon-mod-resource-index.html | 22 +++--- .../mod/resource/pages/index/index.html | 14 ++-- .../index/addon-mod-scorm-index.html | 36 ++++------ src/addons/mod/scorm/components/toc/toc.html | 8 +-- src/addons/mod/scorm/pages/index/index.html | 14 ++-- src/addons/mod/scorm/pages/player/player.html | 13 ++-- .../index/addon-mod-survey-index.html | 18 ++--- src/addons/mod/survey/pages/index/index.html | 12 ++-- .../components/index/addon-mod-url-index.html | 12 ++-- src/addons/mod/url/pages/index/index.html | 12 ++-- .../index/addon-mod-wiki-index.html | 34 ++++----- src/addons/mod/wiki/components/map/map.html | 11 ++- .../addon-mod-wiki-subwiki-picker.html | 8 +-- src/addons/mod/wiki/pages/edit/edit.html | 11 ++- src/addons/mod/wiki/pages/index/index.html | 14 ++-- ...shop-assessment-strategy-accumulative.html | 12 ++-- ...workshop-assessment-strategy-comments.html | 12 ++-- ...orkshop-assessment-strategy-numerrors.html | 20 +++--- ...d-workshop-assessment-strategy-rubric.html | 11 ++- ...ddon-mod-workshop-assessment-strategy.html | 17 ++--- .../addon-mod-workshop-assessment.html | 4 +- .../index/addon-mod-workshop-index.html | 58 ++++++--------- .../mod/workshop/components/phase/phase.html | 17 +++-- .../addon-mod-workshop-submission.html | 35 ++++------ .../workshop/pages/assessment/assessment.html | 21 +++--- .../edit-submission/edit-submission.html | 10 ++- .../mod/workshop/pages/index/index.html | 14 ++-- .../workshop/pages/submission/submission.html | 44 +++++------- .../notes/components/add/add-modal.html | 5 +- src/addons/notes/pages/list/list.html | 35 +++++----- src/addons/notifications/pages/list/list.html | 24 +++---- .../pages/notification/notification.html | 12 ++-- .../pages/settings/settings.html | 28 +++----- .../privatefiles/pages/index/index.html | 13 ++-- .../addon-qbehaviour-deferredcbm.html | 2 +- .../component/addon-qtype-calculated.html | 20 +++--- .../component/addon-qtype-ddimageortext.html | 10 ++- .../component/addon-qtype-ddmarker.html | 11 ++- .../ddwtos/component/addon-qtype-ddwtos.html | 10 ++- .../component/addon-qtype-description.html | 3 +- .../essay/component/addon-qtype-essay.html | 27 +++---- .../component/addon-qtype-gapselect.html | 3 +- .../match/component/addon-qtype-match.html | 10 ++- .../component/addon-qtype-multianswer.html | 3 +- .../component/addon-qtype-multichoice.html | 32 ++++----- .../component/addon-qtype-shortanswer.html | 9 +-- .../pages/course-storage/course-storage.html | 45 +++++------- .../courses-storage/courses-storage.html | 13 ++-- .../addon-user-profile-field-checkbox.html | 11 ++- .../addon-user-profile-field-datetime.html | 11 ++- .../addon-user-profile-field-menu.html | 11 ++- .../addon-user-profile-field-social.html | 13 ++-- .../addon-user-profile-field-text.html | 13 ++-- .../addon-user-profile-field-textarea.html | 14 ++-- .../attachments/core-attachments.html | 8 +-- .../core-button-with-spinner.html | 2 +- src/core/components/chart/core-chart.html | 2 +- .../components/combobox/core-combobox.html | 5 +- .../core-context-menu-popover.html | 11 ++- .../context-menu/core-context-menu.html | 3 +- .../components/course-image/course-image.html | 3 +- .../core-download-refresh.html | 10 +-- .../core-dynamic-component.html | 2 +- .../components/empty-box/core-empty-box.html | 2 +- src/core/components/file/core-file.html | 7 +- src/core/components/files/core-files.html | 10 ++- .../group-selector/group-selector.html | 5 +- .../core-horizontal-scroll-controls.html | 4 +- src/core/components/iframe/core-iframe.html | 4 +- .../core-infinite-loading.html | 4 +- src/core/components/loading/core-loading.html | 2 +- .../local-file/core-local-file.html | 11 ++- .../mark-required/core-mark-required.html | 3 +- src/core/components/message/message.html | 14 ++-- .../navigation-bar/core-navigation-bar.html | 7 +- .../password-modal/password-modal.html | 7 +- .../progress-bar/core-progress-bar.html | 2 +- .../refresh-button-modal.html | 2 +- .../core-send-message-form.html | 2 +- .../components/sheet-modal/sheet-modal.html | 2 +- .../show-password/core-show-password.html | 2 +- .../components/sites-list/sites-list.html | 20 +++--- .../components/split-view/split-view.html | 5 +- .../course-image-cards-page.html | 2 +- .../course-image-list-page.html | 2 +- .../empty-box-page/empty-box-page.html | 5 +- .../sites-list-wrapper.html | 2 +- .../core-swipe-navigation-tour.html | 2 +- .../components/swipe-slides/swipe-slides.html | 3 +- .../tabs-outlet/core-tabs-outlet.html | 8 +-- src/core/components/tabs/core-tabs.html | 8 +-- src/core/components/timer/core-timer.html | 4 +- .../block/components/block/core-block.html | 2 +- .../core-block-pre-rendered.html | 10 ++- .../side-blocks-button.html | 2 +- .../components/side-blocks/side-blocks.html | 9 ++- .../comments/pages/viewer/viewer.html | 35 ++++------ .../choose-site-modal/choose-site-modal.html | 6 +- .../course-format/course-format.html | 40 +++++------ .../components/course-index/course-index.html | 37 ++++------ .../module-completion-details.html | 10 +-- .../core-course-module-completion.html | 8 +-- .../core-course-module-description.html | 3 +- .../module-info/core-course-module-info.html | 25 +++---- .../core-course-module-manual-completion.html | 6 +- .../core-course-module-navigation.html | 4 +- .../module-summary/module-summary.html | 52 ++++++-------- .../components/module/core-course-module.html | 42 +++++------ .../tag-area/core-course-tag-area.html | 2 +- .../core-course-unsupported-module.html | 4 +- .../core-course-format-single-activity.html | 2 +- .../course/pages/contents/contents.html | 5 +- .../pages/course-summary/course-summary.html | 55 ++++++--------- .../features/course/pages/index/index.html | 18 +++-- .../pages/list-mod-type/list-mod-type.html | 16 ++--- .../pages/module-preview/module-preview.html | 21 +++--- .../core-courses-course-list-item.html | 31 ++++---- .../core-courses-course-options-menu.html | 14 ++-- .../core-courses-course-progress.html | 3 +- .../courses/pages/categories/categories.html | 29 ++++---- .../courses/pages/dashboard/dashboard.html | 12 ++-- .../features/courses/pages/list/list.html | 24 +++---- src/core/features/courses/pages/my/my.html | 23 +++--- .../core-editor-rich-text-editor.html | 37 +++++----- .../capture-media/capture-media.html | 13 ++-- .../audio-recorder/audio-recorder.html | 19 +++-- .../features/grades/pages/course/course.html | 27 +++---- .../grades/pages/courses/courses.html | 10 ++- .../h5p-iframe/core-h5p-iframe.html | 3 +- .../h5p-player/core-h5p-player.html | 8 +-- .../exceeded-attempts/exceeded-attempts.html | 2 +- .../login-methods/login-methods.html | 4 +- .../login/components/site-help/site-help.html | 8 +-- .../site-onboarding/site-onboarding.html | 13 ++-- .../components/sites-modal/sites-modal.html | 10 +-- .../change-password/change-password.html | 4 +- .../login/pages/credentials/credentials.html | 20 +++--- .../pages/email-signup/email-signup.html | 49 ++++++------- .../forgotten-password.html | 9 ++- .../login/pages/reconnect/reconnect.html | 19 +++-- .../login/pages/site-policy/site-policy.html | 4 +- src/core/features/login/pages/site/site.html | 25 +++---- .../features/login/pages/sites/sites.html | 10 +-- .../user-menu-button/user-menu-button.html | 3 +- .../components/user-menu/user-menu.html | 27 ++++--- .../features/mainmenu/pages/home/home.html | 12 ++-- .../features/mainmenu/pages/menu/menu.html | 10 +-- .../features/mainmenu/pages/more/more.html | 19 +++-- .../mainmenu/pages/reload/reload.html | 2 +- .../components/question/core-question.html | 12 ++-- .../components/ratings/ratings-modal.html | 7 +- .../reminders/components/date/date.html | 5 +- .../components/set-button/set-button.html | 4 +- .../set-reminder-custom.html | 3 +- .../set-reminder-menu/set-reminder-menu.html | 9 +-- .../report-column/report-column.html | 9 +-- .../report-detail/report-detail.html | 11 ++- .../report-summary/report-summary.html | 18 ++--- .../reportbuilder/pages/list/list.html | 12 ++-- .../reportbuilder/pages/report/report.html | 9 ++- .../global-search-filters.html | 21 +++--- .../global-search-result.html | 18 ++--- .../search-box/core-search-box.html | 10 ++- .../pages/global-search/global-search.html | 18 +++-- .../global-search-results-page.html | 6 +- .../features/settings/pages/about/about.html | 12 ++-- src/core/features/settings/pages/dev/dev.html | 21 +++--- .../settings/pages/deviceinfo/deviceinfo.html | 6 +- .../settings/pages/error-log/error-log.html | 7 +- .../settings/pages/general/general.html | 8 +-- .../features/settings/pages/index/index.html | 6 +- .../settings/pages/licenses/licenses.html | 5 +- .../features/settings/pages/site/site.html | 17 ++--- .../pages/space-usage/space-usage.html | 10 ++- .../synchronization/synchronization.html | 13 ++-- .../components/list-modal/list-modal.html | 5 +- .../sharedfiles/components/list/list.html | 16 ++--- .../pages/choose-site/choose-site.html | 5 +- .../features/sharedfiles/pages/list/list.html | 5 +- .../features/sitehome/pages/index/index.html | 30 ++++---- .../core-siteplugins-assign-feedback.html | 2 +- .../core-siteplugins-assign-submission.html | 2 +- .../block/core-siteplugins-block.html | 3 +- .../core-siteplugins-course-format.html | 3 +- .../core-siteplugins-module-index.html | 11 ++- .../core-siteplugins-plugin-content.html | 3 +- .../core-siteplugins-question-behaviour.html | 2 +- .../question/core-siteplugins-question.html | 2 +- .../core-siteplugins-quiz-access-rule.html | 2 +- .../core-siteplugins-user-profile-field.html | 2 +- ...eplugins-workshop-assessment-strategy.html | 2 +- .../core-siteplugins-course-option.html | 5 +- .../pages/module-index/module-index.html | 10 ++- .../siteplugins/pages/plugin/plugin.html | 11 ++- .../tag/components/feed/core-tag-feed.html | 5 +- .../tag/pages/index-area/index-area.html | 9 ++- src/core/features/tag/pages/index/index.html | 8 +-- .../features/tag/pages/search/search.html | 10 +-- .../tag-area/core-user-tag-area.html | 2 +- .../core-user-profile-field.html | 2 +- src/core/features/user/pages/about/about.html | 15 ++-- .../complete-profile/complete-profile.html | 4 +- .../user/pages/participants/participants.html | 20 ++---- .../features/user/pages/profile/profile.html | 36 +++++----- .../viewer/components/image/image.html | 8 +-- .../components/qr-scanner/qr-scanner.html | 5 +- .../features/viewer/components/text/text.html | 9 ++- .../features/viewer/pages/iframe/iframe.html | 4 +- 340 files changed, 2069 insertions(+), 2941 deletions(-) diff --git a/src/addons/badges/pages/issued-badge/issued-badge.html b/src/addons/badges/pages/issued-badge/issued-badge.html index 7a609db0b41..0cb85f6c714 100644 --- a/src/addons/badges/pages/issued-badge/issued-badge.html +++ b/src/addons/badges/pages/issued-badge/issued-badge.html @@ -1,7 +1,7 @@ - +

{{ badge.name }}

@@ -11,7 +11,7 @@

{{ 'addon.badges.badges' | translate }}

- + @@ -122,8 +122,7 @@

{{ 'addon.badges.badgedetails' | translate}}

{{ 'core.course' | translate}}

- - +

diff --git a/src/addons/badges/pages/user-badges/user-badges.html b/src/addons/badges/pages/user-badges/user-badges.html index d91a5e0e893..edc263c9903 100644 --- a/src/addons/badges/pages/user-badges/user-badges.html +++ b/src/addons/badges/pages/user-badges/user-badges.html @@ -1,7 +1,7 @@ - +

{{ 'addon.badges.badges' | translate }}

@@ -11,11 +11,10 @@

{{ 'addon.badges.badges' | translate }}

- + - - + {{ 'addon.block_activitymodules.pluginname' | translate }} - - + {{ entry.name }} diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html index 1a1f2e148bb..1c55aafb368 100644 --- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html +++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html @@ -7,16 +7,14 @@

{{ 'addon.block_myoverview.pluginname' | translate }}

- + {{prefetchCoursesData.badge}} - - +
@@ -26,8 +24,7 @@

{{ 'addon.block_myoverview.pluginname' | translate }}

- + (ionCancel)="filterTextChanged($event.target)" [placeholder]="'core.courses.filtermycourses' | translate" /> @@ -70,8 +67,7 @@

{{ 'addon.block_myoverview.pluginname' | translate }}

- + (ionCancel)="filterTextChanged($event.target)" [placeholder]="'core.courses.filtermycourses' | translate" /> {{ 'addon.block_myoverview.pluginname' | translate }} - + - +
@@ -114,8 +110,7 @@

{{ 'addon.block_myoverview.pluginname' | translate }}

{{'addon.block_myoverview.nocoursesenrolleddescription' | translate}}

- + @@ -128,8 +123,7 @@

{{ 'addon.block_myoverview.pluginname' | translate }}

- + [layout]="layout" /> diff --git a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html index ea4e9891aec..1b76456b0a6 100644 --- a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html +++ b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html @@ -3,21 +3,19 @@

{{ 'addon.block_recentlyaccessedcourses.pluginname' | translate }}

- - +
+ [message]="'addon.block_recentlyaccessedcourses.nocourses' | translate" />
- - +
diff --git a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html index 9d157d6d1d3..c72044e8706 100644 --- a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html +++ b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html @@ -3,8 +3,7 @@

{{ 'addon.block_recentlyaccesseditems.pluginname' | translate }}

- - +
@@ -16,18 +15,16 @@

{{ 'addon.block_recentlyaccesseditems.pluginname' | translate }}

- + [componentId]="item.cmid" [showAlt]="false" [purpose]="item.purpose" /> {{ item.iconTitle }}

+ [courseId]="item.courseid" />

- - +

@@ -38,6 +35,6 @@

{{ 'addon.block_recentlyaccesseditems.pluginname' | translate }}

+ [message]="'addon.block_recentlyaccesseditems.noitems' | translate" />
diff --git a/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html b/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html index 4b6d5b6bacc..6885e514612 100644 --- a/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html +++ b/src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html @@ -8,10 +8,10 @@

{{ 'addon.block_sitemainmenu.pluginname' | translate }}

+ [contextInstanceId]="siteHomeId" /> - +
diff --git a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html index debe61210ae..f022f3e2c30 100644 --- a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html +++ b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html @@ -3,21 +3,19 @@

{{ 'addon.block_starredcourses.pluginname' | translate }}

- - +
+ [message]="'addon.block_starredcourses.nocourses' | translate" />
- - +
diff --git a/src/addons/block/timeline/components/events/addon-block-timeline-events.html b/src/addons/block/timeline/components/events/addon-block-timeline-events.html index d84981b9629..8e31ce4baeb 100644 --- a/src/addons/block/timeline/components/events/addon-block-timeline-events.html +++ b/src/addons/block/timeline/components/events/addon-block-timeline-events.html @@ -2,8 +2,7 @@

{{ 'core.courses.aria:coursename' | translate }} - - +

@@ -23,15 +22,13 @@

{{ dayEvents.dayTimestamp * 1000 | coreFormatDat {{event.timesort * 1000 | coreFormatDate:"strftimetime24" }} - + [modname]="event.modulename" [purpose]="event.purpose" />

- + [contextInstanceId]="event.id" [courseId]="event.course?.id" /> {{ 'addon.block_timeline.overdue' | translate }} @@ -39,15 +36,13 @@

{{ dayEvents.dayTimestamp * 1000 | coreFormatDat

- + [contextInstanceId]="event.course.id" />

- + [contextInstanceId]="event.id" />

@@ -72,5 +67,5 @@

{{ dayEvents.dayTimestamp * 1000 | coreFormatDat {{ 'core.loadmore' | translate }} - +

diff --git a/src/addons/block/timeline/components/timeline/addon-block-timeline.html b/src/addons/block/timeline/components/timeline/addon-block-timeline.html index b20b7952dee..a5bc3a3123c 100644 --- a/src/addons/block/timeline/components/timeline/addon-block-timeline.html +++ b/src/addons/block/timeline/components/timeline/addon-block-timeline.html @@ -9,7 +9,7 @@

{{ 'addon.block_timeline.pluginname' | translate }}

+ searchArea="AddonBlockTimeline" /> @@ -31,7 +31,7 @@

{{ 'addon.block_timeline.pluginname' | translate }}

+ searchArea="AddonBlockTimeline" /> {{ 'addon.block_timeline.pluginname' | translate }} + [loadingMore]="data.loadingMore" (loadMore)="section.loadMore()" [course]="section.course" /> + [message]="'addon.block_timeline.noevents' | translate" />
diff --git a/src/addons/blog/pages/entries/entries.html b/src/addons/blog/pages/entries/entries.html index df97ac484d4..9fac4dfb2d0 100644 --- a/src/addons/blog/pages/entries/entries.html +++ b/src/addons/blog/pages/entries/entries.html @@ -1,37 +1,35 @@ - +

{{ title | translate }}

- +
- + {{ 'addon.blog.showonlyyourentries' | translate }} - + - - + - +

- + [contextInstanceId]="contextInstanceId" />

{{ 'addon.blog.' + entry.publishTranslated! | translate}} @@ -49,35 +47,32 @@

- + [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId" />
{{ 'core.tag.tags' | translate }}:
- +
- + [instanceId]="entry.userid" contextLevel="user" [showItem]="true" /> - + [componentId]="entry.id" /> {{ 'addon.blog.linktooriginalentry' | translate }}
- {{entry.lastmodified + {{entry.lastmodified | coreTimeAgo}}
- + diff --git a/src/addons/calendar/components/calendar/addon-calendar-calendar.html b/src/addons/calendar/components/calendar/addon-calendar-calendar.html index 02bab4b3b54..2d543551bc6 100644 --- a/src/addons/calendar/components/calendar/addon-calendar-calendar.html +++ b/src/addons/calendar/components/calendar/addon-calendar-calendar.html @@ -2,8 +2,7 @@ - + [content]="'addon.calendar.currentmonth' | translate" iconAction="fas-calendar-day" (action)="goToCurrentMonth()" /> @@ -14,19 +13,18 @@ - +

{{ periodName }} - - +

- +
@@ -50,8 +48,7 @@

- - + + [attr.aria-label]="'core.notsent' | translate" /> + [attr.aria-label]="'core.deletedoffline' | translate" /> {{ event.timestart * 1000 | coreFormatDate: timeFormat }} @@ -98,8 +95,7 @@

- - + diff --git a/src/addons/calendar/components/filter/filter.html b/src/addons/calendar/components/filter/filter.html index 65dee4fd4ab..365e7e72f79 100644 --- a/src/addons/calendar/components/filter/filter.html +++ b/src/addons/calendar/components/filter/filter.html @@ -2,7 +2,7 @@ - + @@ -10,18 +10,18 @@ - + - + - + - + diff --git a/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html b/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html index c16291fdce6..1224e95ef09 100644 --- a/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html +++ b/src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html @@ -1,6 +1,6 @@ - - + @@ -8,9 +8,8 @@ - + [componentId]="event.instance" [showAlt]="false" [purpose]="event.purpose" /> + diff --git a/src/addons/calendar/pages/day/day.html b/src/addons/calendar/pages/day/day.html index acdb943510d..373e65cdd42 100644 --- a/src/addons/calendar/pages/day/day.html +++ b/src/addons/calendar/pages/day/day.html @@ -1,30 +1,28 @@ - +

{{ 'addon.calendar.calendarevents' | translate }}

- + - + iconAction="fas-calendar-day" (action)="goToCurrentDay()" /> - + [closeOnClick]="false" />
- + @@ -34,7 +32,7 @@

{{ 'addon.calendar.calendarevents' | translate }}

- + @@ -42,7 +40,7 @@

{{ periodName }}

- +
@@ -54,14 +52,13 @@

{{ periodName }}

- + - + [message]="'addon.calendar.noevents' | translate" /> @@ -70,11 +67,9 @@

{{ periodName }}

(click)="gotoEvent(event.id, day)" [class.item-dimmed]="event.ispast" [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" button [detail]="false"> - + [modname]="event.modulename" [componentId]="event.instance" [purpose]="event.purpose" /> + aria-hidden="true" /> @@ -84,18 +79,18 @@

{{ periodName }}

+ [contextInstanceId]="event.contextInstanceId" />

- +

- + - +
@@ -111,7 +106,7 @@

{{ periodName }}

- + diff --git a/src/addons/calendar/pages/edit-event/edit-event.html b/src/addons/calendar/pages/edit-event/edit-event.html index 09a7028141d..f949796e813 100644 --- a/src/addons/calendar/pages/edit-event/edit-event.html +++ b/src/addons/calendar/pages/edit-event/edit-event.html @@ -1,7 +1,7 @@ - +

{{ title | translate }}

@@ -10,7 +10,7 @@

{{ title | translate }}

- + @@ -20,9 +20,8 @@

{{ title | translate }}

{{ 'addon.calendar.eventname' | translate }}

- - - + + @@ -31,9 +30,8 @@

{{ title | translate }}

{{ 'core.date' | translate }}

- - + [max]="maxDate" [min]="minDate" [displayTimezone]="displayTimezone" /> + @@ -108,7 +106,7 @@

{{ title | translate }}

- +
@@ -121,7 +119,7 @@

{{ title | translate }}

- + @@ -129,7 +127,7 @@

{{ title | translate }}

{{ reminder.label }}

- +
@@ -146,31 +144,30 @@

{{ title | translate }}

{{ 'addon.calendar.durationnone' | translate }}

- +

{{ 'addon.calendar.durationuntil' | translate }}

- +
- + - + [displayTimezone]="displayTimezone" />

{{ 'addon.calendar.durationminutes' | translate }}

- +
{{ 'addon.calendar.durationminutes' | translate }} + [placeholder]="'addon.calendar.durationminutes' | translate" formControlName="timedurationminutes" /> @@ -181,14 +178,13 @@

{{ title | translate }}

{{ 'addon.calendar.repeatevent' | translate }}

- +

{{ 'addon.calendar.repeatweeksl' | translate }}

- - +
@@ -204,13 +200,13 @@

{{ title | translate }}

{{ 'addon.calendar.repeateditall' | translate:{$a: otherEventsCount} }}

- +

{{ 'addon.calendar.repeateditthis' | translate }}

- +
@@ -222,7 +218,7 @@

{{ title | translate }}

+ [autoSave]="false" /> @@ -230,8 +226,7 @@

{{ title | translate }}

{{ 'core.location' | translate }}

- - +
diff --git a/src/addons/calendar/pages/event/event.html b/src/addons/calendar/pages/event/event.html index 81a83d325ae..1af4abd7504 100644 --- a/src/addons/calendar/pages/event/event.html +++ b/src/addons/calendar/pages/event/event.html @@ -1,42 +1,38 @@ - +

- - +

- + [iconAction]="syncIcon" [closeOnClick]="false" /> - + [content]="'core.edit' | translate" (action)="openEdit()" iconAction="fas-pen" /> + [content]="'core.delete' | translate" (action)="deleteEvent()" iconAction="fas-trash" /> + (action)="undoDelete()" iconAction="fas-rotate-left" />
- + - + [componentId]="event.instance" slot="start" [purpose]="event.purpose" /> + - +

{{ 'addon.calendar.when' | translate }}

- +
- {{ 'core.deletedoffline' | translate }} +
@@ -76,8 +71,7 @@

{{ 'core.course' | translate}}

- - +

@@ -85,8 +79,7 @@

{{ 'core.group' | translate}}

- - +

@@ -94,8 +87,7 @@

{{ 'core.category' | translate}}

- - +

@@ -104,7 +96,7 @@

{{ 'core.description' | translate}}

+ [contextInstanceId]="event.contextInstanceId" />

@@ -114,7 +106,7 @@

+ [contextInstanceId]="event.contextInstanceId" />

@@ -142,7 +134,7 @@

{{ 'addon.calendar.reminders' | translate }}

- +
diff --git a/src/addons/calendar/pages/index/index.html b/src/addons/calendar/pages/index/index.html index 39f92956398..6e3c382bb5e 100644 --- a/src/addons/calendar/pages/index/index.html +++ b/src/addons/calendar/pages/index/index.html @@ -1,55 +1,52 @@ - +

{{ (showCalendar ? 'addon.calendar.calendarevents' : 'addon.calendar.upcomingevents') | translate }}

- + + iconAction="fas-table-list" (action)="toggleDisplay()" /> + iconAction="fas-calendar-days" (action)="toggleDisplay()" /> - + iconAction="fas-gears" /> + [iconAction]="syncIcon" [closeOnClick]="false" /> - +
- + - + - + [displayNavButtons]="showCalendar" (onEventClicked)="gotoEvent($event)" (onDayClicked)="gotoDay($event)" /> - - + - + diff --git a/src/addons/calendar/pages/settings/settings.html b/src/addons/calendar/pages/settings/settings.html index d8982f79b1d..7ca79cf2851 100644 --- a/src/addons/calendar/pages/settings/settings.html +++ b/src/addons/calendar/pages/settings/settings.html @@ -1,7 +1,7 @@ - +

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

diff --git a/src/addons/competency/pages/competencies/competencies.html b/src/addons/competency/pages/competencies/competencies.html index 33b3afe4383..9a4b264c511 100644 --- a/src/addons/competency/pages/competencies/competencies.html +++ b/src/addons/competency/pages/competencies/competencies.html @@ -1,12 +1,11 @@ - +

- - +

@@ -14,7 +13,7 @@

- + @@ -24,8 +23,7 @@

- {{competency.competency.idnumber}} + [contextInstanceId]="contextInstanceId" /> {{competency.competency.idnumber}}

- +

- {{ competency.competency.competency.idnumber }} + [contextInstanceId]="contextInstanceId" /> {{ competency.competency.competency.idnumber }}

- + - +

{{ user.fullname }}

@@ -30,8 +29,7 @@

- + [contextInstanceId]="contextInstanceId" /> @@ -40,26 +38,22 @@

- + [contextInstanceId]="contextInstanceId" /> - + [contextInstanceId]="contextInstanceId" />  /  - + [contextInstanceId]="contextInstanceId" />  /  @@ -76,8 +70,7 @@

@@ -91,12 +84,10 @@

- - + - + [courseId]="courseId" /> @@ -136,7 +127,7 @@

{{ 'addon.competency.evidence' | translate }}< - +

{{ evidence.actionuser.fullname }}

{{ evidence.timemodified * 1000 | coreFormatDate }}

diff --git a/src/addons/competency/pages/competencysummary/competencysummary.html b/src/addons/competency/pages/competencysummary/competencysummary.html index 3c354f39f18..7271d983c1f 100644 --- a/src/addons/competency/pages/competencysummary/competencysummary.html +++ b/src/addons/competency/pages/competencysummary/competencysummary.html @@ -1,28 +1,26 @@ - +

- {{ competency.competency.idnumber }} + [contextInstanceId]="contextInstanceId" /> {{ competency.competency.idnumber }}

- + - + [contextInstanceId]="contextInstanceId" /> @@ -30,14 +28,12 @@

{{ 'addon.competency.path' | translate }}

- + [contextInstanceId]="contextInstanceId" />  / 

diff --git a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html index 687d8f88c01..1547cbb80b6 100644 --- a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html +++ b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html @@ -1,7 +1,7 @@ - +

{{ 'addon.competency.coursecompetencies' | translate }}

@@ -10,7 +10,7 @@

{{ 'addon.competency.coursecompetencies' | translate }}

- + @@ -29,8 +29,7 @@

{{ 'addon.competency.coursecompetencies' | translate }}

{x: courseCompetencies.statistics.proficientcompetencycount, y: courseCompetencies.statistics.competencycount} } }} - + ariaDescribedBy="addon-competency-course-{{courseId}}-progress" /> {{ 'addon.competency.coursecompetencies' | translate }}

{{ 'addon.competency.competenciesmostoftennotproficientincourse' | translate }}

@@ -52,15 +51,14 @@

- +

{{ user.fullname }}

- + message="{{ 'addon.competency.nocompetenciesincourse' | translate }}" />
@@ -68,8 +66,8 @@

- - {{competency.competency.idnumber}} + {{competency.competency.idnumber}}

- + [contextInstanceId]="courseId" />

{{ 'addon.competency.path' | translate }}

@@ -90,24 +87,20 @@

- + [contextInstanceId]="courseId" /> - + [contextInstanceId]="courseId" />  /  - - +  /  @@ -126,12 +119,10 @@

- - + - + [courseId]="courseId" />

@@ -143,8 +134,7 @@

- - +

diff --git a/src/addons/competency/pages/plan/plan.html b/src/addons/competency/pages/plan/plan.html index 8bbcd992dbe..be91b266e2b 100644 --- a/src/addons/competency/pages/plan/plan.html +++ b/src/addons/competency/pages/plan/plan.html @@ -1,25 +1,24 @@ - +

- - +

- + - +

{{ user.fullname }}

@@ -29,8 +28,7 @@

- - +

@@ -50,8 +48,7 @@

{{ 'addon.competency.template' | translate }}

- - +

@@ -64,8 +61,7 @@

- + ariaDescribedBy="addon-competency-plan-{{plan.plan.id}}-progress" /> @@ -85,8 +81,7 @@

- {{competency.competency.idnumber}} + [contextInstanceId]="plan.plan.userid" /> {{competency.competency.idnumber}}

- +

{{ 'addon.competency.userplans' | translate }}

@@ -11,19 +11,16 @@

{{ 'addon.competency.userplans' | translate }}

- + - - - +

- - +

{{ 'addon.competency.duedate' | translate }}:  diff --git a/src/addons/coursecompletion/pages/report/report.html b/src/addons/coursecompletion/pages/report/report.html index d31d01da690..b94dd47639e 100644 --- a/src/addons/coursecompletion/pages/report/report.html +++ b/src/addons/coursecompletion/pages/report/report.html @@ -1,7 +1,7 @@ - +

{{ 'addon.coursecompletion.coursecompletion' | translate }}

@@ -10,11 +10,11 @@

{{ 'addon.coursecompletion.coursecompletion' | translate }}

- + - +

{{user.fullname}}

@@ -44,10 +44,10 @@

{{ 'addon.coursecompletion.requiredcriteria' | translate }}

- +

- +

{{ 'core.yes' | translate }} @@ -65,23 +65,23 @@

{{ 'addon.coursecompletion.requiredcriteria' | translate }}

- + - + - + - + {{ 'core.yes' | translate }} {{ 'core.no' | translate }} {{ criteria.timecompleted * 1000 | coreFormatDate :'strftimedatetimeshort' }} - +
@@ -103,7 +103,7 @@

{{ 'addon.coursecompletion.manualselfcompletion' | translate }}

- + diff --git a/src/addons/messageoutput/airnotifier/pages/devices/devices.html b/src/addons/messageoutput/airnotifier/pages/devices/devices.html index 2a84773ea15..ffecacf6987 100644 --- a/src/addons/messageoutput/airnotifier/pages/devices/devices.html +++ b/src/addons/messageoutput/airnotifier/pages/devices/devices.html @@ -1,7 +1,7 @@ - +

{{ 'addon.messageoutput_airnotifier.processorsettingsdesc' | translate }}

@@ -10,7 +10,7 @@

{{ 'addon.messageoutput_airnotifier.processorsettingsdesc' | translate }} - + @@ -33,8 +33,7 @@

{{ platform.platform }}

- - + diff --git a/src/addons/messages/components/conversation-info/conversation-info.html b/src/addons/messages/components/conversation-info/conversation-info.html index 8d53b3dce3d..1e8b058d312 100644 --- a/src/addons/messages/components/conversation-info/conversation-info.html +++ b/src/addons/messages/components/conversation-info/conversation-info.html @@ -5,14 +5,14 @@

{{ 'addon.messages.groupinfo' | translate }}

- + - + @@ -23,12 +23,11 @@

{{ 'addon.messages.groupinfo' | translate }}

onError="this.src='assets/img/group-avatar.svg'">

- +

- + [contextInstanceId]="0" />

{{ 'addon.messages.numparticipants' | translate:{$a: conversation.membercount} }}

@@ -36,19 +35,16 @@

- - +

{{ member.fullname }} - + [attr.aria-label]="'addon.messages.contactblocked' | translate" />

- - + diff --git a/src/addons/messages/pages/contacts-35/contacts.html b/src/addons/messages/pages/contacts-35/contacts.html index 4086c4c08f8..209e2893016 100644 --- a/src/addons/messages/pages/contacts-35/contacts.html +++ b/src/addons/messages/pages/contacts-35/contacts.html @@ -1,32 +1,32 @@ - +

{{ 'addon.messages.contacts' | translate }}

- +
- + + autocorrect="off" spellcheck="false" lengthCheck="2" [disabled]="!loaded" searchArea="AddonMessagesContacts" /> + [message]="'addon.messages.contactlistempty' | translate" /> + [message]="'addon.messages.nousersfound' | translate" /> @@ -44,7 +44,7 @@

{{ 'addon.messages.contacts' | translate }}

*ngIf="contact.profileimageurl || contact.profileimageurlsmall" [attr.aria-label]="contact.fullname" (click)="gotoDiscussion(contact.id)" [detail]="true" button [attr.aria-current]="contact.id === discussionUserId ? 'page' : 'false'"> - +

{{ contact.fullname }}

diff --git a/src/addons/messages/pages/contacts/contacts.html b/src/addons/messages/pages/contacts/contacts.html index 5903b00eee4..613d674f083 100644 --- a/src/addons/messages/pages/contacts/contacts.html +++ b/src/addons/messages/pages/contacts/contacts.html @@ -1,17 +1,17 @@ - +

{{ 'addon.messages.contacts' | translate }}

- + - +
@@ -23,7 +23,7 @@

{{ 'addon.messages.contacts' | translate }}

- + @@ -31,27 +31,22 @@

{{ 'addon.messages.contacts' | translate }}

*ngFor="let contact of confirmedContacts" [attr.aria-label]="contact.fullname" [detail]="true" [attr.aria-current]="contact.id === selectedUserId ? 'page' : 'false'"> - + [linkProfile]="false" />

- - + - + [attr.aria-label]="'addon.messages.contactblocked' | translate" />

- + [message]="'addon.messages.nocontactsgetstarted' | translate" /> - + position="bottom" />
@@ -61,17 +56,16 @@

{{ 'addon.messages.contacts' | translate }}

badgeA11yText="addon.messages.pendingcontactrequests"> - + - + - - +

{{ 'addon.messages.wouldliketocontactyou' | translate }}

@@ -79,11 +73,9 @@

{{ 'addon.messages.contacts' | translate }}

- + [message]="'addon.messages.nocontactrequests' | translate" /> - + position="bottom" />
diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html index 3a6610ec046..db3c2711258 100644 --- a/src/addons/messages/pages/discussion/discussion.html +++ b/src/addons/messages/pages/discussion/discussion.html @@ -1,67 +1,57 @@ - +

- - + [checkOnline]="otherMember.showonlinestatus" /> + - + [attr.aria-label]="'core.favourites' | translate" /> - + [attr.aria-label]="'addon.messages.mutedconversation' | translate" />

- +
+ [content]="'addon.messages.info' | translate" (action)="viewInfo()" iconAction="fas-circle-info" /> - + [content]="'addon.messages.groupinfo' | translate" (action)="viewInfo()" iconAction="fas-circle-info" /> - + 'addon.messages.addtofavourites') | translate" [iconAction]="favouriteIcon" [iconSlash]="favouriteIconSlash" /> - + [content]="'addon.messages.blockuser' | translate" (action)="blockUser()" [iconAction]="blockIcon" /> - + [content]="'addon.messages.unblockuser' | translate" (action)="unblockUser()" [iconAction]="blockIcon" /> + 'addon.messages.muteconversation') | translate" [iconAction]="muteIcon" /> - + [content]="'addon.messages.showdeletemessages' | translate" iconAction="toggle" [(toggle)]="showDelete" /> + [closeOnClick]="false" [iconAction]="deleteIcon" /> - + [content]="'addon.messages.addtoyourcontacts' | translate" (action)="createContactRequest()" [iconAction]="addRemoveIcon" /> + [iconSlash]="true" />
- - +

{{ 'addon.messages.selfconversation' | translate }}

@@ -78,25 +68,23 @@

{{ 'addon.messages.newmessages' | translate }} - + - + [time]="message.timecreated" /> - + [message]="'addon.messages.nomessagesfound' | translate" /> - + {{ newMessages }} @@ -138,6 +126,6 @@

+ [placeholder]="'addon.messages.newmessage' | translate" /> diff --git a/src/addons/messages/pages/discussions-35/discussions.html b/src/addons/messages/pages/discussions-35/discussions.html index a778f18f281..8995fb3cd77 100644 --- a/src/addons/messages/pages/discussions-35/discussions.html +++ b/src/addons/messages/pages/discussions-35/discussions.html @@ -1,27 +1,27 @@ - +

{{ 'addon.messages.messages' | translate }}

- - + +
- + + [autoFocus]="false" /> @@ -29,7 +29,7 @@

{{ 'addon.messages.messages' | translate }}

- +
diff --git a/src/addons/messages/pages/group-conversations/group-conversations.html b/src/addons/messages/pages/group-conversations/group-conversations.html index 7a9af7157b9..de0dd6db5ad 100644 --- a/src/addons/messages/pages/group-conversations/group-conversations.html +++ b/src/addons/messages/pages/group-conversations/group-conversations.html @@ -1,34 +1,34 @@ - +

{{ 'addon.messages.messages' | translate }}

- + - + - - + +
- + - +
- - + + [error]="favourites.loadMoreError" />

{{ 'addon.messages.nofavourites' | translate }}

@@ -68,7 +66,7 @@

{{ 'core.favourites' | translate }} ({{ favourites.count }})

- + @@ -77,8 +75,7 @@

{{ 'core.favourites' | translate }} ({{ favourites.count }})

[attr.aria-label]="(group.expanded ? 'core.collapse' : 'core.expand') | translate" [attr.aria-expanded]="group.expanded" aria-controls="addon-messages-groupconversations-group" role="heading" [detail]="false"> + [class.expandable-status-icon-expanded]="group.expanded" />

{{ 'addon.messages.groupconversations' | translate }} ({{ group.count }})

@@ -89,11 +86,10 @@

{{ 'addon.messages.groupconversations' | translate }} ({{ group.count }})
- - + + [error]="group.loadMoreError" />

{{ 'addon.messages.nogroupconversations' | translate }}

@@ -102,7 +98,7 @@

{{ 'addon.messages.groupconversations' | translate }} ({{ group.count }}) - + @@ -111,8 +107,7 @@

{{ 'addon.messages.groupconversations' | translate }} ({{ group.count }}) + [class.expandable-status-icon-expanded]="individual.expanded" />

{{ 'addon.messages.individualconversations' | translate }} ({{ individual.count }})

@@ -123,11 +118,10 @@

{{ 'addon.messages.individualconversations' | translate }} ({{ individual.co
- - + + [error]="individual.loadMoreError" />

{{ 'addon.messages.noindividualconversations' | translate }}

@@ -136,7 +130,7 @@

{{ 'addon.messages.individualconversations' | translate }} ({{ individual.co

- + @@ -148,9 +142,9 @@

{{ 'addon.messages.individualconversations' | translate }} ({{ individual.co @@ -161,16 +155,15 @@

{{ 'addon.messages.individualconversations' | translate }} ({{ individual.co + [checkOnline]="conversation.showonlinestatus" slot="start" />

- - - - - + + +

@@ -183,7 +176,7 @@

{{ 'addon.messages.individualconversations' | translate }} ({{ individual.co

- +

@@ -192,7 +185,7 @@

{{ 'addon.messages.individualconversations' | translate }} ({{ individual.co {{ conversation.members[0].fullname + ':' }} + contextLevel="system" [contextInstanceId]="0" />

diff --git a/src/addons/messages/pages/search/search.html b/src/addons/messages/pages/search/search.html index 933c0b2bba6..60fa3c1ca2e 100644 --- a/src/addons/messages/pages/search/search.html +++ b/src/addons/messages/pages/search/search.html @@ -1,35 +1,34 @@ - +

{{ 'addon.messages.searchcombined' | translate }}

- +
+ [spellcheck]="false" [autoFocus]="true" [lengthCheck]="1" searchArea="AddonMessagesSearch" /> - - - + + + + [error]="messages.loadMoreError" /> - + icon="fas-magnifying-glass" [message]="'core.noresults' | translate" /> @@ -46,13 +45,11 @@

{{ item.titleString | translate }}

- +

- - - - + +

{{result.lastmessagedate | coreDateDayOrTime}} @@ -62,7 +59,7 @@

{{ item.titleString | translate }}

{{ 'addon.messages.you' | translate }} + contextLevel="system" [contextInstanceId]="0" class="addon-message-last-message-text" />

@@ -75,7 +72,7 @@

{{ item.titleString | translate }}

- +
diff --git a/src/addons/messages/pages/settings/settings.html b/src/addons/messages/pages/settings/settings.html index fe58ac7960c..c5c8a9c4060 100644 --- a/src/addons/messages/pages/settings/settings.html +++ b/src/addons/messages/pages/settings/settings.html @@ -1,7 +1,7 @@ - +

{{ 'addon.messages.messages' | translate }}

@@ -10,7 +10,7 @@

{{ 'addon.messages.messages' | translate }}

- + @@ -25,7 +25,7 @@

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

{{ 'addon.messages.useentertosend' | translate }}

- + @@ -36,8 +36,7 @@

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

{{ 'addon.messages.blocknoncontacts' | translate }}

- - + @@ -51,19 +50,19 @@

{{ 'addon.messages.contactableprivacy' | translate }}

{{ 'addon.messages.contactableprivacy_onlycontacts' | translate }}

- +

{{ 'addon.messages.contactableprivacy_coursemember' | translate }}

- +

{{ 'addon.messages.contactableprivacy_site' | translate }}

- +
@@ -72,10 +71,10 @@

{{ 'addon.messages.contactableprivacy' | translate }}

- + - +
@@ -109,8 +108,7 @@

{{ notification.displayname }}

- + (ngModelChange)="changePreferenceLegacy(notification, processor, state)" /> {{'core.settings.forced' | translate }} @@ -145,8 +143,7 @@

{{ 'addon.notifications.notificationpreferences' | translate }}

- - + {{ processor.lockedmessage }} diff --git a/src/addons/mod/assign/components/edit-feedback-modal/edit-feedback-modal.html b/src/addons/mod/assign/components/edit-feedback-modal/edit-feedback-modal.html index 38aa16a832f..174c766bdea 100644 --- a/src/addons/mod/assign/components/edit-feedback-modal/edit-feedback-modal.html +++ b/src/addons/mod/assign/components/edit-feedback-modal/edit-feedback-modal.html @@ -5,15 +5,14 @@

{{ plugin.name }}

- +
- - + {{ 'core.done' | translate }}
diff --git a/src/addons/mod/assign/components/feedback-plugin/addon-mod-assign-feedback-plugin.html b/src/addons/mod/assign/components/feedback-plugin/addon-mod-assign-feedback-plugin.html index 3a61b78e2ff..81d2f09e0b6 100644 --- a/src/addons/mod/assign/components/feedback-plugin/addon-mod-assign-feedback-plugin.html +++ b/src/addons/mod/assign/components/feedback-plugin/addon-mod-assign-feedback-plugin.html @@ -9,12 +9,10 @@

{{ plugin.name }}

- + contextLevel="module" [contextInstanceId]="assign.cmid" [courseId]="assign.course" />

- + [alwaysDownload]="true" /> diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html index 3f65bb593e8..cef08233177 100644 --- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html +++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html @@ -1,7 +1,7 @@ - + @@ -12,8 +12,7 @@
- - +
@@ -21,8 +20,7 @@ - - + @@ -115,19 +113,17 @@ - +
- - +
- + [moduleId]="module.id" /> diff --git a/src/addons/mod/assign/components/submission-plugin/addon-mod-assign-submission-plugin.html b/src/addons/mod/assign/components/submission-plugin/addon-mod-assign-submission-plugin.html index 29818a878c0..389c7ed5310 100644 --- a/src/addons/mod/assign/components/submission-plugin/addon-mod-assign-submission-plugin.html +++ b/src/addons/mod/assign/components/submission-plugin/addon-mod-assign-submission-plugin.html @@ -9,12 +9,10 @@

{{ plugin.name }}

- + contextLevel="module" [contextInstanceId]="assign.cmid" [courseId]="assign.course" />

- + [alwaysDownload]="true" /> 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 fc5a166545f..a0f9a4e701a 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 @@ -3,7 +3,7 @@ - + @@ -136,8 +135,7 @@ - + [submission]="userSubmission" [plugin]="plugin" /> @@ -149,7 +147,7 @@

{{ 'addon.mod_assign.userswhoneedtosubmit' | translate: {$a: ''} }}

- +

{{ user.fullname }}

@@ -213,7 +211,7 @@

{{ 'addon.mod_assign.userswhoneedtosubmit' | translate: {$a: ''} }}

{{ 'core.openinbrowser' | translate }} - +
@@ -229,10 +227,9 @@

{{ 'addon.mod_assign.userswhoneedtosubmit' | translate: {$a: ''} }}

- + - - + @@ -253,8 +250,7 @@

{{ 'addon.mod_assign.userswhoneedtosubmit' | translate: {$a: ''} }}

- - + @@ -268,12 +264,12 @@

{{ 'addon.mod_assign.userswhoneedtosubmit' | translate: {$a: ''} }}

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

- +

- + @@ -285,8 +281,7 @@

{{ 'addon.mod_assign.userswhoneedtosubmit' | translate: {$a: ''} }}

{{ 'addon.mod_assign.gradeoutof' | translate: {$a: gradeInfo!.grade} }}

- + [lang]="grade.lang" />

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

@@ -345,8 +340,7 @@

{{ 'addon.mod_assign.userswhoneedtosubmit' | translate: {$a: ''} }}

- + [submission]="userSubmission" [userId]="submitId" [plugin]="plugin" [canEdit]="canSaveGrades" /> @@ -363,7 +357,7 @@

{{ 'addon.mod_assign.userswhoneedtosubmit' | translate: {$a: ''} }}

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

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

- + @@ -387,14 +381,14 @@

{{ 'addon.mod_assign.userswhoneedtosubmit' | translate: {$a: ''} }}

{{ 'addon.mod_assign.addattempt' | translate }} - +
- +

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

{{ grader!.fullname }}

@@ -413,12 +407,12 @@

{{ 'addon.mod_assign.userswhoneedtosubmit' | translate: {$a: ''} }}

- + @@ -434,8 +428,7 @@

{{ 'addon.mod_assign.userswhoneedtosubmit' | translate: {$a: ''} }}

- + [wsNotFiltered]="true" />

- + [contextInstanceId]="assign.cmid" [courseId]="assign.course" />

- +
- {{ 'core.notsent' | translate }} +
@@ -25,6 +24,5 @@

{{ plugin.name }}

{{ plugin.name }} - + elementId="assignfeedbackcomments_editor" [draftExtraParams]="{userid: userId, action: 'grade'}" /> diff --git a/src/addons/mod/assign/feedback/editpdf/component/addon-mod-assign-feedback-editpdf.html b/src/addons/mod/assign/feedback/editpdf/component/addon-mod-assign-feedback-editpdf.html index d50b9ae85db..e3facd7a1de 100644 --- a/src/addons/mod/assign/feedback/editpdf/component/addon-mod-assign-feedback-editpdf.html +++ b/src/addons/mod/assign/feedback/editpdf/component/addon-mod-assign-feedback-editpdf.html @@ -3,8 +3,8 @@

{{plugin.name}}

- - +
diff --git a/src/addons/mod/assign/feedback/file/component/addon-mod-assign-feedback-file.html b/src/addons/mod/assign/feedback/file/component/addon-mod-assign-feedback-file.html index d50b9ae85db..e3facd7a1de 100644 --- a/src/addons/mod/assign/feedback/file/component/addon-mod-assign-feedback-file.html +++ b/src/addons/mod/assign/feedback/file/component/addon-mod-assign-feedback-file.html @@ -3,8 +3,8 @@

{{plugin.name}}

- - +
diff --git a/src/addons/mod/assign/pages/edit/edit.html b/src/addons/mod/assign/pages/edit/edit.html index 9b1cecbaa8f..a054156414f 100644 --- a/src/addons/mod/assign/pages/edit/edit.html +++ b/src/addons/mod/assign/pages/edit/edit.html @@ -1,12 +1,11 @@ - +

- - +

@@ -22,38 +21,33 @@

- + [underTimeClassThresholds]="[300, 900]" /> - + [contextInstanceId]="moduleId" [courseId]="courseId" /> - - +
- - + - + - + [submission]="userSubmission" [plugin]="plugin" [edit]="true" [allowOffline]="allowOffline" />
diff --git a/src/addons/mod/assign/pages/index/index.html b/src/addons/mod/assign/pages/index/index.html index 0ee3bc5a826..4bcdb2e5217 100644 --- a/src/addons/mod/assign/pages/index/index.html +++ b/src/addons/mod/assign/pages/index/index.html @@ -1,24 +1,21 @@ - +

- - +

- - - +
- + - + diff --git a/src/addons/mod/assign/pages/submission-list/submission-list.html b/src/addons/mod/assign/pages/submission-list/submission-list.html index dfc60842153..2dc9b43e2ed 100644 --- a/src/addons/mod/assign/pages/submission-list/submission-list.html +++ b/src/addons/mod/assign/pages/submission-list/submission-list.html @@ -1,35 +1,33 @@ - +

- - +

- +
- + - + [courseId]="courseId" /> - +

{{submission.userfullname}}

@@ -37,8 +35,7 @@

- - + @@ -68,8 +65,7 @@

- + [message]="'addon.mod_assign.submissionstatus_' | translate" /> diff --git a/src/addons/mod/assign/pages/submission-review/submission-review.html b/src/addons/mod/assign/pages/submission-review/submission-review.html index 370086cb05f..fe477e7153f 100644 --- a/src/addons/mod/assign/pages/submission-review/submission-review.html +++ b/src/addons/mod/assign/pages/submission-review/submission-review.html @@ -1,16 +1,15 @@ - +

- - +

- +
@@ -21,10 +20,9 @@

- + - - + diff --git a/src/addons/mod/assign/submission/comments/component/addon-mod-assign-submission-comments.html b/src/addons/mod/assign/submission/comments/component/addon-mod-assign-submission-comments.html index 912151506f2..aeb861c1168 100644 --- a/src/addons/mod/assign/submission/comments/component/addon-mod-assign-submission-comments.html +++ b/src/addons/mod/assign/submission/comments/component/addon-mod-assign-submission-comments.html @@ -2,7 +2,6 @@

{{plugin.name}}

- + area="submission_comments" [title]="plugin.name" [courseId]="assign.course" />
diff --git a/src/addons/mod/assign/submission/file/component/addon-mod-assign-submission-file.html b/src/addons/mod/assign/submission/file/component/addon-mod-assign-submission-file.html index 9dff2e4d5f1..5e4e45293b8 100644 --- a/src/addons/mod/assign/submission/file/component/addon-mod-assign-submission-file.html +++ b/src/addons/mod/assign/submission/file/component/addon-mod-assign-submission-file.html @@ -3,7 +3,7 @@

{{ plugin.name }}

- +
@@ -16,6 +16,5 @@

{{ plugin.name }}

- + [component]="component" [componentId]="assign.cmid" [acceptedTypes]="acceptedTypes" [allowOffline]="allowOffline" /> diff --git a/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html b/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html index b417a128610..80ee1064970 100644 --- a/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html +++ b/src/addons/mod/assign/submission/onlinetext/component/addon-mod-assign-submission-onlinetext.html @@ -5,8 +5,7 @@

{{ plugin.name }}

{{ 'addon.mod_assign.numwords' | translate: {'$a': words} }}

- + [contextInstanceId]="assign.cmid" [courseId]="assign.course" />

@@ -29,7 +28,6 @@

{{ plugin.name }}

- + [draftExtraParams]="{userid: currentUserId, action: 'editsubmission'}" /> diff --git a/src/addons/mod/bigbluebuttonbn/components/index/index.html b/src/addons/mod/bigbluebuttonbn/components/index/index.html index bb1d82c2581..eb5ae623d75 100644 --- a/src/addons/mod/bigbluebuttonbn/components/index/index.html +++ b/src/addons/mod/bigbluebuttonbn/components/index/index.html @@ -1,7 +1,7 @@ - + @@ -10,12 +10,10 @@ - + [courseId]="courseId" (completionChanged)="onCompletionChange()" /> - + [multipleGroupsMessage]="'addon.mod_bigbluebuttonbn.view_groups_selection_warning' | translate" [courseId]="module.course" /> @@ -78,7 +76,7 @@ - + @@ -94,8 +92,7 @@

{{ 'addon.mod_bigbluebuttonbn.view_section_title_recordings' | translate }}< + [class.expandable-status-icon-expanded]="recording.expanded" />

{{ recording.type }}

{{ recording.name }}

@@ -113,7 +110,7 @@

{{ 'addon.mod_bigbluebuttonbn.view_section_title_recordings' | translate }}<

{{ playback.name }}

- +