From 94ec1c973455d7f64062c1dfe013ec2901102a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Mon, 31 May 2021 11:13:05 +0200 Subject: [PATCH 1/5] MOBILE-3320 core: Improve inline loading styles --- .../addon-block-activitymodules.html | 2 +- .../myoverview/addon-block-myoverview.html | 2 +- .../addon-block-recentlyaccessedcourses.html | 2 +- .../addon-block-recentlyaccesseditems.html | 2 +- .../addon-block-sitemainmenu.html | 2 +- .../addon-block-starredcourses.html | 2 +- .../timeline/addon-block-timeline.html | 6 +- .../messages/pages/discussion/discussion.html | 2 +- .../addon-mod-assign-submission.html | 2 +- .../post-options-menu/post-options-menu.html | 2 +- src/core/components/loading/core-loading.html | 6 +- src/core/components/loading/loading.scss | 62 ++++++++++++------- .../core-block-course-blocks.html | 2 +- .../core-block-pre-rendered.html | 2 +- .../components/comments/core-comments.html | 2 +- .../courses/pages/my-courses/my-courses.html | 2 +- .../core-siteplugins-plugin-content.html | 2 +- 17 files changed, 57 insertions(+), 45 deletions(-) diff --git a/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html b/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html index fbd46e52c..c23efa667 100644 --- a/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html +++ b/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html @@ -3,7 +3,7 @@

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

- + 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 405246a1f..87fb9b52f 100644 --- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html +++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html @@ -36,7 +36,7 @@ - +
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 e5cc1f9e0..e65ea9c0d 100644 --- a/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html +++ b/src/addons/block/recentlyaccessedcourses/components/recentlyaccessedcourses/addon-block-recentlyaccessedcourses.html @@ -20,7 +20,7 @@
- + 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 4990142ad..f63f935a5 100644 --- a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html +++ b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html @@ -5,7 +5,7 @@ - +
{{ 'addon.block_sitemainmenu.pluginname' | translate }} - + 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 21147e0c5..b207895af 100644 --- a/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html +++ b/src/addons/block/starredcourses/components/starredcourses/addon-block-starredcourses.html @@ -20,7 +20,7 @@
- + 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 fcba46bf8..f8d82393d 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 @@ - +
@@ -35,12 +35,12 @@
- + + [fullscreen]="false" class="safe-area-page margin"> diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html index 2d0b64d50..cffcc0f16 100644 --- a/src/addons/messages/pages/discussion/discussion.html +++ b/src/addons/messages/pages/discussion/discussion.html @@ -128,7 +128,7 @@ + [attr.aria-label]="'addon.messages.newmessages' | translate"> {{ newMessages }} 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 ddc9d6b2c..09d1c6416 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 @@ -1,4 +1,4 @@ - + + diff --git a/src/core/components/loading/core-loading.html b/src/core/components/loading/core-loading.html index 2bffacab4..7f5006545 100644 --- a/src/core/components/loading/core-loading.html +++ b/src/core/components/loading/core-loading.html @@ -1,8 +1,6 @@
- + +

{{message}}

diff --git a/src/core/components/loading/loading.scss b/src/core/components/loading/loading.scss index 2cb4ac8ea..ba0bcd3d6 100644 --- a/src/core/components/loading/loading.scss +++ b/src/core/components/loading/loading.scss @@ -4,35 +4,44 @@ --loading-background: var(--ion-background-color); --loading-spinner: var(--ion-color-primary); --loading-text-color: var(--ion-text-color); + --loading-inline-margin: 0; + --loading-inline-min-height: 28px; position: static; color: var(--loading-text-color); + &.margin { + --loading-inline-margin: 10px; + } + + &.core-loading-loaded { + --loading-inline-margin: 0; + --loading-inline-min-height: 0; + } + ion-spinner { --color: var(--loading-spinner); color: var(--color); } - > .core-loading-container { + .core-loading-container { position: absolute; @include position(0, 0, 0, 0); - display: table; + display: flex; height: 100%; width: 100%; - text-align: center; - clear: both; + justify-content: center; + align-items: center; + flex-direction: column; z-index: 3; margin: 0; - padding: 10px 0 0 0; + padding: 0; background-color: var(--loading-background); - -webkit-transition: all 200ms ease-in-out; - transition: all 200ms ease-in-out; + @include core-transition(all, 200ms); + } - .core-loading-spinner { - display: table-cell; - text-align: center; - vertical-align: middle; - } + .core-loading-message { + @include margin(10px, 0, 0, 0); } .core-loading-content { @@ -48,21 +57,26 @@ } &.core-loading-inline { - display: block; - - .core-loading-container { - padding-top: 20px; - position: relative; - } - } - - &.core-loading-loaded.core-loading-inline { + --loading-background: transparent; position: relative; - min-height: 102px; + display: block; + min-height: var(--loading-inline-min-height); + margin-top: var(--loading-inline-margin); + margin-bottom: var(--loading-inline-margin); + + .core-loading-message { + @include margin(0, 0, 0, 10px); + } .core-loading-container { - padding-top: 10px; - position: absolute; + flex-direction: row; } } } + +:host-context(ion-item) { + &.core-loading-inline { + position: static; + display: block; + } +} diff --git a/src/core/features/block/components/course-blocks/core-block-course-blocks.html b/src/core/features/block/components/course-blocks/core-block-course-blocks.html index 120e60749..74e57a9b2 100644 --- a/src/core/features/block/components/course-blocks/core-block-course-blocks.html +++ b/src/core/features/block/components/course-blocks/core-block-course-blocks.html @@ -3,7 +3,7 @@
- + diff --git a/src/core/features/block/components/pre-rendered-block/core-block-pre-rendered.html b/src/core/features/block/components/pre-rendered-block/core-block-pre-rendered.html index 46b579a07..f1cf8b8d4 100644 --- a/src/core/features/block/components/pre-rendered-block/core-block-pre-rendered.html +++ b/src/core/features/block/components/pre-rendered-block/core-block-pre-rendered.html @@ -7,7 +7,7 @@ - + +
{{ 'core.comments.commentscount' | translate : {'$a': commentsCount} }}
diff --git a/src/core/features/courses/pages/my-courses/my-courses.html b/src/core/features/courses/pages/my-courses/my-courses.html index dcb81531f..e48166389 100644 --- a/src/core/features/courses/pages/my-courses/my-courses.html +++ b/src/core/features/courses/pages/my-courses/my-courses.html @@ -12,7 +12,7 @@ + (click)="prefetchCourses()" [attr.aria-label]="'core.courses.downloadcourses' | translate"> + From 49f6cc56e55a503c696102946f73a4b3b96be0f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Mon, 31 May 2021 12:28:58 +0200 Subject: [PATCH 2/5] MOBILE-3320 a11y: Improve non button clicks --- .../badges/pages/user-badges/user-badges.html | 2 +- .../addon-block-activitymodules.html | 2 +- src/addons/blog/pages/entries/entries.html | 16 ++-- .../addon-calendar-upcoming-events.html | 2 +- src/addons/calendar/pages/day/day.html | 2 +- .../calendar/pages/edit-event/edit-event.html | 6 +- src/addons/calendar/pages/index/index.page.ts | 5 +- src/addons/calendar/pages/list/list.html | 2 +- .../pages/competencies/competencies.html | 2 +- .../pages/competency/competency.html | 65 ++++++++-------- .../competencysummary/competencysummary.html | 14 ++-- .../coursecompetencies.html | 51 +++++++------ src/addons/competency/pages/plan/plan.html | 30 ++++---- .../competency/pages/planlist/planlist.html | 2 +- .../messages/pages/discussion/discussion.html | 5 +- .../pages/discussion/discussion.page.ts | 2 +- .../pages/discussions-35/discussions.html | 4 +- .../index/addon-mod-assign-index.html | 3 +- .../submission-list/submission-list.html | 2 +- .../addon-mod-assign-submission-comments.html | 2 +- src/addons/mod/book/components/toc/toc.html | 8 +- .../mod/chat/pages/sessions/sessions.html | 11 ++- .../addon-mod-data-field-plugin.html | 3 +- .../index/addon-mod-data-index.html | 18 +++-- src/addons/mod/data/components/index/index.ts | 19 ++++- src/addons/mod/data/data.scss | 8 +- .../addon-mod-data-field-picture.html | 4 +- .../data/fields/picture/component/picture.ts | 7 ++ src/addons/mod/data/pages/entry/entry.html | 13 ++-- src/addons/mod/data/services/data-helper.ts | 2 +- .../discussion-options-menu.html | 26 ++++--- .../mod/forum/components/index/index.html | 2 +- .../post-options-menu/post-options-menu.html | 18 ++--- .../mod/glossary/pages/entry/entry.html | 11 +-- .../attempt-results/attempt-results.html | 12 +-- .../pages/user-attempts/user-attempts.html | 2 +- .../index/addon-mod-imscp-index.html | 2 +- src/addons/mod/imscp/components/toc/toc.html | 7 +- .../index/addon-mod-lesson-index.html | 2 +- .../navigation-modal/navigation-modal.html | 2 +- .../index/addon-mod-scorm-index.html | 4 +- src/addons/mod/wiki/components/map/map.html | 4 +- src/core/components/combobox/combobox.scss | 1 + .../context-menu/context-menu-popover.scss | 14 +++- .../core-context-menu-popover.html | 4 +- .../tabs-outlet/core-tabs-outlet.html | 4 +- src/core/components/tabs/core-tabs.html | 4 +- src/core/directives/format-text.ts | 8 ++ src/core/directives/link.ts | 76 +++++++++++++------ .../components/comments/comments.scss | 4 - .../comments/components/comments/comments.ts | 5 +- .../components/comments/core-comments.html | 35 +++++++-- .../tag-area/core-course-tag-area.html | 2 +- .../course/pages/preview/preview.html | 5 +- .../core-courses-course-list-item.html | 2 +- .../features/grades/pages/course/course.html | 4 +- .../features/grades/pages/course/course.scss | 31 +++++--- .../login/pages/credentials/credentials.html | 2 +- .../login/pages/reconnect/reconnect.html | 2 +- .../features/login/pages/sites/sites.html | 2 +- .../features/mainmenu/pages/more/more.html | 2 +- .../features/settings/pages/site/site.html | 22 +++--- .../sharedfiles/components/list/list.html | 2 +- .../core-siteplugins-module-index.html | 2 +- src/core/features/tag/pages/index/index.html | 3 +- .../user/pages/participants/participants.html | 2 +- src/theme/components/format-text.scss | 2 + src/theme/theme.base.scss | 39 +++++++--- 68 files changed, 401 insertions(+), 282 deletions(-) delete mode 100644 src/core/features/comments/components/comments/comments.scss diff --git a/src/addons/badges/pages/user-badges/user-badges.html b/src/addons/badges/pages/user-badges/user-badges.html index 965f35d70..a04a3e761 100644 --- a/src/addons/badges/pages/user-badges/user-badges.html +++ b/src/addons/badges/pages/user-badges/user-badges.html @@ -18,7 +18,7 @@ + (click)="badges.select(badge)" [attr.aria-current]="badges.getItemAriaCurrent(badge)" detail="true"> diff --git a/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html b/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html index c23efa667..1f39261b4 100644 --- a/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html +++ b/src/addons/block/activitymodules/components/activitymodules/addon-block-activitymodules.html @@ -4,7 +4,7 @@ - {{ entry.name }} diff --git a/src/addons/blog/pages/entries/entries.html b/src/addons/blog/pages/entries/entries.html index 94e0fb5e2..73b15a137 100644 --- a/src/addons/blog/pages/entries/entries.html +++ b/src/addons/blog/pages/entries/entries.html @@ -54,22 +54,18 @@ - - - - - - + + - + {{ 'addon.blog.linktooriginalentry' | translate }} - - + + {{entry.lastmodified | coreTimeAgo}} 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 46de2aacf..315e8e624 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 @@ -5,7 +5,7 @@ + [ngClass]="['addon-calendar-eventtype-'+event.eventtype]" detail="true"> - {{ 'addon.competency.activities' | translate }} +

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

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

@@ -87,13 +90,13 @@ - {{ 'addon.competency.reviewstatus' | translate }} - {{ competency.usercompetency!.statusname }} +

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

+

{{ competency.usercompetency!.statusname }}

 - {{ 'addon.competency.proficient' | translate }} +

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

 {{ 'core.yes' | translate }} @@ -104,7 +107,7 @@ - {{ 'addon.competency.rating' | translate }} +

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

 {{ userCompetency.gradename }} diff --git a/src/addons/competency/pages/competencysummary/competencysummary.html b/src/addons/competency/pages/competencysummary/competencysummary.html index f497b008c..664344804 100644 --- a/src/addons/competency/pages/competencysummary/competencysummary.html +++ b/src/addons/competency/pages/competencysummary/competencysummary.html @@ -23,11 +23,15 @@ - {{ 'addon.competency.path' | translate }} - {{ competency.comppath.framework.name }} - -  / {{ ancestor.name }} - +

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

+

{{ competency.comppath.framework.name }} + +  /  + + +

diff --git a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html index ad3af37bb..de2b0bb59 100644 --- a/src/addons/competency/pages/coursecompetencies/coursecompetencies.html +++ b/src/addons/competency/pages/coursecompetencies/coursecompetencies.html @@ -34,11 +34,11 @@ - {{ 'addon.competency.competenciesmostoftennotproficientincourse' | translate }}: +

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

- +

@@ -63,7 +63,7 @@ [attr.aria-label]="competency.competency.shortname" detail="true" button>

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

- {{ 'addon.competency.path' | translate }} - - {{ competency.comppath.framework.name }} - - - {{ competency.comppath.framework.name }} - -  /  - - - {{ ancestor.name }} +

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

+

+ + {{ competency.comppath.framework.name }} - {{ ancestor.name }} -  /  - + + {{ competency.comppath.framework.name }} + +  /  + + + {{ ancestor.name }} +  /  + +

- {{ 'addon.competency.uponcoursecompletion' | translate }} +

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

{{ ruleoutcome.text }}
- {{ 'addon.competency.activities' | translate }} +

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

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

@@ -121,7 +124,7 @@
- {{ 'addon.competency.userplans' | translate }} +

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

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

diff --git a/src/addons/competency/pages/plan/plan.html b/src/addons/competency/pages/plan/plan.html index 0331c370a..edebcf7ba 100644 --- a/src/addons/competency/pages/plan/plan.html +++ b/src/addons/competency/pages/plan/plan.html @@ -23,37 +23,35 @@ - - +

+ + +

-

- {{ 'addon.competency.status' | translate }}: {{ plan.plan.statusname }} -

+

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

+

{{ plan.plan.statusname }}

 -

- {{ 'addon.competency.duedate' | translate }}: - {{ plan.plan.duedate * 1000 | coreFormatDate }} -

+

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

+

{{ plan.plan.duedate * 1000 | coreFormatDate }}

 -

- {{ 'addon.competency.template' | translate }}: {{ plan.plan.template.shortname }} -

+

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

+

{{ plan.plan.template.shortname }}

 - -

- {{ 'addon.competency.progress' | translate }}: + +

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

+

{{ 'addon.competency.xcompetenciesproficientoutofy' | translate: {$a: {x: plan.proficientcompetencycount, y: plan.competencycount} } }}

diff --git a/src/addons/competency/pages/planlist/planlist.html b/src/addons/competency/pages/planlist/planlist.html index b25476471..1b037fe48 100644 --- a/src/addons/competency/pages/planlist/planlist.html +++ b/src/addons/competency/pages/planlist/planlist.html @@ -17,7 +17,7 @@ + (click)="plans.select(plan)" [attr.aria-current]="plans.getItemAriaCurrent(plan)" button detail="true">

{{ plan.name }}

diff --git a/src/addons/messages/pages/discussion/discussion.html b/src/addons/messages/pages/discussion/discussion.html index cffcc0f16..55faa023b 100644 --- a/src/addons/messages/pages/discussion/discussion.html +++ b/src/addons/messages/pages/discussion/discussion.html @@ -8,10 +8,9 @@ alt="" onError="this.src='assets/img/group-avatar.png'" core-external-content role="presentation" [siteId]="siteId || null"> + [linkProfile]="false" [checkOnline]="otherMember.showonlinestatus"> - + diff --git a/src/addons/messages/pages/discussion/discussion.page.ts b/src/addons/messages/pages/discussion/discussion.page.ts index 8bec7da83..a9531d9b0 100644 --- a/src/addons/messages/pages/discussion/discussion.page.ts +++ b/src/addons/messages/pages/discussion/discussion.page.ts @@ -1302,7 +1302,7 @@ export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterView async viewInfo(): Promise { if (this.isGroup) { // Display the group information. - const userId = await CoreDomUtils.openModal({ + const userId = await CoreDomUtils.openSideModal({ component: AddonMessagesConversationInfoComponent, componentProps: { conversationId: this.conversationId, diff --git a/src/addons/messages/pages/discussions-35/discussions.html b/src/addons/messages/pages/discussions-35/discussions.html index 7340b0c1a..36e69fa31 100644 --- a/src/addons/messages/pages/discussions-35/discussions.html +++ b/src/addons/messages/pages/discussions-35/discussions.html @@ -23,7 +23,7 @@ - + @@ -40,7 +40,7 @@ + [attr.aria-current]="result.userid == discussionUserId ? 'page' : 'false'" detail="false">

{{ result.fullname }}

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 57360cf57..d992ec91a 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 @@ -40,7 +40,8 @@ + contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId" + (onClick)="expandDescription($event)"> 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 b8c02f174..e79b970bb 100644 --- a/src/addons/mod/assign/pages/submission-list/submission-list.html +++ b/src/addons/mod/assign/pages/submission-list/submission-list.html @@ -40,7 +40,7 @@ + [attr.aria-current]="submissions.getItemAriaCurrent(submission)" detail="true">

{{submission.userfullname}}

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 565702191..882718fc8 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 @@ -1,4 +1,4 @@ - +

{{plugin.name}}

+ [class.item-dimmed]="chapter.hidden" detail="false"> -

- {{chapter.indexNumber}} - • +

+ {{chapter.indexNumber}}  + •  diff --git a/src/addons/mod/chat/pages/sessions/sessions.html b/src/addons/mod/chat/pages/sessions/sessions.html index cdd256681..c574fd6a8 100644 --- a/src/addons/mod/chat/pages/sessions/sessions.html +++ b/src/addons/mod/chat/pages/sessions/sessions.html @@ -30,7 +30,7 @@ - @@ -47,11 +47,10 @@ -

- - {{ 'core.showmore' | translate }} - -
+ + {{ 'core.showmore' | translate }} + diff --git a/src/addons/mod/data/components/field-plugin/addon-mod-data-field-plugin.html b/src/addons/mod/data/components/field-plugin/addon-mod-data-field-plugin.html index 44e4d82a5..c738b7d01 100644 --- a/src/addons/mod/data/components/field-plugin/addon-mod-data-field-plugin.html +++ b/src/addons/mod/data/components/field-plugin/addon-mod-data-field-plugin.html @@ -1,5 +1,4 @@ - - + diff --git a/src/addons/mod/data/components/index/addon-mod-data-index.html b/src/addons/mod/data/components/index/addon-mod-data-index.html index 14a74c9a1..6485aa73f 100644 --- a/src/addons/mod/data/components/index/addon-mod-data-index.html +++ b/src/addons/mod/data/components/index/addon-mod-data-index.html @@ -103,16 +103,18 @@ - - - {{ 'addon.mod_data.resetsettings' | translate}} + + + {{ 'addon.mod_data.resetsettings' | translate}} - - -

- + + + +

+ + @@ -144,7 +146,7 @@ - {{ 'addon.mod_data.resetsettings' | translate}} + diff --git a/src/addons/mod/data/components/index/index.ts b/src/addons/mod/data/components/index/index.ts index fc1e1d686..4f27405a5 100644 --- a/src/addons/mod/data/components/index/index.ts +++ b/src/addons/mod/data/components/index/index.ts @@ -48,6 +48,8 @@ import { AddonModDataPrefetchHandler } from '../../services/handlers/prefetch'; import { AddonModDataComponentsCompileModule } from '../components-compile.module'; import { AddonModDataSearchComponent } from '../search/search'; +const contentToken = ''; + /** * Component that displays a data index page. */ @@ -318,12 +320,22 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp if (!this.isEmpty) { this.entries = (entries.offlineEntries || []).concat(entries.entries); - let entriesHTML = AddonModDataHelper.getTemplate( + let headerAndFooter = AddonModDataHelper.getTemplate( this.database!, AddonModDataTemplateType.LIST_HEADER, this.fieldsArray, ); + headerAndFooter += contentToken; + + headerAndFooter += AddonModDataHelper.getTemplate( + this.database!, + AddonModDataTemplateType.LIST_FOOTER, + this.fieldsArray, + ); + + headerAndFooter = CoreDomUtils.fixHtml(headerAndFooter); + // Get first entry from the whole list. if (!this.search.searching || !this.firstEntry) { this.firstEntry = this.entries[0].id; @@ -331,6 +343,8 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp const template = AddonModDataHelper.getTemplate(this.database!, AddonModDataTemplateType.LIST, this.fieldsArray); + let entriesHTML = ''; + const entriesById: Record = {}; this.entries.forEach((entry, index) => { entriesById[entry.id] = entry; @@ -349,9 +363,8 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp actions, ); }); - entriesHTML += AddonModDataHelper.getTemplate(this.database!, AddonModDataTemplateType.LIST_FOOTER, this.fieldsArray); - this.entriesRendered = CoreDomUtils.fixHtml(entriesHTML); + this.entriesRendered = headerAndFooter.replace(contentToken, entriesHTML); // Pass the input data to the component. this.jsData = { diff --git a/src/addons/mod/data/data.scss b/src/addons/mod/data/data.scss index 59fe03bd5..6b7862a8d 100644 --- a/src/addons/mod/data/data.scss +++ b/src/addons/mod/data/data.scss @@ -12,6 +12,10 @@ $grid-column-paddings: ( xl: var(--ion-grid-column-padding-xl, $grid-column-padding) ) !default; +:host { + --border-color: var(--gray); +} + .addon-data-contents { overflow: visible; white-space: normal; @@ -19,9 +23,7 @@ $grid-column-paddings: ( padding: 16px; background-color: var(--ion-item-background); - border-width: 1px 0; - border-style: solid; - border-color: var(--gray-dark); + border-bottom: 1px solid var(--border-color); ::ng-deep { table, tbody { diff --git a/src/addons/mod/data/fields/picture/component/addon-mod-data-field-picture.html b/src/addons/mod/data/fields/picture/component/addon-mod-data-field-picture.html index edfd06cfe..d00754fdc 100644 --- a/src/addons/mod/data/fields/picture/component/addon-mod-data-field-picture.html +++ b/src/addons/mod/data/fields/picture/component/addon-mod-data-field-picture.html @@ -14,9 +14,9 @@ - + diff --git a/src/addons/mod/data/fields/picture/component/picture.ts b/src/addons/mod/data/fields/picture/component/picture.ts index fe7cad78a..af3cdafcd 100644 --- a/src/addons/mod/data/fields/picture/component/picture.ts +++ b/src/addons/mod/data/fields/picture/component/picture.ts @@ -138,4 +138,11 @@ export class AddonModDataFieldPictureComponent extends AddonModDataFieldPluginCo } } + /** + * Navigate to the entry. + */ + navigateEntry(): void { + this.gotoEntry.emit(this.entryId); + } + } diff --git a/src/addons/mod/data/pages/entry/entry.html b/src/addons/mod/data/pages/entry/entry.html index 36ae9d58c..9229f6c15 100644 --- a/src/addons/mod/data/pages/entry/entry.html +++ b/src/addons/mod/data/pages/entry/entry.html @@ -37,7 +37,7 @@ -
+
- - - - - - + + diff --git a/src/addons/mod/data/services/data-helper.ts b/src/addons/mod/data/services/data-helper.ts index 566504941..ee4ef04e3 100644 --- a/src/addons/mod/data/services/data-helper.ts +++ b/src/addons/mod/data/services/data-helper.ts @@ -658,7 +658,7 @@ export class AddonModDataHelperProvider { // Add core-link directive to links. template = template.replace( /]*href="[^>]*)>/ig, - (match, attributes) => '', + (match, attributes) => ' diff --git a/src/addons/mod/wiki/components/map/map.html b/src/addons/mod/wiki/components/map/map.html index d76be6836..3a205d1c8 100644 --- a/src/addons/mod/wiki/components/map/map.html +++ b/src/addons/mod/wiki/components/map/map.html @@ -12,7 +12,7 @@