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

MOBILE-4038 timeline: Move action to separate line

main
Noel De Martin 2022-11-22 10:38:37 +01:00
parent a62cb0ca1e
commit 7269a7c071
2 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,7 @@
</core-mod-icon> </core-mod-icon>
</ion-col> </ion-col>
<ion-col class="addon-block-timeline-activity-name ion-no-padding"> <ion-col class="addon-block-timeline-activity-name ion-no-padding">
<p class="item-heading addon-block-timeline-activity-name-with-status"> <p class="item-heading">
<span> <span>
<core-format-text [text]="event.activityname || event.name" contextLevel="module" <core-format-text [text]="event.activityname || event.name" contextLevel="module"
[contextInstanceId]="event.id" [courseId]="event.course?.id"> [contextInstanceId]="event.id" [courseId]="event.course?.id">
@ -36,14 +36,15 @@
<ion-badge *ngIf="event.overdue" color="danger">{{ 'addon.block_timeline.overdue' | translate }} <ion-badge *ngIf="event.overdue" color="danger">{{ 'addon.block_timeline.overdue' | translate }}
</ion-badge> </ion-badge>
</p> </p>
<p *ngIf="(showInlineCourse && event.course) || event.activitystr" <p *ngIf="showInlineCourse && event.course">
class="addon-block-timeline-activity-course-activity"> <span>
<span *ngIf="showInlineCourse && event.course">
<core-format-text [text]="event.course.fullnamedisplay" contextLevel="course" <core-format-text [text]="event.course.fullnamedisplay" contextLevel="course"
[contextInstanceId]="event.course.id"> [contextInstanceId]="event.course.id">
</core-format-text> </core-format-text>
</span> </span>
<span *ngIf="event.activitystr"> </p>
<p *ngIf="event.activitystr">
<span>
<core-format-text *ngIf="event.activitystr" [text]="event.activitystr" contextLevel="module" <core-format-text *ngIf="event.activitystr" [text]="event.activitystr" contextLevel="module"
[contextInstanceId]="event.id"> [contextInstanceId]="event.id">
</core-format-text> </core-format-text>

40
src/addons/block/timeline/components/events/events.scss
View File

@ -38,34 +38,6 @@ h4.core-bold {
justify-content: flex-end; justify-content: flex-end;
} }
.addon-block-timeline-activity-name-with-status {
display: flex;
flex-wrap: wrap;
span {
overflow: hidden;
text-overflow: ellipsis;
}
}
.addon-block-timeline-activity-course-activity {
display: flex;
flex-wrap: wrap;
span {
overflow: hidden;
text-overflow: ellipsis;
}
span::after {
content: "·";
display: inline;
padding-left: .3rem;
padding-right: .3rem;
}
span:last-child::after {
display: none;
}
}
.addon-block-timeline-activity-main, .addon-block-timeline-activity-main,
.addon-block-timeline-activity-name { .addon-block-timeline-activity-name {
flex-grow: 1; flex-grow: 1;
@ -78,4 +50,16 @@ h4.core-bold {
.addon-block-timeline-activity-name { .addon-block-timeline-activity-name {
flex-grow: 1; flex-grow: 1;
overflow: hidden; overflow: hidden;
& > p {
display: flex;
flex-wrap: wrap;
& > span {
overflow: hidden;
text-overflow: ellipsis;
}
}
} }