commit
f825778d56
|
@ -23,7 +23,8 @@
|
||||||
onError="this.src='assets/img/group-avatar.svg'">
|
onError="this.src='assets/img/group-avatar.svg'">
|
||||||
</div>
|
</div>
|
||||||
<h2>
|
<h2>
|
||||||
<core-format-text [text]="conversation.name" contextLevel="system" [contextInstanceId]="0" />
|
<!-- WS didn't filter the name, see MDL-81815. -->
|
||||||
|
<core-format-text [text]="conversation.name" contextLevel="system" [contextInstanceId]="0" [wsNotFiltered]="true" />
|
||||||
</h2>
|
</h2>
|
||||||
<p>
|
<p>
|
||||||
<core-format-text *ngIf="conversation.subname" [text]="conversation.subname" contextLevel="system"
|
<core-format-text *ngIf="conversation.subname" [text]="conversation.subname" contextLevel="system"
|
||||||
|
|
|
@ -9,7 +9,8 @@
|
||||||
onError="this.src='assets/img/group-avatar.svg'" core-external-content role="presentation" [siteId]="siteId">
|
onError="this.src='assets/img/group-avatar.svg'" core-external-content role="presentation" [siteId]="siteId">
|
||||||
<core-user-avatar *ngIf="loaded && otherMember" class="core-bar-button-image" [user]="otherMember" [linkProfile]="false"
|
<core-user-avatar *ngIf="loaded && otherMember" class="core-bar-button-image" [user]="otherMember" [linkProfile]="false"
|
||||||
[checkOnline]="otherMember.showonlinestatus" />
|
[checkOnline]="otherMember.showonlinestatus" />
|
||||||
<core-format-text [text]="title" contextLevel="system" [contextInstanceId]="0" />
|
<!-- WS didn't filter the conversation name, see MDL-81815. -->
|
||||||
|
<core-format-text [text]="title" contextLevel="system" [contextInstanceId]="0" [wsNotFiltered]="true" />
|
||||||
<ion-icon *ngIf="conversation && conversation.isfavourite" name="fas-star"
|
<ion-icon *ngIf="conversation && conversation.isfavourite" name="fas-star"
|
||||||
[attr.aria-label]="'core.favourites' | translate" />
|
[attr.aria-label]="'core.favourites' | translate" />
|
||||||
<ion-icon *ngIf="conversation && conversation.ismuted" name="fas-bell-slash"
|
<ion-icon *ngIf="conversation && conversation.ismuted" name="fas-bell-slash"
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
<form name="itemEdit" (ngSubmit)="addNote($event)" #itemEdit>
|
<form name="itemEdit" (ngSubmit)="addNote($event)" #itemEdit>
|
||||||
<ion-item>
|
<ion-item>
|
||||||
<ion-select [(ngModel)]="type" name="publishState" interface="popover" [label]="'addon.notes.publishstate' | translate">
|
<ion-select [(ngModel)]="type" name="publishState" interface="popover" [label]="'addon.notes.publishstate' | translate">
|
||||||
<ion-select-option value=" personal">{{ 'addon.notes.personalnotes' | translate }}</ion-select-option>
|
<ion-select-option value="personal">{{ 'addon.notes.personalnotes' | translate }}</ion-select-option>
|
||||||
<ion-select-option value="course">{{ 'addon.notes.coursenotes' | translate }}</ion-select-option>
|
<ion-select-option value="course">{{ 'addon.notes.coursenotes' | translate }}</ion-select-option>
|
||||||
<ion-select-option value="site">{{ 'addon.notes.sitenotes' | translate }}</ion-select-option>
|
<ion-select-option value="site">{{ 'addon.notes.sitenotes' | translate }}</ion-select-option>
|
||||||
</ion-select>
|
</ion-select>
|
||||||
|
|
|
@ -25,6 +25,8 @@ import { AddonNotesDBRecord, AddonNotesDeletedDBRecord } from './database/notes'
|
||||||
import { AddonNotes, AddonNotesCreateNoteData } from './notes';
|
import { AddonNotes, AddonNotesCreateNoteData } from './notes';
|
||||||
import { AddonNotesOffline } from './notes-offline';
|
import { AddonNotesOffline } from './notes-offline';
|
||||||
import { CoreArray } from '@singletons/array';
|
import { CoreArray } from '@singletons/array';
|
||||||
|
import { CoreAnyError } from '@classes/errors/error';
|
||||||
|
import { CoreTextUtils } from '@services/utils/text';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Service to sync notes.
|
* Service to sync notes.
|
||||||
|
@ -154,7 +156,7 @@ export class AddonNotesSyncProvider extends CoreSyncBaseProvider<AddonNotesSyncR
|
||||||
throw new CoreNetworkError();
|
throw new CoreNetworkError();
|
||||||
}
|
}
|
||||||
|
|
||||||
const errors: string[] = [];
|
const errors: CoreAnyError[] = [];
|
||||||
const promises: Promise<void>[] = [];
|
const promises: Promise<void>[] = [];
|
||||||
|
|
||||||
// Format the notes to be sent.
|
// Format the notes to be sent.
|
||||||
|
@ -233,7 +235,7 @@ export class AddonNotesSyncProvider extends CoreSyncBaseProvider<AddonNotesSyncR
|
||||||
result.warnings = errors.map((error) =>
|
result.warnings = errors.map((error) =>
|
||||||
Translate.instant('addon.notes.warningnotenotsent', {
|
Translate.instant('addon.notes.warningnotenotsent', {
|
||||||
course: 'fullname' in course ? course.fullname : courseId, // @deprecated since 4.3.
|
course: 'fullname' in course ? course.fullname : courseId, // @deprecated since 4.3.
|
||||||
error: error,
|
error: CoreTextUtils.getErrorMessageFromError(error),
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -96,7 +96,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.delete-button {
|
.delete-button {
|
||||||
min-height: initial;
|
min-height: 36px;
|
||||||
line-height: initial;
|
line-height: initial;
|
||||||
margin: 0px;
|
margin: 0px;
|
||||||
align-self: flex-end;
|
align-self: flex-end;
|
||||||
|
|
|
@ -342,7 +342,7 @@ export class CorePolicySitePolicyPage implements OnInit, OnDestroy {
|
||||||
|
|
||||||
const scrollElement = await this.content?.getScrollElement();
|
const scrollElement = await this.content?.getScrollElement();
|
||||||
|
|
||||||
this.hasScroll = !!scrollElement && scrollElement.scrollHeight > scrollElement.clientHeight;
|
this.hasScroll = !!scrollElement && scrollElement.scrollHeight > scrollElement.clientHeight + 2; // Add 2px of error margin.
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -0,0 +1,7 @@
|
||||||
|
ion-alert {
|
||||||
|
&.md .alert-button {
|
||||||
|
// Remove padding from alert buttons, they already have min accessibility height.
|
||||||
|
padding-top: 0px;
|
||||||
|
padding-bottom: 0px;
|
||||||
|
}
|
||||||
|
}
|
|
@ -29,6 +29,7 @@
|
||||||
/* Ionic components overrides */
|
/* Ionic components overrides */
|
||||||
html {
|
html {
|
||||||
@import "components/ion-action-sheet.scss";
|
@import "components/ion-action-sheet.scss";
|
||||||
|
@import "components/ion-alert.scss";
|
||||||
@import "components/ion-back-button.scss";
|
@import "components/ion-back-button.scss";
|
||||||
@import "components/ion-button.scss";
|
@import "components/ion-button.scss";
|
||||||
@import "components/ion-card.scss";
|
@import "components/ion-card.scss";
|
||||||
|
|
Loading…
Reference in New Issue