From 89ecb181f8305e33df5f218ef70ba5a128a3f4ee Mon Sep 17 00:00:00 2001
From: Fergal Moran <fergal.moran@gmail.com>
Date: Wed, 22 Jun 2016 18:34:38 +0100
Subject: [PATCH] Pre-merge

---
 .../app/views/mixes/upload/upload.controller.js   |  2 +-
 client/app/views/mixes/upload/upload.html         | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/client/app/views/mixes/upload/upload.controller.js b/client/app/views/mixes/upload/upload.controller.js
index 0ad4128..7e12ac5 100755
--- a/client/app/views/mixes/upload/upload.controller.js
+++ b/client/app/views/mixes/upload/upload.controller.js
@@ -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);
 
diff --git a/client/app/views/mixes/upload/upload.html b/client/app/views/mixes/upload/upload.html
index 8a53d91..3482a5f 100755
--- a/client/app/views/mixes/upload/upload.html
+++ b/client/app/views/mixes/upload/upload.html
@@ -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"/>