Merge branch 'release/3.5.1'

client/app/components/navbar/navbar.html

@@ -52,7 +52,7 @@
                     <span class="fa fa-1-3x fa-envelope"></span>
                     <span ng-if="notificationCount > 0" class="label label-lightred notification-label">{{notificationCount}}</span>
                 </a>
-                <ul class="dropdown-menu message-ul">
+                <ul class="dropdown-menu message-ul navbar-notification">
                     <dss-notifications/>
                 </ul>
             </li>

client/app/components/navbar/navbar.less

@@ -61,7 +61,7 @@ nav > div.collapse.navbar-collapse > ul > li > a {
 }
 
 .radio-player-dropdown {
-  width: 412px!important;
+  width: 412px !important;
 }
 
 //#notifications-button {

client/app/directives/notifications/notifications.html

@@ -1,14 +1,32 @@
-<li ng-repeat="notification in notifications">
-    <a class="notification-wrapper" ui-sref="root.users.mix({user: mix.user.slug, mix: notification.target})"
-        ng-class="notification.accepted_date ? '' : 'notification-new'">
-        <img class="notification-details-profile-image" ng-src="{{notification.from_user.profile_image_small}}" alt="">
-        <div class="details notification-details">
-            <div class="name">
-                    {{notification.from_user.first_name}}
-            </div>
-            <div class="message">
-                {{notification.verb}}&nbsp;{{notification.target_desc}}
+<div>
+    <!--<div class="notification-heading">-->
+        <!--<h4 class="menu-title">Notifications</h4>-->
+        <!--<h4 class="menu-title pull-right">-->
+            <!--View all<i class="glyphicon glyphicon-circle-arrow-right"></i>-->
+        <!--</h4>-->
+    <!--</div>-->
+    <!--<li class="divider"></li>-->
+    <div class="notifications-wrapper notification-wrapper">
+        <div class="content" href="#" ng-repeat="notification in notifications">
+            <div class="notification-item notification-wrapper"
+                ng-class="notification.accepted_date ? '' : 'notification-new'">
+                <img class="notification-details-profile-image" ng-src="{{notification.from_user.profile_image_small}}"
+                     alt="">
+                <div class="details notification-details">
+                    <div class="name">
+                        {{notification.from_user.first_name}}
+                    </div>
+                    <div class="message">
+                        {{notification.verb}}&nbsp;<a href="{{notification.target}}">{{notification.target_desc}}</a>
+                    </div>
+                </div>
             </div>
         </div>
-    </a>
-</li>
+    </div>
+    <!--<li class="divider"></li>-->
+    <!--<div class="notification-footer">-->
+        <!--<h4 class="menu-title">-->
+            <!--View all<i class="glyphicon glyphicon-circle-arrow-right"></i>-->
+        <!--</h4>-->
+    <!--</div>-->
+</div>

client/app/directives/notifications/notifications.less

@@ -1,3 +1,63 @@
+.dropdown {
+  display: inline-block;
+  margin-left: 20px;
+}
+
+.glyphicon-bell {
+  font-size: 1.5rem;
+}
+
+.notifications {
+  min-width: 210px;
+}
+
+.navbar-notification {
+  width: 385px;
+}
+
+.notifications-wrapper {
+  overflow: auto;
+  max-height: 480px;
+}
+
+.menu-title {
+  color: #ff7788;
+  font-size: 1.5rem;
+  display: inline-block;
+}
+
+.glyphicon-circle-arrow-right {
+  margin-left: 10px;
+}
+
+.notification-heading, .notification-footer {
+  padding: 2px 10px;
+}
+
+.dropdown-menu.divider {
+  margin: 5px 0;
+}
+
+.item-title {
+
+  font-size: 1.3rem;
+  color: #000;
+
+}
+
+.notifications a.content {
+  text-decoration: none;
+  background: #ccc;
+
+}
+
+.notification-item {
+  padding: 10px;
+  margin: 5px;
+  background: #ccc;
+  border-radius: 4px;
+}
+
 .navbar-notification-feed {
   overflow: scroll;
   overflow-x: hidden;
@@ -15,6 +75,9 @@
 .notification-details {
   margin-left: 10px;
   padding-left: 15px;
-  max-width: 210px;
   overflow: hidden;
-}
+}
+
+.notication-wrapper:hover {
+  background-color: #FF0000;
+}

client/app/views/mixes/upload/upload.controller.js

@@ -7,7 +7,9 @@ angular.module('dssWebApp')
 
             $scope.mix = mix;
             $scope.waveformHeader = '(drag & drop or click & browse)';
+
             $scope.waveformFooter = '';
+
             $scope.sending = false;
 
             $scope.multipleDemo = {};
@@ -49,7 +51,6 @@ angular.module('dssWebApp')
 
             function _registerProcessingCallback() {
                 SocketService.on('user:process', function (message) {
-                    debugger;
                     console.log("Received user:process message: ", message);
                     if (message.type === 'waveform' && message.target === _uploadHash) {
                         $scope.waveformHeader = "Waveform generated.";
@@ -112,10 +113,9 @@ 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 = "Waveform processing is taking longer than expected.<br />" +
-                                "Your mix should be available <a href='" + url + "'>Here</a>";
+                            $scope.waveformFooter = "Your mix will be available <a href='" + '/mix' + "'>Here</a>";
                             $scope.$apply();
-                        }, 1200);
+                        }, 6400);
 
                         var imageFile = document.getElementById('mix-image-fileinput').files[0];
                         if (imageFile) {
@@ -153,8 +153,9 @@ angular.module('dssWebApp')
                 },
                 complete: function (file) {
                     if (file.status !== 'error') {
-                        $scope.waveformHeader = "Generating waveform, we'll try to let you know when it's done or send you an email.";
-                        $scope.uploadState = uploadStates.AUDIO_SENT;
+                        $scope.waveformHeader =
+                            "<i class='fa fa-spinner fa-spin'></i>" +
+                            "Generating waveform, we'll try to let you know when it's done or send you an email.";                        $scope.uploadState = uploadStates.AUDIO_SENT;
                         $scope.$apply();
                         _checkRedirect();
                     } else {

client/app/views/mixes/upload/upload.html

@@ -8,28 +8,27 @@
             </form>
         </div>
     </div>
+    <div class="row">
+        <div ng-show="uploadState==uploadStates.AUDIO_SENT" class="widget widget-simple col-md-8">
+            <h6 class="description">
+                <span ng-bind-html="waveformHeader | unsafe"></span><br/>
+                <span ng-bind-html="waveformFooter | unsafe"></span>
+            </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==1" class="progress progress-striped">
+                    <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">
-                    <div ng-show="uploadState==2" class="widget widget-simple col-md-8">
-                        <div>
-                            <h6 class="description">
-                                {{waveformHeader}}
-                            </h6>
-                        </div>
-                    </div>
-                </div>
                 <div class="row">
                     <form name="uploadForm" ng-submit="saveMix()" class="form-horizontal">
                         <input type="hidden" ng-model="mix.uid"/>
@@ -42,10 +41,8 @@
                                 <input type="text" id="title" name="title" required="" ng-minlength="5"
                                        ng-maxlength="250"
                                        ng-model="mix.title" class="form-control input-sm"/>
-
                                 <p for="title" ng-show="uploadForm.title.$invalid &amp;&amp; uploadForm.title.$dirty"
                                    class="help-block">Title must be between 5 and 250 characters</p>
-
                                 <p for="title"
                                    ng-show="(uploadForm.title.$error.required) &amp;&amp; uploadForm.$dirty &amp;&amp;!(uploadForm.title.$invalid &amp;&amp; uploadForm.title.$dirty)"
                                    class="help-block">Title is a must</p>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dssweb",
-  "version": "3.4.2",
+  "version": "3.5.1",
   "main": "server/app.js",
   "dependencies": {
     "body-parser": "~1.5.0",