EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2782 from NoelDeMartin/MOBILE-3751 

MOBILE-3751: Headings a11y
main
Pau Ferrer Ocaña 2021-05-21 09:24:40 +02:00 committed by GitHub
parent 90aaa8f9d4 10849facc7
commit f0155f9121
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
175 changed files with 410 additions and 341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/moodle.code-snippets vendored
View File

@ -7,7 +7,7 @@
"",
"@Component({",
" selector: '$2${TM_FILENAME_BASE}',",
" templateUrl: '${TM_FILENAME_BASE}.html',",
" templateUrl: '$2${TM_FILENAME_BASE}.html',",
"})",
"export class ${1:${TM_FILENAME_BASE}}Component {",
"",

4
src/addons/badges/pages/issued-badge/issued-badge.html
View File

@ -3,8 +3,8 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title *ngIf="badge">{{ badge.name }}</ion-title>
<ion-title *ngIf="!badge">{{ 'addon.badges.badges' | translate }}</ion-title>
<h1 *ngIf="badge">{{ badge.name }}</h1>
<h1 *ngIf="!badge">{{ 'addon.badges.badges' | translate }}</h1>
</ion-toolbar>
</ion-header>
<ion-content>

4
src/addons/badges/pages/user-badges/user-badges.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ 'addon.badges.badges' | translate }}</ion-title>
<h1>{{ 'addon.badges.badges' | translate }}</h1>
</ion-toolbar>
</ion-header>
<ion-content>
@ -23,7 +23,7 @@
<img [src]="badge.badgeurl" [alt]="badge.name" core-external-content>
</ion-avatar>
<ion-label>
<h2>{{ badge.name }}</h2>
<p class="item-heading">{{ badge.name }}</p>
<p>{{ badge.dateissued * 1000 | coreFormatDate :'strftimedatetimeshort' }}</p>
</ion-label>
<ion-badge slot="end" color="danger" *ngIf="badge.dateexpire && currentTime >= badge.dateexpire">

4
src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html
View File

@ -21,10 +21,10 @@
<ion-label>
<!-- Add the icon title so accessibility tools read it. -->
<span class="sr-only" *ngIf="item.iconTitle">{{ item.iconTitle }}</span>
<h2>
<p class="item-heading">
<core-format-text [text]="item.name" contextLevel="module" [contextInstanceId]="item.cmid"
[courseId]="item.courseid"></core-format-text>
</h2>
</p>
<p>
<core-format-text [text]="item.coursename" contextLevel="course" [contextInstanceId]="item.courseid">
</core-format-text>

6
src/addons/block/timeline/components/events/addon-block-timeline-events.html
View File

@ -1,6 +1,6 @@
<ion-item-group *ngFor="let dayEvents of filteredEvents">
<ion-item-divider [color]="dayEvents.color">
<ion-label><h2>{{ dayEvents.dayTimestamp * 1000 | coreFormatDate:"strftimedayshort" }}</h2></ion-label>
<ion-label><h3>{{ dayEvents.dayTimestamp * 1000 | coreFormatDate:"strftimedayshort" }}</h3></ion-label>
</ion-item-divider>
<ng-container *ngFor="let event of dayEvents.events">
<ion-item class="ion-text-wrap core-course-module-handler item-media" detail="false" (click)="action($event, event.url)"
@ -9,11 +9,11 @@
<ion-label>
<!-- Add the icon title so accessibility tools read it. -->
<span class="sr-only" *ngIf="event.iconTitle">{{ event.iconTitle }}</span>
<h2>
<p class="item-heading">
<core-format-text [text]="event.name" contextLevel="module" [contextInstanceId]="event.id"
[courseId]="event.course && event.course.id">
</core-format-text>
</h2>
</p>
<p *ngIf="showCourse && event.course">
<core-format-text [text]="event.course.fullnamedisplay" contextLevel="course"
[contextInstanceId]="event.course.id">

6
src/addons/blog/pages/entries/entries.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ title | translate }}</ion-title>
<h1>{{ title | translate }}</h1>
<ion-buttons slot="end"></ion-buttons>
</ion-toolbar>
</ion-header>
@ -24,14 +24,14 @@
<ion-item class="ion-text-wrap">
<core-user-avatar [user]="entry.user" slot="start" [courseId]="entry.courseid"></core-user-avatar>
<ion-label>
<h2>
<p class="item-heading">
<core-format-text [text]="entry.subject" [contextLevel]="contextLevel"
[contextInstanceId]="contextInstanceId">
</core-format-text>
<ion-note class="ion-float-end ion-padding-left ion-text-end">
{{ 'addon.blog.' + entry.publishTranslated! | translate}}
</ion-note>
</h2>
</p>
<p>
<ion-note class="ion-float-end ion-padding-left ion-text-end">
{{entry.created | coreDateDayOrTime}}

2
src/addons/calendar/components/calendar/addon-calendar-calendar.html
View File

@ -18,7 +18,7 @@
</ion-button>
</ion-col>
<ion-col class="ion-text-center addon-calendar-period">
<h3 id="addon-calendar-monthname">{{ periodName }}</h3>
<h2 id="addon-calendar-monthname">{{ periodName }}</h2>
</ion-col>
<ion-col class="ion-text-end" *ngIf="canNavigate">
<ion-button fill="clear" (click)="loadNext()" [attr.aria-label]="'core.next' | translate">

6
src/addons/calendar/components/upcoming-events/addon-calendar-upcoming-events.html
View File

@ -16,8 +16,10 @@
{{ 'addon.calendar.type' + event.formattedType | translate }}
<span class="sr-only" *ngIf="event.moduleIcon && event.iconTitle">{{ event.iconTitle }}</span>
</span>
<h2><core-format-text [text]="event.name" [contextLevel]="event.contextLevel"
[contextInstanceId]="event.contextInstanceId"></core-format-text></h2>
<p class="item-heading">
<core-format-text [text]="event.name" [contextLevel]="event.contextLevel"
[contextInstanceId]="event.contextInstanceId"></core-format-text>
</p>
<p [innerHTML]="event.formattedtime"></p>
</ion-label>
<ion-note *ngIf="event.offline && !event.deleted" slot="end">

8
src/addons/calendar/pages/day/day.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ 'addon.calendar.calendarevents' | translate }}</ion-title>
<h1>{{ 'addon.calendar.calendarevents' | translate }}</h1>
<ion-buttons slot="end">
<ion-button fill="clear" (click)="openFilter($event)" [attr.aria-label]="'core.filter' | translate">
<ion-icon slot="icon-only" name="fas-filter" aria-hidden="true"></ion-icon>
@ -71,8 +71,10 @@
{{ 'addon.calendar.type' + event.formattedType | translate }}
<span class="sr-only" *ngIf="event.moduleIcon && event.iconTitle">{{ event.iconTitle }}</span>
</span>
<h2><core-format-text [text]="event.name" [contextLevel]="event.contextLevel"
[contextInstanceId]="event.contextInstanceId"></core-format-text></h2>
<p class="item-heading">
<core-format-text [text]="event.name" [contextLevel]="event.contextLevel"
[contextInstanceId]="event.contextInstanceId"></core-format-text>
</p>
<p [innerHTML]="event.formattedtime"></p>
</ion-label>
<ion-note *ngIf="event.offline && !event.deleted" slot="end">

2
src/addons/calendar/pages/edit-event/edit-event.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ title | translate }}</ion-title>
<h1>{{ title | translate }}</h1>
</ion-toolbar>
</ion-header>
<ion-content>

4
src/addons/calendar/pages/event/event.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title *ngIf="event">
<h1 *ngIf="event">
<img *ngIf="event.moduleIcon" src="{{event.moduleIcon}}" alt="" role="presentation" class="core-module-icon">
<ion-icon *ngIf="event.eventIcon && !event.moduleIcon" [name]="event.eventIcon" aria-hidden="true"></ion-icon>
<!-- Add the icon title so accessibility tools read it. -->
@ -13,7 +13,7 @@
</span>
<core-format-text [text]="event.name" [contextLevel]="event.contextLevel"
[contextInstanceId]="event.contextInstanceId"></core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<!-- The context menu will be added in here. -->
</ion-buttons>

2
src/addons/calendar/pages/event/event.scss
View File

@ -2,7 +2,7 @@
ion-card ion-note {
font-size: 1.6rem;
}
ion-title ion-icon, ion-title img {
h1 ion-icon, h1 img {
margin-left: 10px;
margin-right: 10px;
}

2
src/addons/calendar/pages/index/index.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ (showCalendar ? 'addon.calendar.calendarevents' : 'addon.calendar.upcomingevents') | translate }}</ion-title>
<h1>{{ (showCalendar ? 'addon.calendar.calendarevents' : 'addon.calendar.upcomingevents') | translate }}</h1>
<ion-buttons slot="end">
<ion-button fill="clear" (click)="openFilter($event)" [attr.aria-label]="'core.filter' | translate">
<ion-icon slot="icon-only" name="fas-filter" aria-hidden="true"></ion-icon>

8
src/addons/calendar/pages/list/list.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ 'addon.calendar.calendarevents' | translate }}</ion-title>
<h1>{{ 'addon.calendar.calendarevents' | translate }}</h1>
<ion-buttons slot="end">
<ion-button fill="clear" (click)="openFilter($event)" [attr.aria-label]="'core.filter' | translate">
<ion-icon slot="icon-only" name="fas-filter" aria-hidden="true"></ion-icon>
@ -40,7 +40,7 @@
<ion-list *ngIf="filteredEvents && filteredEvents.length" class="ion-no-margin">
<ng-container *ngFor="let event of filteredEvents">
<ion-item-divider *ngIf="event.showDate">
<ion-label><h2>{{ event.timestart * 1000 | coreFormatDate: "strftimedayshort" }}</h2></ion-label>
<ion-label><p class="item-heading">{{ event.timestart * 1000 | coreFormatDate: "strftimedayshort" }}</p></ion-label>
</ion-item-divider>
<ion-item class="addon-calendar-event ion-text-wrap" [attr.aria-label]="event.name" (click)="gotoEvent(event.id)"
[attr.aria-current]="event.id == eventId ? 'page' : 'false'"
@ -51,7 +51,7 @@
aria-hidden="true">
</ion-icon>
<ion-label>
<h2>
<p class="item-heading">
<!-- Add the icon title so accessibility tools read it. -->
<span class="sr-only">
{{ 'addon.calendar.type' + event.formattedType | translate }}
@ -60,7 +60,7 @@
<core-format-text [text]="event.name" [contextLevel]="event.contextLevel"
[contextInstanceId]="event.contextInstanceId">
</core-format-text>
</h2>
</p>
<p>
{{ event.timestart * 1000 | coreFormatDate: "strftimetime" }}
<span *ngIf="event.timeduration && event.endsSameDay">

2
src/addons/calendar/pages/settings/settings.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ 'core.settings.settings' | translate }}</ion-title>
<h1>{{ 'core.settings.settings' | translate }}</h1>
</ion-toolbar>
</ion-header>
<ion-content>

4
src/addons/competency/pages/competencies/competencies.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ title }}</ion-title>
<h1>{{ title }}</h1>
</ion-toolbar>
</ion-header>
<ion-content>
@ -17,7 +17,7 @@
[attr.aria-label]="competency.competency.shortname" (click)="competencies.select(competency)"
[attr.aria-current]="competencies.getItemAriaCurrent(competency)" button>
<ion-label>
<h2>{{ competency.competency.shortname }} <em>{{competency.competency.idnumber}}</em></h2>
<p class="item-heading">{{ competency.competency.shortname }} <em>{{competency.competency.idnumber}}</em></p>
</ion-label>
<ion-badge slot="end" *ngIf="competency.usercompetency"
[color]="competency.usercompetency.proficiency ? 'success' : 'danger'">

6
src/addons/competency/pages/competency/competency.html
View File

@ -3,9 +3,9 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title *ngIf="competency">
<h1 *ngIf="competency">
{{ competency.competency.competency.shortname }} <small>{{ competency.competency.competency.idnumber }}</small>
</ion-title>
</h1>
</ion-toolbar>
</ion-header>
<ion-content>
@ -121,7 +121,7 @@
[courseId]="courseId">
<core-user-avatar [user]="evidence.actionuser" slot="start"></core-user-avatar>
<ion-label>
<h2>{{ evidence.actionuser.fullname }}</h2>
<p class="item-heading">{{ evidence.actionuser.fullname }}</p>
<p>{{ evidence.timemodified * 1000 | coreFormatDate }}</p>
</ion-label>
</ion-item>

4
src/addons/competency/pages/competencysummary/competencysummary.html
View File

@ -3,9 +3,9 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title *ngIf="competency">
<h1 *ngIf="competency">
{{ competency.competency.shortname }} <small>{{ competency.competency.idnumber }}</small>
</ion-title>
</h1>
</ion-toolbar>
</ion-header>
<ion-content>

10
src/addons/competency/pages/coursecompetencies/coursecompetencies.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ 'addon.competency.coursecompetencies' | translate }}</ion-title>
<h1>{{ 'addon.competency.coursecompetencies' | translate }}</h1>
</ion-toolbar>
</ion-header>
<ion-content>
@ -44,9 +44,9 @@
</ion-item>
</ion-card>
<h3 class="ion-margin-horizontal" *ngIf="competencies && competencies.statistics.competencycount > 0">
<h2 class="ion-margin-horizontal" *ngIf="competencies && competencies.statistics.competencycount > 0">
{{ 'addon.competency.coursecompetencies' | translate }}
</h3>
</h2>
<ion-card *ngIf="user">
<ion-item class="ion-text-wrap">
<core-user-avatar [user]="user" slot="start"></core-user-avatar>
@ -62,7 +62,9 @@
<ion-item class="ion-text-wrap" (click)="openCompetency(competency.competency.id)"
[attr.aria-label]="competency.competency.shortname" detail="true" button>
<ion-label>
<h2><strong>{{competency.competency.shortname}} <em>{{competency.competency.idnumber}}</em></strong></h2>
<p class="item-heading">
<strong>{{competency.competency.shortname}} <em>{{competency.competency.idnumber}}</em></strong>
</p>
</ion-label>
<ion-badge slot="end" *ngIf="competency.usercompetencycourse && competency.usercompetencycourse.gradename"
[color]="competency.usercompetencycourse.proficiency ? 'success' : 'danger'">

6
src/addons/competency/pages/plan/plan.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title *ngIf="plan">{{plan.plan.name}}</ion-title>
<h1 *ngIf="plan">{{plan.plan.name}}</h1>
</ion-toolbar>
</ion-header>
<ion-content>
@ -78,7 +78,9 @@
<ion-item class="ion-text-wrap" *ngFor="let competency of plan.competencies"
(click)="openCompetency(competency.competency.id)"
[attr.aria-label]="competency.competency.shortname" detail="true" button>
<ion-label><h2>{{competency.competency.shortname}} <em>{{competency.competency.idnumber}}</em></h2></ion-label>
<ion-label>
<p class="item-heading">{{competency.competency.shortname}} <em>{{competency.competency.idnumber}}</em></p>
</ion-label>
<ion-badge *ngIf="competency.usercompetencyplan" slot="end"
[color]="competency.usercompetencyplan.proficiency ? 'success' : 'danger'">
{{ competency.usercompetencyplan.gradename }}

4
src/addons/competency/pages/planlist/planlist.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ 'addon.competency.userplans' | translate }}</ion-title>
<h1>{{ 'addon.competency.userplans' | translate }}</h1>
</ion-toolbar>
</ion-header>
<ion-content>
@ -19,7 +19,7 @@
<ion-item class="ion-text-wrap" *ngFor="let plan of plans.items" [attr.aria-label]="plan.name"
(click)="plans.select(plan)" [attr.aria-current]="plans.getItemAriaCurrent(plan)" button>
<ion-label>
<h2>{{ plan.name }}</h2>
<p class="item-heading">{{ plan.name }}</p>
<p *ngIf="plan.duedate > 0">
{{ 'addon.competency.duedate' | translate }}:&nbsp;
{{ plan.duedate * 1000 | coreFormatDate :'strftimedatetimeshort' }}

6
src/addons/coursecompletion/pages/report/report.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ 'addon.coursecompletion.coursecompletion' | translate }}</ion-title>
<h1>{{ 'addon.coursecompletion.coursecompletion' | translate }}</h1>
</ion-toolbar>
</ion-header>
<ion-content>
@ -32,7 +32,9 @@
</ion-item-divider>
<ion-item class="ion-hide-md-up ion-text-wrap" *ngFor="let criteria of completion.completions">
<ion-label>
<h2><core-format-text clean="true" [text]="criteria.details.criteria" [filter]="false"></core-format-text></h2>
<p class="item-heading">
<core-format-text clean="true" [text]="criteria.details.criteria" [filter]="false"></core-format-text>
</p>
<p><core-format-text clean="true" [text]="criteria.details.requirement" [filter]="false"></core-format-text></p>
</ion-label>
<strong slot="end">{{ criteria.status }}</strong>

2
src/addons/messageoutput/airnotifier/pages/devices/devices.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ 'addon.messageoutput_airnotifier.processorsettingsdesc' | translate }}</ion-title>
<h1>{{ 'addon.messageoutput_airnotifier.processorsettingsdesc' | translate }}</h1>
</ion-toolbar>
</ion-header>
<ion-content>

6
src/addons/messages/components/conversation-info/conversation-info.html
View File

@ -1,6 +1,6 @@
<ion-header>
<ion-toolbar>
<ion-title>{{ 'addon.messages.groupinfo' | translate }}</ion-title>
<h2>{{ 'addon.messages.groupinfo' | translate }}</h2>
<ion-buttons slot="end">
<ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
<ion-icon name="fas-times" slot="icon-only" aria-hidden="true"></ion-icon>
@ -37,12 +37,12 @@
<core-user-avatar [user]="member" [linkProfile]="false" [checkOnline]="member.showonlinestatus" slot="start">
</core-user-avatar>
<ion-label>
<h2>
<p class="item-heading">
{{ member.fullname }}
<ion-icon name="fas-user-slash" *ngIf="member.isblocked"
[attr.aria-label]="'addon.messages.contactblocked' | translate">
</ion-icon>
</h2>
</p>
</ion-label>
</ion-item>

6
src/addons/messages/messages-common.scss
View File

@ -6,7 +6,7 @@
margin-left: 0;
}
h2 {
.item-heading {
core-format-text {
font-weight: bold;
}
@ -52,7 +52,7 @@
}
.addon-message-discussion {
h2 {
.item-heading {
margin-top: 10px;
}
}
@ -66,7 +66,7 @@
:host-context([dir=rtl]) {
.addon-messages-conversation-item,
.addon-message-discussion {
h2 ion-icon {
.item-heading ion-icon {
margin-right: 2px;
margin-left: 0;
}

6
src/addons/messages/pages/contacts-35/contacts.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ 'addon.messages.contacts' | translate }}</ion-title>
<h1>{{ 'addon.messages.contacts' | translate }}</h1>
<ion-buttons slot="end">
<!-- Add an empty context menu so discussion page can add items in split view,
otherwise the menu disappears in some cases. -->
@ -31,7 +31,7 @@
<ion-list *ngFor="let contactType of contactTypes" class="ion-no-margin">
<ng-container *ngIf="contacts[contactType] && (contacts[contactType].length > 0 || contactType === searchType)">
<ion-item-divider>
<ion-label><h2>{{ 'addon.messages.type_' + contactType | translate }}</h2></ion-label>
<ion-label><p class="item-heading">{{ 'addon.messages.type_' + contactType | translate }}</p></ion-label>
<ion-note slot="end" class="ion-padding-end"><ion-badge>{{ contacts[contactType].length }}</ion-badge></ion-note>
</ion-item-divider>
<ng-container *ngFor="let contact of contacts[contactType]">
@ -41,7 +41,7 @@
[attr.aria-label]="contact.fullname" (click)="gotoDiscussion(contact.id)" detail="true" button
[attr.aria-current]="contact.id == discussionUserId ? 'page' : 'false'">
<core-user-avatar [user]="contact" slot="start" [checkOnline]="contact.showonlinestatus"></core-user-avatar>
<ion-label><h2>{{ contact.fullname }}</h2></ion-label>
<ion-label><p class="item-heading">{{ contact.fullname }}</p></ion-label>
</ion-item>
</ng-container>
</ng-container>

6
src/addons/messages/pages/contacts/contacts.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ 'addon.messages.contacts' | translate }}</ion-title>
<h1>{{ 'addon.messages.contacts' | translate }}</h1>
<ion-buttons slot="end">
<ion-button fill="clear" (click)="gotoSearch()" [attr.aria-label]="'addon.messages.searchcombined' | translate">
<ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
@ -33,13 +33,13 @@
[checkOnline]="contact.showonlinestatus" [linkProfile]="false">
</core-user-avatar>
<ion-label>
<h2>
<p class="item-heading">
<core-format-text [text]="contact.fullname" contextLevel="system" [contextInstanceId]="0">
</core-format-text>
<ion-icon *ngIf="contact.isblocked" name="fas-user-slash" slot="end"
[attr.aria-label]="'addon.messages.contactblocked' | translate">
</ion-icon>
</h2>
</p>
</ion-label>
</ion-item>
</ion-list>

16
src/addons/messages/pages/discussion/discussion.html
View File

@ -3,8 +3,8 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<div class="toolbar-title">
<h1>
<div class="addon-messages-discussion-title">
<img *ngIf="loaded && !otherMember && conversationImage" class="core-bar-button-image" [src]="conversationImage"
alt="" onError="this.src='assets/img/group-avatar.png'" core-external-content role="presentation"
[siteId]="siteId || null">
@ -20,7 +20,7 @@
[attr.aria-label]="'addon.messages.mutedconversation' | translate">
</ion-icon>
</div>
</ion-title>
</h1>
<ion-buttons slot="end"></ion-buttons>
</ion-toolbar>
<core-navbar-buttons slot="end">
@ -73,12 +73,14 @@
<p class="ion-text-center"><i>{{ 'addon.messages.selfconversationdefaultmessage' | translate }}</i></p>
</ng-container>
<h2 class="sr-only">{{ title }}</h2>
<ion-list class="addon-messages-discussion-container" [class.addon-messages-discussion-group]="isGroup"
[attr.aria-live]="'polite'">
<ng-container *ngFor="let message of messages; index as index; last as last">
<h6 class="ion-text-center addon-messages-date" *ngIf="message.showDate">
<h3 class="ion-text-center addon-messages-date" *ngIf="message.showDate">
{{ message.timecreated | coreFormatDate: "strftimedayshort" }}
</h6>
</h3>
<ion-chip class="addon-messages-unreadfrom" *ngIf="unreadMessageFrom && message.id == unreadMessageFrom"
color="light">
@ -93,7 +95,7 @@
[@coreSlideInOut]="message.useridfrom == currentUserId ? '' : 'fromLeft'">
<ion-label>
<!-- User data. -->
<h2 class="addon-message-user" [attr.aria-label]="message.useridfrom == currentUserId ?
<div class="item-heading addon-message-user" [attr.aria-label]="message.useridfrom == currentUserId ?
('addon.messages.you' | translate) : members[message.useridfrom].fullname">
<core-user-avatar slot="start" [user]="members[message.useridfrom]" [linkProfile]="false"
*ngIf="message.showUserData"></core-user-avatar>
@ -104,7 +106,7 @@
<ion-note *ngIf="message.pending">
<ion-icon name="fas-clock" [attr.aria-label]="'core.notsent' | translate" role="status"></ion-icon>
</ion-note>
</h2>
</div>
<!-- Some messages have <p> and some others don't. Add a <p> so they all have same styles. -->
<p class="addon-message-text">

8
src/addons/messages/pages/discussion/discussion.scss
View File

@ -183,7 +183,7 @@
ion-item.addon-message.addon-message-mine + ion-item.addon-message.addon-message-no-user.addon-message-mine,
ion-item.addon-message.addon-message-not-mine + ion-item.addon-message.addon-message-no-user.addon-message-not-mine {
h2 {
.item-heading {
margin-bottom: 0;
}
margin-top: -8px;
@ -217,7 +217,7 @@
}
}
ion-header ion-toolbar .toolbar-title {
ion-header ion-toolbar .addon-messages-discussion-title {
display: flex;
align-items: center;
padding: 0;
@ -240,7 +240,7 @@
}
:host-context([dir=rtl]) {
ion-header ion-toolbar .toolbar-title {
ion-header ion-toolbar .addon-messages-discussion-title {
.core-bar-button-image {
margin-left: 6px;
margin-right: 0;
@ -291,7 +291,7 @@
}
:host-context(.ios) {
ion-header ion-toolbar .toolbar-title {
ion-header ion-toolbar .addon-messages-discussion-title {
justify-content: center;
}

6
src/addons/messages/pages/discussions-35/discussions.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ 'addon.messages.messages' | translate }}</ion-title>
<h1>{{ 'addon.messages.messages' | translate }}</h1>
<ion-buttons slot="end">
<!-- Add an empty context menu so discussion page can add items in split view,
otherwise the menu disappears in some cases. -->
@ -43,7 +43,7 @@
[attr.aria-current]="result.userid == discussionUserId ? 'page' : 'false'">
<core-user-avatar [user]="result" slot="start" [checkOnline]="result.showonlinestatus"></core-user-avatar>
<ion-label>
<h2>{{ result.fullname }}</h2>
<p class="item-heading">{{ result.fullname }}</p>
<p><core-format-text clean="true" singleLine="true" [text]="result.lastmessage" contextLevel="system"
[contextInstanceId]="0"></core-format-text></p>
</ion-label>
@ -56,7 +56,7 @@
<core-user-avatar [user]="discussion" slot="start" checkOnline="false"></core-user-avatar>
<ion-label>
<div class="flex-row ion-justify-content-between">
<h2>{{ discussion.fullname }}</h2>
<p class="item-heading">{{ discussion.fullname }}</p>
<ion-note *ngIf="discussion.message!.timecreated > 0 || discussion.unread">
<span *ngIf="discussion.message!.timecreated > 0" class="addon-message-last-message-date">
{{discussion.message!.timecreated / 1000 | coreDateDayOrTime}}

6
src/addons/messages/pages/group-conversations/group-conversations.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ 'addon.messages.messages' | translate }}</ion-title>
<h1>{{ 'addon.messages.messages' | translate }}</h1>
<ion-buttons slot="end">
<ion-button fill="clear" (click)="gotoSearch()" [attr.aria-label]="'addon.messages.searchcombined' | translate">
<ion-icon name="fas-search" slot="icon-only" aria-hidden="true"></ion-icon>
@ -163,13 +163,13 @@
<ion-label>
<div class="flex-row ion-justify-content-between">
<h2>
<p class="item-heading">
<core-format-text [text]="conversation.name" contextLevel="system" [contextInstanceId]="0"></core-format-text>
<ion-icon name="fas-user-slash" *ngIf="conversation.isblocked"
[title]="'addon.messages.contactblocked' | translate"></ion-icon>
<ion-icon *ngIf="conversation.ismuted" name="fas-volume-mute"
[title]="'addon.messages.mutedconversation' | translate"></ion-icon>
</h2>
</p>
<ion-note *ngIf="conversation.lastmessagedate > 0 || conversation.unreadcount">
<span *ngIf="conversation.lastmessagedate > 0" class="addon-message-last-message-date">
{{conversation.lastmessagedate | coreDateDayOrTime}}

6
src/addons/messages/pages/search/search.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ 'addon.messages.searchcombined' | translate }}</ion-title>
<h1>{{ 'addon.messages.searchcombined' | translate }}</h1>
<ion-buttons slot="end">
<!-- Add an empty context menu so discussion page can add items in split view,
otherwise the menu disappears in some cases. -->
@ -47,13 +47,13 @@
button>
<core-user-avatar slot="start" [user]="result" [checkOnline]="true" [linkProfile]="false"></core-user-avatar>
<ion-label>
<h2>
<p class="item-heading">
<core-format-text [text]="result.fullname" [highlight]="result.highlightName" [filter]="false">
</core-format-text>
<ion-icon name="fa-ban" *ngIf="result.isblocked"
[attr.aria-label]="'addon.messages.contactblocked' | translate">
</ion-icon>
</h2>
</p>
<ion-note *ngIf="result.lastmessagedate > 0">
{{result.lastmessagedate | coreDateDayOrTime}}
</ion-note>

2
src/addons/messages/pages/settings/settings.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ 'addon.messages.messages' | translate }}</ion-title>
<h1>{{ 'addon.messages.messages' | translate }}</h1>
</ion-toolbar>
</ion-header>
<ion-content>

2
src/addons/mod/assign/components/edit-feedback-modal/edit-feedback-modal.html
View File

@ -1,6 +1,6 @@
<ion-header>
<ion-toolbar>
<ion-title>{{ plugin.name }}</ion-title>
<h2>{{ plugin.name }}</h2>
<ion-buttons slot="end">
<ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
<ion-icon slot="icon-only" name="fas-times" aria-hidden="true"></ion-icon>

4
src/addons/mod/assign/pages/edit/edit.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<ion-button fill="clear" (click)="save()" [attr.aria-label]="'core.save' | translate">
{{ 'core.save' | translate }}

4
src/addons/mod/assign/pages/index/index.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<!-- The buttons defined by the component will be added in here. -->

10
src/addons/mod/assign/pages/submission-list/submission-list.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end"></ion-buttons>
</ion-toolbar>
@ -43,10 +43,10 @@
[attr.aria-current]="submissions.getItemAriaCurrent(submission)">
<core-user-avatar [user]="submission" [linkProfile]="false" slot="start"></core-user-avatar>
<ion-label>
<h2 *ngIf="submission.userfullname">{{submission.userfullname}}</h2>
<h2 *ngIf="!submission.userfullname">
<p class="item-heading" *ngIf="submission.userfullname">{{submission.userfullname}}</p>
<p class="item-heading" *ngIf="!submission.userfullname">
{{ 'addon.mod_assign.hiddenuser' | translate }}{{submission.blindid}}
</h2>
</p>
<p *ngIf="assign && assign!.teamsubmission">
<span *ngIf="submission.groupname">{{submission.groupname}}</span>
<span *ngIf="assign!.preventsubmissionnotingroup && !submission.groupname && submission.noGroups

4
src/addons/mod/assign/pages/submission-review/submission-review.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="moduleId" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end"></ion-buttons>
</ion-toolbar>

2
src/addons/mod/book/components/toc/toc.html
View File

@ -1,6 +1,6 @@
<ion-header>
<ion-toolbar>
<ion-title>{{ 'addon.mod_book.toc' | translate }}</ion-title>
<h1>{{ 'addon.mod_book.toc' | translate }}</h1>
<ion-buttons slot="end">
<ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
<ion-icon name="fas-times" slot="icon-only" aria-hidden=true></ion-icon>

4
src/addons/mod/book/pages/index/index.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<!-- The buttons defined by the component will be added in here. -->
</ion-buttons>

4
src/addons/mod/chat/components/users-modal/users-modal.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ 'addon.mod_chat.currentusers' | translate }}</ion-title>
<h2>{{ 'addon.mod_chat.currentusers' | translate }}</h2>
<ion-buttons slot="end">
<ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
<ion-icon slot="icon-only" name="fas-times" aria-hidden="true"></ion-icon>
@ -18,7 +18,7 @@
<core-user-avatar [user]="user" slot="start" [linkProfile]="false"></core-user-avatar>
<ion-label>
<h2>{{ user.fullname }}</h2>
<p class="item-heading">{{ user.fullname }}</p>
<ng-container *ngIf="currentUserId != user.id && isOnline">
<ion-button fill="clear" (click)="talkTo(user)">
<ion-icon name="fas-comments" slot="start" aria-hidden="true"></ion-icon>

8
src/addons/mod/chat/pages/chat/chat.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<ion-button fill="clear" *ngIf="loaded" (click)="showChatUsers()" [attr.aria-label]="'core.users' | translate">
<ion-icon name="fas-users" slot="icon-only" aria-hidden="true"></ion-icon>
@ -19,9 +19,9 @@
<ion-list class="addon-messages-discussion-container" aria-live="polite">
<ng-container *ngFor="let message of messages; index as index; last as last">
<h6 class="ion-text-center addon-messages-date" *ngIf="message.showDate">
<p class="ion-text-center addon-messages-date" *ngIf="message.showDate">
{{ message.timestamp * 1000 | coreFormatDate: "strftimedayshort" }}
</h6>
</p>
<div class="ion-text-center addon-mod_chat-notice" *ngIf="message.special">
<ion-badge class="ion-text-wrap" color="success" *ngIf="message.system && message.message == 'enter'">

4
src/addons/mod/chat/pages/index/index.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<!-- The buttons defined by the component will be added in here. -->
</ion-buttons>

6
src/addons/mod/chat/pages/session-messages/session-messages.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ 'addon.mod_chat.messages' | translate }}</ion-title>
<h1>{{ 'addon.mod_chat.messages' | translate }}</h1>
</ion-toolbar>
</ion-header>
<ion-content>
@ -14,9 +14,9 @@
<ion-list class="addon-messages-discussion-container" aria-live="polite">
<ng-container *ngFor="let message of messages; index as index;">
<h6 class="ion-text-center addon-messages-date" *ngIf="message.showDate">
<div class="ion-text-center addon-messages-date" *ngIf="message.showDate">
{{ message.timestamp * 1000 | coreFormatDate:"strftimedayshort" }}
</h6>
</div>
<div class="ion-text-center addon-mod_chat-notice" *ngIf="message.special">
<ion-badge class="ion-text-wrap" color="success" *ngIf="message.issystem && message.message == 'enter'">

4
src/addons/mod/chat/pages/sessions/sessions.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ 'addon.mod_chat.chatreport' | translate }}</ion-title>
<h1>{{ 'addon.mod_chat.chatreport' | translate }}</h1>
</ion-toolbar>
</ion-header>
<ion-content>
@ -36,7 +36,7 @@
<ion-item class="ion-text-wrap">
<ion-label>
<h2>{{ session.sessionstart * 1000 | coreFormatDate }}</h2>
<p class="item-heading">{{ session.sessionstart * 1000 | coreFormatDate }}</p>
<p *ngIf="session.duration">{{ session.duration | coreDuration }}</p>
</ion-label>
</ion-item>

4
src/addons/mod/choice/components/index/addon-mod-choice-index.html
View File

@ -131,11 +131,11 @@
<ion-item-group *ngFor="let result of results">
<ion-item-divider class="ion-text-wrap">
<ion-label>
<h2>
<h3 class="item-heading">
<core-format-text [text]="result.text" contextLevel="module" [contextInstanceId]="module.id"
[courseId]="courseId">
</core-format-text>
</h2>
</h3>
<p>
{{ 'addon.mod_choice.numberofuser' | translate }}: {{ result.numberofuser }}
({{ 'core.percentagenumber' | translate: {$a: result.percentageamountfixed} }})

4
src/addons/mod/choice/pages/index/index.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<!-- The buttons defined by the component will be added in here. -->
</ion-buttons>

2
src/addons/mod/data/components/search/search.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ 'addon.mod_data.search' | translate }}</ion-title>
<h2>{{ 'addon.mod_data.search' | translate }}</h2>
<ion-buttons slot="end">
<ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
<ion-icon name="fas-times" slot="icon-only" aria-hidden=true></ion-icon>

4
src/addons/mod/data/pages/edit/edit.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<ion-button *ngIf="entry" fill="clear" (click)="save($event)" [attr.aria-label]="'core.save' | translate">
{{ 'core.save' | translate }}

4
src/addons/mod/data/pages/entry/entry.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
</ion-toolbar>
</ion-header>
<ion-content>

4
src/addons/mod/data/pages/index/index.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<!-- The buttons defined by the component will be added in here. -->

4
src/addons/mod/feedback/components/index/addon-mod-feedback-index.html
View File

@ -204,11 +204,11 @@
<ion-list *ngIf="items && items.length">
<ion-item class="ion-text-wrap core-analysis" *ngFor="let item of items">
<ion-label>
<h2>
<p class="item-heading">
{{item.num}}. <core-format-text [component]="component" [componentId]="componentId" [text]="item.name"
contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
</core-format-text>
</h2>
</p>
<p>
<core-format-text [component]="component" [componentId]="componentId" [text]="item.label"
contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">

4
src/addons/mod/feedback/pages/attempt/attempt.html
View File

@ -3,12 +3,12 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<ng-container *ngIf="attempt">{{ attempt.fullname }}</ng-container>
<ng-container *ngIf="anonAttempt">
{{ 'addon.mod_feedback.response_nr' |translate }}: {{anonAttempt.number}}
</ng-container>
</ion-title>
</h1>
</ion-toolbar>
</ion-header>
<ion-content>

4
src/addons/mod/feedback/pages/form/form.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
</ion-toolbar>
</ion-header>
<ion-content>

4
src/addons/mod/feedback/pages/index/index.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<!-- The buttons defined by the component will be added in here. -->
</ion-buttons>

4
src/addons/mod/feedback/pages/nonrespondents/nonrespondents.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ 'addon.mod_feedback.responses' |translate }}</ion-title>
<h1>{{ 'addon.mod_feedback.responses' |translate }}</h1>
</ion-toolbar>
</ion-header>
<ion-content>
@ -32,7 +32,7 @@
<ion-item *ngFor="let user of users" class="ion-text-wrap">
<core-user-avatar [user]="user" slot="start"></core-user-avatar>
<ion-label>
<h2>{{ user.fullname }}</h2>
<p class="item-heading">{{ user.fullname }}</p>
<p>
<ion-badge color="success" *ngIf="user.started">
{{ 'addon.mod_feedback.started' | translate}}

4
src/addons/mod/feedback/pages/respondents/respondents.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ 'addon.mod_feedback.responses' |translate }}</ion-title>
<h1>{{ 'addon.mod_feedback.responses' |translate }}</h1>
</ion-toolbar>
</ion-header>
<ion-content>
@ -36,7 +36,7 @@
(click)="responses.select(attempt)" [attr.aria-current]="responses.getItemAriaCurrent(attempt)">
<core-user-avatar [user]="attempt" slot="start"></core-user-avatar>
<ion-label>
<h2>{{ attempt.fullname }}</h2>
<p class="item-heading">{{ attempt.fullname }}</p>
<p *ngIf="attempt.timemodified">{{attempt.timemodified * 1000 | coreFormatDate }}</p>
</ion-label>
</ion-item>

2
src/addons/mod/folder/components/index/addon-mod-folder-index.html
View File

@ -39,7 +39,7 @@
<ion-item class="item-file" (click)="openFolder(folder)" detail="true" button>
<ion-icon name="fas-folder" slot="start" [attr.aria-label]="'core.folder' | translate"></ion-icon>
<ion-label>
<h2>{{folder.filename}}</h2>
<p class="item-heading">{{folder.filename}}</p>
</ion-label>
</ion-item>
</ng-container>

4
src/addons/mod/folder/pages/index/index.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<!-- The buttons defined by the component will be added in here. -->

2
src/addons/mod/forum/components/edit-post/edit-post.html
View File

@ -1,6 +1,6 @@
<ion-header>
<ion-toolbar>
<ion-title>{{ 'addon.mod_forum.yourreply' | translate }}</ion-title>
<h2>{{ 'addon.mod_forum.yourreply' | translate }}</h2>
<ion-buttons slot="end">
<ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
<ion-icon name="fas-times" slot="icon-only" aria-hidden="true"></ion-icon>

6
src/addons/mod/forum/components/index/index.html
View File

@ -89,7 +89,7 @@
(click)="discussions.select(discussion)" button>
<ion-label>
<div class="addon-mod-forum-discussion-title">
<h2 class="ion-text-wrap">
<p class="ion-text-wrap item-heading">
<ion-icon name="fa-map-pin" *ngIf="discussion.pinned"
[attr.aria-label]="'addon.mod_forum.discussionpinned' | translate"></ion-icon>
<ion-icon name="fa-star" class="addon-forum-star" *ngIf="!discussion.pinned && discussion.starred"
@ -98,7 +98,7 @@
[text]="discussion.subject"
contextLevel="module" [contextInstanceId]="module && module.id" [courseId]="courseId">
</core-format-text>
</h2>
</p>
<ion-button *ngIf="canPin || discussion.canlock || discussion.canfavourite"
fill="clear" color="dark"
[attr.aria-label]="('core.displayoptions' | translate)"
@ -111,7 +111,7 @@
<core-user-avatar *ngIf="discussion.userfullname" [user]="discussion" slot="start" [courseId]="courseId">
</core-user-avatar>
<div class="addon-mod-forum-discussion-author">
<h3 *ngIf="discussion.userfullname">{{discussion.userfullname}}</h3>
<span *ngIf="discussion.userfullname">{{discussion.userfullname}}</span>
<p *ngIf="discussion.groupname">
<ion-icon name="fas-users" [attr.aria-label]="'addon.mod_forum.group' | translate">
</ion-icon> {{ discussion.groupname }}

4
src/addons/mod/forum/components/index/index.scss
View File

@ -11,7 +11,7 @@
ion-label {
margin-top: 4px;
h2 {
.item-heading {
margin-top: 8px;
margin-bottom: 8px;
font-weight: bold;
@ -36,7 +36,7 @@
align-items: center;
}
.addon-mod-forum-discussion-title h2,
.addon-mod-forum-discussion-title .item-heading,
.addon-mod-forum-discussion-info .addon-mod-forum-discussion-author {
flex-grow: 1;
}

2
src/addons/mod/forum/components/post/post.html
View File

@ -31,7 +31,7 @@
<core-user-avatar *ngIf="post.author && post.author.fullname" [user]="post.author" slot="start" [courseId]="courseId">
</core-user-avatar>
<div class="addon-mod-forum-post-author">
<h3 *ngIf="post.author && post.author.fullname">{{post.author.fullname}}</h3>
<span *ngIf="post.author && post.author.fullname">{{post.author.fullname}}</span>
<p *ngIf="post.author && post.author.groups">
<ng-container *ngFor="let group of post.author.groups">
<ion-icon name="fas-users" [attr.aria-label]="'addon.mod_forum.group' | translate">

2
src/addons/mod/forum/components/post/post.scss
View File

@ -50,7 +50,7 @@
margin-top: 0px;
}
.addon-mod-forum-post-title h2,
.addon-mod-forum-post-title .item-heading,
.addon-mod-forum-post-info .addon-mod-forum-post-author {
flex-grow: 1;
}

2
src/addons/mod/forum/components/sort-order-selector/sort-order-selector.html
View File

@ -1,6 +1,6 @@
<ion-header>
<ion-toolbar>
<ion-title id="addon-mod-forum-sort-order-label">{{ 'core.sort' | translate }}</ion-title>
<h2 id="addon-mod-forum-sort-order-label">{{ 'core.sort' | translate }}</h2>
<ion-buttons slot="end">
<ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
<ion-icon name="fas-times" slot="icon-only" aria-hidden="true"></ion-icon>

4
src/addons/mod/forum/pages/discussion/discussion.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title *ngIf="startingPost">
<h1 *ngIf="startingPost">
<core-format-text contextLevel="module" [text]="startingPost.subject" [contextInstanceId]="cmId" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<!-- The context menu will be added in here. -->
</ion-buttons>

4
src/addons/mod/forum/pages/index/index.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<!-- The buttons defined by the component will be added in here. -->
</ion-buttons>

2
src/addons/mod/forum/pages/new-discussion/new-discussion.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ 'addon.mod_forum.addanewdiscussion' | translate }}</ion-title>
<h1>{{ 'addon.mod_forum.addanewdiscussion' | translate }}</h1>
<ion-buttons slot="end">
<!-- The context menu will be added in here. -->
</ion-buttons>

4
src/addons/mod/glossary/pages/edit/edit.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title *ngIf="glossary">
<h1 *ngIf="glossary">
<core-format-text [text]="glossary.name" contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
</ion-toolbar>
</ion-header>
<ion-content>

8
src/addons/mod/glossary/pages/entry/entry.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title *ngIf="entry">
<h1 *ngIf="entry">
<core-format-text [text]="entry.concept" contextLevel="module" [contextInstanceId]="componentId" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
</ion-toolbar>
</ion-header>
<ion-content>
@ -30,10 +30,10 @@
</ion-item>
<ion-item class="ion-text-wrap" *ngIf="!showAuthor">
<ion-label>
<h2>
<p class="item-heading">
<core-format-text [text]="entry.concept" contextLevel="module" [contextInstanceId]="componentId">
</core-format-text>
</h2>
</p>
</ion-label>
<ion-note slot="end" *ngIf="showDate">{{ entry.timemodified | coreDateDayOrTime }}</ion-note>
</ion-item>

4
src/addons/mod/glossary/pages/index/index.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<!-- The buttons defined by the component will be added in here. -->
</ion-buttons>

4
src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.html
View File

@ -3,11 +3,11 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text *ngIf="h5pActivity" [text]="h5pActivity.name" contextLevel="module"
[contextInstanceId]="h5pActivity.coursemodule" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
</ion-toolbar>
</ion-header>
<ion-content>

4
src/addons/mod/h5pactivity/pages/index/index.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<!-- The buttons defined by the component will be added in here. -->

4
src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html
View File

@ -3,11 +3,11 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text *ngIf="h5pActivity" [text]="h5pActivity.name" contextLevel="module"
[contextInstanceId]="h5pActivity.coursemodule" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
</ion-toolbar>
</ion-header>
<ion-content>

2
src/addons/mod/imscp/components/toc/toc.html
View File

@ -1,6 +1,6 @@
<ion-header>
<ion-toolbar>
<ion-title>{{ 'addon.mod_imscp.toc' | translate }}</ion-title>
<h1>{{ 'addon.mod_imscp.toc' | translate }}</h1>
<ion-buttons slot="end">
<ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
<ion-icon name="fas-times" slot="icon-only" aria-hidden=true></ion-icon>

4
src/addons/mod/imscp/pages/index/index.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<!-- The buttons defined by the component will be added in here. -->

2
src/addons/mod/lesson/components/index/addon-mod-lesson-index.html
View File

@ -300,7 +300,7 @@
<core-user-avatar [user]="student" slot="start" [userId]="student.id" [courseId]="courseId">
</core-user-avatar>
<ion-label>
<h2>{{ student.fullname }}</h2>
<p class="item-heading">{{ student.fullname }}</p>
<core-progress-bar [progress]="student.bestgrade" a11yText="addon.mod_lesson.grade">
</core-progress-bar>
</ion-label>

2
src/addons/mod/lesson/components/menu-modal/menu-modal.html
View File

@ -1,6 +1,6 @@
<ion-header>
<ion-toolbar>
<ion-title>{{ pageInstance?.lesson?.name }}</ion-title>
<h2>{{ pageInstance?.lesson?.name }}</h2>
<ion-buttons slot="end">
<ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">

2
src/addons/mod/lesson/components/password-modal/password-modal.html
View File

@ -1,6 +1,6 @@
<ion-header>
<ion-toolbar>
<ion-title>{{ 'core.login.password' | translate }}</ion-title>
<h2>{{ 'core.login.password' | translate }}</h2>
<ion-buttons slot="end">
<ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">

4
src/addons/mod/lesson/pages/index/index.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<!-- The buttons defined by the component will be added in here. -->
</ion-buttons>

4
src/addons/mod/lesson/pages/player/player.html
View File

@ -3,11 +3,11 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="lesson?.coursemodule"
[courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<ion-button fill="clear" *ngIf="displayMenu || mediaFile" [attr.aria-label]="'addon.mod_lesson.lessonmenu' | translate"
(click)="showMenu()">

2
src/addons/mod/lesson/pages/user-retake/user-retake.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ 'addon.mod_lesson.detailedstats' | translate }}</ion-title>
<h1>{{ 'addon.mod_lesson.detailedstats' | translate }}</h1>
</ion-toolbar>
</ion-header>
<ion-content>

4
src/addons/mod/lti/pages/index/index.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<!-- The buttons defined by the component will be added in here. -->

4
src/addons/mod/page/pages/index/index.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<!-- The buttons defined by the component will be added in here. -->
</ion-buttons>

2
src/addons/mod/quiz/components/navigation-modal/navigation-modal.html
View File

@ -1,6 +1,6 @@
<ion-header>
<ion-toolbar>
<ion-title>{{ 'addon.mod_quiz.quiznavigation' | translate }}</ion-title>
<h2>{{ 'addon.mod_quiz.quiznavigation' | translate }}</h2>
<ion-buttons slot="end">
<ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">

2
src/addons/mod/quiz/components/preflight-modal/preflight-modal.html
View File

@ -1,6 +1,6 @@
<ion-header>
<ion-toolbar>
<ion-title>{{ title | translate }}</ion-title>
<h2>{{ title | translate }}</h2>
<ion-buttons slot="end">
<ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">

4
src/addons/mod/quiz/pages/attempt/attempt.html
View File

@ -3,11 +3,11 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text *ngIf="quiz" [text]="quiz.name" contextLevel="module" [contextInstanceId]="quiz.coursemodule"
[courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
</ion-toolbar>
</ion-header>
<ion-content>

4
src/addons/mod/quiz/pages/index/index.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<!-- The buttons defined by the component will be added in here. -->

4
src/addons/mod/quiz/pages/player/player.html
View File

@ -3,11 +3,11 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text *ngIf="quiz" [text]="quiz.name" contextLevel="module" [contextInstanceId]="quiz.coursemodule"
[courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<ion-button fill="clear" id="addon-mod_quiz-connection-error-button" [hidden]="!autoSaveError"

4
src/addons/mod/quiz/pages/review/review.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ 'addon.mod_quiz.review' | translate }}</ion-title>
<h1>{{ 'addon.mod_quiz.review' | translate }}</h1>
<ion-buttons slot="end">
<ion-button fill="clear" *ngIf="navigation.length" [attr.aria-label]="'addon.mod_quiz.opentoc' | translate"
@ -74,7 +74,7 @@
</ion-item>
<ion-item class="ion-text-wrap" *ngFor="let data of additionalData">
<ion-label>
<h2>{{ data.title }}</h2>
<p class="item-heading">{{ data.title }}</p>
<core-format-text [component]="component" [componentId]="cmId" [text]="data.content"
contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
</core-format-text>

4
src/addons/mod/resource/pages/index/index.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<!-- The buttons defined by the component will be added in here. -->

2
src/addons/mod/scorm/components/toc/toc.html
View File

@ -1,6 +1,6 @@
<ion-header>
<ion-toolbar>
<ion-title>{{ 'addon.mod_scorm.toc' | translate }}</ion-title>
<h1>{{ 'addon.mod_scorm.toc' | translate }}</h1>
<ion-buttons slot="end">
<ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
<ion-icon slot="icon-only" name="fas-times" aria-hidden="true"></ion-icon>

4
src/addons/mod/scorm/pages/index/index.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<!-- The buttons defined by the component will be added in here. -->
</ion-buttons>

4
src/addons/mod/scorm/pages/player/player.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<ion-button fill="clear" *ngIf="showToc && !loadingToc && toc.length" (click)="openToc()"
[attr.aria-label]="'addon.mod_scorm.toc' | translate" aria-haspopup="true">

4
src/addons/mod/survey/pages/index/index.html
View File

@ -3,9 +3,9 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module.id"></core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<!-- The buttons defined by the component will be added in here. -->

4
src/addons/mod/url/pages/index/index.html
View File

@ -3,9 +3,9 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id"></core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<!-- The buttons defined by the component will be added in here. -->

2
src/addons/mod/wiki/components/map/map.html
View File

@ -1,6 +1,6 @@
<ion-header>
<ion-toolbar>
<ion-title>{{ 'addon.mod_wiki.map' | translate }}</ion-title>
<h1>{{ 'addon.mod_wiki.map' | translate }}</h1>
<ion-buttons slot="end">
<ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
<ion-icon name="fas-times" aria-hidden="true"></ion-icon>

4
src/addons/mod/wiki/pages/edit/edit.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="cmId" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<ion-button fill="clear" (click)="save()" [attr.aria-label]="'core.save' | translate">

4
src/addons/mod/wiki/pages/index/index.html
View File

@ -3,10 +3,10 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>
<h1>
<core-format-text [text]="title" contextLevel="module" [contextInstanceId]="module?.id" [courseId]="courseId">
</core-format-text>
</ion-title>
</h1>
<ion-buttons slot="end">
<!-- The buttons defined by the component will be added in here. -->

2
src/addons/mod/workshop/components/phase/phase.html
View File

@ -3,7 +3,7 @@
<ion-buttons slot="start">
<ion-back-button [text]="'core.back' | translate"></ion-back-button>
</ion-buttons>
<ion-title>{{ 'addon.mod_workshop.userplan' | translate }}</ion-title>
<h2>{{ 'addon.mod_workshop.userplan' | translate }}</h2>
<ion-buttons slot="end">
<ion-button fill="clear" (click)="closeModal()" [attr.aria-label]="'core.close' | translate">
<ion-icon name="fas-times" slot="icon-only" aria-hidden=true></ion-icon>

Some files were not shown because too many files have changed in this diff Show More