Merge branch 'accessibility-settings-7.6' into accessibility-settings…

…-8_x
atmire · Nov 7, 2024 · 59eda8b · 59eda8b
2 parents 6319c9b + bb7f0cd
commit 59eda8b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html
@@ -36,7 +36,7 @@ <h1>{{'profile.title' | translate}}</h1>
     <div class="card mb-4">
       <div class="card-header">{{'profile.card.accessibility.header' | translate}}</div>
       <div class="card-body">
-        <div class="mb-1">{{'profile.card.accessibility.content' | translate}}</div>
+        <ds-alert class="mb-4" [type]="'alert-info'">{{'profile.card.accessibility.content' | translate}}</ds-alert>
         <a [routerLink]="'/info/accessibility'">{{'profile.card.accessibility.link' | translate}}</a>
       </div>
     </div>

diff --git a/src/app/profile-page/profile-page.component.spec.ts b/src/app/profile-page/profile-page.component.spec.ts
@@ -5,6 +5,7 @@ import {
   waitForAsync,
 } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterModule } from '@angular/router';
 import { StoreModule } from '@ngrx/store';
 import { provideMockStore } from '@ngrx/store/testing';
@@ -116,6 +117,7 @@ describe('ProfilePageComponent', () => {
         RouterModule.forRoot([]),
         ProfilePageComponent,
         VarDirective,
+        NoopAnimationsModule,
       ],
       providers: [
         { provide: EPersonDataService, useValue: epersonService },

diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts
@@ -41,6 +41,7 @@ import {
   getRemoteDataPayload,
 } from '../core/shared/operators';
 import { SuggestionsNotificationComponent } from '../notifications/suggestions-notification/suggestions-notification.component';
+import { AlertComponent } from '../shared/alert/alert.component';
 import {
   hasValue,
   isNotEmpty,
@@ -67,6 +68,7 @@ import { ProfilePageSecurityFormComponent } from './profile-page-security-form/p
     NgForOf,
     SuggestionsNotificationComponent,
     RouterModule,
+    AlertComponent,
   ],
   standalone: true,
 })

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
@@ -3894,7 +3894,7 @@
 
   "profile.card.accessibility.header": "Accessibility",
 
-  "profile.card.accessibility.link": "Accessibility Settings Page",
+  "profile.card.accessibility.link": "Go to Accessibility Settings Page",
 
   "profile.card.identify": "Identify",
 

diff --git a/src/themes/custom/app/profile-page/profile-page.component.ts b/src/themes/custom/app/profile-page/profile-page.component.ts
@@ -12,6 +12,7 @@ import { ProfilePageComponent as BaseComponent } from '../../../../app/profile-p
 import { ThemedProfilePageMetadataFormComponent } from '../../../../app/profile-page/profile-page-metadata-form/themed-profile-page-metadata-form.component';
 import { ProfilePageResearcherFormComponent } from '../../../../app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component';
 import { ProfilePageSecurityFormComponent } from '../../../../app/profile-page/profile-page-security-form/profile-page-security-form.component';
+import { AlertComponent } from '../../../../app/shared/alert/alert.component';
 import { VarDirective } from '../../../../app/shared/utils/var.directive';
 
 @Component({
@@ -32,6 +33,7 @@ import { VarDirective } from '../../../../app/shared/utils/var.directive';
     NgForOf,
     SuggestionsNotificationComponent,
     RouterModule,
+    AlertComponent,
   ],
 })
 /**