Skip to content

Mobile 4065 #3550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 17, 2023
Merged

Mobile 4065 #3550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b9b617
MOBILE-4065 dev: Reset site onboarding when reseting tours
crazyserver Feb 13, 2023
50773aa
MOBILE-4065 a11y: Add aria-role region to headings order
crazyserver Feb 13, 2023
38de8c2
MOBILE-4065 theme: Add separate variables for calendar events
crazyserver Feb 13, 2023
a6de01f
MOBILE-4065 a11y: Fix lots of headings
crazyserver Feb 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions src/addons/badges/pages/issued-badge/issued-badge.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ <h2>{{ 'addon.badges.recipientdetails' | translate}}</h2>
</ion-item-divider>
<ion-item class="ion-text-wrap">
<ion-label>
<h2>{{ 'core.name' | translate}}</h2>
<p class="item-heading">{{ 'core.name' | translate}}</p>
<p>{{ user.fullname }}</p>
</ion-label>
</ion-item>
Expand All @@ -48,13 +48,13 @@ <h2>{{ 'addon.badges.issuerdetails' | translate}}</h2>
</ion-item-divider>
<ion-item class="ion-text-wrap" *ngIf="badge.issuername">
<ion-label>
<h2>{{ 'addon.badges.issuername' | translate}}</h2>
<p class="item-heading">{{ 'addon.badges.issuername' | translate}}</p>
<p>{{ badge.issuername }}</p>
</ion-label>
</ion-item>
<ion-item class="ion-text-wrap" *ngIf="badge.issuercontact">
<ion-label>
<h2>{{ 'addon.badges.contact' | translate}}</h2>
<p class="item-heading">{{ 'addon.badges.contact' | translate}}</p>
<p><a href="mailto:{{badge.issuercontact}}" core-link auto-login="no" [showBrowserWarning]="false">
{{ badge.issuercontact }}
</a></p>
Expand All @@ -70,57 +70,57 @@ <h2>{{ 'addon.badges.badgedetails' | translate}}</h2>
</ion-item-divider>
<ion-item class="ion-text-wrap" *ngIf="badge.name">
<ion-label>
<h2>{{ 'core.name' | translate}}</h2>
<p class="item-heading">{{ 'core.name' | translate}}</p>
<p>{{ badge.name }}</p>
</ion-label>
</ion-item>
<ion-item class="ion-text-wrap" *ngIf="badge.version">
<ion-label>
<h2>{{ 'addon.badges.version' | translate}}</h2>
<p class="item-heading">{{ 'addon.badges.version' | translate}}</p>
<p>{{ badge.version }}</p>
</ion-label>
</ion-item>
<ion-item class="ion-text-wrap" *ngIf="badge.language">
<ion-label>
<h2>{{ 'addon.badges.language' | translate}}</h2>
<p class="item-heading">{{ 'addon.badges.language' | translate}}</p>
<p>{{ badge.language }}</p>
</ion-label>
</ion-item>
<ion-item class="ion-text-wrap" *ngIf="badge.description">
<ion-label>
<h2>{{ 'core.description' | translate}}</h2>
<p class="item-heading">{{ 'core.description' | translate}}</p>
<p>{{ badge.description }}</p>
</ion-label>
</ion-item>
<ion-item class="ion-text-wrap" *ngIf="badge.imageauthorname">
<ion-label>
<h2>{{ 'addon.badges.imageauthorname' | translate}}</h2>
<p class="item-heading">{{ 'addon.badges.imageauthorname' | translate}}</p>
<p>{{ badge.imageauthorname }}</p>
</ion-label>
</ion-item>
<ion-item class="ion-text-wrap" *ngIf="badge.imageauthoremail">
<ion-label>
<h2>{{ 'addon.badges.imageauthoremail' | translate}}</h2>
<p class="item-heading">{{ 'addon.badges.imageauthoremail' | translate}}</p>
<p><a href="mailto:{{badge.imageauthoremail}}" core-link auto-login="no" [showBrowserWarning]="false">
{{ badge.imageauthoremail }}
</a></p>
</ion-label>
</ion-item>
<ion-item class="ion-text-wrap" *ngIf="badge.imageauthorurl">
<ion-label>
<h2>{{ 'addon.badges.imageauthorurl' | translate}}</h2>
<p class="item-heading">{{ 'addon.badges.imageauthorurl' | translate}}</p>
<p><a [href]="badge.imageauthorurl" core-link auto-login="no"> {{ badge.imageauthorurl }} </a></p>
</ion-label>
</ion-item>
<ion-item class="ion-text-wrap" *ngIf="badge.imagecaption">
<ion-label>
<h2>{{ 'addon.badges.imagecaption' | translate}}</h2>
<p class="item-heading">{{ 'addon.badges.imagecaption' | translate}}</p>
<p>{{ badge.imagecaption }}</p>
</ion-label>
</ion-item>
<ion-item class="ion-text-wrap" *ngIf="course">
<ion-label>
<h2>{{ 'core.course' | translate}}</h2>
<p class="item-heading">{{ 'core.course' | translate}}</p>
<p>
<core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="courseId">
</core-format-text>
Expand All @@ -138,13 +138,13 @@ <h2>{{ 'addon.badges.issuancedetails' | translate}}</h2>
</ion-item-divider>
<ion-item class="ion-text-wrap" *ngIf="badge.dateissued">
<ion-label>
<h2>{{ 'addon.badges.dateawarded' | translate}}</h2>
<p class="item-heading">{{ 'addon.badges.dateawarded' | translate}}</p>
<p>{{badge.dateissued * 1000 | coreFormatDate }}</p>
</ion-label>
</ion-item>
<ion-item class="ion-text-wrap" *ngIf="badge.dateexpire">
<ion-label>
<h2>{{ 'addon.badges.expirydate' | translate}}</h2>
<p class="item-heading">{{ 'addon.badges.expirydate' | translate}}</p>
<p>
{{ badge.dateexpire * 1000 | coreFormatDate }}
<span class="text-danger" *ngIf="currentTime >= badge.dateexpire">
Expand All @@ -165,13 +165,13 @@ <h2>{{ 'addon.badges.bendorsement' | translate}}</h2>
</ion-item-divider>
<ion-item class="ion-text-wrap" *ngIf="badge.endorsement.issuername">
<ion-label>
<h2>{{ 'addon.badges.issuername' | translate}}</h2>
<p class="item-heading">{{ 'addon.badges.issuername' | translate}}</p>
<p>{{ badge.endorsement.issuername }}</p>
</ion-label>
</ion-item>
<ion-item class="ion-text-wrap" *ngIf="badge.endorsement.issueremail">
<ion-label>
<h2>{{ 'addon.badges.issueremail' | translate}}</h2>
<p class="item-heading">{{ 'addon.badges.issueremail' | translate}}</p>
<p>
<a href="mailto:{{badge.endorsement.issueremail}}" core-link auto-login="no" [showBrowserWarning]="false">
{{ badge.endorsement.issueremail }}
Expand All @@ -181,25 +181,25 @@ <h2>{{ 'addon.badges.issueremail' | translate}}</h2>
</ion-item>
<ion-item class="ion-text-wrap" *ngIf="badge.endorsement.issuerurl">
<ion-label>
<h2>{{ 'addon.badges.issuerurl' | translate}}</h2>
<p class="item-heading">{{ 'addon.badges.issuerurl' | translate}}</p>
<p><a [href]="badge.endorsement.issuerurl" core-link auto-login="no"> {{ badge.endorsement.issuerurl }} </a></p>
</ion-label>
</ion-item>
<ion-item class="ion-text-wrap" *ngIf="badge.endorsement.dateissued">
<ion-label>
<h2>{{ 'addon.badges.dateawarded' | translate}}</h2>
<p class="item-heading">{{ 'addon.badges.dateawarded' | translate}}</p>
<p>{{ badge.endorsement.dateissued * 1000 | coreFormatDate }}</p>
</ion-label>
</ion-item>
<ion-item class="ion-text-wrap" *ngIf="badge.endorsement.claimid">
<ion-label>
<h2>{{ 'addon.badges.claimid' | translate}}</h2>
<p class="item-heading">{{ 'addon.badges.claimid' | translate}}</p>
<p><a [href]="badge.endorsement.claimid" core-link auto-login="no"> {{ badge.endorsement.claimid }} </a></p>
</ion-label>
</ion-item>
<ion-item class="ion-text-wrap" *ngIf="badge.endorsement.claimcomment">
<ion-label>
<h2>{{ 'addon.badges.claimcomment' | translate}}</h2>
<p class="item-heading">{{ 'addon.badges.claimcomment' | translate}}</p>
<p>{{ badge.endorsement.claimcomment }}</p>
</ion-label>
</ion-item>
Expand All @@ -214,12 +214,12 @@ <h2>{{ 'addon.badges.relatedbages' | translate}}</h2>
</ion-item-divider>
<ion-item class="ion-text-wrap" *ngFor="let relatedBadge of badge.relatedbadges">
<ion-label>
<h2>{{ relatedBadge.name }}</h2>
<p class="item-heading">{{ relatedBadge.name }}</p>
</ion-label>
</ion-item>
<ion-item class="ion-text-wrap" *ngIf="badge.relatedbadges.length == 0">
<ion-label>
<h2>{{ 'addon.badges.norelated' | translate}}</h2>
<p class="item-heading">{{ 'addon.badges.norelated' | translate}}</p>
</ion-label>
</ion-item>
</ion-item-group>
Expand All @@ -234,12 +234,12 @@ <h2>{{ 'addon.badges.alignment' | translate}}</h2>
<ion-item class="ion-text-wrap" *ngFor="let alignment of badge.alignment" [href]="alignment.targeturl" core-link
auto-login="no">
<ion-label>
<h2>{{ alignment.targetname }}</h2>
<p class="item-heading">{{ alignment.targetname }}</p>
</ion-label>
</ion-item>
<ion-item class="ion-text-wrap" *ngIf="badge.alignment.length == 0">
<ion-label>
<h2>{{ 'addon.badges.noalignment' | translate}}</h2>
<p class="item-heading">{{ 'addon.badges.noalignment' | translate}}</p>
</ion-label>
</ion-item>
</ion-item-group>
Expand Down
21 changes: 12 additions & 9 deletions src/addons/blog/pages/entries/entries.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,22 @@ <h1>{{ title | translate }}</h1>
<ion-item class="ion-text-wrap">
<core-user-avatar [user]="entry.user" slot="start" [courseId]="entry.courseid"></core-user-avatar>
<ion-label>
<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-start ion-text-end">
<div class="flex-row ion-justify-content-between ion-align-items-center">
<h2>
<core-format-text [text]="entry.subject" [contextLevel]="contextLevel"
[contextInstanceId]="contextInstanceId">
</core-format-text>
</h2>
<ion-note class="ion-text-end">
{{ 'addon.blog.' + entry.publishTranslated! | translate}}
</ion-note>
</p>
<p>
<ion-note class="ion-float-end ion-text-end">
</div>
<div class="flex-row ion-justify-content-between ion-align-items-center">
{{entry.user && entry.user.fullname}}
<ion-note class="ion-text-end">
{{entry.created | coreDateDayOrTime}}
</ion-note>
{{entry.user && entry.user!.fullname}}
</p>
</div>
</ion-label>
</ion-item>
<ion-card-content>
Expand Down
2 changes: 1 addition & 1 deletion src/addons/calendar/components/calendar/calendar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@

.addon-calendar-period {
flex-grow: 3;
h3 {
h2 {
margin-top: 10px;
font-size: 1.2rem;
}
Expand Down
2 changes: 1 addition & 1 deletion src/addons/calendar/pages/day/day.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ <h1>{{ 'addon.calendar.calendarevents' | translate }}</h1>
</ion-button>
</ion-col>
<ion-col class="ion-text-center addon-calendar-period">
<h3>{{ periodName }}</h3>
<h2>{{ periodName }}</h2>
</ion-col>
<ion-col class="ion-text-end">
<ion-button fill="clear" (click)="loadNext()" [attr.aria-label]="'addon.calendar.daynext' | translate">
Expand Down
2 changes: 1 addition & 1 deletion src/addons/calendar/pages/day/day.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

.addon-calendar-period {
flex-grow: 3;
h3 {
h2 {
margin-top: 10px;
font-size: 1.2rem;
}
Expand Down
14 changes: 7 additions & 7 deletions src/addons/calendar/pages/event/event.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ <h1>
</ion-item>
<ion-item class="ion-text-wrap">
<ion-label>
<h2>{{ 'addon.calendar.when' | translate }}</h2>
<p class="item-heading">{{ 'addon.calendar.when' | translate }}</p>
<core-format-text [text]="event.formattedtime" [contextLevel]="event.contextLevel"
[contextInstanceId]="event.contextInstanceId"></core-format-text>
</ion-label>
Expand All @@ -70,13 +70,13 @@ <h2>{{ 'addon.calendar.when' | translate }}</h2>
</ion-item>
<ion-item>
<ion-label>
<h2>{{ 'addon.calendar.eventtype' | translate }}</h2>
<p class="item-heading">{{ 'addon.calendar.eventtype' | translate }}</p>
<p>{{ 'addon.calendar.type' + event.formattedType | translate }}</p>
</ion-label>
</ion-item>
<ion-item class="ion-text-wrap" *ngIf="courseName" [href]="courseUrl" core-link capture="true">
<ion-label>
<h2>{{ 'core.course' | translate}}</h2>
<p class="item-heading">{{ 'core.course' | translate}}</p>
<p>
<core-format-text [text]="courseName" contextLevel="course" [contextInstanceId]="courseId">
</core-format-text>
Expand All @@ -85,13 +85,13 @@ <h2>{{ 'core.course' | translate}}</h2>
</ion-item>
<ion-item class="ion-text-wrap core-groupname" *ngIf="groupName">
<ion-label>
<h2>{{ 'core.group' | translate}}</h2>
<p class="item-heading">{{ 'core.group' | translate}}</p>
<p>{{ groupName }}</p>
</ion-label>
</ion-item>
<ion-item class="ion-text-wrap" *ngIf="categoryPath">
<ion-label>
<h2>{{ 'core.category' | translate}}</h2>
<p class="item-heading">{{ 'core.category' | translate}}</p>
<p>
<core-format-text [text]="categoryPath" contextLevel="coursecat" [contextInstanceId]="event.categoryid">
</core-format-text>
Expand All @@ -100,7 +100,7 @@ <h2>{{ 'core.category' | translate}}</h2>
</ion-item>
<ion-item class="ion-text-wrap" *ngIf="event.description">
<ion-label>
<h2>{{ 'core.description' | translate}}</h2>
<p class="item-heading">{{ 'core.description' | translate}}</p>
<p>
<core-format-text [text]="event.description" [contextLevel]="event.contextLevel"
[contextInstanceId]="event.contextInstanceId"></core-format-text>
Expand All @@ -109,7 +109,7 @@ <h2>{{ 'core.description' | translate}}</h2>
</ion-item>
<ion-item class="ion-text-wrap" *ngIf="event.location">
<ion-label>
<h2>{{ 'core.location' | translate}}</h2>
<p class="item-heading">{{ 'core.location' | translate}}</p>
<p>
<a [href]="event.encodedLocation" core-link auto-login="no">
<core-format-text [text]="event.location" [contextLevel]="event.contextLevel"
Expand Down
4 changes: 2 additions & 2 deletions src/addons/competency/pages/competency/competency.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1 *ngIf="competency">
<ion-item 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>
</ion-label>
</ion-item>
</ion-card>
Expand Down Expand Up @@ -115,7 +115,7 @@ <h2>{{ user.fullname }}</h2>
</ion-card>

<div *ngIf="competency">
<h3 class="ion-margin-horizontal">{{ 'addon.competency.evidence' | translate }}</h3>
<h2 class="ion-margin-horizontal">{{ 'addon.competency.evidence' | translate }}</h2>
<p class="ion-margin-horizontal" *ngIf="competency.evidence.length == 0">
{{ 'addon.competency.noevidence' | translate }}
</p>
Expand Down
2 changes: 1 addition & 1 deletion src/addons/competency/pages/coursecompetencies/coursecompetencies.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ <h2 class="ion-margin-horizontal" *ngIf="courseCompetencies && courseCompetencie
<ion-item 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>
</ion-label>
</ion-item>
</ion-card>
Expand Down
2 changes: 1 addition & 1 deletion src/addons/competency/pages/plan/plan.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h1 *ngIf="plan">{{plan.plan.name}}</h1>
<ion-item class="ion-text-wrap">
<ion-label>
<core-user-avatar [user]="user" slot="start"></core-user-avatar>
<h2>{{ user.fullname }}</h2>
<p class="item-heading">{{ user.fullname }}</p>
</ion-label>
</ion-item>
</ion-card>
Expand Down
Loading