Merge branch 'master' into 8173-myplanet-reports-hide-export-button-i…

…f-no-data-to-export
open-learning-exchange · Jan 31, 2025 · 701cc58 · 701cc58
2 parents 69cbb48 + 05a545f
commit 701cc58
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -3,8 +3,8 @@
   "license": "AGPL-3.0",
   "version": "0.16.91",
   "myplanet": {
-    "latest": "v0.22.58",
-    "min": "v0.21.58"
+    "latest": "v0.22.63",
+    "min": "v0.21.63"
   },
   "scripts": {
     "ng": "ng",

diff --git a/src/app/courses/courses.component.ts b/src/app/courses/courses.component.ts
@@ -456,13 +456,16 @@ export class CoursesComponent implements OnInit, OnChanges, AfterViewInit, OnDes
   }
 
   openCourseViewDialog(courseId) {
-    this.dialog.open(CoursesViewDetailDialogComponent, {
+    const dialogRef = this.dialog.open(CoursesViewDetailDialogComponent, {
       data: { courseId },
       minWidth: '600px',
       maxWidth: '90vw',
       maxHeight: '90vh',
       autoFocus: false
     });
+    dialogRef.afterClosed().subscribe(() => {
+      this.dialog.closeAll();
+    });
   }
 
   addTag(tag: string) {

diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html
@@ -45,7 +45,7 @@ <h1><ng-container>Planet</ng-container> {{planetName}}</h1>
     <span *ngIf="layout === 'classic' && !forceModern">
       <button mat-icon-button routerLink="/chat" i18n-title title="Chat"><mat-icon>question_answer</mat-icon></button>
       <button mat-icon-button planetFeedback i18n-title title="Submit Feedback"><mat-icon>feedback_outline</mat-icon></button>
-      <button mat-icon-button routerLink="/feedback" i18n-title title="Review Feedback"><mat-icon>mail_outline</mat-icon></button>
+      <button mat-icon-button routerLink="/feedback" i18n-title title="Review Feedback"><mat-icon>mail</mat-icon></button>
       <ng-container *planetAuthorizedRoles>
         <button mat-icon-button planetSync i18n-title title="Sync" *ngIf="onlineStatus === 'accepted'"><mat-icon svgIcon="feedback"></mat-icon></button>
       </ng-container>
@@ -211,12 +211,9 @@ <h1><ng-container>Planet</ng-container> {{planetName}}</h1>
             </a>
           </li>
         </ng-container>
+        <li style="text-align: center;">
+          <planet-language [iconOnly]="layout === 'modern' || forceModern"></planet-language>
         <li>
-          <a mat-button (click)="openLanguageDialog()" i18n-title title="Change Language">
-            <mat-icon>translate</mat-icon>
-            <label *ngIf="sidenavState === 'open'" i18n>Language</label>
-          </a>
-        </li>
         <ng-container *planetAuthorizedRoles>
           <li *ngIf="onlineStatus === 'accepted'">
             <a mat-button planetSync i18n-title title="Sync">

diff --git a/src/app/shared/planet-language.component.html b/src/app/shared/planet-language.component.html
@@ -1,5 +1,5 @@
 <button mat-button [matMenuTriggerFor]="languageMenu">
-  <mat-icon>language</mat-icon>
+  <mat-icon>translate</mat-icon>
   <span *ngIf="!iconOnly">{{this.currentLanguage.name}}</span>
 </button>