mirror
/
OpenDroneMap-NodeODM
kopia lustrzana https://github.com/OpenDroneMap/NodeODM
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Replaced buttons with links for downloads

pull/73/head
Piero Toffanin 2019-02-13 13:31:18 -05:00
rodzic 4463ae6ec9
commit b19c14f2b4
2 zmienionych plików z 21 dodań i 18 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

29
public/index.html
Wyświetl plik

@ -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>

10
public/js/main.js
Wyświetl plik

@ -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();