fergalmoran/dss.web
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.web.git synced 2026-02-15 04:25:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pre-merge

Browse Source
This commit is contained in:
Fergal Moran
2016-06-22 18:34:38 +01:00
parent 29d54ee979
commit 89ecb181f8
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/app/views/mixes/upload/upload.controller.js
View File

@@ -113,7 +113,7 @@ angular.module('dssWebApp')
$scope.mix = result;
$timeout(function () {
var url = $state.href('root.user.mix', {user: $scope.mix.user.slug, mix: $scope.mix.slug});
$scope.waveformFooter = "Your mix will be available <a href='" + '/mix' + "'>Here</a>";
$scope.waveformFooter = "Your mix will be available <a href='" + '/' + url + "'>Here</a>";
$scope.$apply();
}, 6400);

15
client/app/views/mixes/upload/upload.html
View File

@@ -1,6 +1,12 @@
<div ng-hide="$root.currentUser" class="row">
<button type="button" ng-click="login()" class="btn btn-sm btn-danger">Login</button>
</div>
<div ng-show="uploadState==uploadStates.AUDIO_SENDING && !detailsEntered" class="progress progress-striped">
<div role="progressbar" aria-valuenow="uploadProgress" aria-valuemin="0" aria-valuemax="100"
ng-style="uploadProgressStyle" class="progress-bar progress-bar-success">
{{uploadProgress}}%
</div>
</div>
<div ng-show="$root.currentUser" class="row">
<div ng-show="uploadState <= uploadStates.AUDIO_SENT" class="text-center row">
<div class="block full">
@@ -16,19 +22,12 @@
</h6>
</div>
</div>
<div ng-show="uploadState != uploadStates.VIRGIN && (!detailsEntered || uploadState == uploadStates.EDIT_MODE)"
class="row">
<div class="block text-center">
<div class="col-md-2"></div>
<div class="col-md-8">
<div class="row">
<div ng-show="uploadState==uploadStates.AUDIO_SENDING" class="progress progress-striped">
<div role="progressbar" aria-valuenow="uploadProgress" aria-valuemin="0" aria-valuemax="100"
ng-style="uploadProgressStyle" class="progress-bar progress-bar-success">
{{uploadProgress}}%
</div>
</div>
</div>
<div class="row">
<form name="uploadForm" ng-submit="saveMix()" class="form-horizontal">
<input type="hidden" ng-model="mix.uid"/>