mirror of
https://github.com/fergalmoran/dss.web.git
synced 2026-02-15 04:25:41 +00:00
Merge branch 'master' into feature/mix_stacking
This commit is contained in:
Fergal Moran
@@ -26,79 +26,10 @@
|
||||
height: 29px;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
#page-content {
|
||||
min-height: 894px;
|
||||
}
|
||||
|
||||
.list-nostyle {
|
||||
list-style: none outside none;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.list-horiz li {
|
||||
.header .nav {
|
||||
float: left;
|
||||
list-style-type: none;
|
||||
position: relative;
|
||||
padding-right: 20px;
|
||||
}
|
||||
|
||||
.truncate {
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
.non-url-button {
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
.chat-talk {
|
||||
padding-top: 5px;
|
||||
}
|
||||
|
||||
.slimScrollDiv {
|
||||
padding-left: 5px;
|
||||
padding-right: 5px;
|
||||
}
|
||||
|
||||
.sidebar-alt-visible-lg #sidebar-alt {
|
||||
width: 300px !important;
|
||||
}
|
||||
|
||||
.sidebar-alt-visible-lg #main-container {
|
||||
margin-right: 300px !important;
|
||||
}
|
||||
|
||||
.sidebar-alt-visible-lg.header-fixed-top header.navbar-fixed-top, .sidebar-alt-visible-lg.header-fixed-bottom header.navbar-fixed-bottom,
|
||||
.sidebar-alt-visible-lg.footer-fixed #main-container #page-content + footer {
|
||||
right: 300px !important;
|
||||
}
|
||||
|
||||
.sidebar-content {
|
||||
width: 100% !important;
|
||||
}
|
||||
|
||||
.search-result-image {
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
}
|
||||
|
||||
.fa-1-3x {
|
||||
font-size: 1.3em;
|
||||
}
|
||||
|
||||
.override-text-align {
|
||||
text-align: left !important;
|
||||
}
|
||||
|
||||
h6.description {
|
||||
font-weight: bold;
|
||||
letter-spacing: 2px;
|
||||
color: #999;
|
||||
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
|
||||
padding-bottom: 5px;
|
||||
}
|
||||
|
||||
*/
|
||||
.top-nav-buttons {
|
||||
margin-left: 54px;
|
||||
}
|
||||
@@ -3,9 +3,13 @@
|
||||
</div>
|
||||
<a ui-sref="root" class="logo">Deep<span>South</span>Sounds</a>
|
||||
<div class="nav notify-row" id="top_menu">
|
||||
<ul class="nav top-menu" ng-if="$root.currentUser">
|
||||
<dss-notifications/>
|
||||
<li style="padding-left: 52px;">
|
||||
<ul class="nav top-menu" ng-show="$root.currentUser">
|
||||
<dss-notifications />
|
||||
</ul>
|
||||
</div>
|
||||
<div class="top-nav ">
|
||||
<ul class="nav top-menu top-nav-buttons">
|
||||
<li id="navbar-upload-button">
|
||||
<a ui-sref="root.upload">
|
||||
<i class="fa fa-cloud-upload"></i>
|
||||
<span>Upload</span>
|
||||
|
||||
@@ -26,4 +26,4 @@
|
||||
<a href="#">See all messages</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
</li>
|
||||
@@ -1,104 +0,0 @@
|
||||
<nav class="navbar navbar-default" role="navigation" id="navigation">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#collapse-menu">
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" ui-sref="root" id="brand">Deep|South|Sounds</a>
|
||||
</div>
|
||||
<div class="collapse navbar-collapse" id="collapse-menu">
|
||||
<ul class="nav navbar-nav">
|
||||
<li ui-sref-active="active" ng-if="$root.currentUser">
|
||||
<a ui-sref="root.upload">
|
||||
<i class="fa fa-cloud-upload"></i>
|
||||
<span>Upload</span>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="col-sm-6 col-md-6">
|
||||
<form class="navbar-form" role="search">
|
||||
<div class="input-group">
|
||||
<input type="text" ng-model="selected" placeholder="Search..."
|
||||
uib-typeahead="result for results in getSearchResults($viewValue)"
|
||||
typeahead-template-url="app/views/templates/searchResult.html"
|
||||
typeahead-loading="loadingSearchResults"
|
||||
class="form-control navbar-search"/>
|
||||
<div class="input-group-btn">
|
||||
<button class="btn btn-default" type="submit"><i class="fa fa-search"></i>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li id="navbar-radio-dropdown" class="dropdown">
|
||||
<a href="#" class="dropdown-toggle navbar-button" data-toggle="dropdown" uib-tooltip="Live">
|
||||
<span class="fa fa-1-3x fa-microphone"> Radio</span>
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li class="radio-player-dropdown">
|
||||
<dss-radio-player />
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<li id="navbar-notification-dropdown" class="dropdown" ng-if="$root.currentUser">
|
||||
<a href="#" class="dropdown-toggle navbar-button" data-toggle="dropdown" id="notifications-button">
|
||||
<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 navbar-notification">
|
||||
<dss-notifications/>
|
||||
</ul>
|
||||
</li>
|
||||
<li id="navbar-profile-dropdown" class="dropdown" ng-if="$root.currentUser">
|
||||
<a href="#" class="dropdown-toggle navbar-profile-dropdown" data-toggle="dropdown">{{
|
||||
$root.currentUser.display_name }}
|
||||
<b class="caret"></b>
|
||||
<img class="navbar-profile-image img-circle" ng-src="{{$root.currentUser.profile_image_small}}"
|
||||
alt="">
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li>
|
||||
<a ui-sref="root.me">View profile</a>
|
||||
</li>
|
||||
<li>
|
||||
<a ui-sref="root.me.edit">Account settings</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#" ng-click="logout()">Sign out</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li class="ms-hover" ng-if="!$root.currentUser">
|
||||
<a href="#" data-toggle="dropdown" class="dropdown-toggle">
|
||||
Login/Signup
|
||||
<i class="fa fa-angle-down"></i>
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<li>
|
||||
<div class="social-buttons">
|
||||
<ul class="list-nostyle">
|
||||
<li>
|
||||
<a ng-click="doLogin('facebook')" class="btn btn-fb"><i
|
||||
class="fa fa-facebook"></i> Facebook</a>
|
||||
</li>
|
||||
<li>
|
||||
<a ng-click="doLogin('twitter')" class="btn btn-tw"><i
|
||||
class="fa fa-twitter"></i> Twitter</a>
|
||||
</li>
|
||||
<li>
|
||||
<a ng-click="doLogin('google')" class="btn btn-google"><i
|
||||
class="fa fa-google"></i>
|
||||
Google</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</nav>
|
||||
@@ -1,4 +1,97 @@
|
||||
(function(c){var k={init:function(a){var b={color:c(this).css("background-color"),reach:20,speed:1E3,pause:0,glow:!0,repeat:!0,onHover:!1};c(this).css({"-moz-outline-radius":c(this).css("border-top-left-radius"),"-webkit-outline-radius":c(this).css("border-top-left-radius"),"outline-radius":c(this).css("border-top-left-radius")});a&&c.extend(b,a);b.color=c("<div style='background:"+b.color+"'></div>").css("background-color");!0!==b.repeat&&(!isNaN(b.repeat)&&0<b.repeat)&&(b.repeat-=1);return this.each(function(){b.onHover?
|
||||
c(this).bind("mouseover",function(){g(b,this,0)}).bind("mouseout",function(){c(this).pulsate("destroy")}):g(b,this,0)})},destroy:function(){return this.each(function(){clearTimeout(this.timer);c(this).css("outline",0)})}},g=function(a,b,d){var f=a.reach;d=d>f?0:d;var h=(f-d)/f,e=a.color.split(","),h="rgba("+e[0].split("(")[1]+","+e[1]+","+e[2].split(")")[0]+","+h+")",e={outline:"2px solid "+h};a.glow?(e["box-shadow"]="0px 0px "+parseInt(d/1.5)+"px "+h,userAgent=navigator.userAgent||"",/(chrome)[ \/]([\w.]+)/.test(userAgent.toLowerCase())&&
|
||||
(e["outline-offset"]=d+"px",e["outline-radius"]="100 px")):e["outline-offset"]=d+"px";c(b).css(e);b.timer&&clearTimeout(b.timer);b.timer=setTimeout(function(){if(d>=f&&!a.repeat)return c(b).pulsate("destroy"),!1;if(d>=f&&!0!==a.repeat&&!isNaN(a.repeat)&&0<a.repeat)a.repeat-=1;else if(a.pause&&d>=f)return l(a,b,d+1),!1;g(a,b,d+1)},a.speed/f)},l=function(a,b,c){innerfunc=function(){g(a,b,c)};b.timer=setTimeout(innerfunc,a.pause)};c.fn.pulsate=function(a){if(k[a])return k[a].apply(this,Array.prototype.slice.call(arguments,
|
||||
1));if("object"===typeof a||!a)return k.init.apply(this,arguments);c.error("Method "+a+" does not exist on jQuery.pulsate")}})(jQuery);
|
||||
(function( $ ){
|
||||
var methods = {
|
||||
init: function(options) {
|
||||
var settings = {
|
||||
color: $(this).css("background-color"),
|
||||
reach: 20,
|
||||
speed: 1000,
|
||||
pause: 0,
|
||||
glow: true,
|
||||
repeat: true,
|
||||
onHover: false
|
||||
};
|
||||
$(this).css({
|
||||
"-moz-outline-radius": $(this).css("border-top-left-radius"),
|
||||
"-webkit-outline-radius": $(this).css("border-top-left-radius"),
|
||||
"outline-radius": $(this).css("border-top-left-radius")
|
||||
});
|
||||
|
||||
if (options) {
|
||||
$.extend(settings, options);
|
||||
}
|
||||
settings.color = $("<div style='background:" + settings.color + "'></div>").css("background-color");
|
||||
if(settings.repeat !== true && !isNaN(settings.repeat) && settings.repeat > 0) {
|
||||
settings.repeat -=1;
|
||||
}
|
||||
|
||||
return this.each(function() {
|
||||
if(settings.onHover) {
|
||||
$(this).bind("mouseover", function () {pulse(settings, this, 0);})
|
||||
.bind("mouseout", function (){$(this).pulsate("destroy");});
|
||||
} else {
|
||||
pulse(settings, this, 0);
|
||||
}
|
||||
});
|
||||
},
|
||||
destroy: function() {
|
||||
return this.each(function() {
|
||||
clearTimeout(this.timer);
|
||||
$(this).css("outline",0);
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
var pulse = function(options, el, count) {
|
||||
var reach = options.reach,
|
||||
count = count>reach ? 0 : count,
|
||||
opacity = (reach-count)/reach,
|
||||
colorarr = options.color.split(","),
|
||||
color = "rgba(" + colorarr[0].split("(")[1] + "," + colorarr[1] + "," + colorarr[2].split(")")[0] + "," + opacity + ")",
|
||||
cssObj = {
|
||||
"outline": "2px solid " + color
|
||||
};
|
||||
if(options.glow) {
|
||||
cssObj["box-shadow"] = "0px 0px " + parseInt((count/1.5)) + "px " + color;
|
||||
}
|
||||
cssObj["outline-offset"] = count + "px";
|
||||
|
||||
$(el).css(cssObj);
|
||||
|
||||
var innerfunc = function () {
|
||||
if(count>=reach && !options.repeat) {
|
||||
$(el).pulsate("destroy");
|
||||
return false;
|
||||
} else if(count>=reach && options.repeat !== true && !isNaN(options.repeat) && options.repeat > 0) {
|
||||
options.repeat = options.repeat-1;
|
||||
} else if(options.pause && count>=reach) {
|
||||
pause(options, el, count+1);
|
||||
return false;
|
||||
}
|
||||
pulse(options, el, count+1);
|
||||
};
|
||||
|
||||
if(el.timer){
|
||||
clearTimeout(el.timer);
|
||||
}
|
||||
el.timer = setTimeout(innerfunc, options.speed/reach);
|
||||
};
|
||||
|
||||
var pause = function (options, el, count) {
|
||||
innerfunc = function () {
|
||||
pulse(options, el, count);
|
||||
};
|
||||
el.timer = setTimeout(innerfunc, options.pause);
|
||||
};
|
||||
|
||||
$.fn.pulsate = function( method ) {
|
||||
// Method calling logic
|
||||
if ( methods[method] ) {
|
||||
return methods[ method ].apply( this, Array.prototype.slice.call( arguments, 1 ));
|
||||
} else if ( typeof method === 'object' || ! method ) {
|
||||
return methods.init.apply( this, arguments );
|
||||
} else {
|
||||
$.error( 'Method ' + method + ' does not exist on jQuery.pulsate' );
|
||||
}
|
||||
|
||||
};
|
||||
})( jQuery );
|
||||
@@ -1,71 +1,38 @@
|
||||
<div id="ap1" style="width:100%; " class="skin-wave skin-wave-mode-normal audioplayer loaded">
|
||||
<div class="audioplayer-inner">
|
||||
<a class="the-thumb-con">
|
||||
<dss-mix-image></dss-mix-image>
|
||||
</a>
|
||||
<div class="ap-controls">
|
||||
<dss-waveform class="hidden-xs"></dss-waveform>
|
||||
</div>
|
||||
</div>
|
||||
<div ng-show="addingComment" class="lower-container add-comment animate-show">
|
||||
<div class="input-group comment-add-form pull-right">
|
||||
<span class="input-group-btn">
|
||||
<button type="button" class="btn btn-primary">
|
||||
<i class="fa fa-pencil"></i>
|
||||
</button>
|
||||
</span>
|
||||
<input type="text" placeholder="Add comment"
|
||||
ng-keyup="$event.keyCode == 13 && addComment($event)"
|
||||
ng-show="addingComment"
|
||||
show-focus="addingComment" class="form-control"/>
|
||||
</div>
|
||||
</div>
|
||||
<div ng-hide="addingComment" class="lower-container mix-details animate-show">
|
||||
<div class="control-container pull-left">
|
||||
<div class="con-controls">
|
||||
<div class="the-bg"></div>
|
||||
<div ng-click="play($event)" class="con-playpause">
|
||||
<div ng-show="(playState == 0 || playState == 2)" class="playbtn">
|
||||
<div class="play-icon"></div>
|
||||
<div class="play-icon-hover"></div>
|
||||
</div>
|
||||
<div ng-show="(playState == 1)" class="pausebtn">
|
||||
<div class="pause-icon">
|
||||
<div class="pause-part-1"></div>
|
||||
<div class="pause-part-2"></div>
|
||||
</div>
|
||||
<div class="pause-icon-hover"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style="left: 56px;" class="hidden-xs">
|
||||
<a ui-sref="root.user({user: mix.user.slug})"
|
||||
class="the-artist ng-binding">
|
||||
{{mix.user.display_name}}
|
||||
</a>
|
||||
<a href="#" ng-click="toggleFollow()" ng-show="currentUser"
|
||||
uib-tooltip="{{mix.user.is_following ? 'Unfollow' : 'Follow'}} {{mix.user.display_name}}">
|
||||
<i class="fa fa-user-plus"
|
||||
ng-class="mix.user.is_following ? 'text-danger' : 'text-success'"></i>
|
||||
</a>
|
||||
<div class="meta-artist"><span class="the-name ng-binding">{{mix.title}}</span></div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div style="width: 920px; left: 220px;" class="hidden-sm" ng-click="showCommentForm($event)" class="comments-holder active">
|
||||
<div class="the-bg"></div>
|
||||
<span ng-style="{'left': + (comment.time_index/mix.duration) * 100 + '%'}"
|
||||
ng-repeat="comment in comments | filter: { time_index: '!0' }"
|
||||
class="a-comment with-tooltip">
|
||||
<div class="aux-padder"></div>
|
||||
<span style="width: 250px;" class="dzstooltip skin-black">
|
||||
<span class="the-comment-author">@{{comment.user}}</span> says:<br/>{{comment.comment}}
|
||||
</span>
|
||||
<div style="background-image: url({{comment.avatar_image}})" class="the-avatar">
|
||||
</div>
|
||||
</span>
|
||||
</div>
|
||||
<div class="clear"></div>
|
||||
<div class=sidebar-toggle-box><i class="fa fa-bars"></i></div><a ui-sref=root
|
||||
class=logo>Deep<span>South</span>Sounds</a>
|
||||
<div class="nav notify-row" id=top_menu>
|
||||
<ul class="nav top-menu" ng-show=$root.currentUser>
|
||||
<dss-notifications>
|
||||
<li id=navbar-upload-button><a ui-sref=root.upload><i class="fa fa-cloud-upload"></i>
|
||||
<span>Upload</span></a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class=top-nav>
|
||||
<ul class="nav pull-right top-menu">
|
||||
<li><input class="form-control search" placeholder=Search></li>
|
||||
<li class=dropdown ng-if=$root.currentUser><a data-toggle=dropdown class=dropdown-toggle href=#>
|
||||
<img alt=""
|
||||
class=profile-dropdown-image
|
||||
ng-src={{$root.currentUser.profile_image_small}}>
|
||||
<span class=username>{{ $root.currentUser.display_name }}</span> <b class=caret></b></a>
|
||||
<ul class="dropdown-menu extended logout">
|
||||
<div class=log-arrow-up></div>
|
||||
<li><a ui-sref=root.me><i class="fa fa-suitcase"></i>Profile</a></li>
|
||||
<li><a ui-sref=root.me.edit><i class="fa fa-cog"></i> Settings</a></li>
|
||||
<li><a href=# ng-click="alert('Coming Soon');"><i class="fa fa-comments"></i> Chat</a></li>
|
||||
<li><a href=# ng-click=logout()><i class="fa fa-key"></i> Log Out</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li class=dropdown ng-if=!$root.currentUser><a data-toggle=dropdown class=dropdown-toggle href=#><i
|
||||
class="fa fa-user"></i> <span class=username>Login</span> <b class=caret></b></a>
|
||||
<ul class="dropdown-menu extended logout">
|
||||
<div class=log-arrow-up></div>
|
||||
<li><a href=# ng-click="doLogin('facebook')"><i class="fa fa-facebook"></i> Facebook</a></li>
|
||||
<li><a href=# ng-click="doLogin('twitter')"><i class="fa fa-twitter"></i> Twitter</a></li>
|
||||
<li><a href=# ng-click="doLogin('google')"><i class="fa fa-google"></i> Google</a></li>
|
||||
<li><i class="fa fa-key"></i> Choose Provider</li>
|
||||
</ul>
|
||||
</li>
|
||||
<!--\n <li class="sb-toggle-right">\n <i class="fa fa-align-right"></i>\n </li>\n -->
|
||||
</ul>
|
||||
</div>
|
||||
Reference in New Issue
Block a user