From 03ddde9a970259af732ada012fca42b42ccfc80d Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 5 Oct 2021 16:07:02 +0200
Subject: [PATCH] 83635: Button layout changes + LGTM fixes

---
 .../bitstream-page/bitstream-page-routing.module.ts    |  1 -
 src/app/item-page/item-page-routing.module.ts          |  1 -
 .../email-request-copy.component.html                  | 10 +++++-----
 .../bitstream-request-a-copy-page.component.ts         |  2 +-
 src/assets/i18n/en.json5                               |  2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/app/bitstream-page/bitstream-page-routing.module.ts b/src/app/bitstream-page/bitstream-page-routing.module.ts
index f0b6e3c6de..27b9db9a05 100644
--- a/src/app/bitstream-page/bitstream-page-routing.module.ts
+++ b/src/app/bitstream-page/bitstream-page-routing.module.ts
@@ -10,7 +10,6 @@ import { ResourcePolicyResolver } from '../shared/resource-policies/resolvers/re
 import { ResourcePolicyEditComponent } from '../shared/resource-policies/edit/resource-policy-edit.component';
 import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component';
 import { LegacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver';
-import { BitstreamRequestACopyPageComponent } from '../shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component';
 
 const EDIT_BITSTREAM_PATH = ':id/edit';
 const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
diff --git a/src/app/item-page/item-page-routing.module.ts b/src/app/item-page/item-page-routing.module.ts
index 692783e6ab..89c89122e3 100644
--- a/src/app/item-page/item-page-routing.module.ts
+++ b/src/app/item-page/item-page-routing.module.ts
@@ -13,7 +13,6 @@ import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model';
 import { ThemedItemPageComponent } from './simple/themed-item-page.component';
 import { ThemedFullItemPageComponent } from './full/themed-full-item-page.component';
 import { BitstreamRequestACopyPageComponent } from '../shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component';
-import { BitstreamPageResolver } from '../bitstream-page/bitstream-page.resolver';
 
 @NgModule({
   imports: [
diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.html b/src/app/request-copy/email-request-copy/email-request-copy.component.html
index 6f5bf9189b..d7633b0334 100644
--- a/src/app/request-copy/email-request-copy/email-request-copy.component.html
+++ b/src/app/request-copy/email-request-copy/email-request-copy.component.html
@@ -14,17 +14,17 @@
     </div>
   </div>
   <ng-content></ng-content>
-  <div class="d-flex">
+  <div class="d-flex flex-row-reverse">
     <button (click)="submit()"
             [disabled]="!message || message.length === 0 || !subject || subject.length === 0"
-            class="btn btn-success mr-auto"
+            class="btn btn-primary"
             title="{{'grant-deny-request-copy.email.send' | translate }}">
-      <i class="fa fa-envelope"></i> {{'grant-deny-request-copy.email.send' | translate }}
+      <i class="fas fa-envelope"></i> {{'grant-deny-request-copy.email.send' | translate }}
     </button>
     <button (click)="return()"
-            class="btn btn-outline-secondary"
+            class="btn btn-outline-secondary mr-1"
             title="{{'grant-deny-request-copy.email.back' | translate }}">
-      {{'grant-deny-request-copy.email.back' | translate }}
+      <i class="fas fa-arrow-left"></i> {{'grant-deny-request-copy.email.back' | translate }}
     </button>
   </div>
 </form>
diff --git a/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.ts b/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.ts
index 7697d5fad8..3b9bc38aab 100644
--- a/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.ts
+++ b/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { filter, map, switchMap, take, tap } from 'rxjs/operators';
+import { filter, map, switchMap, take } from 'rxjs/operators';
 import { ActivatedRoute, Router } from '@angular/router';
 import { hasValue, isNotEmpty } from '../empty.util';
 import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 64bcde7167..6d9ae075a2 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1453,7 +1453,7 @@
 
   "grant-deny-request-copy.email.message.empty": "Please enter a message",
 
-  "grant-deny-request-copy.email.permissions.info": "You may use this occasion to reconsider the access restrictions on the document, to avoid having to respond to these requests. If there is no reason to keep it restricted, please check the box below.",
+  "grant-deny-request-copy.email.permissions.info": "You may use this occasion to reconsider the access restrictions on the document, to avoid having to respond to these requests. If you’d like to ask the repository administrators to remove these restrictions, please check the box below.",
 
   "grant-deny-request-copy.email.permissions.label": "Change to open access",