Merge pull request #4039 from dpalou/MOBILE-4470

Mobile 4470
main
Pau Ferrer Ocaña 2024-05-08 13:12:40 +02:00 committed by GitHub
commit f825778d56
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 19 additions and 7 deletions

View File

@ -23,7 +23,8 @@
onError="this.src='assets/img/group-avatar.svg'">
</div>
<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>
<p>
<core-format-text *ngIf="conversation.subname" [text]="conversation.subname" contextLevel="system"

View File

@ -9,7 +9,8 @@
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"
[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"
[attr.aria-label]="'core.favourites' | translate" />
<ion-icon *ngIf="conversation && conversation.ismuted" name="fas-bell-slash"

View File

@ -14,7 +14,7 @@
<form name="itemEdit" (ngSubmit)="addNote($event)" #itemEdit>
<ion-item>
<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="site">{{ 'addon.notes.sitenotes' | translate }}</ion-select-option>
</ion-select>

View File

@ -25,6 +25,8 @@ import { AddonNotesDBRecord, AddonNotesDeletedDBRecord } from './database/notes'
import { AddonNotes, AddonNotesCreateNoteData } from './notes';
import { AddonNotesOffline } from './notes-offline';
import { CoreArray } from '@singletons/array';
import { CoreAnyError } from '@classes/errors/error';
import { CoreTextUtils } from '@services/utils/text';
/**
* Service to sync notes.
@ -154,7 +156,7 @@ export class AddonNotesSyncProvider extends CoreSyncBaseProvider<AddonNotesSyncR
throw new CoreNetworkError();
}
const errors: string[] = [];
const errors: CoreAnyError[] = [];
const promises: Promise<void>[] = [];
// Format the notes to be sent.
@ -233,7 +235,7 @@ export class AddonNotesSyncProvider extends CoreSyncBaseProvider<AddonNotesSyncR
result.warnings = errors.map((error) =>
Translate.instant('addon.notes.warningnotenotsent', {
course: 'fullname' in course ? course.fullname : courseId, // @deprecated since 4.3.
error: error,
error: CoreTextUtils.getErrorMessageFromError(error),
}));
}

View File

@ -96,7 +96,7 @@
}
.delete-button {
min-height: initial;
min-height: 36px;
line-height: initial;
margin: 0px;
align-self: flex-end;

View File

@ -342,7 +342,7 @@ export class CorePolicySitePolicyPage implements OnInit, OnDestroy {
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.
}
/**

View File

@ -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;
}
}

View File

@ -29,6 +29,7 @@
/* Ionic components overrides */
html {
@import "components/ion-action-sheet.scss";
@import "components/ion-alert.scss";
@import "components/ion-back-button.scss";
@import "components/ion-button.scss";
@import "components/ion-card.scss";