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

Merge pull request #3817 from dpalou/MOBILE-4362 

Mobile 4362
main
Pau Ferrer Ocaña 2023-10-11 16:51:41 +02:00 committed by GitHub
parent edf1aea478 f4030ab5a7
commit 42f6fc6843
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/addons/mod/glossary/services/handlers/index-link.ts
View File

@ -28,6 +28,13 @@ export class AddonModGlossaryIndexLinkHandlerService extends CoreContentLinksMod
super('AddonModGlossary', 'glossary', 'g'); super('AddonModGlossary', 'glossary', 'g');
} }
/**
* @inheritdoc
*/
async isEnabled(siteId: string, url: string, params: Record<string, string>): Promise<boolean> {
return !params.hook && !params.eid;
}
} }
export const AddonModGlossaryIndexLinkHandler = makeSingleton(AddonModGlossaryIndexLinkHandlerService); export const AddonModGlossaryIndexLinkHandler = makeSingleton(AddonModGlossaryIndexLinkHandlerService);

4
src/addons/mod/lesson/pages/user-retake/user-retake.scss
View File

@ -17,7 +17,7 @@
opacity: 0.5; opacity: 0.5;
} }
.addon-mod_lesson-answer-success { .addon-mod_lesson-answer-stats {
@include margin-horizontal(4px, null); @include margin-horizontal(null, 4px);
} }
} }

4
src/core/components/message/message.html
View File

@ -35,8 +35,8 @@
color="danger" (click)="delete($event)" [attr.aria-label]="'addon.messages.deletemessage' | translate" class="delete-button"> color="danger" (click)="delete($event)" [attr.aria-label]="'addon.messages.deletemessage' | translate" class="delete-button">
<ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon> <ion-icon name="fas-trash" slot="icon-only" aria-hidden="true"></ion-icon>
</ion-button> </ion-button>
<ion-button *ngIf="showDelete && message.deleted" fill="clear" color="danger" (click)="undoDelete($event)" <ion-button *ngIf="showDelete && message.deleted" fill="clear" [@coreSlideInOut]="'fromRight'" color="danger"
[attr.aria-label]="'core.restore' | translate" class="delete-button"> (click)="undoDelete($event)" [attr.aria-label]="'core.restore' | translate" class="delete-button">
<ion-icon name="fas-rotate-left" slot="icon-only" aria-hidden="true"></ion-icon> <ion-icon name="fas-rotate-left" slot="icon-only" aria-hidden="true"></ion-icon>
</ion-button> </ion-button>
</div> </div>

3
src/core/features/comments/pages/viewer/viewer.html
View File

@ -12,7 +12,8 @@
<ion-buttons slot="end"> <ion-buttons slot="end">
<ion-button *ngIf="canDeleteComments" slot="end" fill="clear" (click)="toggleDelete()" <ion-button *ngIf="canDeleteComments" slot="end" fill="clear" (click)="toggleDelete()"
[attr.aria-label]="'core.toggledelete' | translate"> [attr.aria-label]="'core.toggledelete' | translate">
<ion-icon name="fas-pen" slot="icon-only" aria-hidden="true"></ion-icon> <ion-icon *ngIf="!showDelete" name="fas-pen" slot="icon-only" aria-hidden="true"></ion-icon>
<ion-icon *ngIf="showDelete" name="fas-check" slot="icon-only" aria-hidden="true"></ion-icon>
</ion-button> </ion-button>
<core-context-menu> <core-context-menu>
<core-context-menu-item [hidden]="!(commentsLoaded && !hasOffline)" [priority]="100" [content]="'core.refresh' | translate" <core-context-menu-item [hidden]="!(commentsLoaded && !hasOffline)" [priority]="100" [content]="'core.refresh' | translate"

1
src/core/features/comments/pages/viewer/viewer.ts
View File

@ -222,6 +222,7 @@ export class CoreCommentsViewerPage implements OnInit, OnDestroy {
comment.showDate = this.showDate(comment, prevComment); comment.showDate = this.showDate(comment, prevComment);
comment.showUserData = this.showUserData(comment, prevComment); comment.showUserData = this.showUserData(comment, prevComment);
comment.showTail = this.showTail(comment, prevComment); comment.showTail = this.showTail(comment, prevComment);
comment.delete = comment.delete ?? false; // If this property is undefined, core-message assumes comment can be deleted.
} }
/** /**