Skip to content

Commit 12546f6

Browse files
dpaloudpalou
authored
Merge pull request #3550 from crazyserver/MOBILE-4065
Mobile 4065
2 parents 2f8abd5 + a6de01f commit 12546f6

File tree

108 files changed

+391
-354
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+391
-354
lines changed

‎src/addons/badges/pages/issued-badge/issued-badge.html‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ <h2>{{ 'addon.badges.recipientdetails' | translate}}</h2>
3333
</ion-item-divider>
3434
<ion-item class="ion-text-wrap">
3535
<ion-label>
36-
<h2>{{ 'core.name' | translate}}</h2>
36+
<p class="item-heading">{{ 'core.name' | translate}}</p>
3737
<p>{{ user.fullname }}</p>
3838
</ion-label>
3939
</ion-item>
@@ -48,13 +48,13 @@ <h2>{{ 'addon.badges.issuerdetails' | translate}}</h2>
4848
</ion-item-divider>
4949
<ion-item class="ion-text-wrap" *ngIf="badge.issuername">
5050
<ion-label>
51-
<h2>{{ 'addon.badges.issuername' | translate}}</h2>
51+
<p class="item-heading">{{ 'addon.badges.issuername' | translate}}</p>
5252
<p>{{ badge.issuername }}</p>
5353
</ion-label>
5454
</ion-item>
5555
<ion-item class="ion-text-wrap" *ngIf="badge.issuercontact">
5656
<ion-label>
57-
<h2>{{ 'addon.badges.contact' | translate}}</h2>
57+
<p class="item-heading">{{ 'addon.badges.contact' | translate}}</p>
5858
<p><a href="mailto:{{badge.issuercontact}}" core-link auto-login="no" [showBrowserWarning]="false">
5959
{{ badge.issuercontact }}
6060
</a></p>
@@ -70,57 +70,57 @@ <h2>{{ 'addon.badges.badgedetails' | translate}}</h2>
7070
</ion-item-divider>
7171
<ion-item class="ion-text-wrap" *ngIf="badge.name">
7272
<ion-label>
73-
<h2>{{ 'core.name' | translate}}</h2>
73+
<p class="item-heading">{{ 'core.name' | translate}}</p>
7474
<p>{{ badge.name }}</p>
7575
</ion-label>
7676
</ion-item>
7777
<ion-item class="ion-text-wrap" *ngIf="badge.version">
7878
<ion-label>
79-
<h2>{{ 'addon.badges.version' | translate}}</h2>
79+
<p class="item-heading">{{ 'addon.badges.version' | translate}}</p>
8080
<p>{{ badge.version }}</p>
8181
</ion-label>
8282
</ion-item>
8383
<ion-item class="ion-text-wrap" *ngIf="badge.language">
8484
<ion-label>
85-
<h2>{{ 'addon.badges.language' | translate}}</h2>
85+
<p class="item-heading">{{ 'addon.badges.language' | translate}}</p>
8686
<p>{{ badge.language }}</p>
8787
</ion-label>
8888
</ion-item>
8989
<ion-item class="ion-text-wrap" *ngIf="badge.description">
9090
<ion-label>
91-
<h2>{{ 'core.description' | translate}}</h2>
91+
<p class="item-heading">{{ 'core.description' | translate}}</p>
9292
<p>{{ badge.description }}</p>
9393
</ion-label>
9494
</ion-item>
9595
<ion-item class="ion-text-wrap" *ngIf="badge.imageauthorname">
9696
<ion-label>
97-
<h2>{{ 'addon.badges.imageauthorname' | translate}}</h2>
97+
<p class="item-heading">{{ 'addon.badges.imageauthorname' | translate}}</p>
9898
<p>{{ badge.imageauthorname }}</p>
9999
</ion-label>
100100
</ion-item>
101101
<ion-item class="ion-text-wrap" *ngIf="badge.imageauthoremail">
102102
<ion-label>
103-
<h2>{{ 'addon.badges.imageauthoremail' | translate}}</h2>
103+
<p class="item-heading">{{ 'addon.badges.imageauthoremail' | translate}}</p>
104104
<p><a href="mailto:{{badge.imageauthoremail}}" core-link auto-login="no" [showBrowserWarning]="false">
105105
{{ badge.imageauthoremail }}
106106
</a></p>
107107
</ion-label>
108108
</ion-item>
109109
<ion-item class="ion-text-wrap" *ngIf="badge.imageauthorurl">
110110
<ion-label>
111-
<h2>{{ 'addon.badges.imageauthorurl' | translate}}</h2>
111+
<p class="item-heading">{{ 'addon.badges.imageauthorurl' | translate}}</p>
112112
<p><a [href]="badge.imageauthorurl" core-link auto-login="no"> {{ badge.imageauthorurl }} </a></p>
113113
</ion-label>
114114
</ion-item>
115115
<ion-item class="ion-text-wrap" *ngIf="badge.imagecaption">
116116
<ion-label>
117-
<h2>{{ 'addon.badges.imagecaption' | translate}}</h2>
117+
<p class="item-heading">{{ 'addon.badges.imagecaption' | translate}}</p>
118118
<p>{{ badge.imagecaption }}</p>
119119
</ion-label>
120120
</ion-item>
121121
<ion-item class="ion-text-wrap" *ngIf="course">
122122
<ion-label>
123-
<h2>{{ 'core.course' | translate}}</h2>
123+
<p class="item-heading">{{ 'core.course' | translate}}</p>
124124
<p>
125125
<core-format-text [text]="course.fullname" contextLevel="course" [contextInstanceId]="courseId">
126126
</core-format-text>
@@ -138,13 +138,13 @@ <h2>{{ 'addon.badges.issuancedetails' | translate}}</h2>
138138
</ion-item-divider>
139139
<ion-item class="ion-text-wrap" *ngIf="badge.dateissued">
140140
<ion-label>
141-
<h2>{{ 'addon.badges.dateawarded' | translate}}</h2>
141+
<p class="item-heading">{{ 'addon.badges.dateawarded' | translate}}</p>
142142
<p>{{badge.dateissued * 1000 | coreFormatDate }}</p>
143143
</ion-label>
144144
</ion-item>
145145
<ion-item class="ion-text-wrap" *ngIf="badge.dateexpire">
146146
<ion-label>
147-
<h2>{{ 'addon.badges.expirydate' | translate}}</h2>
147+
<p class="item-heading">{{ 'addon.badges.expirydate' | translate}}</p>
148148
<p>
149149
{{ badge.dateexpire * 1000 | coreFormatDate }}
150150
<span class="text-danger" *ngIf="currentTime >= badge.dateexpire">
@@ -165,13 +165,13 @@ <h2>{{ 'addon.badges.bendorsement' | translate}}</h2>
165165
</ion-item-divider>
166166
<ion-item class="ion-text-wrap" *ngIf="badge.endorsement.issuername">
167167
<ion-label>
168-
<h2>{{ 'addon.badges.issuername' | translate}}</h2>
168+
<p class="item-heading">{{ 'addon.badges.issuername' | translate}}</p>
169169
<p>{{ badge.endorsement.issuername }}</p>
170170
</ion-label>
171171
</ion-item>
172172
<ion-item class="ion-text-wrap" *ngIf="badge.endorsement.issueremail">
173173
<ion-label>
174-
<h2>{{ 'addon.badges.issueremail' | translate}}</h2>
174+
<p class="item-heading">{{ 'addon.badges.issueremail' | translate}}</p>
175175
<p>
176176
<a href="mailto:{{badge.endorsement.issueremail}}" core-link auto-login="no" [showBrowserWarning]="false">
177177
{{ badge.endorsement.issueremail }}
@@ -181,25 +181,25 @@ <h2>{{ 'addon.badges.issueremail' | translate}}</h2>
181181
</ion-item>
182182
<ion-item class="ion-text-wrap" *ngIf="badge.endorsement.issuerurl">
183183
<ion-label>
184-
<h2>{{ 'addon.badges.issuerurl' | translate}}</h2>
184+
<p class="item-heading">{{ 'addon.badges.issuerurl' | translate}}</p>
185185
<p><a [href]="badge.endorsement.issuerurl" core-link auto-login="no"> {{ badge.endorsement.issuerurl }} </a></p>
186186
</ion-label>
187187
</ion-item>
188188
<ion-item class="ion-text-wrap" *ngIf="badge.endorsement.dateissued">
189189
<ion-label>
190-
<h2>{{ 'addon.badges.dateawarded' | translate}}</h2>
190+
<p class="item-heading">{{ 'addon.badges.dateawarded' | translate}}</p>
191191
<p>{{ badge.endorsement.dateissued * 1000 | coreFormatDate }}</p>
192192
</ion-label>
193193
</ion-item>
194194
<ion-item class="ion-text-wrap" *ngIf="badge.endorsement.claimid">
195195
<ion-label>
196-
<h2>{{ 'addon.badges.claimid' | translate}}</h2>
196+
<p class="item-heading">{{ 'addon.badges.claimid' | translate}}</p>
197197
<p><a [href]="badge.endorsement.claimid" core-link auto-login="no"> {{ badge.endorsement.claimid }} </a></p>
198198
</ion-label>
199199
</ion-item>
200200
<ion-item class="ion-text-wrap" *ngIf="badge.endorsement.claimcomment">
201201
<ion-label>
202-
<h2>{{ 'addon.badges.claimcomment' | translate}}</h2>
202+
<p class="item-heading">{{ 'addon.badges.claimcomment' | translate}}</p>
203203
<p>{{ badge.endorsement.claimcomment }}</p>
204204
</ion-label>
205205
</ion-item>
@@ -214,12 +214,12 @@ <h2>{{ 'addon.badges.relatedbages' | translate}}</h2>
214214
</ion-item-divider>
215215
<ion-item class="ion-text-wrap" *ngFor="let relatedBadge of badge.relatedbadges">
216216
<ion-label>
217-
<h2>{{ relatedBadge.name }}</h2>
217+
<p class="item-heading">{{ relatedBadge.name }}</p>
218218
</ion-label>
219219
</ion-item>
220220
<ion-item class="ion-text-wrap" *ngIf="badge.relatedbadges.length == 0">
221221
<ion-label>
222-
<h2>{{ 'addon.badges.norelated' | translate}}</h2>
222+
<p class="item-heading">{{ 'addon.badges.norelated' | translate}}</p>
223223
</ion-label>
224224
</ion-item>
225225
</ion-item-group>
@@ -234,12 +234,12 @@ <h2>{{ 'addon.badges.alignment' | translate}}</h2>
234234
<ion-item class="ion-text-wrap" *ngFor="let alignment of badge.alignment" [href]="alignment.targeturl" core-link
235235
auto-login="no">
236236
<ion-label>
237-
<h2>{{ alignment.targetname }}</h2>
237+
<p class="item-heading">{{ alignment.targetname }}</p>
238238
</ion-label>
239239
</ion-item>
240240
<ion-item class="ion-text-wrap" *ngIf="badge.alignment.length == 0">
241241
<ion-label>
242-
<h2>{{ 'addon.badges.noalignment' | translate}}</h2>
242+
<p class="item-heading">{{ 'addon.badges.noalignment' | translate}}</p>
243243
</ion-label>
244244
</ion-item>
245245
</ion-item-group>

‎src/addons/blog/pages/entries/entries.html‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,22 @@ <h1>{{ title | translate }}</h1>
2727
<ion-item class="ion-text-wrap">
2828
<core-user-avatar [user]="entry.user" slot="start" [courseId]="entry.courseid"></core-user-avatar>
2929
<ion-label>
30-
<p class="item-heading">
31-
<core-format-text [text]="entry.subject" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId">
32-
</core-format-text>
33-
<ion-note class="ion-float-end ion-padding-start ion-text-end">
30+
<div class="flex-row ion-justify-content-between ion-align-items-center">
31+
<h2>
32+
<core-format-text [text]="entry.subject" [contextLevel]="contextLevel"
33+
[contextInstanceId]="contextInstanceId">
34+
</core-format-text>
35+
</h2>
36+
<ion-note class="ion-text-end">
3437
{{ 'addon.blog.' + entry.publishTranslated! | translate}}
3538
</ion-note>
36-
</p>
37-
<p>
38-
<ion-note class="ion-float-end ion-text-end">
39+
</div>
40+
<div class="flex-row ion-justify-content-between ion-align-items-center">
41+
{{entry.user && entry.user.fullname}}
42+
<ion-note class="ion-text-end">
3943
{{entry.created | coreDateDayOrTime}}
4044
</ion-note>
41-
{{entry.user && entry.user!.fullname}}
42-
</p>
45+
</div>
4346
</ion-label>
4447
</ion-item>
4548
<ion-card-content>

‎src/addons/calendar/components/calendar/calendar.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898

9999
.addon-calendar-period {
100100
flex-grow: 3;
101-
h3 {
101+
h2 {
102102
margin-top: 10px;
103103
font-size: 1.2rem;
104104
}

‎src/addons/calendar/pages/day/day.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ <h1>{{ 'addon.calendar.calendarevents' | translate }}</h1>
3838
</ion-button>
3939
</ion-col>
4040
<ion-col class="ion-text-center addon-calendar-period">
41-
<h3>{{ periodName }}</h3>
41+
<h2>{{ periodName }}</h2>
4242
</ion-col>
4343
<ion-col class="ion-text-end">
4444
<ion-button fill="clear" (click)="loadNext()" [attr.aria-label]="'addon.calendar.daynext' | translate">

‎src/addons/calendar/pages/day/day.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
.addon-calendar-period {
88
flex-grow: 3;
9-
h3 {
9+
h2 {
1010
margin-top: 10px;
1111
font-size: 1.2rem;
1212
}

‎src/addons/calendar/pages/event/event.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ <h1>
6060
</ion-item>
6161
<ion-item class="ion-text-wrap">
6262
<ion-label>
63-
<h2>{{ 'addon.calendar.when' | translate }}</h2>
63+
<p class="item-heading">{{ 'addon.calendar.when' | translate }}</p>
6464
<core-format-text [text]="event.formattedtime" [contextLevel]="event.contextLevel"
6565
[contextInstanceId]="event.contextInstanceId"></core-format-text>
6666
</ion-label>
@@ -70,13 +70,13 @@ <h2>{{ 'addon.calendar.when' | translate }}</h2>
7070
</ion-item>
7171
<ion-item>
7272
<ion-label>
73-
<h2>{{ 'addon.calendar.eventtype' | translate }}</h2>
73+
<p class="item-heading">{{ 'addon.calendar.eventtype' | translate }}</p>
7474
<p>{{ 'addon.calendar.type' + event.formattedType | translate }}</p>
7575
</ion-label>
7676
</ion-item>
7777
<ion-item class="ion-text-wrap" *ngIf="courseName" [href]="courseUrl" core-link capture="true">
7878
<ion-label>
79-
<h2>{{ 'core.course' | translate}}</h2>
79+
<p class="item-heading">{{ 'core.course' | translate}}</p>
8080
<p>
8181
<core-format-text [text]="courseName" contextLevel="course" [contextInstanceId]="courseId">
8282
</core-format-text>
@@ -85,13 +85,13 @@ <h2>{{ 'core.course' | translate}}</h2>
8585
</ion-item>
8686
<ion-item class="ion-text-wrap core-groupname" *ngIf="groupName">
8787
<ion-label>
88-
<h2>{{ 'core.group' | translate}}</h2>
88+
<p class="item-heading">{{ 'core.group' | translate}}</p>
8989
<p>{{ groupName }}</p>
9090
</ion-label>
9191
</ion-item>
9292
<ion-item class="ion-text-wrap" *ngIf="categoryPath">
9393
<ion-label>
94-
<h2>{{ 'core.category' | translate}}</h2>
94+
<p class="item-heading">{{ 'core.category' | translate}}</p>
9595
<p>
9696
<core-format-text [text]="categoryPath" contextLevel="coursecat" [contextInstanceId]="event.categoryid">
9797
</core-format-text>
@@ -100,7 +100,7 @@ <h2>{{ 'core.category' | translate}}</h2>
100100
</ion-item>
101101
<ion-item class="ion-text-wrap" *ngIf="event.description">
102102
<ion-label>
103-
<h2>{{ 'core.description' | translate}}</h2>
103+
<p class="item-heading">{{ 'core.description' | translate}}</p>
104104
<p>
105105
<core-format-text [text]="event.description" [contextLevel]="event.contextLevel"
106106
[contextInstanceId]="event.contextInstanceId"></core-format-text>
@@ -109,7 +109,7 @@ <h2>{{ 'core.description' | translate}}</h2>
109109
</ion-item>
110110
<ion-item class="ion-text-wrap" *ngIf="event.location">
111111
<ion-label>
112-
<h2>{{ 'core.location' | translate}}</h2>
112+
<p class="item-heading">{{ 'core.location' | translate}}</p>
113113
<p>
114114
<a [href]="event.encodedLocation" core-link auto-login="no">
115115
<core-format-text [text]="event.location" [contextLevel]="event.contextLevel"

‎src/addons/competency/pages/competency/competency.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h1 *ngIf="competency">
1919
<ion-item class="ion-text-wrap">
2020
<core-user-avatar [user]="user" slot="start"></core-user-avatar>
2121
<ion-label>
22-
<h2>{{ user.fullname }}</h2>
22+
<p class="item-heading">{{ user.fullname }}</p>
2323
</ion-label>
2424
</ion-item>
2525
</ion-card>
@@ -115,7 +115,7 @@ <h2>{{ user.fullname }}</h2>
115115
</ion-card>
116116

117117
<div *ngIf="competency">
118-
<h3 class="ion-margin-horizontal">{{ 'addon.competency.evidence' | translate }}</h3>
118+
<h2 class="ion-margin-horizontal">{{ 'addon.competency.evidence' | translate }}</h2>
119119
<p class="ion-margin-horizontal" *ngIf="competency.evidence.length == 0">
120120
{{ 'addon.competency.noevidence' | translate }}
121121
</p>

‎src/addons/competency/pages/coursecompetencies/coursecompetencies.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ <h2 class="ion-margin-horizontal" *ngIf="courseCompetencies && courseCompetencie
5353
<ion-item class="ion-text-wrap">
5454
<core-user-avatar [user]="user" slot="start"></core-user-avatar>
5555
<ion-label>
56-
<h2>{{ user.fullname }}</h2>
56+
<p class="item-heading">{{ user.fullname }}</p>
5757
</ion-label>
5858
</ion-item>
5959
</ion-card>

‎src/addons/competency/pages/plan/plan.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ <h1 *ngIf="plan">{{plan.plan.name}}</h1>
1717
<ion-item class="ion-text-wrap">
1818
<ion-label>
1919
<core-user-avatar [user]="user" slot="start"></core-user-avatar>
20-
<h2>{{ user.fullname }}</h2>
20+
<p class="item-heading">{{ user.fullname }}</p>
2121
</ion-label>
2222
</ion-item>
2323
</ion-card>

0 commit comments

Comments
 (0)