From bacb778fa7b0f85bfaeaf89ece1262f1a43ed6b0 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 30 Apr 2020 17:25:00 +0200
Subject: [PATCH] Fixed resource policy page buttons

---
 resources/i18n/en.json5                       |  6 +++++-
 .../resource-policies.component.html          | 21 ++++++++++++-------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/resources/i18n/en.json5 b/resources/i18n/en.json5
index 96b4729caa..3868be5d41 100644
--- a/resources/i18n/en.json5
+++ b/resources/i18n/en.json5
@@ -1987,6 +1987,8 @@
 
 
 
+  "resource-policies.add.button": "Add",
+
   "resource-policies.add.for.": "Add a new policy",
 
   "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
@@ -2003,7 +2005,9 @@
 
   "resource-policies.create.page.title": "Create new resource policy",
 
-  "resource-policies.delete.btn": "Delete selected resource policies",
+  "resource-policies.delete.btn": "Delete selected",
+
+  "resource-policies.delete.btn.title": "Delete selected resource policies",
 
   "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
 
diff --git a/src/app/shared/resource-policies/resource-policies.component.html b/src/app/shared/resource-policies/resource-policies.component.html
index 8209c836ff..2a2c013ecb 100644
--- a/src/app/shared/resource-policies/resource-policies.component.html
+++ b/src/app/shared/resource-policies/resource-policies.component.html
@@ -2,24 +2,28 @@
   <table class="table table-striped table-bordered table-hover">
     <thead>
       <tr>
-        <th colspan="9">
+        <th colspan="10">
           <div class="d-flex justify-content-between align-items-center m-0">
             {{ 'resource-policies.table.headers.title.for.' + resourceType | translate }} {{resourceUUID}}
             <div>
-              <button class="btn btn-outline-primary float-right ml-1"
+              <button class="btn btn-danger float-right ml-1"
                       [disabled]="(!(canDelete() | async)) || (isProcessingDelete() | async)"
+                      [title]="'resource-policies.delete.btn.title' | translate"
                       (click)="deleteSelectedResourcePolicies()">
                 <span *ngIf="(isProcessingDelete() | async)">
                   <i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}
                 </span>
                 <span *ngIf="!(isProcessingDelete() | async)">
+                  <i class='fas fa-trash-alt fa-fw'></i>
                   {{'resource-policies.delete.btn' | translate}}
                 </span>
               </button>
-              <button class="btn btn-outline-primary float-right"
+              <button class="btn btn-success float-right"
                       [disabled]="(isProcessingDelete() | async)"
+                      [title]="'resource-policies.add.for.' + resourceType | translate"
                       (click)="redirectToResourcePolicyCreatePage()">
-                {{'resource-policies.add.for.' + resourceType | translate}}
+                <i class='fas fa-plus'></i>
+                {{'resource-policies.add.button' | translate}}
               </button>
             </div>
           </div>
@@ -43,6 +47,7 @@
         <th>{{'resource-policies.table.headers.group' | translate}}</th>
         <th>{{'resource-policies.table.headers.date.start' | translate}}</th>
         <th>{{'resource-policies.table.headers.date.end' | translate}}</th>
+        <th>{{'resource-policies.table.headers.edit' | translate}}</th>
       </tr>
     </thead>
     <tbody>
@@ -59,9 +64,6 @@
         </td>
         <th scope="row">
           {{entry.id}}
-          <button class="btn btn-link pt-0 pb-0" (click)="redirectToResourcePolicyEditPage(entry.policy)">
-            {{'resource-policies.table.headers.edit' | translate}}
-          </button>
         </th>
         <td>{{entry.policy.name}}</td>
         <td>{{entry.policy.policyType}}</td>
@@ -79,6 +81,11 @@
         <td *ngIf="!(hasGroup(entry.policy) | async)"></td>
         <td>{{formatDate(entry.policy.startDate)}}</td>
         <td>{{formatDate(entry.policy.endDate)}}</td>
+        <td class="text-center">
+          <button class="btn btn-outline-primary pt-0 pb-0" (click)="redirectToResourcePolicyEditPage(entry.policy)">
+            <i class="fas fa-edit fa-fw"></i>
+          </button>
+        </td>
       </tr>
     </tbody>
   </table>