From 55a5b1891e749b2456ef47a9dd09fb21bd95f07b Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Mon, 29 Jul 2019 13:10:57 +0200
Subject: [PATCH] 63945: Upload, Download and Edit buttons

---
 resources/i18n/en.json                        |  5 ++-
 .../item-bitstreams.component.html            | 41 ++++++++++---------
 .../item-edit-bitstream.component.html        |  9 ++++
 3 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/resources/i18n/en.json b/resources/i18n/en.json
index edddd05215..b4960f395e 100644
--- a/resources/i18n/en.json
+++ b/resources/i18n/en.json
@@ -271,6 +271,7 @@
         }
       },
       "bitstreams": {
+        "upload-button": "Upload",
         "discard-button": "Discard",
         "reinstate-button": "Undo",
         "save-button": "Save",
@@ -284,7 +285,9 @@
         "edit": {
           "buttons": {
             "remove": "Remove",
-            "undo": "Undo changes"
+            "undo": "Undo changes",
+            "download": "Download",
+            "edit": "Edit"
           }
         },
         "notifications": {
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index 087f9a6fab..91f7a0b1f7 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -1,23 +1,26 @@
 <div class="item-bitstreams">
-  <div class="float-right">
-    <div class="button-row top mb-4 mt-2">
-      <button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
-              [disabled]="!(hasChanges() | async)"
-              (click)="discard()"><i
-        class="fas fa-times"></i>
-        <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
-      </button>
-      <button class="btn btn-warning" *ngIf="isReinstatable() | async"
-              (click)="reinstate()"><i
-        class="fas fa-undo-alt"></i>
-        <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
-      </button>
-      <button class="btn btn-primary" [disabled]="!(hasChanges() | async)"
-              (click)="submit()"><i
-        class="fas fa-save"></i>
-        <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.save-button" | translate}}</span>
-      </button>
-    </div>
+  <div class="button-row top d-flex mt-2">
+    <button class="mr-auto btn btn-success"
+            [routerLink]="['/items/', item.id, 'bitstreams', 'new']"><i
+            class="fas fa-upload"></i>
+      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.upload-button" | translate}}</span>
+    </button>
+    <button class="btn btn-danger mr-1" *ngIf="!(isReinstatable() | async)"
+            [disabled]="!(hasChanges() | async)"
+            (click)="discard()"><i
+            class="fas fa-times"></i>
+      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
+    </button>
+    <button class="btn btn-warning mr-1" *ngIf="isReinstatable() | async"
+            (click)="reinstate()"><i
+            class="fas fa-undo-alt"></i>
+      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
+    </button>
+    <button class="btn btn-primary" [disabled]="!(hasChanges() | async)"
+            (click)="submit()"><i
+            class="fas fa-save"></i>
+      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.save-button" | translate}}</span>
+    </button>
   </div>
 
   <ds-pagination *ngIf="(updates$ | async) && ((updates$ | async) | dsObjectValues).length > 0"
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
index 9f98e23281..1dc53fc4b0 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
@@ -12,6 +12,15 @@
 </td>
 <td class="text-center">
   <div class="btn-group relationship-action-buttons">
+    <a [href]="bitstream?.content"
+            class="btn btn-outline-primary btn-sm"
+            title="{{'item.edit.bitstreams.edit.buttons.download' | translate}}">
+      <i class="fas fa-download fa-fw"></i>
+    </a>
+    <button [routerLink]="['/bitstreams/', bitstream.id, 'edit']" class="btn btn-outline-primary btn-sm"
+            title="{{'item.edit.bitstreams.edit.buttons.edit' | translate}}">
+      <i class="fas fa-edit fa-fw"></i>
+    </button>
     <button [disabled]="!canRemove()" (click)="remove()"
             class="btn btn-outline-danger btn-sm"
             title="{{'item.edit.bitstreams.edit.buttons.remove' | translate}}">