MOBILE-3814 course: Change contents tab string

main
Pau Ferrer Ocaña 2022-01-21 16:07:16 +01:00
parent 7f3ecdc21b
commit 6041ec0137
6 changed files with 7 additions and 13 deletions

View File

@ -1515,7 +1515,6 @@
"core.course.confirmdownloadzerosize": "local_moodlemobileapp", "core.course.confirmdownloadzerosize": "local_moodlemobileapp",
"core.course.confirmlimiteddownload": "local_moodlemobileapp", "core.course.confirmlimiteddownload": "local_moodlemobileapp",
"core.course.confirmpartialdownloadsize": "local_moodlemobileapp", "core.course.confirmpartialdownloadsize": "local_moodlemobileapp",
"core.course.contents": "local_moodlemobileapp",
"core.course.couldnotloadsectioncontent": "local_moodlemobileapp", "core.course.couldnotloadsectioncontent": "local_moodlemobileapp",
"core.course.couldnotloadsections": "local_moodlemobileapp", "core.course.couldnotloadsections": "local_moodlemobileapp",
"core.course.coursesummary": "moodle", "core.course.coursesummary": "moodle",

View File

@ -26,7 +26,6 @@
"confirmdownloadzerosize": "You are about to start downloading.{{availableSpace}} Are you sure you want to continue?", "confirmdownloadzerosize": "You are about to start downloading.{{availableSpace}} Are you sure you want to continue?",
"confirmpartialdownloadsize": "You are about to download <strong>at least</strong> {{size}}.{{availableSpace}} Are you sure you want to continue?", "confirmpartialdownloadsize": "You are about to download <strong>at least</strong> {{size}}.{{availableSpace}} Are you sure you want to continue?",
"confirmlimiteddownload": "You are not currently connected to Wi-Fi. ", "confirmlimiteddownload": "You are not currently connected to Wi-Fi. ",
"contents": "Contents",
"gotonextactivity": "Continue to next activity", "gotonextactivity": "Continue to next activity",
"gotonextactivitynotfound": "Next activity not found. It's possible that it has been hidden or deleted.", "gotonextactivitynotfound": "Next activity not found. It's possible that it has been hidden or deleted.",
"gotopreviousactivity": "Continue to previous activity", "gotopreviousactivity": "Continue to previous activity",

View File

@ -385,7 +385,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy {
openCourseSummary(): void { openCourseSummary(): void {
CoreNavigator.navigateToSitePath( CoreNavigator.navigateToSitePath(
'/course/' + this.course.id + '/preview', '/course/' + this.course.id + '/preview',
{ params: { course: this.course, avoidOpenCourse: true } }, { params: { course: this.course } },
); );
} }

View File

@ -51,7 +51,7 @@ export class CoreCourseIndexPage implements OnInit, OnDestroy {
protected isGuest?: boolean; protected isGuest?: boolean;
protected contentsTab: CoreTabsOutletTab = { protected contentsTab: CoreTabsOutletTab = {
page: CONTENTS_PAGE_NAME, page: CONTENTS_PAGE_NAME,
title: 'core.course.contents', title: 'core.course',
pageParams: {}, pageParams: {},
}; };

View File

@ -21,8 +21,8 @@
</div> </div>
</div> </div>
<div class="core-course-thumb-parallax-content" *ngIf="course"> <div class="core-course-thumb-parallax-content" *ngIf="course">
<ion-item class="ion-text-wrap" (click)="openCourse()" [attr.aria-label]="course.fullname" <ion-item class="ion-text-wrap" (click)="openCourse()" [attr.aria-label]="course.fullname" [detail]="canAccessCourse"
[detail]="!avoidOpenCourse && canAccessCourse" [button]="!avoidOpenCourse && canAccessCourse"> [button]="canAccessCourse">
<ion-icon name="fas-graduation-cap" fixed-width slot="start" aria-hidden="true"></ion-icon> <ion-icon name="fas-graduation-cap" fixed-width slot="start" aria-hidden="true"></ion-icon>
<ion-label> <ion-label>
<h2> <h2>
@ -121,11 +121,10 @@
<h2 *ngIf="prefetchCourseData.status == statusDownloaded">{{ 'core.course.refreshcourse' | translate }}</h2> <h2 *ngIf="prefetchCourseData.status == statusDownloaded">{{ 'core.course.refreshcourse' | translate }}</h2>
</ion-label> </ion-label>
</ion-item> </ion-item>
<ion-item button (click)="openCourse()" [attr.aria-label]="course.fullname" *ngIf="!avoidOpenCourse && canAccessCourse" <ion-item button (click)="openCourse()" [attr.aria-label]="course.fullname" *ngIf="canAccessCourse" detail="true">
detail="true">
<ion-icon name="fas-briefcase" slot="start" aria-hidden="true"></ion-icon> <ion-icon name="fas-briefcase" slot="start" aria-hidden="true"></ion-icon>
<ion-label> <ion-label>
<h2>{{ 'core.course.contents' | translate }}</h2> <h2>{{ 'core.course' | translate }}</h2>
</ion-label> </ion-label>
</ion-item> </ion-item>
<ion-item [href]="courseUrl" core-link [attr.aria-label]="course.fullname" button detail="false" [showBrowserWarning]="false"> <ion-item [href]="courseUrl" core-link [attr.aria-label]="course.fullname" button detail="false" [showBrowserWarning]="false">

View File

@ -51,7 +51,6 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
selfEnrolInstances: CoreCourseEnrolmentMethod[] = []; selfEnrolInstances: CoreCourseEnrolmentMethod[] = [];
paypalEnabled = false; paypalEnabled = false;
dataLoaded = false; dataLoaded = false;
avoidOpenCourse = false;
prefetchCourseData: CorePrefetchStatusInfo = { prefetchCourseData: CorePrefetchStatusInfo = {
icon: '', icon: '',
statusTranslatable: 'core.loading', statusTranslatable: 'core.loading',
@ -97,7 +96,6 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
*/ */
async ngOnInit(): Promise<void> { async ngOnInit(): Promise<void> {
this.course = CoreNavigator.getRouteParam('course'); this.course = CoreNavigator.getRouteParam('course');
this.avoidOpenCourse = !!CoreNavigator.getRouteBooleanParam('avoidOpenCourse');
if (!this.course) { if (!this.course) {
CoreNavigator.back(); CoreNavigator.back();
@ -238,8 +236,7 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy {
* Open the course. * Open the course.
*/ */
openCourse(): void { openCourse(): void {
if (!this.canAccessCourse || this.avoidOpenCourse) { if (!this.canAccessCourse) {
// Course cannot be opened or we are avoiding opening because we accessed from inside a course.
return; return;
} }