hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 01:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Icon changes & fix after rebase

Browse Source
This commit is contained in:
Marie Verdonck
2021-07-01 16:19:31 +02:00
parent 6c219e72d5
commit 1721ba5ddf
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/core/auth/auth.reducer.spec.ts
View File

@@ -610,7 +610,8 @@ describe('authReducer', () => {
loaded: false, loaded: false,
blocking: true, blocking: true,
loading: false, loading: false,
authMethods: authMethods authMethods: authMethods,
idle: false
}; };
expect(newState).toEqual(state); expect(newState).toEqual(state);
}); });
@@ -621,7 +622,8 @@ describe('authReducer', () => {
loaded: false, loaded: false,
blocking: true, blocking: true,
loading: true, loading: true,
authMethods: [] authMethods: [],
idle: false
}; };
const action = new RetrieveAuthMethodsErrorAction(false); const action = new RetrieveAuthMethodsErrorAction(false);
@@ -685,7 +687,8 @@ describe('authReducer', () => {
loaded: false, loaded: false,
blocking: true, blocking: true,
loading: true, loading: true,
authMethods: [] authMethods: [],
idle: false
}; };
const action = new RetrieveAuthMethodsErrorAction(true); const action = new RetrieveAuthMethodsErrorAction(true);
@@ -695,7 +698,8 @@ describe('authReducer', () => {
loaded: false, loaded: false,
blocking: true, blocking: true,
loading: false, loading: false,
authMethods: [new AuthMethod(AuthMethodType.Password)] authMethods: [new AuthMethod(AuthMethodType.Password)],
idle: false
}; };
expect(newState).toEqual(state); expect(newState).toEqual(state);
}); });

6
src/app/shared/idle-modal/idle-modal.component.html
View File

@@ -9,10 +9,10 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="cancel btn btn-danger" (click)="logOutPressed()" aria-label="Log out"> <button type="button" class="cancel btn btn-danger" (click)="logOutPressed()" aria-label="Log out">
<i class="fas fa-times"></i> {{ "idle-modal.log-out" | translate }} <i class="fas fa-sign-out-alt"></i> {{ "idle-modal.log-out" | translate }}
</button> </button>
<button type="button" class="confirm btn btn-outline-secondary" (click)="extendSessionPressed()" aria-label="Extend session" ngbAutofocus> <button type="button" class="confirm btn btn-primary" (click)="extendSessionPressed()" aria-label="Extend session" ngbAutofocus>
{{ "idle-modal.extend-session" | translate }} <i class="fas fa-redo-alt"></i> {{ "idle-modal.extend-session" | translate }}
</button> </button>
</div> </div>
</div> </div>