-
-
-
-
-
-
- {{notificationCount}}
-
-
-
-
-
- - You have 9 messages - -
-
-
Łukasz Holeczek 6 min Lorem ipsum dolor sit amet consectetur adipiscing elit, et al commore
-
- -
-
Megan Abott 56 min Lorem ipsum dolor sit amet consectetur adipiscing elit, et al commore
-
- -
-
Kate Ross 3 hours Lorem ipsum dolor sit amet consectetur adipiscing elit, et al commore
-
- -
-
Julie Blank yesterday Lorem ipsum dolor sit amet consectetur adipiscing elit, et al commore
-
- -
-
Jane Sanders Jul 25, 2012 Lorem ipsum dolor sit amet consectetur adipiscing elit, et al commore
-
- - - View all messages - -
-
- {{ $root.currentUser.display_name }}
+ {{
+ $root.currentUser.display_name }}
-
+
diff --git a/client/app/components/navbar/navbar.less b/client/app/components/navbar/navbar.less index de458ca..b9c7cef 100644 --- a/client/app/components/navbar/navbar.less +++ b/client/app/components/navbar/navbar.less @@ -52,11 +52,12 @@ nav > div.collapse.navbar-collapse > ul > li > a { .notification-label { position: absolute !important; - top: 5px !important;; - font-size: 11px !important;; - font-weight: 400 !important;; - padding: 0 3px !important;; - line-height: 14px !important;; + top: 5px !important; + left: 22px !important; + font-size: 11px !important; + font-weight: 400 !important; + padding: 0 3px !important; + line-height: 14px !important; } #notifications-button { @@ -68,342 +69,10 @@ nav > div.collapse.navbar-collapse > ul > li > a { position: relative; } -#notifications-button i{ +#notifications-button i { font-size: 18px; } -#LI_1 { - box-sizing: border-box; - color: rgb(255, 255, 255); - display: block; - float: left; - height: 40px; - position: relative; - width: 46px; - perspective-origin: 23px 20px; - transform-origin: 23px 20px; - border: 0px none rgb(255, 255, 255); - font: normal normal normal normal 14px / 20px Lato, sans-serif; - list-style: none outside none; - outline: rgb(255, 255, 255) none 0px; -} - -/*#LI_1*/ - -#A_2 { - box-sizing: border-box; - color: rgb(255, 255, 255); - cursor: pointer; - display: inline-block; - height: 30px; - position: relative; - text-align: center; - text-decoration: none; - vertical-align: middle; - white-space: nowrap; - width: 40px; - perspective-origin: 20px 15px; - transform-origin: 20px 15px; - background: rgb(64, 69, 74) none repeat scroll 0% 0% / auto padding-box border-box; - border: 0px none rgb(255, 255, 255); - border-radius: 2px 2px 2px 2px; - font: normal normal normal normal 12px / 20px Lato, sans-serif; - list-style: none outside none; - margin: 5px 3px; - outline: rgb(255, 255, 255) none 0px; - padding: 5px 0px; -} - -/*#A_2*/ - -#I_3 { - box-sizing: border-box; - color: rgb(255, 255, 255); - cursor: pointer; - display: inline-block; - height: 12px; - text-align: center; - white-space: nowrap; - width: 12.0156px; - perspective-origin: 6px 6px; - transform-origin: 6px 6px; - border: 0px none rgb(255, 255, 255); - font: normal normal normal normal 12px / 12px FontAwesome; - list-style: none outside none; - margin: 2px 0px 0px; - outline: rgb(255, 255, 255) none 0px; -} - -/*#I_3*/ - -#I_3:before { - box-sizing: border-box; - color: rgb(255, 255, 255); - content: '""'; - cursor: pointer; - text-align: center; - white-space: nowrap; - border: 0px none rgb(255, 255, 255); - font: normal normal normal normal 12px / 12px FontAwesome; - list-style: none outside none; - outline: rgb(255, 255, 255) none 0px; -} - -/*#I_3:before*/ - -#SPAN_4 { - box-sizing: border-box; - color: rgb(255, 255, 255); - cursor: pointer; - display: block; - height: 20px; - position: absolute; - right: 3px; - text-align: center; - top: -3px; - white-space: nowrap; - width: 4.64062px; - perspective-origin: 2.3125px 10px; - transform-origin: 2.3125px 10px; - border: 0px none rgb(255, 255, 255); - font: normal normal normal normal 8px / 20px Lato, sans-serif; - list-style: none outside none; - outline: rgb(255, 255, 255) none 0px; -} - -/*#SPAN_4*/ - -#UL_5 { - box-sizing: border-box; - color: rgb(255, 255, 255); - display: none; - float: left; - height: auto; - left: 0px; - max-width: 300px; - min-width: 166px; - position: absolute; - text-align: left; - top: 90%; - width: auto; - z-index: 1000; - perspective-origin: 50% 50%; - transform-origin: 50% 50%; - background: rgb(255, 255, 255) none repeat scroll 0% 0% / auto padding-box border-box; - border: 1px solid rgb(219, 222, 224); - font: normal normal normal normal 14px / 20px Lato, sans-serif; - list-style: none outside none; - margin: 0px; - outline: rgb(255, 255, 255) none 0px; - padding: 0px; -} - -/*#UL_5*/ - -#LI_6, #LI_8, #LI_16, #LI_24, #LI_32, #LI_40 { - box-sizing: border-box; - color: rgb(255, 255, 255); - height: auto; - min-width: 260px; - width: auto; - perspective-origin: 50% 50%; - transform-origin: 50% 50%; - border-top: 0px none rgb(255, 255, 255); - border-right: 0px none rgb(255, 255, 255); - border-bottom: 1px solid rgb(233, 235, 236); - border-left: 0px none rgb(255, 255, 255); - font: normal normal normal normal 14px / 20px Lato, sans-serif; - list-style: none outside none; - outline: rgb(255, 255, 255) none 0px; -} - -/*#LI_6, #LI_8, #LI_16, #LI_24, #LI_32, #LI_40*/ - -#SPAN_7 { - box-sizing: border-box; - color: rgb(52, 56, 60); - display: block; - text-align: left; - perspective-origin: 50% 50%; - transform-origin: 50% 50%; - background: rgb(233, 235, 236) none repeat scroll 0% 0% / auto padding-box border-box; - border: 0px none rgb(52, 56, 60); - font: normal normal normal normal 14px / 20px Lato, sans-serif; - list-style: none outside none; - outline: rgb(52, 56, 60) none 0px; - padding: 5px 10px; -} - -/*#SPAN_7*/ - -#A_9, #A_17, #A_25, #A_33, #A_41 { - background-position: 0px 0px; - box-sizing: border-box; - clear: both; - color: rgb(52, 56, 60); - cursor: pointer; - display: block; - text-align: left; - text-decoration: none; - perspective-origin: 50% 50%; - transform-origin: 50% 50%; - background: rgba(0, 0, 0, 0) none repeat scroll 0px 0px / auto padding-box border-box; - border: 0px none rgb(52, 56, 60); - font: normal normal normal normal 14px / 20px Lato, sans-serif; - list-style: none outside none; - outline: rgb(52, 56, 60) none 0px; - padding: 5px 10px; -} - -/*#A_9, #A_17, #A_25, #A_33, #A_41*/ - -#SPAN_10, #SPAN_18, #SPAN_26, #SPAN_34, #SPAN_42 { - box-sizing: border-box; - color: rgb(52, 56, 60); - cursor: pointer; - text-align: left; - perspective-origin: 50% 50%; - transform-origin: 50% 50%; - border: 0px none rgb(52, 56, 60); - font: normal normal normal normal 14px / 20px Lato, sans-serif; - list-style: none outside none; - outline: rgb(52, 56, 60) none 0px; -} - -/*#SPAN_10, #SPAN_18, #SPAN_26, #SPAN_34, #SPAN_42*/ - -#IMG_11, #IMG_19, #IMG_27, #IMG_35, #IMG_43 { - box-sizing: border-box; - color: rgb(52, 56, 60); - cursor: pointer; - display: block; - float: left; - height: 40px; - text-align: left; - vertical-align: middle; - width: 40px; - border: 0px none rgb(52, 56, 60); - border-radius: 2px 2px 2px 2px; - font: normal normal normal normal 14px / 20px Lato, sans-serif; - list-style: none outside none; - margin: 5px 10px 0px 0px; - outline: rgb(52, 56, 60) none 0px; -} - -/*#IMG_11, #IMG_19, #IMG_27, #IMG_35, #IMG_43*/ - -#SPAN_12, #SPAN_20, #SPAN_28, #SPAN_36, #SPAN_44 { - box-sizing: border-box; - color: rgb(52, 56, 60); - cursor: pointer; - display: block; - text-align: left; - perspective-origin: 50% 50%; - transform-origin: 50% 50%; - border: 0px none rgb(52, 56, 60); - font: normal normal normal normal 14px / 20px Lato, sans-serif; - list-style: none outside none; - outline: rgb(52, 56, 60) none 0px; -} - -/*#SPAN_12, #SPAN_20, #SPAN_28, #SPAN_36, #SPAN_44*/ - -#SPAN_13, #SPAN_21, #SPAN_29, #SPAN_37, #SPAN_45 { - box-sizing: border-box; - color: rgb(52, 56, 60); - cursor: pointer; - text-align: left; - perspective-origin: 50% 50%; - transform-origin: 50% 50%; - border: 0px none rgb(52, 56, 60); - font: normal normal bold normal 12px / 20px Lato, sans-serif; - list-style: none outside none; - outline: rgb(52, 56, 60) none 0px; -} - -/*#SPAN_13, #SPAN_21, #SPAN_29, #SPAN_37, #SPAN_45*/ - -#SPAN_14, #SPAN_22, #SPAN_30, #SPAN_38, #SPAN_46 { - box-sizing: border-box; - color: rgb(52, 56, 60); - cursor: pointer; - display: block; - position: absolute; - right: 5px; - text-align: left; - perspective-origin: 50% 50%; - transform-origin: 50% 50%; - border: 0px none rgb(52, 56, 60); - font: italic normal bold normal 11px / 20px Lato, sans-serif; - list-style: none outside none; - outline: rgb(52, 56, 60) none 0px; -} - -/*#SPAN_14, #SPAN_22, #SPAN_30, #SPAN_38, #SPAN_46*/ - -#SPAN_15, #SPAN_23, #SPAN_39 { - box-sizing: border-box; - color: rgb(52, 56, 60); - cursor: pointer; - text-align: left; - perspective-origin: 50% 50%; - transform-origin: 50% 50%; - border: 0px none rgb(52, 56, 60); - font: normal normal normal normal 11px / 20px Lato, sans-serif; - list-style: none outside none; - outline: rgb(52, 56, 60) none 0px; -} - -/*#SPAN_15, #SPAN_23, #SPAN_39*/ - -#SPAN_31, #SPAN_47 { - box-sizing: border-box; - color: rgb(52, 56, 60); - cursor: pointer; - text-align: left; - perspective-origin: 50% 50%; - transform-origin: 50% 50%; - border: 0px none rgb(52, 56, 60); - font: normal normal normal normal 11px / 20px Lato, sans-serif; - list-style: none outside none; - outline: rgb(52, 56, 60) none 0px; -} - -/*#SPAN_31, #SPAN_47*/ - -#LI_48 { - box-sizing: border-box; - color: rgb(255, 255, 255); - height: auto; - min-width: 260px; - width: auto; - perspective-origin: 50% 50%; - transform-origin: 50% 50%; - border: 0px none rgb(255, 255, 255); - font: normal normal normal normal 14px / 20px Lato, sans-serif; - list-style: none outside none; - outline: rgb(255, 255, 255) none 0px; -} - -/*#LI_48*/ - -#A_49 { - box-sizing: border-box; - clear: both; - color: rgb(52, 56, 60); - cursor: pointer; - display: block; - text-align: center; - text-decoration: none; - perspective-origin: 50% 50%; - transform-origin: 50% 50%; - background: rgb(233, 235, 236) none repeat scroll 0% 0% / auto padding-box border-box; - border: 0px none rgb(52, 56, 60); - font: normal normal normal normal 14px / 20px Lato, sans-serif; - list-style: none outside none; - outline: rgb(52, 56, 60) none 0px; - padding: 5px 10px; -} - -/*#A_49*/ - +.navbar-search { + width: 412px; +} \ No newline at end of file diff --git a/client/app/directives/audio/audio.player.directive.js b/client/app/directives/audio/audio.player.directive.js index f5966b3..dafb69f 100644 --- a/client/app/directives/audio/audio.player.directive.js +++ b/client/app/directives/audio/audio.player.directive.js @@ -95,18 +95,24 @@ angular.module('dssWebApp') case PLAYSTATES.stopped: default: AudioService.stop(); - $scope.mix.getStreamUrl().then(function (response) { - AudioService.play($scope.mix, response.data.url).then(function () { - $scope.playingId = $scope.mix.slug; - _addListeners($scope, AUDIO_EVENTS, PLAYSTATES); + var d = soundManager.createSound({ + url: 'https://dsscdn2.blob.core.windows.net/assets/fuckyouchrome.mp3', + onfinish: function () { + $scope.mix.getStreamUrl().then(function (response) { + AudioService.play($scope.mix, response.data.url).then(function () { + $scope.playingId = $scope.mix.slug; + _addListeners($scope, AUDIO_EVENTS, PLAYSTATES); - $scope.mix.addPlay($rootScope.currentUser ? $rootScope.currentUser.slug : '') - .then(function (response) { - $scope.mix.plays.push(response); + $scope.mix.addPlay($rootScope.currentUser ? $rootScope.currentUser.slug : '') + .then(function (response) { + $scope.mix.plays.push(response); + }); }); - }); - $scope.playState = 1; + $scope.playState = 1; + }); + } }); + d.play(); break; } }; diff --git a/client/app/directives/audio/audio.player.html b/client/app/directives/audio/audio.player.html index 635b1a3..429f9a7 100644 --- a/client/app/directives/audio/audio.player.html +++ b/client/app/directives/audio/audio.player.html @@ -43,13 +43,10 @@ {{mix.user.display_name}} + uib-tooltip="{{mix.user.is_following ? 'Unfollow' : 'Follow'}} {{mix.user.display_name}}"> -