From b19c14f2b4dad4a167cb8255f1ac5acf0443d5a0 Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Wed, 13 Feb 2019 13:31:18 -0500
Subject: [PATCH] Replaced buttons with links for downloads

---
 public/index.html | 29 +++++++++++++----------------
 public/js/main.js | 10 ++++++++--
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/public/index.html b/public/index.html
index 3b6083a..8b8c893 100644
--- a/public/index.html
+++ b/public/index.html
@@ -148,30 +148,27 @@
                             <div class="taskItem"><strong>Status:</strong> <span data-bind="text: statusDescr()"></span></div>
                             <div class="taskItem"><strong>Time Elapsed:</strong> <span data-bind="text: timeElapsed()"></span></div>
                             <div class="taskItem"><strong>Output:</strong> <a href="javascript:void(0);" data-bind="click: viewOutput, visible: !viewingOutput()">View</a><a href="javascript:void(0);" data-bind="click: hideOutput, visible: viewingOutput()">Hide</a> | <a href="#" data-bind="click: downloadOutput">Download</a></a></div>
+                            
+                            <div data-bind="visible: showDownload()" style="float: left; margin-top: 6px; padding-top: 6px; border-top: 1px solid #eee;">
+                                <div class="taskItem"><strong>Download: </strong> <a data-bind="attr: {'href': downloadLink()}">All Assets</a> | <a data-bind="attr: {'href': downloadOrthoLink()}">Orthophoto</a></div>
+                            </div>
+                            
                             <textarea class="consoleOutput" data-bind="value: output().join('\n'), visible: viewingOutput(), event: {mouseover: consoleMouseOver, mouseout: consoleMouseOut}, attr: {id: 'console_' + uuid}"></textarea>
 
                             <span data-bind="css: 'statusIcon glyphicon ' + icon()"></span>
 
                             <div class="actionButtons">
-                                <button data-bind="click: download, visible: showDownload()" type="button" class="btn btn-primary btn-sm">
-                    <span class="glyphicon glyphicon-download-alt"></span> Download All Assets
-                  </button>
-
-                                <button data-bind="click: downloadOrthophoto, visible: showDownload()" type="button" class="btn btn-primary btn-sm">
-                    <span class="glyphicon glyphicon-picture"></span> Download Orthophoto
-                  </button>
-
                                 <button data-bind="click: cancel, visible: showCancel()" type="button" class="btn btn-primary btn-sm">
-                    <span class="glyphicon glyphicon-remove-circle"></span> Cancel
-                  </button>
+                                    <span class="glyphicon glyphicon-remove-circle"></span> Cancel
+                                </button>
 
                                 <button data-bind="click: restart, visible: showRestart()" type="button" class="btn btn-primary btn-sm">
-                    <span class="glyphicon glyphicon-play"></span> Restart
-                  </button>
+                                    <span class="glyphicon glyphicon-play"></span> Restart
+                                </button>
 
                                 <button data-bind="click: remove, visible: showRemove()" type="button" class="btn btn-primary btn-sm">
-                    <span class="glyphicon glyphicon-remove-circle"></span> Remove
-                  </button>
+                                    <span class="glyphicon glyphicon-remove-circle"></span> Remove
+                                </button>
                             </div>
                         </div>
 
@@ -180,8 +177,8 @@
                             <div class="alert alert-warning" role="alert" data-bind="text: info().error"></div>
                             <div class="actionButtons">
                                 <button data-bind="click: remove" type="button" class="btn btn-primary btn-sm">
-                    <span class="glyphicon glyphicon-remove-circle"></span> Remove
-                  </button>
+                                    <span class="glyphicon glyphicon-remove-circle"></span> Remove
+                                </button>
                             </div>
                         </div>
                     </div>
diff --git a/public/js/main.js b/public/js/main.js
index 4779b8c..29adaef 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -436,11 +436,17 @@ $(function() {
     Task.prototype.restart = genApiCall("/task/restart?token=" + token, function(task) {
         task.resetOutput();
     });
+    Task.prototype.downloadLink = function(){
+        return "/task/" + this.uuid + "/download/all.zip?token=" + token;
+    };
+    Task.prototype.downloadOrthoLink = function(){
+        return "/task/" + this.uuid + "/download/orthophoto.tif?token=" + token;
+    };
     Task.prototype.download = function() {
-        location.href = "/task/" + this.uuid + "/download/all.zip?token=" + token;
+        location.href = this.downloadLink();
     };
     Task.prototype.downloadOrthophoto = function() {
-        location.href = "/task/" + this.uuid + "/download/orthophoto.tif?token=" + token;
+        location.href = this.downloadOrthoLink();
     };
 
     var taskList = new TaskList();